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=340e455215f360b96077f4c890d607aab39edd57;hp=75e008ad12cceaf6a9c61d6e7e0f7f20fe2ee563;hb=74857298f431569df1849e8ef91387cb25274095;hpb=30b6db5cdccb01d98f19b3a6af91d9f8ae1322bf 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 75e008ad..340e4552 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-2017 Soren Stoutner . + * Copyright © 2016-2017 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -20,6 +20,7 @@ package com.stoutner.privacybrowser.fragments; import android.annotation.SuppressLint; +import android.content.Intent; import android.content.SharedPreferences; import android.os.Build; import android.os.Bundle; @@ -30,6 +31,7 @@ import android.view.View; import android.webkit.WebView; import com.stoutner.privacybrowser.R; +import com.stoutner.privacybrowser.activities.MainWebViewActivity; public class SettingsFragment extends PreferenceFragment { private SharedPreferences.OnSharedPreferenceChangeListener preferencesListener; @@ -44,27 +46,42 @@ public class SettingsFragment extends PreferenceFragment { savedPreferences = getPreferenceScreen().getSharedPreferences(); // Get handles for the preferences we need to modify. - final Preference javaScriptEnabled = findPreference("javascript_enabled"); - final Preference firstPartyCookiesEnabled = findPreference("first_party_cookies_enabled"); - final Preference thirdPartyCookiesEnabled = findPreference("third_party_cookies_enabled"); - final Preference domStorageEnabled = findPreference("dom_storage_enabled"); + 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"); final Preference userAgentPreference = findPreference("user_agent"); - final Preference customUserAgent = findPreference("custom_user_agent"); + final Preference customUserAgentPreference = findPreference("custom_user_agent"); + final Preference blockAdsPreference = findPreference("block_ads"); + final Preference incognitoModePreference = findPreference("incognito_mode"); + final Preference doNotTrackPreference = findPreference("do_not_track"); + 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 hideSystemBarsPreference = findPreference("hide_system_bars"); final Preference translucentNavigationBarPreference = findPreference("translucent_navigation_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 clearCachePreference = findPreference("clear_cache"); final Preference homepagePreference = findPreference("homepage"); final Preference defaultFontSizePreference = findPreference("default_font_size"); + final Preference swipeToRefreshPreference = findPreference("swipe_to_refresh"); + final Preference displayAdditionalAppBarIconsPreference = findPreference("display_additional_app_bar_icons"); + final Preference darkThemePreference = findPreference("dark_theme"); + final Preference displayWebpageImagesPreference = findPreference("display_webpage_images"); // Set dependencies. - domStorageEnabled.setDependency("javascript_enabled"); + domStoragePreference.setDependency("javascript_enabled"); torHomepagePreference.setDependency("proxy_through_orbot"); torSearchPreference.setDependency("proxy_through_orbot"); - hideSystemBarsPreference.setDependency("enable_full_screen_browsing_mode"); + hideSystemBarsPreference.setDependency("full_screen_browsing_mode"); // Get strings from the preferences. String torSearchString = savedPreferences.getString("tor_search", "https://3g2upl4pq6kufc4m.onion/html/?q="); @@ -74,9 +91,13 @@ public class SettingsFragment extends PreferenceFragment { boolean javaScriptEnabledBoolean = savedPreferences.getBoolean("javascript_enabled", false); boolean firstPartyCookiesEnabledBoolean = savedPreferences.getBoolean("first_party_cookies_enabled", false); boolean thirdPartyCookiesEnabledBoolean = savedPreferences.getBoolean("third_party_cookies_enabled", false); + boolean proxyThroughOrbotBoolean = savedPreferences.getBoolean("proxy_through_orbot", false); + boolean fullScreenBrowsingModeBoolean = savedPreferences.getBoolean("full_screen_browsing_mode", false); + boolean hideSystemBarsBoolean = savedPreferences.getBoolean("hide_system_bars", false); + boolean clearEverythingBoolean = savedPreferences.getBoolean("clear_everything", true); - // Only enable `third_party_cookies_enabled` if `first_party_cookies_enabled` is `true` and API >= 21. - thirdPartyCookiesEnabled.setEnabled(firstPartyCookiesEnabledBoolean && (Build.VERSION.SDK_INT >= 21)); + // Only enable `thirdPartyCookiesPreference` if `firstPartyCookiesEnabledBoolean` is `true` and API >= 21. + thirdPartyCookiesPreference.setEnabled(firstPartyCookiesEnabledBoolean && (Build.VERSION.SDK_INT >= 21)); // We need to inflated a `WebView` to get the default user agent. LayoutInflater inflater = getActivity().getLayoutInflater(); @@ -102,9 +123,9 @@ public class SettingsFragment extends PreferenceFragment { break; } - // Set the summary text for "custom_user_agent" (the default is "PrivacyBrowser/1.0") and enable it if "user_agent" it set to "Custom user agent". - customUserAgent.setSummary(savedPreferences.getString("custom_user_agent", "PrivacyBrowser/1.0")); - customUserAgent.setEnabled(userAgentPreference.getSummary().equals("Custom user agent")); + // Set the summary text for "customUserAgentPreference" (the default is `PrivacyBrowser/1.0`) and enable it if `userAgentPreference` it set to `Custom user agent`. + customUserAgentPreference.setSummary(savedPreferences.getString("custom_user_agent", "PrivacyBrowser/1.0")); + customUserAgentPreference.setEnabled(userAgentPreference.getSummary().equals("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`. @@ -124,7 +145,7 @@ public class SettingsFragment extends PreferenceFragment { torSearchCustomURLPreference.setSummary(savedPreferences.getString("tor_search_custom_url", "")); // Enable the Tor custom URL search options only if proxying through Orbot and the search is set to `Custom URL`. - torSearchCustomURLPreference.setEnabled(savedPreferences.getBoolean("proxy_through_orbot", false) && torSearchString.equals("Custom URL")); + torSearchCustomURLPreference.setEnabled(proxyThroughOrbotBoolean && 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=`. @@ -141,9 +162,14 @@ public class SettingsFragment extends PreferenceFragment { searchCustomURLPreference.setEnabled(searchString.equals("Custom URL")); - // Enable `transparent_navigation_bar` only if full screen browsing mode is enabled and `hide_system_bars` is disabled. - translucentNavigationBarPreference.setEnabled(savedPreferences.getBoolean("enable_full_screen_browsing_mode", false) && !savedPreferences.getBoolean("hide_system_bars", false)); + // Enable `translucentNavigationBarPreference` only if full screen browsing mode is enabled and `hide_system_bars` is disabled. + translucentNavigationBarPreference.setEnabled(fullScreenBrowsingModeBoolean && !hideSystemBarsBoolean); + // Set the status of the `Clear and Exit` preferences. + clearCookiesPreference.setEnabled(!clearEverythingBoolean); + clearDomStoragePreference.setEnabled(!clearEverythingBoolean); + clearFormDataPreference.setEnabled(!clearEverythingBoolean); + clearCachePreference.setEnabled(!clearEverythingBoolean); // Set the homepage URL as the summary text for the `Homepage` preference when the preference screen is loaded. The default is `https://duckduckgo.com`. homepagePreference.setSummary(savedPreferences.getString("homepage", "https://duckduckgo.com")); @@ -152,42 +178,201 @@ public class SettingsFragment extends PreferenceFragment { defaultFontSizePreference.setSummary(savedPreferences.getString("default_font_size", "100") + "%%"); - // Set the `javascript_enabled` icon. + // Set the `javaScriptPreference` icon. if (javaScriptEnabledBoolean) { - javaScriptEnabled.setIcon(R.drawable.javascript_enabled); + javaScriptPreference.setIcon(R.drawable.javascript_enabled); } else { - javaScriptEnabled.setIcon(R.drawable.privacy_mode); + javaScriptPreference.setIcon(R.drawable.privacy_mode); } - // Set the `first_party_cookies_enabled` icon. + // Set the `firstPartyCookiesPreference` icon. if (firstPartyCookiesEnabledBoolean) { - firstPartyCookiesEnabled.setIcon(R.drawable.cookies_enabled); + firstPartyCookiesPreference.setIcon(R.drawable.cookies_enabled); } else { - firstPartyCookiesEnabled.setIcon(R.drawable.cookies_disabled); + firstPartyCookiesPreference.setIcon(R.drawable.cookies_disabled); } - // Set the `third_party_cookies_enabled` icon. + // Set the `thirdPartyCookiesPreference` icon. if (firstPartyCookiesEnabledBoolean && Build.VERSION.SDK_INT >= 21) { if (thirdPartyCookiesEnabledBoolean) { - thirdPartyCookiesEnabled.setIcon(R.drawable.cookies_warning); + thirdPartyCookiesPreference.setIcon(R.drawable.cookies_warning); } else { - thirdPartyCookiesEnabled.setIcon(R.drawable.cookies_disabled); + thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled); } } else { - thirdPartyCookiesEnabled.setIcon(R.drawable.cookies_ghosted); + thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted); } - // Set the `dom_storage_enabled` icon. + // Set the `domStoragePreference` icon. if (javaScriptEnabledBoolean) { if (savedPreferences.getBoolean("dom_storage_enabled", false)) { - domStorageEnabled.setIcon(R.drawable.dom_storage_enabled); + domStoragePreference.setIcon(R.drawable.dom_storage_enabled); } else { - domStorageEnabled.setIcon(R.drawable.dom_storage_disabled); + domStoragePreference.setIcon(R.drawable.dom_storage_disabled); } } else { - domStorageEnabled.setIcon(R.drawable.dom_storage_ghosted); + domStoragePreference.setIcon(R.drawable.dom_storage_ghosted); } + // Set the `saveFormDataPreference` icon. + if (savedPreferences.getBoolean("save_form_data_enabled", false)) { + saveFormDataPreference.setIcon(R.drawable.form_data_enabled); + } else { + saveFormDataPreference.setIcon(R.drawable.form_data_disabled); + } + + // Set the `customUserAgentPreference` icon. + if (customUserAgentPreference.isEnabled()) { + customUserAgentPreference.setIcon(R.drawable.custom_user_agent_enabled); + } else { + customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted); + } + + // Set the `blockAdsPreference` icon. + if (savedPreferences.getBoolean("block_ads", true)) { + blockAdsPreference.setIcon(R.drawable.block_ads_enabled); + } else { + blockAdsPreference.setIcon(R.drawable.block_ads_disabled); + } + + // Set the `incognitoModePreference` icon. + if (savedPreferences.getBoolean("incognito_mode", false)) { + incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled); + } else { + incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled); + } + + // Set the `doNotTrackPreference` icon. + if (savedPreferences.getBoolean("do_not_track", false)) { + doNotTrackPreference.setIcon(R.drawable.do_not_track_enabled); + } else { + doNotTrackPreference.setIcon(R.drawable.do_not_track_disabled); + } + + // Set the `proxyThroughOrbotPreference` icon. + if (proxyThroughOrbotBoolean) { + proxyThroughOrbotPreference.setIcon(R.drawable.orbot_enabled); + } else { + proxyThroughOrbotPreference.setIcon(R.drawable.orbot_disabled); + } + + // Set the `torSearchPreference` and `torSearchCustomURLPreference` icons. + if (proxyThroughOrbotBoolean) { + // Set the `torHomepagePreference` and `torSearchPreference` icons. + torHomepagePreference.setIcon(R.drawable.home_enabled); + torSearchPreference.setIcon(R.drawable.search_enabled); + + // Set the `torSearchCustomURLPreference` icon. + if (torSearchCustomURLPreference.isEnabled()) { + torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled); + } else { + torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_disabled); + } + } else { // Proxy through Orbot is disabled. + torHomepagePreference.setIcon(R.drawable.home_ghosted); + torSearchPreference.setIcon(R.drawable.search_ghosted); + torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted); + } + + // Set the `searchCustomURLPreference` icon. + if (searchCustomURLPreference.isEnabled()) { + searchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled); + } else { + searchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted); + } + + // Set the full screen browsing mode icons. + if (fullScreenBrowsingModeBoolean) { + // Set the `fullScreenBrowsingModePreference` icon. + fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_enabled); + + if (hideSystemBarsBoolean) { + // Set `hideSystemBarsPreference` to use the enabled icon. + hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_enabled); + + // Set `translucentNavigationBarPreference` to use the ghosted icon. + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted); + } else { // `hideSystemBarsBoolean` is false. + // Set `hideSystemBarsPreference` to use the disabled icon. + hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_disabled); + + // Set the correct icon for `translucentNavigationBarPreference`. + if (savedPreferences.getBoolean("translucent_navigation_bar", true)) { + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled); + } else { + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled); + } + } + } else { // `fullScreenBrowsingModeBoolean` is false. + fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_disabled); + hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_ghosted); + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted); + } + + // Set the `clearEverythingPreference` icon. + if (clearEverythingBoolean) { + clearEverythingPreference.setIcon(R.drawable.clear_everything_enabled); + } else { + clearEverythingPreference.setIcon(R.drawable.clear_everything_disabled); + } + + // Set the `clearCookiesPreference` icon. + if (clearEverythingBoolean || savedPreferences.getBoolean("clear_cookies", true)) { + clearCookiesPreference.setIcon(R.drawable.cookies_cleared); + } else { + clearCookiesPreference.setIcon(R.drawable.cookies_warning); + } + + // Set the `clearDomStoragePreference` icon. + if (clearEverythingBoolean || savedPreferences.getBoolean("clear_dom_storage", true)) { + clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared); + } else { + clearDomStoragePreference.setIcon(R.drawable.dom_storage_warning); + } + + // Set the `clearFormDataPreference` icon. + if (clearEverythingBoolean || savedPreferences.getBoolean("clear_form_data", true)) { + clearFormDataPreference.setIcon(R.drawable.form_data_cleared); + } else { + clearFormDataPreference.setIcon(R.drawable.form_data_warning); + } + + // Set the `clearCachePreference` icon. + if (clearEverythingBoolean || savedPreferences.getBoolean("clear_cache", true)) { + clearCachePreference.setIcon(R.drawable.cache_cleared); + } else { + clearCachePreference.setIcon(R.drawable.cache_warning); + } + + // Set the `swipeToRefreshPreference` icon. + if (savedPreferences.getBoolean("swipe_to_refresh", false)) { + swipeToRefreshPreference.setIcon(R.drawable.refresh_enabled); + } else { + swipeToRefreshPreference.setIcon(R.drawable.refresh_disabled); + } + + // Set the `displayAdditionalAppBarIconsPreference` icon. + if (savedPreferences.getBoolean("display_additional_app_bar_icons", false)) { + displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_enabled); + } else { + displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_disabled); + } + + // Set the `darkThemePreference` icon. + if (savedPreferences.getBoolean("dark_theme", false)) { + darkThemePreference.setIcon(R.drawable.theme_dark); + } else { + darkThemePreference.setIcon(R.drawable.theme_light); + } + + // Set the `displayWebpageImagesPreference` icon. + if (savedPreferences.getBoolean("display_webpage_images", true)) { + displayWebpageImagesPreference.setIcon(R.drawable.images_enabled); + } else { + displayWebpageImagesPreference.setIcon(R.drawable.images_disabled); + } + + // Listen for preference changes. preferencesListener = new SharedPreferences.OnSharedPreferenceChangeListener() { @Override @@ -200,20 +385,20 @@ public class SettingsFragment extends PreferenceFragment { // Update the icons. if (sharedPreferences.getBoolean("javascript_enabled", false)) { // Update the icon for `javascript_enabled`. - javaScriptEnabled.setIcon(R.drawable.javascript_enabled); + javaScriptPreference.setIcon(R.drawable.javascript_enabled); // Update the icon for `dom_storage_enabled`. if (sharedPreferences.getBoolean("dom_storage_enabled", false)) { - domStorageEnabled.setIcon(R.drawable.dom_storage_enabled); + domStoragePreference.setIcon(R.drawable.dom_storage_enabled); } else { - domStorageEnabled.setIcon(R.drawable.dom_storage_disabled); + domStoragePreference.setIcon(R.drawable.dom_storage_disabled); } } else { // `javascript_enabled` is `false`. // Update the icon for `javascript_enabled`. - javaScriptEnabled.setIcon(R.drawable.privacy_mode); + javaScriptPreference.setIcon(R.drawable.privacy_mode); // Set the icon for `dom_storage_disabled` to be ghosted. - domStorageEnabled.setIcon(R.drawable.dom_storage_ghosted); + domStoragePreference.setIcon(R.drawable.dom_storage_ghosted); } break; @@ -221,75 +406,120 @@ public class SettingsFragment extends PreferenceFragment { // 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`. - firstPartyCookiesEnabled.setIcon(R.drawable.cookies_enabled); + firstPartyCookiesPreference.setIcon(R.drawable.cookies_enabled); // Update the icon for `third_party_cookies_enabled`. if (Build.VERSION.SDK_INT >= 21) { if (sharedPreferences.getBoolean("third_party_cookies_enabled", false)) { - thirdPartyCookiesEnabled.setIcon(R.drawable.cookies_warning); + thirdPartyCookiesPreference.setIcon(R.drawable.cookies_warning); } else { - thirdPartyCookiesEnabled.setIcon(R.drawable.cookies_disabled); + thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled); } } else { - thirdPartyCookiesEnabled.setIcon(R.drawable.cookies_ghosted); + thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted); } } else { // `first_party_cookies_enabled` is `false`. // Update the icon for `first_party_cookies_enabled`. - firstPartyCookiesEnabled.setIcon(R.drawable.cookies_disabled); + firstPartyCookiesPreference.setIcon(R.drawable.cookies_disabled); // Set the icon for `third_party_cookies_enabled` to be ghosted. - thirdPartyCookiesEnabled.setIcon(R.drawable.cookies_ghosted); + thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted); } // Enable `third_party_cookies_enabled` if `first_party_cookies_enabled` is `true` and API >= 21. - thirdPartyCookiesEnabled.setEnabled(sharedPreferences.getBoolean("first_party_cookies_enabled", false) && (Build.VERSION.SDK_INT >= 21)); + thirdPartyCookiesPreference.setEnabled(sharedPreferences.getBoolean("first_party_cookies_enabled", false) && (Build.VERSION.SDK_INT >= 21)); break; case "third_party_cookies_enabled": // Update the icon. if (sharedPreferences.getBoolean("third_party_cookies_enabled", false)) { - thirdPartyCookiesEnabled.setIcon(R.drawable.cookies_warning); + thirdPartyCookiesPreference.setIcon(R.drawable.cookies_warning); } else { - thirdPartyCookiesEnabled.setIcon(R.drawable.cookies_disabled); + thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled); } break; case "dom_storage_enabled": // Update the icon. if (sharedPreferences.getBoolean("dom_storage_enabled", false)) { - domStorageEnabled.setIcon(R.drawable.dom_storage_enabled); + domStoragePreference.setIcon(R.drawable.dom_storage_enabled); } else { - domStorageEnabled.setIcon(R.drawable.dom_storage_disabled); + domStoragePreference.setIcon(R.drawable.dom_storage_disabled); } break; + case "save_form_data_enabled": + // Update the icon. + if (sharedPreferences.getBoolean("save_form_data_enabled", false)) { + saveFormDataPreference.setIcon(R.drawable.form_data_enabled); + } else { + saveFormDataPreference.setIcon(R.drawable.form_data_disabled); + } + case "user_agent": String userAgentString = sharedPreferences.getString("user_agent", "PrivacyBrowser/1.0"); switch (userAgentString) { case "WebView default user agent": - // Display the user agent as the summary text for `userAgentPreference`, and disable `customUserAgent`. + // Display the user agent as the summary text for `userAgentPreference`. userAgentPreference.setSummary(bareWebView.getSettings().getUserAgentString()); - customUserAgent.setEnabled(false); + + // Update `customUserAgentPreference`. + customUserAgentPreference.setEnabled(false); + customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted); break; case "Custom user agent": - // Display `Custom user agent` as the summary text for `userAgentPreference`, and enable `customUserAgent`. + // Display `Custom user agent` as the summary text for `userAgentPreference`. userAgentPreference.setSummary(R.string.custom_user_agent); - customUserAgent.setEnabled(true); + + // Update `customUserAgentPreference`. + customUserAgentPreference.setEnabled(true); + customUserAgentPreference.setIcon(R.drawable.custom_user_agent_enabled); break; default: - // Display the user agent as the summary text for `userAgentPreference`, and disable `customUserAgent`. + // Display the user agent as the summary text for `userAgentPreference`. userAgentPreference.setSummary(sharedPreferences.getString("user_agent", "PrivacyBrowser/1.0")); - customUserAgent.setEnabled(false); + + // Update `customUserAgentPreference`. + customUserAgentPreference.setEnabled(false); + customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted); break; } break; case "custom_user_agent": // Set the new custom user agent as the summary text for `custom_user_agent`. The default is `PrivacyBrowser/1.0`. - customUserAgent.setSummary(sharedPreferences.getString("custom_user_agent", "PrivacyBrowser/1.0")); + customUserAgentPreference.setSummary(sharedPreferences.getString("custom_user_agent", "PrivacyBrowser/1.0")); + break; + + case "block_ads": + // Update the icon. + if (sharedPreferences.getBoolean("block_ads", true)) { + blockAdsPreference.setIcon(R.drawable.block_ads_enabled); + } else { + blockAdsPreference.setIcon(R.drawable.block_ads_disabled); + } + break; + + case "incognito_mode": + // Update the icon. + if (sharedPreferences.getBoolean("incognito_mode", false)) { + incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled); + } else { + incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled); + } + break; + + case "do_not_track": + // Update the icon. + if (sharedPreferences.getBoolean("do_not_track", false)) { + doNotTrackPreference.setIcon(R.drawable.do_not_track_enabled); + } else { + doNotTrackPreference.setIcon(R.drawable.do_not_track_disabled); + } + break; case "proxy_through_orbot": @@ -299,6 +529,26 @@ public class SettingsFragment extends PreferenceFragment { // 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")); + + // Update the icons. + if (currentProxyThroughOrbot) { + // Set the `proxyThroughOrbotPreference`, `torHomepagePreference`, and `torSearchPreference` icons. + proxyThroughOrbotPreference.setIcon(R.drawable.orbot_enabled); + torHomepagePreference.setIcon(R.drawable.home_enabled); + torSearchPreference.setIcon(R.drawable.search_enabled); + + // Set the `torSearchCustomURLPreference` icon. + if (torSearchCustomURLPreference.isEnabled()) { + torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled); + } else { + torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_disabled); + } + } else { // Proxy through Orbot is disabled. + proxyThroughOrbotPreference.setIcon(R.drawable.orbot_disabled); + torHomepagePreference.setIcon(R.drawable.home_ghosted); + torSearchPreference.setIcon(R.drawable.search_ghosted); + torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted); + } break; case "tor_homepage": @@ -310,17 +560,22 @@ public class SettingsFragment extends PreferenceFragment { // Get the present search string. String presentTorSearchString = sharedPreferences.getString("tor_search", "https://3g2upl4pq6kufc4m.onion/html/?q="); - // Set the summary text for `tor_search`. + // Update the preferences. if (presentTorSearchString.equals("Custom URL")) { - // Use R.string.custom_url, which is translated, instead of the array value, which isn't. + // Use `R.string.custom_url`, which is translated, as the summary instead of the array value, which isn't. torSearchPreference.setSummary(R.string.custom_url); + + // Update `torSearchCustomURLPreference`. + torSearchCustomURLPreference.setEnabled(true); + torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled); } else { // Set the array value as the summary text. torSearchPreference.setSummary(presentTorSearchString); - } - // Set the status of `torJavaScriptDisabledSearchCustomURLPreference`. - torSearchCustomURLPreference.setEnabled(presentTorSearchString.equals("Custom URL")); + // Update `torSearchCustomURLPreference`. + torSearchCustomURLPreference.setEnabled(false); + torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_disabled); + } break; case "tor_search_custom_url": @@ -329,15 +584,25 @@ public class SettingsFragment extends PreferenceFragment { break; case "search": + // Store the new search string. String newSearchString = sharedPreferences.getString("search", "https://duckduckgo.com/html/?q="); - if (newSearchString.equals("Custom URL")) { // Set the summary text to `R.string.custom_url`, which is translated. + + // Update `searchPreference` and `searchCustomURLPreference`. + if (newSearchString.equals("Custom URL")) { // `Custom URL` is selected. + // Set the summary text to `R.string.custom_url`, which is translated. searchPreference.setSummary(R.string.custom_url); - } else { // Set the new search URL as the summary text for the JavaScript-disabled search preference. + + // Update `searchCustomURLPreference`. + searchCustomURLPreference.setEnabled(true); + searchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled); + } else { // `Custom URL` is not selected. + // Set the summary text to `newSearchString`. searchPreference.setSummary(newSearchString); - } - // Enable or disable `searchCustomURLPreference`. - searchCustomURLPreference.setEnabled(newSearchString.equals("Custom URL")); + // Update `searchCustomURLPreference`. + searchCustomURLPreference.setEnabled(false); + searchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted); + } break; case "search_custom_url": @@ -345,14 +610,152 @@ public class SettingsFragment extends PreferenceFragment { searchCustomURLPreference.setSummary(sharedPreferences.getString("search_custom_url", "")); break; - case "enable_full_screen_browsing_mode": - // Enable `transparent_navigation_bar` only if full screen browsing mode is enabled and `hide_system_bars` is disabled. - translucentNavigationBarPreference.setEnabled(sharedPreferences.getBoolean("enable_full_screen_browsing_mode", false) && !sharedPreferences.getBoolean("hide_system_bars", false)); + case "full_screen_browsing_mode": + if (sharedPreferences.getBoolean("full_screen_browsing_mode", false)) { + // Set `fullScreenBrowsingModePreference` to use the enabled icon. + fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_enabled); + + if (sharedPreferences.getBoolean("hide_system_bars", false)) { + // Set `hideSystemBarsPreference` to use the enabled icon. + hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_enabled); + + // Update `translucentNavigationBarPreference`. + translucentNavigationBarPreference.setEnabled(false); + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted); + } else { // `hide_system_bars` is false. + // Set `hideSystemBarsPreference` to use the disabled icon. + hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_disabled); + + // Update `translucentNavigationBarPreference`. + translucentNavigationBarPreference.setEnabled(true); + if (sharedPreferences.getBoolean("translucent_navigation_bar", true)) { + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled); + } else { + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled); + } + } + } else { // `full_screen_browsing_mode` is false. + // Disable `translucentNavigationBarPreference`. + translucentNavigationBarPreference.setEnabled(false); + + // Update the icons. + fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_disabled); + hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_ghosted); + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted); + } break; case "hide_system_bars": - // Enable `translucentNavigationBarPreference` if `hide_system_bars` is disabled. - translucentNavigationBarPreference.setEnabled(!sharedPreferences.getBoolean("hide_system_bars", false)); + if (sharedPreferences.getBoolean("hide_system_bars", false)) { + // Set `hideSystemBarsPreference` to use the enabled icon. + hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_enabled); + + // Update `translucentNavigationBarPreference`. + translucentNavigationBarPreference.setEnabled(false); + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted); + } else { // `hide_system_bars` is false. + // Set `hideSystemBarsPreference` to use the disabled icon. + hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_disabled); + + // Update `translucentNavigationBarPreference`. + translucentNavigationBarPreference.setEnabled(true); + if (sharedPreferences.getBoolean("translucent_navigation_bar", true)) { + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled); + } else { + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled); + } + } + break; + + case "translucent_navigation_bar": + // Update the icon. + if (sharedPreferences.getBoolean("translucent_navigation_bar", true)) { + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled); + } else { + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled); + } + break; + + case "clear_everything": + // Store the new `clear_everything` status + boolean newClearEverythingBoolean = sharedPreferences.getBoolean("clear_everything", true); + + // Update the status of the `Clear and Exit` preferences. + clearCookiesPreference.setEnabled(!newClearEverythingBoolean); + clearDomStoragePreference.setEnabled(!newClearEverythingBoolean); + clearFormDataPreference.setEnabled(!newClearEverythingBoolean); + clearCachePreference.setEnabled(!newClearEverythingBoolean); + + // Update the `clearEverythingPreference` icon. + if (newClearEverythingBoolean) { + clearEverythingPreference.setIcon(R.drawable.clear_everything_enabled); + } else { + clearEverythingPreference.setIcon(R.drawable.clear_everything_disabled); + } + + // Update the `clearCookiesPreference` icon. + if (newClearEverythingBoolean || sharedPreferences.getBoolean("clear_cookies", true)) { + clearCookiesPreference.setIcon(R.drawable.cookies_cleared); + } else { + clearCookiesPreference.setIcon(R.drawable.cookies_warning); + } + + // Update the `clearDomStoragePreference` icon. + if (newClearEverythingBoolean || sharedPreferences.getBoolean("clear_dom_storage", true)) { + clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared); + } else { + clearDomStoragePreference.setIcon(R.drawable.dom_storage_warning); + } + + // Update the `clearFormDataPreference` icon. + if (newClearEverythingBoolean || sharedPreferences.getBoolean("clear_form_data", true)) { + clearFormDataPreference.setIcon(R.drawable.form_data_cleared); + } else { + clearFormDataPreference.setIcon(R.drawable.form_data_warning); + } + + // Update the `clearCachePreference` icon. + if (newClearEverythingBoolean || sharedPreferences.getBoolean("clear_cache", true)) { + clearCachePreference.setIcon(R.drawable.cache_cleared); + } else { + clearCachePreference.setIcon(R.drawable.cache_warning); + } + break; + + case "clear_cookies": + // Update the icon. + if (sharedPreferences.getBoolean("clear_cookies", true)) { + clearCookiesPreference.setIcon(R.drawable.cookies_cleared); + } else { + clearCookiesPreference.setIcon(R.drawable.cookies_warning); + } + break; + + case "clear_dom_storage": + // Update the icon. + if (sharedPreferences.getBoolean("clear_dom_storage", true)) { + clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared); + } else { + clearDomStoragePreference.setIcon(R.drawable.dom_storage_warning); + } + break; + + case "clear_form_data": + // Update the icon. + if (sharedPreferences.getBoolean("clear_form_data", true)) { + clearFormDataPreference.setIcon(R.drawable.form_data_cleared); + } else { + clearFormDataPreference.setIcon(R.drawable.form_data_warning); + } + break; + + case "clear_cache": + // Update the icon. + if (sharedPreferences.getBoolean("clear_cache", true)) { + clearCachePreference.setIcon(R.drawable.cache_cleared); + } else { + clearCachePreference.setIcon(R.drawable.cache_warning); + } break; case "homepage": @@ -365,8 +768,59 @@ public class SettingsFragment extends PreferenceFragment { defaultFontSizePreference.setSummary(sharedPreferences.getString("default_font_size", "100") + "%%"); break; - default: - // If no match, do nothing. + case "swipe_to_refresh": + // Update the icon. + if (sharedPreferences.getBoolean("swipe_to_refresh", false)) { + swipeToRefreshPreference.setIcon(R.drawable.refresh_enabled); + } else { + swipeToRefreshPreference.setIcon(R.drawable.refresh_disabled); + } + break; + + case "display_additional_app_bar_icons": + // Update the icon. + if (sharedPreferences.getBoolean("display_additional_app_bar_icons", false)) { + displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_enabled); + } else { + displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_disabled); + } + break; + + case "dark_theme": + // Update the icon. + if (sharedPreferences.getBoolean("dark_theme", false)) { + darkThemePreference.setIcon(R.drawable.theme_dark); + } else { + darkThemePreference.setIcon(R.drawable.theme_light); + } + + // Create an `Intent` to restart Privacy Browser. + Intent intent = getActivity().getParentActivityIntent(); + + // Assert that `intent` is not `null` to remove the lint error below. + assert intent != 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); + + // Make it so. + startActivity(intent); + break; + + case "display_webpage_images": + if (sharedPreferences.getBoolean("display_webpage_images", true)) { + // Update the icon. + displayWebpageImagesPreference.setIcon(R.drawable.images_enabled); + + // `mainWebView` does not need to be reloaded because unloaded images will load automatically. + MainWebViewActivity.reloadOnRestartBoolean = false; + } else { + // Update the icon. + displayWebpageImagesPreference.setIcon(R.drawable.images_disabled); + + // Set `mainWebView` to reload on restart to remove the current images. + MainWebViewActivity.reloadOnRestartBoolean = true; + } break; } }