From 63087a4311872cd0f8cddd0941214960f3af7192 Mon Sep 17 00:00:00 2001 From: Vincent Nagel Date: Sat, 11 Apr 2020 17:26:16 -0500 Subject: [PATCH] renamed to "restricted mode" --- .../java/org/schabi/newpipe/DebugApp.java | 2 +- app/src/main/java/org/schabi/newpipe/App.java | 2 +- .../org/schabi/newpipe/DownloaderImpl.java | 31 +++++++++---------- .../newpipe/fragments/MainFragment.java | 18 +++++------ .../settings/ContentSettingsFragment.java | 8 ++--- app/src/main/res/values/settings_keys.xml | 1 + app/src/main/res/values/strings.xml | 1 + app/src/main/res/xml/content_settings.xml | 6 ++++ 8 files changed, 38 insertions(+), 31 deletions(-) diff --git a/app/src/debug/java/org/schabi/newpipe/DebugApp.java b/app/src/debug/java/org/schabi/newpipe/DebugApp.java index a378911c6..1dc6cd03b 100644 --- a/app/src/debug/java/org/schabi/newpipe/DebugApp.java +++ b/app/src/debug/java/org/schabi/newpipe/DebugApp.java @@ -43,7 +43,7 @@ public class DebugApp extends App { DownloaderImpl downloader = DownloaderImpl.init(new OkHttpClient.Builder() .addNetworkInterceptor(new StethoInterceptor())); setCookiesToDownloader(downloader); - downloader.updateAgeRestrictedContentCookies(getApplicationContext()); + downloader.updateRestrictedModeCookies(getApplicationContext()); return downloader; } diff --git a/app/src/main/java/org/schabi/newpipe/App.java b/app/src/main/java/org/schabi/newpipe/App.java index 167f459f0..77cfcf0f5 100644 --- a/app/src/main/java/org/schabi/newpipe/App.java +++ b/app/src/main/java/org/schabi/newpipe/App.java @@ -137,7 +137,7 @@ public class App extends Application { getApplicationContext()); final String key = getApplicationContext().getString(R.string.recaptcha_cookies_key); downloader.setCookie(ReCaptchaActivity.RECAPTCHA_COOKIES_KEY, prefs.getString(key, "")); - downloader.updateAgeRestrictedContentCookies(getApplicationContext()); + downloader.updateRestrictedModeCookies(getApplicationContext()); } private void configureRxJavaErrorHandler() { diff --git a/app/src/main/java/org/schabi/newpipe/DownloaderImpl.java b/app/src/main/java/org/schabi/newpipe/DownloaderImpl.java index 1abdeb504..66292e38c 100644 --- a/app/src/main/java/org/schabi/newpipe/DownloaderImpl.java +++ b/app/src/main/java/org/schabi/newpipe/DownloaderImpl.java @@ -44,10 +44,9 @@ import static org.schabi.newpipe.MainActivity.DEBUG; public final class DownloaderImpl extends Downloader { public static final String USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Firefox/68.0"; - - public static final String YOUTUBE_AGE_RESTRICTED_CONTENT_COOKIE_KEY = - "youtube_age_restricted_content_cookie_key"; - public static final String YOUTUBE_AGE_RESTRICTED_CONTENT_COOKIE = "PREF=f2=8000000"; + public static final String YOUTUBE_RESTRICTED_MODE_COOKIE_KEY + = "youtube_restricted_mode_key"; + public static final String YOUTUBE_RESTRICTED_MODE_COOKIE = "PREF=f2=8000000"; public static final String YOUTUBE_DOMAIN = "youtube.com"; private static DownloaderImpl instance; @@ -134,7 +133,7 @@ public final class DownloaderImpl extends Downloader { public String getCookies(final String url) { List resultCookies = new ArrayList<>(); if (url.contains(YOUTUBE_DOMAIN)) { - String youtubeCookie = getCookie(YOUTUBE_AGE_RESTRICTED_CONTENT_COOKIE_KEY); + String youtubeCookie = getCookie(YOUTUBE_RESTRICTED_MODE_COOKIE_KEY); if (youtubeCookie != null) { resultCookies.add(youtubeCookie); } @@ -159,20 +158,20 @@ public final class DownloaderImpl extends Downloader { mCookies.remove(key); } - public void updateAgeRestrictedContentCookies(final Context context) { - String showAgeRestrictedContentKey = - context.getString(R.string.show_age_restricted_content); - boolean showAgeRestrictedContent = PreferenceManager.getDefaultSharedPreferences(context) - .getBoolean(showAgeRestrictedContentKey, false); - updateAgeRestrictedContentCookies(showAgeRestrictedContent); + public void updateRestrictedModeCookies(final Context context) { + String restrictedModeEnabledKey = + context.getString(R.string.restricted_mode_enabled); + boolean restrictedModeEnabled = PreferenceManager.getDefaultSharedPreferences(context) + .getBoolean(restrictedModeEnabledKey, false); + updateRestrictedModeCookies(restrictedModeEnabled); } - public void updateAgeRestrictedContentCookies(final boolean showAgeRestrictedContent) { - if (!showAgeRestrictedContent) { - setCookie(YOUTUBE_AGE_RESTRICTED_CONTENT_COOKIE_KEY, - YOUTUBE_AGE_RESTRICTED_CONTENT_COOKIE); + public void updateRestrictedModeCookies(final boolean restrictedModeEnabled) { + if (restrictedModeEnabled) { + setCookie(YOUTUBE_RESTRICTED_MODE_COOKIE_KEY, + YOUTUBE_RESTRICTED_MODE_COOKIE); } else { - removeCookie(YOUTUBE_AGE_RESTRICTED_CONTENT_COOKIE_KEY); + removeCookie(YOUTUBE_RESTRICTED_MODE_COOKIE_KEY); } InfoCache.getInstance().clearCache(); } diff --git a/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java index 9cb21f4e7..50ed6b024 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java @@ -46,8 +46,8 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte private boolean hasTabsChanged = false; - private boolean previousShowAgeRestrictedContent; - private String showAgeRestrictedContentKey; + private boolean previousRestrictedModeEnabled; + private String restrictedModeEnabledKey; /*////////////////////////////////////////////////////////////////////////// // Fragment's LifeCycle @@ -70,10 +70,10 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte } }); - showAgeRestrictedContentKey = getString(R.string.show_age_restricted_content); - previousShowAgeRestrictedContent = + restrictedModeEnabledKey = getString(R.string.restricted_mode_enabled); + previousRestrictedModeEnabled = PreferenceManager.getDefaultSharedPreferences(getContext()) - .getBoolean(showAgeRestrictedContentKey, false); + .getBoolean(restrictedModeEnabledKey, false); } @Override @@ -100,11 +100,11 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte public void onResume() { super.onResume(); - boolean showAgeRestrictedContent = + boolean restrictedModeEnabled = PreferenceManager.getDefaultSharedPreferences(getContext()) - .getBoolean(showAgeRestrictedContentKey, false); - if (previousShowAgeRestrictedContent != showAgeRestrictedContent) { - previousShowAgeRestrictedContent = showAgeRestrictedContent; + .getBoolean(restrictedModeEnabledKey, false); + if (previousRestrictedModeEnabled != restrictedModeEnabled) { + previousRestrictedModeEnabled = restrictedModeEnabled; setupTabs(); } else if (hasTabsChanged) { setupTabs(); diff --git a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java index c47c47ed1..e577d2ac8 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java +++ b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java @@ -58,7 +58,7 @@ public class ContentSettingsFragment extends BasePreferenceFragment { private File newpipeSettings; private String thumbnailLoadToggleKey; - private String showAgeRestrictedContentKey; + private String restrictedModeEnabledKey; private Localization initialSelectedLocalization; private ContentCountry initialSelectedContentCountry; @@ -68,7 +68,7 @@ public class ContentSettingsFragment extends BasePreferenceFragment { public void onCreate(@Nullable final Bundle savedInstanceState) { super.onCreate(savedInstanceState); thumbnailLoadToggleKey = getString(R.string.download_thumbnail_key); - showAgeRestrictedContentKey = getString(R.string.show_age_restricted_content); + restrictedModeEnabledKey = getString(R.string.restricted_mode_enabled); initialSelectedLocalization = org.schabi.newpipe.util.Localization .getPreferredLocalization(requireContext()); @@ -90,10 +90,10 @@ public class ContentSettingsFragment extends BasePreferenceFragment { Toast.LENGTH_SHORT).show(); } - if (preference.getKey().equals(showAgeRestrictedContentKey)) { + if (preference.getKey().equals(restrictedModeEnabledKey)) { Context context = getContext(); if (context != null) { - DownloaderImpl.getInstance().updateAgeRestrictedContentCookies(context); + DownloaderImpl.getInstance().updateRestrictedModeCookies(context); } else { Log.w(TAG, "onPreferenceTreeClick: null context"); } diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml index ca8528fef..0a0d2c70a 100644 --- a/app/src/main/res/values/settings_keys.xml +++ b/app/src/main/res/values/settings_keys.xml @@ -170,6 +170,7 @@ peertube_instance_list content_country show_age_restricted_content + restricted_mode_enabled use_tor enable_search_history enable_watch_history diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f5c993dda..125d411c2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -137,6 +137,7 @@ Content Age restricted content Show age restricted video. Future changes are possible from the settings. + Restricted mode This video is age restricted.\n\nIf you want to view it, enable \"Age restricted content\" in the settings. Live Downloads diff --git a/app/src/main/res/xml/content_settings.xml b/app/src/main/res/xml/content_settings.xml index e2fbc081d..e90520229 100644 --- a/app/src/main/res/xml/content_settings.xml +++ b/app/src/main/res/xml/content_settings.xml @@ -51,6 +51,12 @@ android:key="@string/show_age_restricted_content" android:title="@string/show_age_restricted_content_title"/> + +