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=b9f8e16c7c177fe287ee500a59f1cfd9ed7a4b2d;hp=88d57994e0460532bd1a33e87713c2e7508711dd;hb=af807cce079aaae9cbf0430e7da946fcbe0c99c3;hpb=6ccecb3374c1988aef2650a87dac20923ce3aa2f 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 88d57994..b9f8e16c 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java @@ -1,5 +1,5 @@ /* - * Copyright © 2016-2018 Soren Stoutner . + * Copyright © 2016-2019 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -26,6 +26,7 @@ import android.content.SharedPreferences; import android.os.Build; import android.os.Bundle; import android.preference.Preference; +import android.preference.PreferenceCategory; import android.preference.PreferenceFragment; import android.view.LayoutInflater; import android.view.View; @@ -41,7 +42,10 @@ public class SettingsFragment extends PreferenceFragment { @Override public void onCreate(Bundle savedInstanceState) { + // Run the default commands. super.onCreate(savedInstanceState); + + // Load the preferences from the XML file. addPreferencesFromResource(R.xml.preferences); // Get a handle for the context. @@ -50,20 +54,23 @@ public class SettingsFragment extends PreferenceFragment { // Initialize savedPreferences. savedPreferences = getPreferenceScreen().getSharedPreferences(); - // Get handles for the preferences we need to modify. - final Preference javaScriptPreference = findPreference("javascript_enabled"); - final Preference firstPartyCookiesPreference = findPreference("first_party_cookies_enabled"); - final Preference thirdPartyCookiesPreference = findPreference("third_party_cookies_enabled"); - final Preference domStoragePreference = findPreference("dom_storage_enabled"); - final Preference saveFormDataPreference = findPreference("save_form_data_enabled"); + // 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("fanboy_annoyance_list"); - final Preference fanboySocialBlockingListPreference = findPreference("fanboy_social_blocking_list"); + 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"); @@ -71,17 +78,18 @@ public class SettingsFragment extends PreferenceFragment { final Preference searchPreference = findPreference("search"); final Preference searchCustomURLPreference = findPreference("search_custom_url"); final Preference fullScreenBrowsingModePreference = findPreference("full_screen_browsing_mode"); - final Preference hideSystemBarsPreference = findPreference("hide_system_bars"); - final Preference translucentNavigationBarPreference = findPreference("translucent_navigation_bar"); + 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"); + 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 defaultFontSizePreference = findPreference("default_font_size"); + 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"); @@ -89,46 +97,56 @@ public class SettingsFragment extends PreferenceFragment { // Set dependencies. torHomepagePreference.setDependency("proxy_through_orbot"); torSearchPreference.setDependency("proxy_through_orbot"); - hideSystemBarsPreference.setDependency("full_screen_browsing_mode"); - - // Get Strings from the preferences. - String torSearchString = savedPreferences.getString("tor_search", "https://3g2upl4pq6kufc4m.onion/html/?q="); - String searchString = savedPreferences.getString("search", "https://duckduckgo.com/html/?q="); - - // Get booleans from the preferences. - final boolean javaScriptEnabled = savedPreferences.getBoolean("javascript_enabled", false); - boolean firstPartyCookiesEnabled = savedPreferences.getBoolean("first_party_cookies_enabled", false); - boolean thirdPartyCookiesEnabled = savedPreferences.getBoolean("third_party_cookies_enabled", false); - boolean fanboyAnnoyanceListEnabled = savedPreferences.getBoolean("fanboy_annoyance_list", true); - boolean fanboySocialBlockingEnabled = savedPreferences.getBoolean("fanboy_social_blocking_list", true); + hideAppBarPreference.setDependency("full_screen_browsing_mode"); + + // Get strings from the preferences. + String torSearchString = savedPreferences.getString("tor_search", getString(R.string.tor_search_default_value)); + 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 firstPartyCookiesEnabled = savedPreferences.getBoolean("first_party_cookies", false); + boolean thirdPartyCookiesEnabled = savedPreferences.getBoolean("third_party_cookies", false); + boolean fanboyAnnoyanceListEnabled = savedPreferences.getBoolean("fanboys_annoyance_list", true); + boolean fanboySocialBlockingEnabled = savedPreferences.getBoolean("fanboys_social_blocking_list", true); boolean proxyThroughOrbot = savedPreferences.getBoolean("proxy_through_orbot", false); boolean fullScreenBrowsingMode = savedPreferences.getBoolean("full_screen_browsing_mode", false); - boolean hideSystemBars = savedPreferences.getBoolean("hide_system_bars", false); boolean clearEverything = savedPreferences.getBoolean("clear_everything", true); final boolean nightMode = savedPreferences.getBoolean("night_mode", false); - // Only enable the third-party preference if first-party cookies are enabled and API >= 21. + // Only enable the third-party cookies preference if first-party cookies are enabled and API >= 21. thirdPartyCookiesPreference.setEnabled(firstPartyCookiesEnabled && (Build.VERSION.SDK_INT >= 21)); // Only enable the DOM storage preference if either JavaScript or Night Mode is enabled. domStoragePreference.setEnabled(javaScriptEnabled || nightMode); + // Remove the form data preferences if the API is >= 26 as they no longer do anything. + if (Build.VERSION.SDK_INT >= 26) { + // Get the categories. + PreferenceCategory privacyCategory = (PreferenceCategory) findPreference("privacy"); + PreferenceCategory clearAndExitCategory = (PreferenceCategory) findPreference("clear_and_exit"); + + // Remove the form data preferences. + privacyCategory.removePreference(saveFormDataPreference); + clearAndExitCategory.removePreference(clearFormDataPreference); + } + // Only enable Fanboy's social blocking list preference if Fanboy's annoyance list is disabled. fanboySocialBlockingListPreference.setEnabled(!fanboyAnnoyanceListEnabled); - // We need to inflated a `WebView` to get the default user agent. + // Inflate a WebView to get the default user agent. LayoutInflater inflater = getActivity().getLayoutInflater(); - // `@SuppressLint("InflateParams")` removes the warning about using `null` as the `ViewGroup`, which in this case makes sense because we don't want to display `bare_webview` on the screen. + // `@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); // Get the user agent arrays. - ArrayAdapter userAgentNamesArray = ArrayAdapter.createFromResource(context, R.array.user_agent_names, R.layout.domain_settings_spinner_item); + ArrayAdapter userAgentNamesArray = ArrayAdapter.createFromResource(context, R.array.user_agent_names, R.layout.spinner_item); String[] translatedUserAgentNamesArray = getResources().getStringArray(R.array.translated_user_agent_names); String[] userAgentDataArray = getResources().getStringArray(R.array.user_agent_data); // Get the current user agent name from the preference. - String userAgentName = savedPreferences.getString("user_agent", "Privacy Browser"); + String userAgentName = savedPreferences.getString("user_agent", getString(R.string.user_agent_default_value)); // Get the array position of the user agent name. int userAgentArrayPosition = userAgentNamesArray.getPosition(userAgentName); @@ -156,15 +174,15 @@ public class SettingsFragment extends PreferenceFragment { } // Set the summary text for the custom user agent preference and enable it if user agent preference is set to custom. - customUserAgentPreference.setSummary(savedPreferences.getString("custom_user_agent", "PrivacyBrowser/1.0")); + customUserAgentPreference.setSummary(savedPreferences.getString("custom_user_agent", getString(R.string.custom_user_agent_default_value))); customUserAgentPreference.setEnabled(userAgentPreference.getSummary().equals(getString(R.string.custom_user_agent))); - // Set the Tor homepage URL as the summary text for the `tor_homepage` preference when the preference screen is loaded. The default is DuckDuckGo: `https://3g2upl4pq6kufc4m.onion`. - torHomepagePreference.setSummary(savedPreferences.getString("tor_homepage", "https://3g2upl4pq6kufc4m.onion")); + // Set the Tor homepage URL as the summary text for the `tor_homepage` preference when the preference screen is loaded. The default is Searx: `http://ulrn6sryqaifefld.onion/`. + torHomepagePreference.setSummary(savedPreferences.getString("tor_homepage", getString(R.string.tor_homepage_default_value))); - // Set the Tor search URL as the summary text for the Tor preference when the preference screen is loaded. The default is `https://3g2upl4pq6kufc4m.onion/html/?q=` + // Set the Tor search URL as the summary text for the Tor preference when the preference screen is loaded. if (torSearchString.equals("Custom URL")) { // Use R.string.custom_url, which will be translated, instead of the array value, which will not. torSearchPreference.setSummary(R.string.custom_url); @@ -174,13 +192,13 @@ public class SettingsFragment extends PreferenceFragment { } // Set the summary text for `tor_search_custom_url`. The default is `""`. - torSearchCustomURLPreference.setSummary(savedPreferences.getString("tor_search_custom_url", "")); + torSearchCustomURLPreference.setSummary(savedPreferences.getString("tor_search_custom_url", getString(R.string.tor_search_custom_url_default_value))); // Enable the Tor custom URL search options only if proxying through Orbot and the search is set to `Custom URL`. torSearchCustomURLPreference.setEnabled(proxyThroughOrbot && torSearchString.equals("Custom URL")); - // Set the search URL as the summary text for the search preference when the preference screen is loaded. The default is `https://duckduckgo.com/html/?q=`. + // Set the search URL as the summary text for the search preference when the preference screen is loaded. if (searchString.equals("Custom URL")) { // Use R.string.custom_url, which will be translated, instead of the array value, which will not. searchPreference.setSummary(R.string.custom_url); @@ -190,36 +208,32 @@ public class SettingsFragment extends PreferenceFragment { } // Set the summary text for `search_custom_url` (the default is `""`) and enable it if `search` is set to `Custom URL`. - searchCustomURLPreference.setSummary(savedPreferences.getString("search_custom_url", "")); + searchCustomURLPreference.setSummary(savedPreferences.getString("search_custom_url", getString(R.string.search_custom_url_default_value))); searchCustomURLPreference.setEnabled(searchString.equals("Custom URL")); - - // Enable the translucent navigation bar preference only if full screen browsing mode is enabled and `hide_system_bars` is disabled. - translucentNavigationBarPreference.setEnabled(fullScreenBrowsingMode && !hideSystemBars); - - // Set the status of the `Clear and Exit` preferences. + // Set the status of the Clear and Exit preferences. clearCookiesPreference.setEnabled(!clearEverything); clearDomStoragePreference.setEnabled(!clearEverything); - clearFormDataPreference.setEnabled(!clearEverything); + clearFormDataPreference.setEnabled(!clearEverything); // The form data line can be removed once the minimum API is >= 26. clearCachePreference.setEnabled(!clearEverything); // Set the homepage URL as the summary text for the homepage preference. - homepagePreference.setSummary(savedPreferences.getString("homepage", "https://duckduckgo.com/?kao=-1&kak=-1")); + homepagePreference.setSummary(savedPreferences.getString("homepage", getString(R.string.homepage_default_value))); - // Set the default font size as the summary text for the preference. - defaultFontSizePreference.setSummary(savedPreferences.getString("default_font_size", "100") + "%%"); + // Set the font size as the summary text for the preference. + fontSizePreference.setSummary(savedPreferences.getString("font_size", getString(R.string.font_size_default_value)) + "%%"); - // Disable `javaScriptPreference` if `nightModeBoolean` is true. JavaScript will be enabled for all web pages. + // Disable the JavaScript preference if Night Mode is enabled. JavaScript will be enabled for all web pages. javaScriptPreference.setEnabled(!nightMode); - // Set the `javaScriptPreference` icon. + // Set the JavaScript icon. if (javaScriptEnabled || nightMode) { javaScriptPreference.setIcon(R.drawable.javascript_enabled); } else { javaScriptPreference.setIcon(R.drawable.privacy_mode); } - // Set the `firstPartyCookiesPreference` icon. + // Set the first-party cookies icon. if (firstPartyCookiesEnabled) { firstPartyCookiesPreference.setIcon(R.drawable.cookies_enabled); } else { @@ -230,7 +244,7 @@ public class SettingsFragment extends PreferenceFragment { } } - // Set the `thirdPartyCookiesPreference` icon. + // Set the third party cookies icon. if (firstPartyCookiesEnabled && Build.VERSION.SDK_INT >= 21) { if (thirdPartyCookiesEnabled) { thirdPartyCookiesPreference.setIcon(R.drawable.cookies_warning); @@ -249,9 +263,9 @@ public class SettingsFragment extends PreferenceFragment { } } - // Set the `domStoragePreference` icon. + // Set the DOM storage icon. if (javaScriptEnabled || nightMode) { // The preference is enabled. - if (savedPreferences.getBoolean("dom_storage_enabled", false)) { // DOM storage is enabled. + if (savedPreferences.getBoolean("dom_storage", false)) { // DOM storage is enabled. domStoragePreference.setIcon(R.drawable.dom_storage_enabled); } else { // DOM storage is disabled. if (MainWebViewActivity.darkTheme) { @@ -268,18 +282,20 @@ public class SettingsFragment extends PreferenceFragment { } } - // Set the `saveFormDataPreference` icon. - if (savedPreferences.getBoolean("save_form_data_enabled", false)) { - saveFormDataPreference.setIcon(R.drawable.form_data_enabled); - } else { - if (MainWebViewActivity.darkTheme) { - saveFormDataPreference.setIcon(R.drawable.form_data_disabled_dark); + // 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); } else { - saveFormDataPreference.setIcon(R.drawable.form_data_disabled_light); + if (MainWebViewActivity.darkTheme) { + saveFormDataPreference.setIcon(R.drawable.form_data_disabled_dark); + } else { + saveFormDataPreference.setIcon(R.drawable.form_data_disabled_light); + } } } - // Set the `customUserAgentPreference` icon. + // Set the custom user agent icon. if (customUserAgentPreference.isEnabled()) { if (MainWebViewActivity.darkTheme) { customUserAgentPreference.setIcon(R.drawable.custom_user_agent_enabled_dark); @@ -294,7 +310,7 @@ public class SettingsFragment extends PreferenceFragment { } } - // Set the `incognitoModePreference` icon. + // Set the incognito mode icon. if (savedPreferences.getBoolean("incognito_mode", false)) { if (MainWebViewActivity.darkTheme) { incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled_dark); @@ -309,7 +325,7 @@ public class SettingsFragment extends PreferenceFragment { } } - // Set the `doNotTrackPreference` icon. + // Set the Do Not Track icon. if (savedPreferences.getBoolean("do_not_track", false)) { if (MainWebViewActivity.darkTheme) { doNotTrackPreference.setIcon(R.drawable.block_tracking_enabled_dark); @@ -324,6 +340,21 @@ public class SettingsFragment extends PreferenceFragment { } } + // Set the allow screenshots icon. + if (savedPreferences.getBoolean("allow_screenshots", false)) { + if (MainWebViewActivity.darkTheme) { + allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_dark); + } else { + allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_light); + } + } else { + if (MainWebViewActivity.darkTheme) { + allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_dark); + } else { + allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_light); + } + } + // Set the EasyList icon. if (savedPreferences.getBoolean("easylist", true)) { if (MainWebViewActivity.darkTheme) { @@ -354,7 +385,7 @@ public class SettingsFragment extends PreferenceFragment { } } - // Set the Fanboy list icons. + // Set the Fanboy lists icons. if (fanboyAnnoyanceListEnabled) { if (MainWebViewActivity.darkTheme) { // Set the Fanboy annoyance list icon. @@ -393,6 +424,36 @@ public class SettingsFragment extends PreferenceFragment { } } + // Set the UltraPrivacy icon. + if (savedPreferences.getBoolean("ultraprivacy", true)) { + if (MainWebViewActivity.darkTheme) { + ultraPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_dark); + } else { + ultraPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_light); + } + } else { + if (MainWebViewActivity.darkTheme) { + ultraPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_dark); + } else { + ultraPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_light); + } + } + + // Set the block all third-party requests icon. + if (savedPreferences.getBoolean("block_all_third_party_requests", false)) { + if (MainWebViewActivity.darkTheme) { + blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_enabled_dark); + } else { + blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_enabled_light); + } + } else { + if (MainWebViewActivity.darkTheme) { + blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_disabled_dark); + } else { + blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_disabled_light); + } + } + // Set the Tor icons according to the theme. if (proxyThroughOrbot) { // Proxying is enabled. if (MainWebViewActivity.darkTheme) { @@ -432,7 +493,7 @@ public class SettingsFragment extends PreferenceFragment { } } - // Set the `searchCustomURLPreference` icon. + // Set the search custom URL icon. if (searchCustomURLPreference.isEnabled()) { if (MainWebViewActivity.darkTheme) { searchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled_dark); @@ -456,49 +517,30 @@ public class SettingsFragment extends PreferenceFragment { fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_enabled_light); } - if (hideSystemBars) { // `hideSystemBarsBoolean` is `true`. - // Set the icons according to the theme. + // Set the hide app bar icon. + if (savedPreferences.getBoolean("hide_app_bar", true)) { // Hide app bar is enabled. + // Set the icon according to the theme. if (MainWebViewActivity.darkTheme) { - hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_enabled_dark); - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted_dark); + hideAppBarPreference.setIcon(R.drawable.app_bar_enabled_dark); } else { - hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_enabled_light); - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted_light); + hideAppBarPreference.setIcon(R.drawable.app_bar_enabled_light); } - } else { // `hideSystemBarsBoolean` is `false`. - // Set the `hideSystemBarsPreference` icon according to the theme. + } else { // Hide app bar is disabled. + // Set the icon according to the theme. if (MainWebViewActivity.darkTheme) { - // Set the icon for `hideSystemBarsPreference`. - hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_disabled_dark); - - // Set the icon for `translucentNavigationBarPreference`. - if (savedPreferences.getBoolean("translucent_navigation_bar", true)) { - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled_dark); - } else { - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled_dark); - } + hideAppBarPreference.setIcon(R.drawable.app_bar_disabled_dark); } else { - // Set the icon for `hideSystemBarsPreference`. - hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_disabled_light); - - // Set the icon for `translucentNavigationBarPreference`. - if (savedPreferences.getBoolean("translucent_navigation_bar", true)) { - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled_light); - } else { - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled_light); - } + hideAppBarPreference.setIcon(R.drawable.app_bar_disabled_light); } } } else { // Full screen browsing mode is disabled. // Set the icons according to the theme. if (MainWebViewActivity.darkTheme) { fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_disabled_dark); - hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_ghosted_dark); - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted_dark); + hideAppBarPreference.setIcon(R.drawable.app_bar_ghosted_dark); } else { fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_disabled_light); - hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_ghosted_light); - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted_light); + hideAppBarPreference.setIcon(R.drawable.app_bar_ghosted_light); } } @@ -535,15 +577,17 @@ public class SettingsFragment extends PreferenceFragment { clearDomStoragePreference.setIcon(R.drawable.dom_storage_warning); } - // Set the clear form data preference icon. - if (clearEverything || savedPreferences.getBoolean("clear_form_data", true)) { - if (MainWebViewActivity.darkTheme) { - clearFormDataPreference.setIcon(R.drawable.form_data_cleared_dark); + // Set the clear form data preference icon if the API < 26. It has no effect on newer versions of Android. + if (Build.VERSION.SDK_INT < 26) { + if (clearEverything || savedPreferences.getBoolean("clear_form_data", true)) { + if (MainWebViewActivity.darkTheme) { + clearFormDataPreference.setIcon(R.drawable.form_data_cleared_dark); + } else { + clearFormDataPreference.setIcon(R.drawable.form_data_cleared_light); + } } else { - clearFormDataPreference.setIcon(R.drawable.form_data_cleared_light); + clearFormDataPreference.setIcon(R.drawable.form_data_warning); } - } else { - clearFormDataPreference.setIcon(R.drawable.form_data_warning); } // Set the clear cache preference icon. @@ -572,6 +616,21 @@ public class SettingsFragment extends PreferenceFragment { } } + // Set the scroll app bar preference icon. + if (savedPreferences.getBoolean("scroll_app_bar", true)) { + if (MainWebViewActivity.darkTheme) { + scrollAppBarPreference.setIcon(R.drawable.app_bar_enabled_dark); + } else { + scrollAppBarPreference.setIcon(R.drawable.app_bar_enabled_light); + } + } else { + if (MainWebViewActivity.darkTheme) { + scrollAppBarPreference.setIcon(R.drawable.app_bar_disabled_dark); + } else { + scrollAppBarPreference.setIcon(R.drawable.app_bar_disabled_light); + } + } + // Set the display additional app bar icons preference icon. if (savedPreferences.getBoolean("display_additional_app_bar_icons", false)) { if (MainWebViewActivity.darkTheme) { @@ -587,6 +646,21 @@ public class SettingsFragment extends PreferenceFragment { } } + // Set the download with external app preference icon. + if (savedPreferences.getBoolean("download_with_external_app", false)) { + if (MainWebViewActivity.darkTheme) { + downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_enabled_dark); + } else { + downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_enabled_light); + } + } else { + if (MainWebViewActivity.darkTheme) { + downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_disabled_dark); + } else { + downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_disabled_light); + } + } + // Set the dark theme preference icon. if (savedPreferences.getBoolean("dark_theme", false)) { darkThemePreference.setIcon(R.drawable.theme_dark); @@ -628,9 +702,9 @@ public class SettingsFragment extends PreferenceFragment { // Listen for preference changes. preferencesListener = (SharedPreferences sharedPreferences, String key) -> { switch (key) { - case "javascript_enabled": + case "javascript": // Update the icons and the DOM storage preference status. - if (sharedPreferences.getBoolean("javascript_enabled", false)) { // The JavaScript preference is enabled. + if (sharedPreferences.getBoolean("javascript", false)) { // The JavaScript preference is enabled. // Update the icon for the JavaScript preference. javaScriptPreference.setIcon(R.drawable.javascript_enabled); @@ -638,7 +712,7 @@ public class SettingsFragment extends PreferenceFragment { domStoragePreference.setEnabled(true); // Update the icon for the DOM storage preference. - if (sharedPreferences.getBoolean("dom_storage_enabled", false)) { + if (sharedPreferences.getBoolean("dom_storage", false)) { domStoragePreference.setIcon(R.drawable.dom_storage_enabled); } else { if (MainWebViewActivity.darkTheme) { @@ -663,15 +737,15 @@ public class SettingsFragment extends PreferenceFragment { } break; - case "first_party_cookies_enabled": - // Update the icons for `first_party_cookies_enabled` and `third_party_cookies_enabled`. - if (sharedPreferences.getBoolean("first_party_cookies_enabled", false)) { - // Set the icon for `first_party_cookies_enabled`. + case "first_party_cookies": + // Update the icons for `first_party_cookies` and `third_party_cookies`. + if (sharedPreferences.getBoolean("first_party_cookies", false)) { + // Set the icon for `first_party_cookies`. firstPartyCookiesPreference.setIcon(R.drawable.cookies_enabled); - // Update the icon for `third_party_cookies_enabled`. + // Update the icon for `third_party_cookies`. if (Build.VERSION.SDK_INT >= 21) { - if (sharedPreferences.getBoolean("third_party_cookies_enabled", false)) { + if (sharedPreferences.getBoolean("third_party_cookies", false)) { thirdPartyCookiesPreference.setIcon(R.drawable.cookies_warning); } else { if (MainWebViewActivity.darkTheme) { @@ -687,15 +761,15 @@ public class SettingsFragment extends PreferenceFragment { thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted_light); } } - } else { // `first_party_cookies_enabled` is `false`. - // Update the icon for `first_party_cookies_enabled`. + } else { // `first_party_cookies` is `false`. + // Update the icon for `first_party_cookies`. if (MainWebViewActivity.darkTheme) { firstPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_dark); } else { firstPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_light); } - // Set the icon for `third_party_cookies_enabled` to be ghosted. + // Set the icon for `third_party_cookies` to be ghosted. if (MainWebViewActivity.darkTheme) { thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted_dark); } else { @@ -703,13 +777,13 @@ public class SettingsFragment extends PreferenceFragment { } } - // Enable `third_party_cookies_enabled` if `first_party_cookies_enabled` is `true` and API >= 21. - thirdPartyCookiesPreference.setEnabled(sharedPreferences.getBoolean("first_party_cookies_enabled", false) && (Build.VERSION.SDK_INT >= 21)); + // Enable `third_party_cookies` if `first_party_cookies` is `true` and API >= 21. + thirdPartyCookiesPreference.setEnabled(sharedPreferences.getBoolean("first_party_cookies", false) && (Build.VERSION.SDK_INT >= 21)); break; - case "third_party_cookies_enabled": + case "third_party_cookies": // Update the icon. - if (sharedPreferences.getBoolean("third_party_cookies_enabled", false)) { + if (sharedPreferences.getBoolean("third_party_cookies", false)) { thirdPartyCookiesPreference.setIcon(R.drawable.cookies_warning); } else { if (MainWebViewActivity.darkTheme) { @@ -720,9 +794,9 @@ public class SettingsFragment extends PreferenceFragment { } break; - case "dom_storage_enabled": + case "dom_storage": // Update the icon. - if (sharedPreferences.getBoolean("dom_storage_enabled", false)) { + if (sharedPreferences.getBoolean("dom_storage", false)) { domStoragePreference.setIcon(R.drawable.dom_storage_enabled); } else { if (MainWebViewActivity.darkTheme) { @@ -733,9 +807,10 @@ public class SettingsFragment extends PreferenceFragment { } break; - case "save_form_data_enabled": + // Save form data can be removed once the minimum API >= 26. + case "save_form_data": // Update the icon. - if (sharedPreferences.getBoolean("save_form_data_enabled", false)) { + if (sharedPreferences.getBoolean("save_form_data", false)) { saveFormDataPreference.setIcon(R.drawable.form_data_enabled); } else { if (MainWebViewActivity.darkTheme) { @@ -747,7 +822,7 @@ public class SettingsFragment extends PreferenceFragment { case "user_agent": // Get the new user agent name. - String newUserAgentName = sharedPreferences.getString("user_agent", "Privacy Browser"); + String newUserAgentName = sharedPreferences.getString("user_agent", getString(R.string.user_agent_default_value)); // Get the array position for the new user agent name. int newUserAgentArrayPosition = userAgentNamesArray.getPosition(newUserAgentName); @@ -805,7 +880,7 @@ public class SettingsFragment extends PreferenceFragment { case "custom_user_agent": // Set the new custom user agent as the summary text for the preference. - customUserAgentPreference.setSummary(sharedPreferences.getString("custom_user_agent", "PrivacyBrowser/1.0")); + customUserAgentPreference.setSummary(sharedPreferences.getString("custom_user_agent", getString(R.string.custom_user_agent_default_value))); break; case "incognito_mode": @@ -843,6 +918,35 @@ public class SettingsFragment extends PreferenceFragment { break; + case "allow_screenshots": + // Update the icon. + if (sharedPreferences.getBoolean("allow_screenshots", false)) { + if (MainWebViewActivity.darkTheme) { + allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_dark); + } else { + allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_light); + } + } else { + if (MainWebViewActivity.darkTheme) { + allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_dark); + } else { + allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_light); + } + } + + // Create an intent to restart Privacy Browser. + Intent allowScreenshotsRestartIntent = getActivity().getParentActivityIntent(); + + // Assert that the intent is not null to remove the lint error below. + assert allowScreenshotsRestartIntent != null; + + // `Intent.FLAG_ACTIVITY_CLEAR_TASK` removes all activities from the stack. It requires `Intent.FLAG_ACTIVITY_NEW_TASK`. + allowScreenshotsRestartIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); + + // Make it so. + startActivity(allowScreenshotsRestartIntent); + break; + case "easylist": // Update the icon. if (sharedPreferences.getBoolean("easylist", true)) { @@ -877,12 +981,12 @@ public class SettingsFragment extends PreferenceFragment { } break; - case "fanboy_annoyance_list": - boolean currentFanboyAnnoyanceList = sharedPreferences.getBoolean("fanboy_annoyance_list", true); - boolean currentFanboySocialBlockingList = sharedPreferences.getBoolean("fanboy_social_blocking_list", true); + case "fanboys_annoyance_list": + boolean currentFanboyAnnoyanceList = sharedPreferences.getBoolean("fanboys_annoyance_list", true); + boolean currentFanboySocialBlockingList = sharedPreferences.getBoolean("fanboys_social_blocking_list", true); // Update the Fanboy icons. - if (sharedPreferences.getBoolean("fanboy_annoyance_list", true)) { + if (currentFanboyAnnoyanceList) { // Fanboy's annoyance list is enabled. if (MainWebViewActivity.darkTheme) { // Update the Fanboy's annoyance list icon. fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_enabled_dark); @@ -896,16 +1000,16 @@ public class SettingsFragment extends PreferenceFragment { // Update the Fanboy's social blocking list icon. fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_ghosted_light); } - } else { + } else { // Fanboy's annoyance list is disabled. if (MainWebViewActivity.darkTheme) { // Update the Fanboy's annoyance list icon. fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_disabled_dark); // Update the Fanboy's social blocking list icon. if (currentFanboySocialBlockingList) { - fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_enabled_dark); + fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_enabled_dark); } else { - fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_disabled_dark); + fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_disabled_dark); } } else { // Update the Fanboy's annoyance list icon. @@ -913,9 +1017,9 @@ public class SettingsFragment extends PreferenceFragment { // Update the Fanboy's social blocking list icon. if (currentFanboySocialBlockingList) { - fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_enabled_light); + fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_enabled_light); } else { - fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_disabled_light); + fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_disabled_light); } } } @@ -924,9 +1028,9 @@ public class SettingsFragment extends PreferenceFragment { fanboySocialBlockingListPreference.setEnabled(!currentFanboyAnnoyanceList); break; - case "fanboy_social_blocking_list": + case "fanboys_social_blocking_list": // Update the icon. - if (sharedPreferences.getBoolean("fanboy_social_blocking_list", true)) { + if (sharedPreferences.getBoolean("fanboys_social_blocking_list", true)) { if (MainWebViewActivity.darkTheme) { fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_enabled_dark); } else { @@ -941,10 +1045,44 @@ public class SettingsFragment extends PreferenceFragment { } break; + case "ultraprivacy": + // Update the icon. + if (sharedPreferences.getBoolean("ultraprivacy", true)) { + if (MainWebViewActivity.darkTheme) { + ultraPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_dark); + } else { + ultraPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_light); + } + } else { + if (MainWebViewActivity.darkTheme) { + ultraPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_dark); + } else { + ultraPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_light); + } + } + break; + + case "block_all_third_party_requests": + // Update the icon. + if (sharedPreferences.getBoolean("block_all_third_party_requests", false)) { + if (MainWebViewActivity.darkTheme) { + blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_enabled_dark); + } else { + blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_enabled_light); + } + } else { + if (MainWebViewActivity.darkTheme) { + blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_disabled_dark); + } else { + blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_disabled_light); + } + } + break; + case "proxy_through_orbot": // Get current settings. boolean currentProxyThroughOrbot = sharedPreferences.getBoolean("proxy_through_orbot", false); - String currentTorSearchString = sharedPreferences.getString("tor_search", "https://3g2upl4pq6kufc4m.onion/html/?q="); + String currentTorSearchString = sharedPreferences.getString("tor_search", getString(R.string.tor_search_default_value)); // Enable the Tor custom URL search option only if `currentProxyThroughOrbot` is true and the search is set to `Custom URL`. torSearchCustomURLPreference.setEnabled(currentProxyThroughOrbot && currentTorSearchString.equals("Custom URL")); @@ -991,13 +1129,13 @@ public class SettingsFragment extends PreferenceFragment { break; case "tor_homepage": - // Set the new tor homepage URL as the summary text for the `tor_homepage` preference. The default is DuckDuckGo: `https://3g2upl4pq6kufc4m.onion`. - torHomepagePreference.setSummary(sharedPreferences.getString("tor_homepage", "https://3g2upl4pq6kufc4m.onion")); + // Set the new tor homepage URL as the summary text for the `tor_homepage` preference. The default is Searx: `http://ulrn6sryqaifefld.onion/`. + torHomepagePreference.setSummary(sharedPreferences.getString("tor_homepage", getString(R.string.tor_homepage_default_value))); break; case "tor_search": // Get the present search string. - String presentTorSearchString = sharedPreferences.getString("tor_search", "https://3g2upl4pq6kufc4m.onion/html/?q="); + String presentTorSearchString = sharedPreferences.getString("tor_search", getString(R.string.tor_search_default_value)); // Update the preferences. if (presentTorSearchString.equals("Custom URL")) { @@ -1031,12 +1169,12 @@ public class SettingsFragment extends PreferenceFragment { case "tor_search_custom_url": // Set the summary text for `tor_search_custom_url`. - torSearchCustomURLPreference.setSummary(sharedPreferences.getString("tor_search_custom_url", "")); + torSearchCustomURLPreference.setSummary(sharedPreferences.getString("tor_search_custom_url", getString(R.string.tor_search_custom_url_default_value))); break; case "search": // Store the new search string. - String newSearchString = sharedPreferences.getString("search", "https://duckduckgo.com/html/?q="); + String newSearchString = sharedPreferences.getString("search", getString(R.string.search_default_value)); // Update `searchPreference` and `searchCustomURLPreference`. if (newSearchString.equals("Custom URL")) { // `Custom URL` is selected. @@ -1070,129 +1208,61 @@ public class SettingsFragment extends PreferenceFragment { case "search_custom_url": // Set the new custom search URL as the summary text for `search_custom_url`. The default is `""`. - searchCustomURLPreference.setSummary(sharedPreferences.getString("search_custom_url", "")); + searchCustomURLPreference.setSummary(sharedPreferences.getString("search_custom_url", getString(R.string.search_custom_url_default_value))); break; case "full_screen_browsing_mode": - if (sharedPreferences.getBoolean("full_screen_browsing_mode", false)) { - // Set the `fullScreenBrowsingModePreference` icon according to the theme. + if (sharedPreferences.getBoolean("full_screen_browsing_mode", false)) { // Full screen browsing is enabled. + // Set the full screen browsing mode preference icon according to the theme. if (MainWebViewActivity.darkTheme) { fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_enabled_dark); } else { fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_enabled_light); } - if (sharedPreferences.getBoolean("hide_system_bars", false)) { // `hide_system_bars` is `true`. - // Disable `translucentNavigationBarPreference`. - translucentNavigationBarPreference.setEnabled(false); - - // Set the icons according to the theme. + // Set the hide app bar preference icon. + if (sharedPreferences.getBoolean("hide_app_bar", true)) { // Hide app bar is enabled. + // Set the icon according to the theme. if (MainWebViewActivity.darkTheme) { - hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_enabled_dark); - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted_dark); + hideAppBarPreference.setIcon(R.drawable.app_bar_enabled_dark); } else { - hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_enabled_light); - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted_light); + hideAppBarPreference.setIcon(R.drawable.app_bar_enabled_light); } - } else { // `hide_system_bars` is `false`. - // Enable `translucentNavigationBarPreference`. - translucentNavigationBarPreference.setEnabled(true); - - // Set the icons according to the theme. - if (MainWebViewActivity.darkTheme) { // Use the dark theme. - // Set the `hideSystemBarsPreference` icon. - hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_disabled_dark); - - // Set the `translucentNavigationBarPreference` icon. - if (sharedPreferences.getBoolean("translucent_navigation_bar", true)) { - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled_dark); - } else { - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled_dark); - } - } else { // Use the light theme. - // Set the `hideSystemBarsPreference` icon. - hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_disabled_light); - - // Set the `translucentNavigationBarPreference` icon. - if (sharedPreferences.getBoolean("translucent_navigation_bar", true)) { - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled_light); - } else { - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled_light); - } + } else { // Hide app bar is disabled. + // Set the icon according to the theme. + if (MainWebViewActivity.darkTheme) { + hideAppBarPreference.setIcon(R.drawable.app_bar_disabled_dark); + } else { + hideAppBarPreference.setIcon(R.drawable.app_bar_disabled_light); } } - } else { // `full_screen_browsing_mode` is false. - // Disable `translucentNavigationBarPreference`. - translucentNavigationBarPreference.setEnabled(false); - + } else { // Full screen browsing is disabled. // Update the icons according to the theme. if (MainWebViewActivity.darkTheme) { fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_disabled_dark); - hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_ghosted_dark); - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted_dark); + hideAppBarPreference.setIcon(R.drawable.app_bar_ghosted_dark); } else { fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_disabled_light); - hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_ghosted_light); - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted_light); - } - } - break; - - case "hide_system_bars": - if (sharedPreferences.getBoolean("hide_system_bars", false)) { - // Disable `translucentNavigationBarPreference`. - translucentNavigationBarPreference.setEnabled(false); - - // Set the icons according to the theme. - if (MainWebViewActivity.darkTheme) { - hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_enabled_dark); - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted_dark); - } else { - hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_enabled_light); - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted_light); - } - } else { // `hide_system_bars` is false. - // Enable `translucentNavigationBarPreference`. - translucentNavigationBarPreference.setEnabled(true); - - // Set the icons according to the theme. - if (MainWebViewActivity.darkTheme) { - // Set the `hideSystemBarsPreference` icon. - hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_disabled_dark); - - // Set the `translucentNavigationBarPreference` icon. - if (sharedPreferences.getBoolean("translucent_navigation_bar", true)) { - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled_dark); - } else { - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled_dark); - } - } else { - // Set the `hideSystemBarsPreference` icon. - hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_disabled_light); - - // Set the `translucentNavigationBarPreference` icon. - if (sharedPreferences.getBoolean("translucent_navigation_bar", true)) { - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled_light); - } else { - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled_light); - } + hideAppBarPreference.setIcon(R.drawable.app_bar_ghosted_light); } } break; - case "translucent_navigation_bar": + case "hide_app_bar": // Update the icon. - if (sharedPreferences.getBoolean("translucent_navigation_bar", true)) { + if (sharedPreferences.getBoolean("hide_app_bar", true)) { // Hide app bar is enabled. + // Set the icon according to the theme. if (MainWebViewActivity.darkTheme) { - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled_dark); + hideAppBarPreference.setIcon(R.drawable.app_bar_enabled_dark); } else { - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled_light); + hideAppBarPreference.setIcon(R.drawable.app_bar_enabled_light); } - } else { + } else { // Hide app bar is disabled. + // Set the icon according to the theme. if (MainWebViewActivity.darkTheme) { - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled_dark); + hideAppBarPreference.setIcon(R.drawable.app_bar_disabled_dark); } else { - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled_light); + hideAppBarPreference.setIcon(R.drawable.app_bar_disabled_light); } } break; @@ -1204,7 +1274,7 @@ public class SettingsFragment extends PreferenceFragment { // Update the status of the `Clear and Exit` preferences. clearCookiesPreference.setEnabled(!newClearEverythingBoolean); clearDomStoragePreference.setEnabled(!newClearEverythingBoolean); - clearFormDataPreference.setEnabled(!newClearEverythingBoolean); + clearFormDataPreference.setEnabled(!newClearEverythingBoolean); // This line can be removed once the minimum API >= 26. clearCachePreference.setEnabled(!newClearEverythingBoolean); // Update the `clearEverythingPreference` icon. @@ -1240,15 +1310,17 @@ public class SettingsFragment extends PreferenceFragment { clearDomStoragePreference.setIcon(R.drawable.dom_storage_warning); } - // Update the `clearFormDataPreference` icon. - if (newClearEverythingBoolean || sharedPreferences.getBoolean("clear_form_data", true)) { - if (MainWebViewActivity.darkTheme) { - clearFormDataPreference.setIcon(R.drawable.form_data_cleared_dark); + // Update the clear form data preference icon if the API < 26. + if (Build.VERSION.SDK_INT < 26) { + if (newClearEverythingBoolean || sharedPreferences.getBoolean("clear_form_data", true)) { + if (MainWebViewActivity.darkTheme) { + clearFormDataPreference.setIcon(R.drawable.form_data_cleared_dark); + } else { + clearFormDataPreference.setIcon(R.drawable.form_data_cleared_light); + } } else { - clearFormDataPreference.setIcon(R.drawable.form_data_cleared_light); + clearFormDataPreference.setIcon(R.drawable.form_data_warning); } - } else { - clearFormDataPreference.setIcon(R.drawable.form_data_warning); } // Update the `clearCachePreference` icon. @@ -1289,6 +1361,7 @@ public class SettingsFragment extends PreferenceFragment { } break; + // This section can be removed once the minimum API >= 26. case "clear_form_data": // Update the icon. if (sharedPreferences.getBoolean("clear_form_data", true)) { @@ -1316,13 +1389,13 @@ public class SettingsFragment extends PreferenceFragment { break; case "homepage": - // Set the new homepage URL as the summary text for the Homepage preference. The default is `https://www.duckduckgo.com`. - homepagePreference.setSummary(sharedPreferences.getString("homepage", "https://www.duckduckgo.com")); + // Set the new homepage URL as the summary text for the Homepage preference. + homepagePreference.setSummary(sharedPreferences.getString("homepage", getString(R.string.homepage_default_value))); break; - case "default_font_size": - // Update the summary text of `default_font_size`. - defaultFontSizePreference.setSummary(sharedPreferences.getString("default_font_size", "100") + "%%"); + case "font_size": + // Update the font size summary text. + fontSizePreference.setSummary(sharedPreferences.getString("font_size", getString(R.string.font_size_default_value)) + "%%"); break; case "swipe_to_refresh": @@ -1342,6 +1415,23 @@ public class SettingsFragment extends PreferenceFragment { } break; + case "scroll_app_bar": + // Update the icon. + if (sharedPreferences.getBoolean("scroll_app_bar", true)) { + if (MainWebViewActivity.darkTheme) { + scrollAppBarPreference.setIcon(R.drawable.app_bar_enabled_dark); + } else { + scrollAppBarPreference.setIcon(R.drawable.app_bar_enabled_light); + } + } else { + if (MainWebViewActivity.darkTheme) { + scrollAppBarPreference.setIcon(R.drawable.app_bar_disabled_dark); + } else { + scrollAppBarPreference.setIcon(R.drawable.app_bar_disabled_light); + } + } + break; + case "display_additional_app_bar_icons": // Update the icon. if (sharedPreferences.getBoolean("display_additional_app_bar_icons", false)) { @@ -1359,6 +1449,23 @@ public class SettingsFragment extends PreferenceFragment { } break; + case "download_with_external_app": + // Update the icon. + if (sharedPreferences.getBoolean("download_with_external_app", false)) { + if (MainWebViewActivity.darkTheme) { + downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_enabled_dark); + } else { + downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_enabled_light); + } + } else { + if (MainWebViewActivity.darkTheme) { + downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_disabled_dark); + } else { + downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_disabled_light); + } + } + break; + case "dark_theme": // Update the icon. if (sharedPreferences.getBoolean("dark_theme", false)) { @@ -1367,17 +1474,17 @@ public class SettingsFragment extends PreferenceFragment { darkThemePreference.setIcon(R.drawable.theme_light); } - // Create an `Intent` to restart Privacy Browser. - Intent intent = getActivity().getParentActivityIntent(); + // Create an intent to restart Privacy Browser. + Intent changeThemeRestartIntent = getActivity().getParentActivityIntent(); - // Assert that `intent` is not `null` to remove the lint error below. - assert intent != null; + // Assert that the intent is not null to remove the lint error below. + assert changeThemeRestartIntent != null; // `Intent.FLAG_ACTIVITY_CLEAR_TASK` removes all activities from the stack. It requires `Intent.FLAG_ACTIVITY_NEW_TASK`. - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); + changeThemeRestartIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); // Make it so. - startActivity(intent); + startActivity(changeThemeRestartIntent); break; case "night_mode": @@ -1386,7 +1493,7 @@ public class SettingsFragment extends PreferenceFragment { // Store the current night mode status. boolean currentNightModeBoolean = sharedPreferences.getBoolean("night_mode", false); - boolean currentJavaScriptBoolean = sharedPreferences.getBoolean("javascript_enabled", false); + boolean currentJavaScriptBoolean = sharedPreferences.getBoolean("javascript", false); // Update the icon. if (currentNightModeBoolean) { @@ -1414,9 +1521,9 @@ public class SettingsFragment extends PreferenceFragment { javaScriptPreference.setIcon(R.drawable.privacy_mode); } - // Update the `domStoragePreference` icon. + // Update the DOM storage preference icon. if (currentNightModeBoolean || currentJavaScriptBoolean) { // The preference is enabled. - if (sharedPreferences.getBoolean("dom_storage_enabled", false)) { // DOM storage is enabled. + if (sharedPreferences.getBoolean("dom_storage", false)) { // DOM storage is enabled. domStoragePreference.setIcon(R.drawable.dom_storage_enabled); } else { // DOM storage is disabled. if (MainWebViewActivity.darkTheme) { @@ -1464,8 +1571,7 @@ public class SettingsFragment extends PreferenceFragment { savedPreferences.registerOnSharedPreferenceChangeListener(preferencesListener); } - // It is necessary to re-register the listener on every resume or it will randomly stop working because apps can be paused and resumed at any time - // even while running in the foreground. + // It is necessary to re-register the listener on every resume or it will randomly stop working because apps can be paused and resumed at any time, even while running in the foreground. @Override public void onPause() { super.onPause();