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=f1706184e8d6a1760347dc6f80a83e6f04c24ce9;hpb=a56ffa22c6a0ef7ad717cba03a433999553340cb;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 f1706184..b783703e 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 Soren Stoutner . +/* + * Copyright 2016-2017 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -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; @@ -42,26 +43,43 @@ public class SettingsFragment extends PreferenceFragment { // Initialize savedPreferences. savedPreferences = getPreferenceScreen().getSharedPreferences(); - // Allow the user to access "dom_storage_enabled" if "javascript_enabled" is enabled. The default is false. + // Get handles for the preferences we need to modify. final Preference domStorageEnabled = findPreference("dom_storage_enabled"); - 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. final Preference thirdPartyCookiesEnabled = findPreference("third_party_cookies_enabled"); - thirdPartyCookiesEnabled.setEnabled(savedPreferences.getBoolean("first_party_cookies_enabled", false)); + final Preference userAgentPreference = findPreference("user_agent"); + final Preference customUserAgent = findPreference("custom_user_agent"); + 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 homepagePreference = findPreference("homepage"); + final Preference defaultFontSizePreference = findPreference("default_font_size"); + // Set dependencies. + domStorageEnabled.setDependency("javascript_enabled"); + torHomepagePreference.setDependency("proxy_through_orbot"); + torSearchPreference.setDependency("proxy_through_orbot"); + hideSystemBarsPreference.setDependency("enable_full_screen_browsing_mode"); - // We need an inflated `WebView` to get the default user agent. + // 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="); + + // 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(); - // `@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. - // `false` does not attach the view to the root. + // `@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. `false` does not attach the view to the root. @SuppressLint("InflateParams") View bareWebViewLayout = inflater.inflate(R.layout.bare_webview, null, false); final WebView bareWebView = (WebView) bareWebViewLayout.findViewById(R.id.bare_webview); // Set the current user-agent as the summary text for the "user_agent" preference when the preference screen is loaded. - final Preference userAgentPreference = findPreference("user_agent"); - switch (savedPreferences.getString("user_agent", "Default user agent")) { - case "Default user agent": + switch (savedPreferences.getString("user_agent", "PrivacyBrowser/1.0")) { + case "WebView default user agent": // Get the user agent text from the webview (which changes based on the version of Android and WebView installed). userAgentPreference.setSummary(bareWebView.getSettings().getUserAgentString()); break; @@ -73,64 +91,58 @@ public class SettingsFragment extends PreferenceFragment { default: // Display the user agent from the preference as the summary text. - userAgentPreference.setSummary(savedPreferences.getString("user_agent", "Default user agent")); + userAgentPreference.setSummary(savedPreferences.getString("user_agent", "PrivacyBrowser/1.0")); 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". - final Preference customUserAgent = findPreference("custom_user_agent"); customUserAgent.setSummary(savedPreferences.getString("custom_user_agent", "PrivacyBrowser/1.0")); 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=". - final Preference javaScriptDisabledSearchPreference = findPreference("javascript_disabled_search"); - String javaScriptDisabledSearchString = savedPreferences.getString("javascript_disabled_search", "https://duckduckgo.com/html/?q="); - if (javaScriptDisabledSearchString.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. - javaScriptDisabledSearchPreference.setSummary(R.string.custom_url); + // 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 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. + torSearchPreference.setSummary(R.string.custom_url); } else { // Set the array value as the summary text. - javaScriptDisabledSearchPreference.setSummary(javaScriptDisabledSearchString); + torSearchPreference.setSummary(torSearchString); } - // 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". - final Preference javaScriptDisabledSearchCustomURLPreference = findPreference("javascript_disabled_search_custom_url"); - javaScriptDisabledSearchCustomURLPreference.setSummary(savedPreferences.getString("javascript_disabled_search_custom_url", "")); - javaScriptDisabledSearchCustomURLPreference.setEnabled(javaScriptDisabledSearchString.equals("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 JavaScript-enabled searchURL as the summary text for the JavaScript-enabled search preference when the preference screen is loaded. - // The default is "https://duckduckgo.com/?q=". - final Preference javaScriptEnabledSearchPreference = findPreference("javascript_enabled_search"); - String javaScriptEnabledSearchString = savedPreferences.getString("javascript_enabled_search", "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); + // 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. + searchPreference.setSummary(R.string.custom_url); } else { // Set the array value as the summary text. - javaScriptEnabledSearchPreference.setSummary(javaScriptEnabledSearchString); + searchPreference.setSummary(searchString); } - // 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". - final Preference javaScriptEnabledSearchCustomURLPreference = findPreference("javascript_enabled_search_custom_url"); - javaScriptEnabledSearchCustomURLPreference.setSummary(savedPreferences.getString("javascript_enabled_search_custom_url", "")); - javaScriptEnabledSearchCustomURLPreference.setEnabled(javaScriptEnabledSearchString.equals("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")); - // 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`. - final Preference homepagePreference = findPreference("homepage"); - homepagePreference.setSummary(savedPreferences.getString("homepage", "https://www.duckduckgo.com")); + // 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 default font size as the summary text for the `Default Font Size` preference when the preference screen is loaded. The default is `100`. - final Preference defaultFontSizePreference = findPreference("default_font_size"); - String defaultFontSizeString = savedPreferences.getString("default_font_size", "100"); - defaultFontSizePreference.setSummary(defaultFontSizeString + "%%"); - // Disable `transparent_navigation_bar` if `hide_system_bars` is enabled. - final Preference translucentNavigationBarPreference = findPreference("translucent_navigation_bar"); - translucentNavigationBarPreference.setEnabled(!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://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(savedPreferences.getString("default_font_size", "100") + "%%"); // Listen for preference changes. @@ -141,92 +153,96 @@ 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": - String userAgentString = sharedPreferences.getString("user_agent", "Default user agent"); + String userAgentString = sharedPreferences.getString("user_agent", "PrivacyBrowser/1.0"); switch (userAgentString) { - case "Default user agent": + case "WebView default user agent": // Display the user agent as the summary text for `userAgentPreference`, and disable `customUserAgent`. userAgentPreference.setSummary(bareWebView.getSettings().getUserAgentString()); customUserAgent.setEnabled(false); 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. - userAgentPreference.setSummary(sharedPreferences.getString("user_agent", "Default user agent")); + // 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; } 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". + // 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")); 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); - } + 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="); - // Enable or disable javaScriptDisabledSearchCustomURLPreference. - javaScriptDisabledSearchCustomURLPreference.setEnabled(newJavaScriptDisabledSearchString.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 "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", "")); + 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")); 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); + case "tor_search": + // Get the present search string. + String presentTorSearchString = sharedPreferences.getString("tor_search", "https://3g2upl4pq6kufc4m.onion/html/?q="); + + // 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. + torSearchPreference.setSummary(R.string.custom_url); + } else { + // Set the array value as the summary text. + torSearchPreference.setSummary(presentTorSearchString); } - // Enable or disable javaScriptEnabledSearchCustomURLPreference. - javaScriptEnabledSearchCustomURLPreference.setEnabled(newJavaScriptEnabledSearchString.equals("Custom URL")); + // Set the status of `torJavaScriptDisabledSearchCustomURLPreference`. + torSearchCustomURLPreference.setEnabled(presentTorSearchString.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", "")); + case "tor_search_custom_url": + // Set the summary text for `tor_search_custom_url`. + torSearchCustomURLPreference.setSummary(sharedPreferences.getString("tor_search_custom_url", "")); 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")); + 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); + } + + // Enable or disable `searchCustomURLPreference`. + searchCustomURLPreference.setEnabled(newSearchString.equals("Custom URL")); 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"); + 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; - // Update the summary text of `default_font_size`. - defaultFontSizePreference.setSummary(newDefaultFontSizeString + "%%"); + 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": @@ -234,6 +250,16 @@ public class SettingsFragment extends PreferenceFragment { translucentNavigationBarPreference.setEnabled(!sharedPreferences.getBoolean("hide_system_bars", false)); 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")); + break; + + case "default_font_size": + // Update the summary text of `default_font_size`. + defaultFontSizePreference.setSummary(sharedPreferences.getString("default_font_size", "100") + "%%"); + break; + default: // If no match, do nothing. break;