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=b7a829da4b1bf1642316bd002ae3259309c68ed7;hp=75f9b31d903b0f0058dbd539f91d0d4796150bb4;hb=5917df154b320eadd4c2d935baf30f98fd6055c4;hpb=27e33047e14466c84212bca02a14a7fc4ff15af8 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 75f9b31d..b7a829da 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java @@ -81,7 +81,7 @@ public class SettingsFragment extends PreferenceFragmentCompat { Preference customUserAgentPreference = findPreference("custom_user_agent"); Preference incognitoModePreference = findPreference("incognito_mode"); Preference doNotTrackPreference = findPreference("do_not_track"); - Preference allowScreenshotsPreference = findPreference("allow_screenshots"); + Preference allowScreenshotsPreference = findPreference(getString(R.string.allow_screenshots_key)); Preference easyListPreference = findPreference("easylist"); Preference easyPrivacyPreference = findPreference("easyprivacy"); Preference fanboyAnnoyanceListPreference = findPreference("fanboys_annoyance_list"); @@ -102,6 +102,7 @@ public class SettingsFragment extends PreferenceFragmentCompat { Preference clearCookiesPreference = findPreference("clear_cookies"); Preference clearDomStoragePreference = findPreference("clear_dom_storage"); Preference clearFormDataPreference = findPreference("clear_form_data"); // The clear form data preference can be removed once the minimum API >= 26. + Preference clearLogcatPreference = findPreference(getString(R.string.clear_logcat_key)); Preference clearCachePreference = findPreference("clear_cache"); Preference homepagePreference = findPreference("homepage"); Preference downloadLocationPreference = findPreference("download_location"); @@ -112,7 +113,7 @@ public class SettingsFragment extends PreferenceFragmentCompat { Preference scrollAppBarPreference = findPreference("scroll_app_bar"); Preference displayAdditionalAppBarIconsPreference = findPreference("display_additional_app_bar_icons"); Preference appThemePreference = findPreference("app_theme"); - Preference nightModePreference = findPreference("night_mode"); + Preference webViewThemePreference = findPreference("webview_theme"); Preference wideViewportPreference = findPreference("wide_viewport"); Preference displayWebpageImagesPreference = findPreference("display_webpage_images"); @@ -147,6 +148,7 @@ public class SettingsFragment extends PreferenceFragmentCompat { assert clearCookiesPreference != null; assert clearDomStoragePreference != null; assert clearFormDataPreference != null; + assert clearLogcatPreference != null; assert clearCachePreference != null; assert homepagePreference != null; assert downloadLocationPreference != null; @@ -157,12 +159,13 @@ public class SettingsFragment extends PreferenceFragmentCompat { assert scrollAppBarPreference != null; assert displayAdditionalAppBarIconsPreference != null; assert appThemePreference != null; - assert nightModePreference != null; + assert webViewThemePreference != null; assert wideViewportPreference != null; assert displayWebpageImagesPreference != null; - // Set the hide app bar preference dependency. + // Set the preference dependencies. hideAppBarPreference.setDependency("full_screen_browsing_mode"); + domStoragePreference.setDependency("javascript"); // Get strings from the preferences. String userAgentName = savedPreferences.getString("user_agent", getString(R.string.user_agent_default_value)); @@ -173,26 +176,21 @@ public class SettingsFragment extends PreferenceFragmentCompat { // Get booleans that are used in multiple places from the preferences. 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 fullScreenBrowsingMode = savedPreferences.getBoolean("full_screen_browsing_mode", false); boolean clearEverything = savedPreferences.getBoolean("clear_everything", true); - boolean nightMode = savedPreferences.getBoolean("night_mode", false); // Only enable the third-party cookies preference if first-party cookies are enabled and API >= 21. thirdPartyCookiesPreference.setEnabled(firstPartyCookiesEnabled && (Build.VERSION.SDK_INT >= 21)); - // 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. + // Get handles for the categories. PreferenceCategory privacyCategory = findPreference("privacy"); PreferenceCategory clearAndExitCategory = findPreference("clear_and_exit"); - // Remove the lint warnings below that the preference categories might be null. + // Remove the incorrect lint warnings below that the preference categories might be null. assert privacyCategory != null; assert clearAndExitCategory != null; @@ -297,10 +295,11 @@ public class SettingsFragment extends PreferenceFragmentCompat { proxyCustomUrlPreference.setEnabled(proxyString.equals("Custom")); - // 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); // The form data line can be removed once the minimum API is >= 26. + clearLogcatPreference.setEnabled(!clearEverything); clearCachePreference.setEnabled(!clearEverything); @@ -335,22 +334,25 @@ public class SettingsFragment extends PreferenceFragmentCompat { fontSizePreference.setSummary(savedPreferences.getString("font_size", getString(R.string.font_size_default_value)) + "%"); - // Get the theme string arrays. + // Get the app theme string arrays. String[] appThemeEntriesStringArray = resources.getStringArray(R.array.app_theme_entries); String[] appThemeEntryValuesStringArray = resources.getStringArray(R.array.app_theme_entry_values); - // Get the current theme. + // Get the current app theme. String currentAppTheme = savedPreferences.getString("app_theme", getString(R.string.app_theme_default_value)); - // Define a theme entry number. + // Define an app theme entry number. int appThemeEntryNumber; - // Get the theme entry number that matches the current theme. A switch statement cannot be used because the theme entry values string array is not a compile time constant. + // Get the app theme entry number that matches the current app theme. A switch statement cannot be used because the theme entry values string array is not a compile time constant. if (currentAppTheme.equals(appThemeEntryValuesStringArray[1])) { // The light theme is selected. + // Store the app theme entry number. appThemeEntryNumber = 1; } else if (currentAppTheme.equals(appThemeEntryValuesStringArray[2])) { // The dark theme is selected. + // Store the app theme entry number. appThemeEntryNumber = 2; } else { // The system default theme is selected. + // Store the app theme entry number. appThemeEntryNumber = 0; } @@ -358,11 +360,46 @@ public class SettingsFragment extends PreferenceFragmentCompat { appThemePreference.setSummary(appThemeEntriesStringArray[appThemeEntryNumber]); - // Disable the JavaScript preference if Night Mode is enabled. JavaScript will be enabled for all web pages. - javaScriptPreference.setEnabled(!nightMode); + // Get the WebView theme string arrays. + String[] webViewThemeEntriesStringArray = resources.getStringArray(R.array.webview_theme_entries); + String[] webViewThemeEntryValuesStringArray = resources.getStringArray(R.array.webview_theme_entry_values); + + // Get the current WebView theme. + String currentWebViewTheme = savedPreferences.getString("webview_theme", getString(R.string.webview_theme_default_value)); + + // Define a WebView theme entry number. + int webViewThemeEntryNumber; + + // Get the WebView theme entry number that matches the current WebView theme. A switch statement cannot be used because the WebView theme entry values string array is not a compile time constant. + if (currentWebViewTheme.equals(webViewThemeEntryValuesStringArray[1])) { // The light theme is selected. + // Store the WebView theme entry number. + webViewThemeEntryNumber = 1; + } else if (currentWebViewTheme.equals(webViewThemeEntryValuesStringArray[2])) { // The dark theme is selected. + // Store the WebView theme entry number. + webViewThemeEntryNumber = 2; + } else { // The system default theme is selected. + // Store the WebView theme entry number. + webViewThemeEntryNumber = 0; + } + + // Set the visibility of the WebView theme preference. + if (Build.VERSION.SDK_INT < 21) { // The device is running API 19. + // Get a handle for the general category. + PreferenceCategory generalCategory = findPreference("general"); + + // Remove the incorrect lint warning below that the general preference category might be null. + assert generalCategory != null; + + // Remove the WebView theme preference. + generalCategory.removePreference(webViewThemePreference); + } else { // The device is running API >= 21 + // Set the current theme as the summary text for the preference. + webViewThemePreference.setSummary(webViewThemeEntriesStringArray[webViewThemeEntryNumber]); + } + // Set the JavaScript icon. - if (javaScriptEnabled || nightMode) { + if (javaScriptEnabled) { javaScriptPreference.setIcon(R.drawable.javascript_enabled); } else { javaScriptPreference.setIcon(R.drawable.privacy_mode); @@ -381,7 +418,7 @@ public class SettingsFragment extends PreferenceFragmentCompat { // Set the third party cookies icon. if (firstPartyCookiesEnabled && Build.VERSION.SDK_INT >= 21) { - if (thirdPartyCookiesEnabled) { + if (savedPreferences.getBoolean("third_party_cookies", false)) { thirdPartyCookiesPreference.setIcon(R.drawable.cookies_warning); } else { if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { @@ -399,7 +436,7 @@ public class SettingsFragment extends PreferenceFragmentCompat { } // Set the DOM storage icon. - if (javaScriptEnabled || nightMode) { // The preference is enabled. + if (javaScriptEnabled) { // The preference is enabled. if (savedPreferences.getBoolean("dom_storage", false)) { // DOM storage is enabled. domStoragePreference.setIcon(R.drawable.dom_storage_enabled); } else { // DOM storage is disabled. @@ -476,17 +513,17 @@ public class SettingsFragment extends PreferenceFragmentCompat { } // Set the allow screenshots icon. - if (savedPreferences.getBoolean("allow_screenshots", false)) { - if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { - allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_night); - } else { + if (savedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false)) { + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_day); + } else { + allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_night); } } else { - if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { - allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_night); - } else { + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_day); + } else { + allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_night); } } @@ -785,6 +822,17 @@ public class SettingsFragment extends PreferenceFragmentCompat { } } + // Set the clear logcat preference icon. + if (clearEverything || savedPreferences.getBoolean(getString(R.string.clear_logcat_key), true)) { + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { + clearLogcatPreference.setIcon(R.drawable.bug_cleared_day); + } else { + clearLogcatPreference.setIcon(R.drawable.bug_cleared_night); + } + } else { + clearLogcatPreference.setIcon(R.drawable.bug_warning); + } + // Set the clear cache preference icon. if (clearEverything || savedPreferences.getBoolean("clear_cache", true)) { if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { @@ -871,19 +919,33 @@ public class SettingsFragment extends PreferenceFragmentCompat { } } - // Set the night mode preference icon. - if (nightMode) { - if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { - nightModePreference.setIcon(R.drawable.night_mode_enabled_night); - } else { - nightModePreference.setIcon(R.drawable.night_mode_enabled_day); - } - } else { - if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { - nightModePreference.setIcon(R.drawable.night_mode_disabled_night); - } else { - nightModePreference.setIcon(R.drawable.night_mode_disabled_day); - } + // Set the WebView theme preference icon. + switch (webViewThemeEntryNumber) { + case 0: // The system default WebView theme is selected. + // Set the icon according to the app theme. + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { + webViewThemePreference.setIcon(R.drawable.webview_light_theme_day); + } else { + webViewThemePreference.setIcon(R.drawable.webview_dark_theme_night); + } + break; + + case 1: // The light WebView theme is selected. + // Set the icon according to the app theme. + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { + webViewThemePreference.setIcon(R.drawable.webview_light_theme_day); + } else { + webViewThemePreference.setIcon(R.drawable.webview_light_theme_night); + } + break; + + case 2: // The dark WebView theme is selected. + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { + webViewThemePreference.setIcon(R.drawable.webview_dark_theme_day); + } else { + webViewThemePreference.setIcon(R.drawable.webview_dark_theme_night); + } + break; } // Set the wide viewport preference icon. @@ -1139,17 +1201,17 @@ public class SettingsFragment extends PreferenceFragmentCompat { case "allow_screenshots": // Update the icon. - if (sharedPreferences.getBoolean("allow_screenshots", false)) { - if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { - allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_night); - } else { + if (sharedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false)) { + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_day); + } else { + allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_night); } } else { - if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { - allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_night); - } else { + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_day); + } else { + allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_night); } } @@ -1549,16 +1611,17 @@ public class SettingsFragment extends PreferenceFragmentCompat { break; case "clear_everything": - // Store the new `clear_everything` status + // Store the new clear everything status boolean newClearEverythingBoolean = sharedPreferences.getBoolean("clear_everything", true); - // Update the status of the `Clear and Exit` preferences. + // Update the status of the clear and exit preferences. clearCookiesPreference.setEnabled(!newClearEverythingBoolean); clearDomStoragePreference.setEnabled(!newClearEverythingBoolean); clearFormDataPreference.setEnabled(!newClearEverythingBoolean); // This line can be removed once the minimum API >= 26. + clearLogcatPreference.setEnabled(!newClearEverythingBoolean); clearCachePreference.setEnabled(!newClearEverythingBoolean); - // Update the `clearEverythingPreference` icon. + // Update the clear everything preference icon. if (newClearEverythingBoolean) { if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { clearEverythingPreference.setIcon(R.drawable.clear_everything_enabled_night); @@ -1569,7 +1632,7 @@ public class SettingsFragment extends PreferenceFragmentCompat { clearEverythingPreference.setIcon(R.drawable.clear_everything_disabled); } - // Update the `clearCookiesPreference` icon. + // Update the clear cookies preference icon. if (newClearEverythingBoolean || sharedPreferences.getBoolean("clear_cookies", true)) { if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { clearCookiesPreference.setIcon(R.drawable.cookies_cleared_night); @@ -1580,7 +1643,7 @@ public class SettingsFragment extends PreferenceFragmentCompat { clearCookiesPreference.setIcon(R.drawable.cookies_warning); } - // Update the `clearDomStoragePreference` icon. + // Update the clear dom storage preference icon. if (newClearEverythingBoolean || sharedPreferences.getBoolean("clear_dom_storage", true)) { if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_night); @@ -1604,7 +1667,18 @@ public class SettingsFragment extends PreferenceFragmentCompat { } } - // Update the `clearCachePreference` icon. + // Update the clear logcat preference icon. + if (newClearEverythingBoolean || sharedPreferences.getBoolean(getString(R.string.clear_logcat_key), true)) { + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { + clearLogcatPreference.setIcon(R.drawable.bug_cleared_day); + } else { + clearLogcatPreference.setIcon(R.drawable.bug_cleared_night); + } + } else { + clearLogcatPreference.setIcon(R.drawable.cache_warning); + } + + // Update the clear cache preference icon. if (newClearEverythingBoolean || sharedPreferences.getBoolean("clear_cache", true)) { if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { clearCachePreference.setIcon(R.drawable.cache_cleared_night); @@ -1656,6 +1730,19 @@ public class SettingsFragment extends PreferenceFragmentCompat { } break; + case "clear_logcat": + // Update the icon. + if (sharedPreferences.getBoolean(getString(R.string.clear_logcat_key), true)) { + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { + clearLogcatPreference.setIcon(R.drawable.bug_cleared_day); + } else { + clearLogcatPreference.setIcon(R.drawable.bug_cleared_night); + } + } else { + clearLogcatPreference.setIcon(R.drawable.bug_warning); + } + break; + case "clear_cache": // Update the icon. if (sharedPreferences.getBoolean("clear_cache", true)) { @@ -1822,55 +1909,55 @@ public class SettingsFragment extends PreferenceFragmentCompat { currentThemeStatus = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK; break; - case "night_mode": - // Store the current night mode status. - boolean currentNightModeBoolean = sharedPreferences.getBoolean("night_mode", false); - boolean currentJavaScriptBoolean = sharedPreferences.getBoolean("javascript", false); + case "webview_theme": + // Get the new WebView theme. + String newWebViewTheme = sharedPreferences.getString("webview_theme", getString(R.string.webview_theme_default_value)); - // Update the icon. - if (currentNightModeBoolean) { - if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { - nightModePreference.setIcon(R.drawable.night_mode_enabled_night); - } else { - nightModePreference.setIcon(R.drawable.night_mode_enabled_day); - } - } else { - if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { - nightModePreference.setIcon(R.drawable.night_mode_disabled_night); - } else { - nightModePreference.setIcon(R.drawable.night_mode_disabled_day); - } + // Define a new WebView theme entry number. + int newWebViewThemeEntryNumber; + + // Get the webView theme entry number that matches the new WebView theme. A switch statement cannot be used because the theme entry values string array is not a compile time constant. + if (newWebViewTheme.equals(webViewThemeEntriesStringArray[1])) { // The light theme is selected. + // Store the new WebView theme entry number. + newWebViewThemeEntryNumber = 1; + } else if (newWebViewTheme.equals(webViewThemeEntryValuesStringArray[2])) { // The dark theme is selected. + // Store the WebView theme entry number. + newWebViewThemeEntryNumber = 2; + } else { // The system default theme is selected. + // Store the WebView theme entry number. + newWebViewThemeEntryNumber = 0; } - // Update the status of `javaScriptPreference` and `domStoragePreference`. - javaScriptPreference.setEnabled(!currentNightModeBoolean); - domStoragePreference.setEnabled(currentNightModeBoolean || currentJavaScriptBoolean); + // Update the icon. + switch (newWebViewThemeEntryNumber) { + case 0: // The system default WebView theme is selected. + // Set the icon according to the app theme. + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { + webViewThemePreference.setIcon(R.drawable.webview_light_theme_day); + } else { + webViewThemePreference.setIcon(R.drawable.webview_dark_theme_night); + } + break; - // Update the `javaScriptPreference` icon. - if (currentNightModeBoolean || currentJavaScriptBoolean) { - javaScriptPreference.setIcon(R.drawable.javascript_enabled); - } else { - javaScriptPreference.setIcon(R.drawable.privacy_mode); - } + case 1: // The system default WebView theme is selected. + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { + webViewThemePreference.setIcon(R.drawable.webview_light_theme_day); + } else { + webViewThemePreference.setIcon(R.drawable.webview_light_theme_night); + } + break; - // Update the DOM storage preference icon. - if (currentNightModeBoolean || currentJavaScriptBoolean) { // The preference 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 (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { - domStoragePreference.setIcon(R.drawable.dom_storage_disabled_night); + case 2: // The system default WebView theme is selected. + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { + webViewThemePreference.setIcon(R.drawable.webview_dark_theme_day); } else { - domStoragePreference.setIcon(R.drawable.dom_storage_disabled_day); + webViewThemePreference.setIcon(R.drawable.webview_dark_theme_night); } - } - } else { // The preference is disabled. The icon should be ghosted. - if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { - domStoragePreference.setIcon(R.drawable.dom_storage_ghosted_night); - } else { - domStoragePreference.setIcon(R.drawable.dom_storage_ghosted_day); - } + break; } + + // Set the current theme as the summary text for the preference. + webViewThemePreference.setSummary(webViewThemeEntriesStringArray[newWebViewThemeEntryNumber]); break; case "wide_viewport":