X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Ffragments%2FSettingsFragment.java;h=b783703e9350a519fcae82dd71adde77dd195810;hb=6d798f8c57d672eecd8f5fe7fd3543c79f228406;hp=bda6dc82ead9210ca3843b3cb5a882c7f61b3964;hpb=b3b4105e9acd9cf8e202abef3b811d49c6c36bec;p=PrivacyBrowserAndroid.git 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 bda6dc82..b783703e 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java @@ -21,6 +21,7 @@ package com.stoutner.privacybrowser.fragments; import android.annotation.SuppressLint; import android.content.SharedPreferences; +import android.os.Build; import android.os.Bundle; import android.preference.Preference; import android.preference.PreferenceFragment; @@ -47,37 +48,28 @@ public class SettingsFragment extends PreferenceFragment { final Preference thirdPartyCookiesEnabled = findPreference("third_party_cookies_enabled"); final Preference userAgentPreference = findPreference("user_agent"); final Preference customUserAgent = findPreference("custom_user_agent"); - final Preference javaScriptDisabledSearchPreference = findPreference("javascript_disabled_search"); - final Preference javaScriptDisabledSearchCustomURLPreference = findPreference("javascript_disabled_search_custom_url"); - final Preference javaScriptEnabledSearchPreference = findPreference("javascript_enabled_search"); - final Preference javaScriptEnabledSearchCustomURLPreference = findPreference("javascript_enabled_search_custom_url"); + 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 hideSystemBarsPreference = findPreference("hide_system_bars"); final Preference translucentNavigationBarPreference = findPreference("translucent_navigation_bar"); - final Preference torHomepagePreference = findPreference("tor_homepage"); - final Preference torJavaScriptDisabledSearchPreference = findPreference("tor_javascript_disabled_search"); - final Preference torJavaScriptDisabledSearchCustomURLPreference = findPreference("tor_javascript_disabled_search_custom_url"); - final Preference torJavaScriptEnabledSearchPreference = findPreference("tor_javascript_enabled_search"); - final Preference torJavaScriptEnabledSearchCustomURLPreference = findPreference("tor_javascript_enabled_search_custom_url"); final Preference homepagePreference = findPreference("homepage"); final Preference defaultFontSizePreference = findPreference("default_font_size"); - // Get booleans from the preferences. - final boolean fullScreenBrowsingModeEnabled = savedPreferences.getBoolean("enable_full_screen_browsing_mode", false); - final boolean proxyThroughOrbot = savedPreferences.getBoolean("proxy_through_orbot", false); + // Set dependencies. + domStorageEnabled.setDependency("javascript_enabled"); + torHomepagePreference.setDependency("proxy_through_orbot"); + torSearchPreference.setDependency("proxy_through_orbot"); + hideSystemBarsPreference.setDependency("enable_full_screen_browsing_mode"); // Get strings from the preferences. - String javaScriptDisabledSearchString = savedPreferences.getString("javascript_disabled_search", "https://duckduckgo.com/html/?q="); - String javaScriptEnabledSearchString = savedPreferences.getString("javascript_enabled_search", "https://duckduckgo.com/?q="); - String torJavaScriptDisabledSearchString = savedPreferences.getString("tor_javascript_disabled_search", "https://3g2upl4pq6kufc4m.onion/html/?q="); - String torJavaScriptEnabledSearchString = savedPreferences.getString("tor_javascript_enabled_search", "https://3g2upl4pq6kufc4m.onion/?q="); - String defaultFontSizeString = savedPreferences.getString("default_font_size", "100"); - - // Allow the user to access "dom_storage_enabled" if "javascript_enabled" is enabled. The default is false. - domStorageEnabled.setEnabled(savedPreferences.getBoolean("javascript_enabled", false)); - - // Allow the user to access "third_party_cookies_enabled" if "first_party_cookies_enabled" is enabled. The default is false. - thirdPartyCookiesEnabled.setEnabled(savedPreferences.getBoolean("first_party_cookies_enabled", false)); + String torSearchString = savedPreferences.getString("tor_search", "https://3g2upl4pq6kufc4m.onion/html/?q="); + String searchString = savedPreferences.getString("search", "https://duckduckgo.com/html/?q="); + // Only enable `third_party_cookies_enabled` if `first_party_cookies_enabled` is `true` and API >= 21. + thirdPartyCookiesEnabled.setEnabled(savedPreferences.getBoolean("first_party_cookies_enabled", false) && (Build.VERSION.SDK_INT >= 21)); // We need to inflated a `WebView` to get the default user agent. LayoutInflater inflater = getActivity().getLayoutInflater(); @@ -108,90 +100,49 @@ public class SettingsFragment extends PreferenceFragment { customUserAgent.setEnabled(userAgentPreference.getSummary().equals("Custom user agent")); - // Set the JavaScript-disabled search URL as the summary text for the JavaScript-disabled search preference when the preference screen is loaded. The default is `https://duckduckgo.com/html/?q=`. - if (javaScriptDisabledSearchString.equals("Custom URL")) { - // Use R.string.custom_url, which will be translated, instead of the array value, which will not. - javaScriptDisabledSearchPreference.setSummary(R.string.custom_url); - } else { - // Set the array value as the summary text. - javaScriptDisabledSearchPreference.setSummary(javaScriptDisabledSearchString); - } - - // Set the summary text for `javascript_disabled_search_custom_url` (the default is `""`) and enable it if `javascript_disabled_search` is set to `Custom URL`. - javaScriptDisabledSearchCustomURLPreference.setSummary(savedPreferences.getString("javascript_disabled_search_custom_url", "")); - javaScriptDisabledSearchCustomURLPreference.setEnabled(javaScriptDisabledSearchString.equals("Custom URL")); - - - // Set the JavaScript-enabled search URL as the summary text for the JavaScript-enabled search preference when the preference screen is loaded. The default is `https://duckduckgo.com/?q=`. - if (javaScriptEnabledSearchString.equals("Custom URL")) { - // If set to "Custom URL", use R.string.custom_url, which will be translated, instead of the array value, which will not. - javaScriptEnabledSearchPreference.setSummary(R.string.custom_url); - } else { - // Set the array value as the summary text. - javaScriptEnabledSearchPreference.setSummary(javaScriptEnabledSearchString); - } - - // Set the summary text for `javascript_enabled_search_custom_url` (the default is `""`) and enable it if `javascript_enabled_search` is set to `Custom URL`. - javaScriptEnabledSearchCustomURLPreference.setSummary(savedPreferences.getString("javascript_enabled_search_custom_url", "")); - javaScriptEnabledSearchCustomURLPreference.setEnabled(javaScriptEnabledSearchString.equals("Custom URL")); - - - // Enable the full screen options if full screen browsing mode is enabled. - if (!fullScreenBrowsingModeEnabled) { - // Disable the full screen options. - hideSystemBarsPreference.setEnabled(false); - translucentNavigationBarPreference.setEnabled(false); - } else { - // Disable `transparent_navigation_bar` if `hide_system_bars` is `true`. - translucentNavigationBarPreference.setEnabled(!savedPreferences.getBoolean("hide_system_bars", false)); - } - - // 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 JavaScript-disabled search URL as the summary text for the Tor JavaScript-disabled search preference when the preference screen is loaded. The default is `https://3g2upl4pq6kufc4m.onion/html/?q=` - if (torJavaScriptDisabledSearchString.equals("Custom URL")) { + // 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=` + if (torSearchString.equals("Custom URL")) { // Use R.string.custom_url, which will be translated, instead of the array value, which will not. - torJavaScriptDisabledSearchPreference.setSummary(R.string.custom_url); + torSearchPreference.setSummary(R.string.custom_url); } else { // Set the array value as the summary text. - torJavaScriptDisabledSearchPreference.setSummary(torJavaScriptDisabledSearchString); + torSearchPreference.setSummary(torSearchString); } - // Set the summary text for `tor_javascript_disabled_search_custom_url`. The default is `""`. - torJavaScriptDisabledSearchCustomURLPreference.setSummary(savedPreferences.getString("tor_javascript_disabled_search_custom_url", "")); + // Set the summary text for `tor_search_custom_url`. The default is `""`. + 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")); - // Set the Tor JavaScript-enabled search URL as the summary text for the Tor Javascript-enabled search preference when the preference screen is loaded. The default is `https://3g2upl4pq6kufc4m.onion/?q=`. - if (torJavaScriptEnabledSearchString.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=`. + if (searchString.equals("Custom URL")) { // Use R.string.custom_url, which will be translated, instead of the array value, which will not. - torJavaScriptEnabledSearchPreference.setSummary(R.string.custom_url); + searchPreference.setSummary(R.string.custom_url); } else { // Set the array value as the summary text. - torJavaScriptEnabledSearchPreference.setSummary(torJavaScriptEnabledSearchString); + searchPreference.setSummary(searchString); } - // Set the summary text for `tor_javascript_enabled_search_custom_url`. The default is `""`. - torJavaScriptEnabledSearchCustomURLPreference.setSummary(savedPreferences.getString("tor_javascript_enabled_search_custom_url", "")); - + // 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.setEnabled(searchString.equals("Custom URL")); - // Enable the Tor preferences only if `proxy_through_orbot` is enabled. The default is `false`. - torHomepagePreference.setEnabled(proxyThroughOrbot); - torJavaScriptDisabledSearchPreference.setEnabled(proxyThroughOrbot); - torJavaScriptEnabledSearchPreference.setEnabled(proxyThroughOrbot); - // Enable the Tor custom URL search options only if `proxyThroughOrbot` is true and the search is set to `Custom URL`. - torJavaScriptDisabledSearchCustomURLPreference.setEnabled(proxyThroughOrbot && torJavaScriptDisabledSearchString.equals("Custom URL")); - torJavaScriptEnabledSearchCustomURLPreference.setEnabled(proxyThroughOrbot && torJavaScriptEnabledSearchString.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)); - // Set the homepage URL as the summary text for the `Homepage` preference when the preference screen is loaded. The default is `https://www.duckduckgo.com`. - homepagePreference.setSummary(savedPreferences.getString("homepage", "https://www.duckduckgo.com")); + // 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")); // Set the default font size as the summary text for the `Default Font Size` preference when the preference screen is loaded. The default is `100`. - defaultFontSizePreference.setSummary(defaultFontSizeString + "%%"); + defaultFontSizePreference.setSummary(savedPreferences.getString("default_font_size", "100") + "%%"); // Listen for preference changes. @@ -202,16 +153,9 @@ public class SettingsFragment extends PreferenceFragment { public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { switch (key) { - case "javascript_enabled": - // Toggle the state of the `dom_storage_enabled` preference. The default is `false`. - final Preference domStorageEnabled = findPreference("dom_storage_enabled"); - domStorageEnabled.setEnabled(sharedPreferences.getBoolean("javascript_enabled", false)); - break; - case "first_party_cookies_enabled": - // Toggle the state of the `third_party_cookies_enabled` preference. The default is `false`. - final Preference thirdPartyCookiesEnabled = findPreference("third_party_cookies_enabled"); - thirdPartyCookiesEnabled.setEnabled(sharedPreferences.getBoolean("first_party_cookies_enabled", false)); + // 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)); break; case "user_agent": @@ -225,13 +169,13 @@ public class SettingsFragment extends PreferenceFragment { 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`, and enable `customUserAgent`. userAgentPreference.setSummary(R.string.custom_user_agent); customUserAgent.setEnabled(true); 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`, and disable `customUserAgent`. userAgentPreference.setSummary(sharedPreferences.getString("user_agent", "PrivacyBrowser/1.0")); customUserAgent.setEnabled(false); break; @@ -243,69 +187,13 @@ public class SettingsFragment extends PreferenceFragment { customUserAgent.setSummary(sharedPreferences.getString("custom_user_agent", "PrivacyBrowser/1.0")); break; - case "javascript_disabled_search": - String newJavaScriptDisabledSearchString = sharedPreferences.getString("javascript_disabled_search", "https://duckduckgo.com/html/?q="); - if (newJavaScriptDisabledSearchString.equals("Custom URL")) { // Set the summary text to `R.string.custom_url`, which is translated. - javaScriptDisabledSearchPreference.setSummary(R.string.custom_url); - } else { // Set the new search URL as the summary text for the JavaScript-disabled search preference. - javaScriptDisabledSearchPreference.setSummary(newJavaScriptDisabledSearchString); - } - - // Enable or disable javaScriptDisabledSearchCustomURLPreference. - javaScriptDisabledSearchCustomURLPreference.setEnabled(newJavaScriptDisabledSearchString.equals("Custom URL")); - break; - - case "javascript_disabled_search_custom_url": - // Set the new custom search URL as the summary text for `javascript_disabled_search_custom_url`. The default is `""`. - javaScriptDisabledSearchCustomURLPreference.setSummary(sharedPreferences.getString("javascript_disabled_search_custom_url", "")); - break; - - case "javascript_enabled_search": - String newJavaScriptEnabledSearchString = sharedPreferences.getString("javascript_enabled_search", "https://duckduckgo.com/?q="); - if (newJavaScriptEnabledSearchString.equals("Custom URL")) { // Set the summary text to `R.string.custom_url`, which is translated. - javaScriptEnabledSearchPreference.setSummary(R.string.custom_url); - } else { // Set the new search URL as the summary text for the JavaScript-enabled search preference.. - javaScriptEnabledSearchPreference.setSummary(newJavaScriptEnabledSearchString); - } - - // Enable or disable javaScriptEnabledSearchCustomURLPreference. - javaScriptEnabledSearchCustomURLPreference.setEnabled(newJavaScriptEnabledSearchString.equals("Custom URL")); - break; - - case "javascript_enabled_search_custom_url": - // Set the new custom search URL as the summary text for `javascript_enabled_search_custom_url`. The default is `""`. - javaScriptEnabledSearchCustomURLPreference.setSummary(sharedPreferences.getString("javascript_enabled_search_custom_url", "")); - break; - - case "enable_full_screen_browsing_mode": - boolean newFullScreenBrowsingModeEnabled = sharedPreferences.getBoolean("enable_full_screen_browsing_mode", false); - if (newFullScreenBrowsingModeEnabled) { - // Enable `hideSystemBarsPreference`. - hideSystemBarsPreference.setEnabled(true); - - // Only enable `transparent_navigation_bar` if `hide_system_bars` is `false`. - translucentNavigationBarPreference.setEnabled(!sharedPreferences.getBoolean("hide_system_bars", false)); - } else { - // Disable the full screen options. - hideSystemBarsPreference.setEnabled(false); - translucentNavigationBarPreference.setEnabled(false); - } - break; - case "proxy_through_orbot": // Get current settings. boolean currentProxyThroughOrbot = sharedPreferences.getBoolean("proxy_through_orbot", false); - String currentTorJavaScriptDisabledSearchString = sharedPreferences.getString("tor_javascript_disabled_search", "https://3g2upl4pq6kufc4m.onion/html/?q="); - String currentTorJavaScriptEnabledSearchString = sharedPreferences.getString("tor_javascript_enabled_search", "https://3g2upl4pq6kufc4m.onion/?q="); - - // Enable the Tor preferences only if `proxy_through_orbot` is enabled. The default is `false`. - torHomepagePreference.setEnabled(currentProxyThroughOrbot); - torJavaScriptDisabledSearchPreference.setEnabled(currentProxyThroughOrbot); - torJavaScriptEnabledSearchPreference.setEnabled(currentProxyThroughOrbot); + String currentTorSearchString = sharedPreferences.getString("tor_search", "https://3g2upl4pq6kufc4m.onion/html/?q="); - // Enable the Tor custom URL search options only if `currentProxyThroughOrbot` is true and the search is set to `Custom URL`. - torJavaScriptDisabledSearchCustomURLPreference.setEnabled(currentProxyThroughOrbot && currentTorJavaScriptDisabledSearchString.equals("Custom URL")); - torJavaScriptEnabledSearchCustomURLPreference.setEnabled(currentProxyThroughOrbot && currentTorJavaScriptEnabledSearchString.equals("Custom URL")); + // 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")); break; case "tor_homepage": @@ -313,48 +201,53 @@ public class SettingsFragment extends PreferenceFragment { torHomepagePreference.setSummary(sharedPreferences.getString("tor_homepage", "https://3g2upl4pq6kufc4m.onion")); break; - case "tor_javascript_disabled_search": + case "tor_search": // Get the present search string. - String presentTorJavaScriptDisabledSearchString = sharedPreferences.getString("tor_javascript_disabled_search", "https://3g2upl4pq6kufc4m.onion/html/?q="); + String presentTorSearchString = sharedPreferences.getString("tor_search", "https://3g2upl4pq6kufc4m.onion/html/?q="); - // Set the summary text for `tor_javascript_disabled_search`. - if (presentTorJavaScriptDisabledSearchString.equals("Custom URL")) { + // Set the summary text for `tor_search`. + if (presentTorSearchString.equals("Custom URL")) { // Use R.string.custom_url, which is translated, instead of the array value, which isn't. - torJavaScriptDisabledSearchPreference.setSummary(R.string.custom_url); + torSearchPreference.setSummary(R.string.custom_url); } else { // Set the array value as the summary text. - torJavaScriptDisabledSearchPreference.setSummary(presentTorJavaScriptDisabledSearchString); + torSearchPreference.setSummary(presentTorSearchString); } // Set the status of `torJavaScriptDisabledSearchCustomURLPreference`. - torJavaScriptDisabledSearchCustomURLPreference.setEnabled(presentTorJavaScriptDisabledSearchString.equals("Custom URL")); + torSearchCustomURLPreference.setEnabled(presentTorSearchString.equals("Custom URL")); break; - case "tor_javascript_disabled_search_custom_url": - // Set the summary text for `tor_javascript_disabled_search_custom_url`. - torJavaScriptDisabledSearchCustomURLPreference.setSummary(sharedPreferences.getString("tor_javascript_disabled_search_custom_url", "")); + case "tor_search_custom_url": + // Set the summary text for `tor_search_custom_url`. + torSearchCustomURLPreference.setSummary(sharedPreferences.getString("tor_search_custom_url", "")); break; - case "tor_javascript_enabled_search": - // Get the present search string. - String presentTorJavaScriptEnabledSearchString = sharedPreferences.getString("tor_javascript_enabled_search", "https://3g2upl4pq6kufc4m.onion/?q="); - - // Set the summary text for `tor_javascript_enabled_search`. - if (presentTorJavaScriptEnabledSearchString.equals("Custom URL")) { - // Use R.string.custom_url, which is translated, instead of the array value, which isn't. - torJavaScriptEnabledSearchPreference.setSummary(R.string.custom_url); - } else { - // Set the array value as the summary text. - torJavaScriptEnabledSearchPreference.setSummary(presentTorJavaScriptEnabledSearchString); + case "search": + 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. + searchPreference.setSummary(R.string.custom_url); + } else { // Set the new search URL as the summary text for the JavaScript-disabled search preference. + searchPreference.setSummary(newSearchString); } - // Set the status of `torJavaScriptEnabledSearchCustomURLPreference`. - torJavaScriptEnabledSearchCustomURLPreference.setEnabled(presentTorJavaScriptEnabledSearchString.equals("Custom URL")); + // Enable or disable `searchCustomURLPreference`. + searchCustomURLPreference.setEnabled(newSearchString.equals("Custom URL")); + break; + + 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", "")); break; - case "tor_javascript_enabled_search_custom_url": - // Set the summary text for `tor_javascript_enabled_search_custom_url`. - torJavaScriptEnabledSearchCustomURLPreference.setSummary(sharedPreferences.getString("tor_javascript_enabled_search_custom_url", "")); + 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)); + break; + + case "hide_system_bars": + // Enable `translucentNavigationBarPreference` if `hide_system_bars` is disabled. + translucentNavigationBarPreference.setEnabled(!sharedPreferences.getBoolean("hide_system_bars", false)); break; case "homepage": @@ -363,16 +256,8 @@ public class SettingsFragment extends PreferenceFragment { break; case "default_font_size": - // Get the default font size as a string. The default is `100`. - String newDefaultFontSizeString = sharedPreferences.getString("default_font_size", "100"); - // Update the summary text of `default_font_size`. - defaultFontSizePreference.setSummary(newDefaultFontSizeString + "%%"); - break; - - case "hide_system_bars": - // Enable `translucentNavigationBarPreference` if `hide_system_bars` is disabled. - translucentNavigationBarPreference.setEnabled(!sharedPreferences.getBoolean("hide_system_bars", false)); + defaultFontSizePreference.setSummary(sharedPreferences.getString("default_font_size", "100") + "%%"); break; default: