X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Ffragments%2FSettingsFragment.java;h=73ad08bad1eccb8df00d8b8058b625e1471c7fdd;hp=4001345b14037b1497f734f58b6e30b4b1b42c2f;hb=c0f2dcca77fffd804c90cee5103795fc3849112b;hpb=e7380180e2936dc8ebafaae1999a4b6789309c13 diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java b/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java index 4001345b..73ad08ba 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java @@ -56,44 +56,48 @@ public class SettingsFragment extends PreferenceFragment { savedPreferences = getPreferenceScreen().getSharedPreferences(); // Get handles for the preferences. - final Preference javaScriptPreference = findPreference("javascript"); - final Preference firstPartyCookiesPreference = findPreference("first_party_cookies"); - final Preference thirdPartyCookiesPreference = findPreference("third_party_cookies"); - final Preference domStoragePreference = findPreference("dom_storage"); - final Preference saveFormDataPreference = findPreference("save_form_data"); // The form data preference can be removed once the minimum API >= 26. - final Preference userAgentPreference = findPreference("user_agent"); - final Preference customUserAgentPreference = findPreference("custom_user_agent"); - final Preference incognitoModePreference = findPreference("incognito_mode"); - final Preference doNotTrackPreference = findPreference("do_not_track"); - final Preference allowScreenshotsPreference = findPreference("allow_screenshots"); - final Preference easyListPreference = findPreference("easylist"); - final Preference easyPrivacyPreference = findPreference("easyprivacy"); - final Preference fanboyAnnoyanceListPreference = findPreference("fanboys_annoyance_list"); - final Preference fanboySocialBlockingListPreference = findPreference("fanboys_social_blocking_list"); - final Preference ultraPrivacyPreference = findPreference("ultraprivacy"); - final Preference blockAllThirdPartyRequestsPreference = findPreference("block_all_third_party_requests"); - final Preference proxyThroughOrbotPreference = findPreference("proxy_through_orbot"); - final Preference torHomepagePreference = findPreference("tor_homepage"); - final Preference torSearchPreference = findPreference("tor_search"); - final Preference torSearchCustomURLPreference = findPreference("tor_search_custom_url"); - final Preference searchPreference = findPreference("search"); - final Preference searchCustomURLPreference = findPreference("search_custom_url"); - final Preference fullScreenBrowsingModePreference = findPreference("full_screen_browsing_mode"); - final Preference hideAppBarPreference = findPreference("hide_app_bar"); - final Preference clearEverythingPreference = findPreference("clear_everything"); - final Preference clearCookiesPreference = findPreference("clear_cookies"); - final Preference clearDomStoragePreference = findPreference("clear_dom_storage"); - final Preference clearFormDataPreference = findPreference("clear_form_data"); // The clear form data preference can be removed once the minimum API >= 26. - final Preference clearCachePreference = findPreference("clear_cache"); - final Preference homepagePreference = findPreference("homepage"); - final Preference fontSizePreference = findPreference("font_size"); - final Preference swipeToRefreshPreference = findPreference("swipe_to_refresh"); - final Preference scrollAppBarPreference = findPreference("scroll_app_bar"); - final Preference displayAdditionalAppBarIconsPreference = findPreference("display_additional_app_bar_icons"); - final Preference downloadWithExternalAppPreference = findPreference("download_with_external_app"); - final Preference darkThemePreference = findPreference("dark_theme"); - final Preference nightModePreference = findPreference("night_mode"); - final Preference displayWebpageImagesPreference = findPreference("display_webpage_images"); + Preference javaScriptPreference = findPreference("javascript"); + Preference firstPartyCookiesPreference = findPreference("first_party_cookies"); + Preference thirdPartyCookiesPreference = findPreference("third_party_cookies"); + Preference domStoragePreference = findPreference("dom_storage"); + Preference formDataPreference = findPreference("save_form_data"); // The form data preference can be removed once the minimum API >= 26. + Preference userAgentPreference = findPreference("user_agent"); + Preference customUserAgentPreference = findPreference("custom_user_agent"); + Preference incognitoModePreference = findPreference("incognito_mode"); + Preference doNotTrackPreference = findPreference("do_not_track"); + Preference allowScreenshotsPreference = findPreference("allow_screenshots"); + Preference easyListPreference = findPreference("easylist"); + Preference easyPrivacyPreference = findPreference("easyprivacy"); + Preference fanboyAnnoyanceListPreference = findPreference("fanboys_annoyance_list"); + Preference fanboySocialBlockingListPreference = findPreference("fanboys_social_blocking_list"); + Preference ultraPrivacyPreference = findPreference("ultraprivacy"); + Preference blockAllThirdPartyRequestsPreference = findPreference("block_all_third_party_requests"); + Preference googleAnalyticsPreference = findPreference("google_analytics"); + Preference facebookClickIdsPreference = findPreference("facebook_click_ids"); + Preference twitterAmpRedirectsPreference = findPreference("twitter_amp_redirects"); + Preference proxyThroughOrbotPreference = findPreference("proxy_through_orbot"); + Preference torHomepagePreference = findPreference("tor_homepage"); + Preference torSearchPreference = findPreference("tor_search"); + Preference torSearchCustomURLPreference = findPreference("tor_search_custom_url"); + Preference searchPreference = findPreference("search"); + Preference searchCustomURLPreference = findPreference("search_custom_url"); + Preference fullScreenBrowsingModePreference = findPreference("full_screen_browsing_mode"); + Preference hideAppBarPreference = findPreference("hide_app_bar"); + Preference clearEverythingPreference = findPreference("clear_everything"); + Preference clearCookiesPreference = findPreference("clear_cookies"); + Preference clearDomStoragePreference = findPreference("clear_dom_storage"); + Preference clearFormDataPreference = findPreference("clear_form_data"); // The clear form data preference can be removed once the minimum API >= 26. + Preference clearCachePreference = findPreference("clear_cache"); + Preference homepagePreference = findPreference("homepage"); + Preference fontSizePreference = findPreference("font_size"); + Preference openIntentsInNewTabPreference = findPreference("open_intents_in_new_tab"); + Preference swipeToRefreshPreference = findPreference("swipe_to_refresh"); + Preference scrollAppBarPreference = findPreference("scroll_app_bar"); + Preference displayAdditionalAppBarIconsPreference = findPreference("display_additional_app_bar_icons"); + Preference downloadWithExternalAppPreference = findPreference("download_with_external_app"); + Preference darkThemePreference = findPreference("dark_theme"); + Preference nightModePreference = findPreference("night_mode"); + Preference displayWebpageImagesPreference = findPreference("display_webpage_images"); // Set dependencies. torHomepagePreference.setDependency("proxy_through_orbot"); @@ -105,7 +109,7 @@ public class SettingsFragment extends PreferenceFragment { String searchString = savedPreferences.getString("search", getString(R.string.search_default_value)); // Get booleans that are used in multiple places from the preferences. - final boolean javaScriptEnabled = savedPreferences.getBoolean("javascript", false); + boolean javaScriptEnabled = savedPreferences.getBoolean("javascript", false); boolean firstPartyCookiesEnabled = savedPreferences.getBoolean("first_party_cookies", false); boolean thirdPartyCookiesEnabled = savedPreferences.getBoolean("third_party_cookies", false); boolean fanboyAnnoyanceListEnabled = savedPreferences.getBoolean("fanboys_annoyance_list", true); @@ -114,7 +118,7 @@ public class SettingsFragment extends PreferenceFragment { boolean fullScreenBrowsingMode = savedPreferences.getBoolean("full_screen_browsing_mode", false); boolean clearEverything = savedPreferences.getBoolean("clear_everything", true); boolean darkTheme = savedPreferences.getBoolean("dark_theme", false); - final boolean nightMode = savedPreferences.getBoolean("night_mode", false); + boolean nightMode = savedPreferences.getBoolean("night_mode", false); // Only enable the third-party cookies preference if first-party cookies are enabled and API >= 21. thirdPartyCookiesPreference.setEnabled(firstPartyCookiesEnabled && (Build.VERSION.SDK_INT >= 21)); @@ -129,7 +133,7 @@ public class SettingsFragment extends PreferenceFragment { PreferenceCategory clearAndExitCategory = (PreferenceCategory) findPreference("clear_and_exit"); // Remove the form data preferences. - privacyCategory.removePreference(saveFormDataPreference); + privacyCategory.removePreference(formDataPreference); clearAndExitCategory.removePreference(clearFormDataPreference); } @@ -140,7 +144,7 @@ public class SettingsFragment extends PreferenceFragment { LayoutInflater inflater = getActivity().getLayoutInflater(); // `@SuppressLint("InflateParams")` removes the warning about using `null` as the `ViewGroup`, which in this case makes sense because the `bare_webview` will not be displayed. @SuppressLint("InflateParams") View bareWebViewLayout = inflater.inflate(R.layout.bare_webview, null, false); - final WebView bareWebView = bareWebViewLayout.findViewById(R.id.bare_webview); + WebView bareWebView = bareWebViewLayout.findViewById(R.id.bare_webview); // Get the user agent arrays. ArrayAdapter userAgentNamesArray = ArrayAdapter.createFromResource(context, R.array.user_agent_names, R.layout.spinner_item); @@ -287,12 +291,12 @@ public class SettingsFragment extends PreferenceFragment { // Set the save form data icon if API < 26. Save form data has no effect on API >= 26. if (Build.VERSION.SDK_INT < 26) { if (savedPreferences.getBoolean("save_form_data", false)) { - saveFormDataPreference.setIcon(R.drawable.form_data_enabled); + formDataPreference.setIcon(R.drawable.form_data_enabled); } else { if (darkTheme) { - saveFormDataPreference.setIcon(R.drawable.form_data_disabled_dark); + formDataPreference.setIcon(R.drawable.form_data_disabled_dark); } else { - saveFormDataPreference.setIcon(R.drawable.form_data_disabled_light); + formDataPreference.setIcon(R.drawable.form_data_disabled_light); } } } @@ -456,6 +460,51 @@ public class SettingsFragment extends PreferenceFragment { } } + // Set the Google Analytics icon according to the theme. + if (savedPreferences.getBoolean("google_analytics", true)) { + if (darkTheme) { + googleAnalyticsPreference.setIcon(R.drawable.modify_url_enabled_dark); + } else { + googleAnalyticsPreference.setIcon(R.drawable.modify_url_enabled_light); + } + } else { + if (darkTheme) { + googleAnalyticsPreference.setIcon(R.drawable.modify_url_disabled_dark); + } else { + googleAnalyticsPreference.setIcon(R.drawable.modify_url_disabled_light); + } + } + + // Set the Facebook Click IDs icon according to the theme. + if (savedPreferences.getBoolean("facebook_click_ids", true)) { + if (darkTheme) { + facebookClickIdsPreference.setIcon(R.drawable.modify_url_enabled_dark); + } else { + facebookClickIdsPreference.setIcon(R.drawable.modify_url_enabled_light); + } + } else { + if (darkTheme) { + facebookClickIdsPreference.setIcon(R.drawable.modify_url_disabled_dark); + } else { + facebookClickIdsPreference.setIcon(R.drawable.modify_url_disabled_light); + } + } + + // Set the Twitter AMP redirects icon according to the theme. + if (savedPreferences.getBoolean("twitter_amp_redirects", true)) { + if (darkTheme) { + twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_enabled_dark); + } else { + twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_enabled_light); + } + } else { + if (darkTheme) { + twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_disabled_dark); + } else { + twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_disabled_light); + } + } + // Set the Tor icons according to the theme. if (proxyThroughOrbot) { // Proxying is enabled. if (darkTheme) { @@ -603,6 +652,21 @@ public class SettingsFragment extends PreferenceFragment { clearCachePreference.setIcon(R.drawable.cache_warning); } + // Set the open intents in new tab preference icon. + if (savedPreferences.getBoolean("open_intents_in_new_tab", true)) { + if (darkTheme) { + openIntentsInNewTabPreference.setIcon(R.drawable.tab_enabled_dark); + } else { + openIntentsInNewTabPreference.setIcon(R.drawable.tab_enabled_light); + } + } else { + if (darkTheme) { + openIntentsInNewTabPreference.setIcon(R.drawable.tab_disabled_dark); + } else { + openIntentsInNewTabPreference.setIcon(R.drawable.tab_disabled_light); + } + } + // Set the swipe to refresh preference icon. if (savedPreferences.getBoolean("swipe_to_refresh", true)) { if (darkTheme) { @@ -813,12 +877,12 @@ public class SettingsFragment extends PreferenceFragment { case "save_form_data": // Update the icon. if (sharedPreferences.getBoolean("save_form_data", false)) { - saveFormDataPreference.setIcon(R.drawable.form_data_enabled); + formDataPreference.setIcon(R.drawable.form_data_enabled); } else { if (darkTheme) { - saveFormDataPreference.setIcon(R.drawable.form_data_disabled_dark); + formDataPreference.setIcon(R.drawable.form_data_disabled_dark); } else { - saveFormDataPreference.setIcon(R.drawable.form_data_disabled_light); + formDataPreference.setIcon(R.drawable.form_data_disabled_light); } } break; @@ -1094,6 +1158,57 @@ public class SettingsFragment extends PreferenceFragment { } break; + case "google_analytics": + // Update the icon. + if (sharedPreferences.getBoolean("google_analytics", true)) { + if (darkTheme) { + googleAnalyticsPreference.setIcon(R.drawable.modify_url_enabled_dark); + } else { + googleAnalyticsPreference.setIcon(R.drawable.modify_url_enabled_light); + } + } else { + if (darkTheme) { + googleAnalyticsPreference.setIcon(R.drawable.modify_url_disabled_dark); + } else { + googleAnalyticsPreference.setIcon(R.drawable.modify_url_disabled_light); + } + } + break; + + case "facebook_click_ids": + // Update the icon. + if (sharedPreferences.getBoolean("facebook_click_ids", true)) { + if (darkTheme) { + facebookClickIdsPreference.setIcon(R.drawable.modify_url_enabled_dark); + } else { + facebookClickIdsPreference.setIcon(R.drawable.modify_url_enabled_light); + } + } else { + if (darkTheme) { + facebookClickIdsPreference.setIcon(R.drawable.modify_url_disabled_dark); + } else { + facebookClickIdsPreference.setIcon(R.drawable.modify_url_disabled_light); + } + } + break; + + case "twitter_amp_redirects": + // Update the icon. + if (sharedPreferences.getBoolean("twitter_amp_redirects", true)) { + if (darkTheme) { + twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_enabled_dark); + } else { + twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_enabled_light); + } + } else { + if (darkTheme) { + twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_disabled_dark); + } else { + twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_disabled_light); + } + } + break; + case "proxy_through_orbot": // Get current settings. boolean currentProxyThroughOrbot = sharedPreferences.getBoolean("proxy_through_orbot", false); @@ -1413,6 +1528,23 @@ public class SettingsFragment extends PreferenceFragment { fontSizePreference.setSummary(sharedPreferences.getString("font_size", getString(R.string.font_size_default_value)) + "%%"); break; + case "open_intents_in_new_tab": + // Update the icon. + if (sharedPreferences.getBoolean("open_intents_in_new_tab", true)) { + if (darkTheme) { + openIntentsInNewTabPreference.setIcon(R.drawable.tab_enabled_dark); + } else { + openIntentsInNewTabPreference.setIcon(R.drawable.tab_enabled_light); + } + } else { + if (darkTheme) { + openIntentsInNewTabPreference.setIcon(R.drawable.tab_disabled_dark); + } else { + openIntentsInNewTabPreference.setIcon(R.drawable.tab_disabled_light); + } + } + break; + case "swipe_to_refresh": // Update the icon. if (sharedPreferences.getBoolean("swipe_to_refresh", true)) { @@ -1510,7 +1642,7 @@ public class SettingsFragment extends PreferenceFragment { System.exit(0); }; - // Restart the activity after 100 milliseconds, so that the app has enought time to save the change to the preference. + // Restart the activity after 100 milliseconds, so that the app has enough time to save the change to the preference. changeThemeRestartHandler.postDelayed(changeThemeRestartRunnable, 100); break;