From 6c53bf6c22b1d6c12d0dd1d87c98fc796fbfc9aa Mon Sep 17 00:00:00 2001 From: Stefan Schueller Date: Sun, 11 Nov 2018 01:15:06 +0100 Subject: [PATCH] - fixed default NSFW setting --- app/build.gradle | 4 ++-- .../peertube/activity/SearchActivity.java | 2 +- .../peertube/activity/VideoListActivity.java | 2 +- app/src/main/res/drawable/ic_peertube.xml | 18 ++++++++++++++++++ 4 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 app/src/main/res/drawable/ic_peertube.xml diff --git a/app/build.gradle b/app/build.gradle index a0f046f..3ecd1ee 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ android { applicationId "net.schueller.peertube" minSdkVersion 23 targetSdkVersion 28 - versionCode 101 - versionName "1.0.1" + versionCode 102 + versionName "1.0.2" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/app/src/main/java/net/schueller/peertube/activity/SearchActivity.java b/app/src/main/java/net/schueller/peertube/activity/SearchActivity.java index e8622d0..9cc00c3 100644 --- a/app/src/main/java/net/schueller/peertube/activity/SearchActivity.java +++ b/app/src/main/java/net/schueller/peertube/activity/SearchActivity.java @@ -115,7 +115,7 @@ public class SearchActivity extends AppCompatActivity { isLoading = true; SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this); - String nsfw = sharedPref.getBoolean("pref_show_nsfw", true) ? "both" : "false"; + String nsfw = sharedPref.getBoolean("pref_show_nsfw", false) ? "both" : "false"; String apiBaseURL = APIUrlHelper.getUrl(this); diff --git a/app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java b/app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java index 7853b3e..75312b7 100644 --- a/app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java +++ b/app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java @@ -238,7 +238,7 @@ public class VideoListActivity extends AppCompatActivity { isLoading = true; SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this); - String nsfw = sharedPref.getBoolean("pref_show_nsfw", true) ? "both" : "false"; + String nsfw = sharedPref.getBoolean("pref_show_nsfw", false) ? "both" : "false"; String apiBaseURL = APIUrlHelper.getUrl(this); diff --git a/app/src/main/res/drawable/ic_peertube.xml b/app/src/main/res/drawable/ic_peertube.xml new file mode 100644 index 0000000..b30ec62 --- /dev/null +++ b/app/src/main/res/drawable/ic_peertube.xml @@ -0,0 +1,18 @@ + + + + + +