X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FSettingsFragment.java;h=30a34f7628d1e152366381714c1b3adc4b211f05;hb=57b05bcbae9759d4b58ce3b96ede61992eb34eee;hp=35021b3e8d09dcb333bf70d2954fc98123cf4a95;hpb=8f89d3c5ef3625bec2dd8a99fae255f5c6f46636;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/SettingsFragment.java b/app/src/main/java/com/stoutner/privacybrowser/SettingsFragment.java index 35021b3e..30a34f76 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/SettingsFragment.java +++ b/app/src/main/java/com/stoutner/privacybrowser/SettingsFragment.java @@ -19,6 +19,7 @@ package com.stoutner.privacybrowser; +import android.annotation.SuppressLint; import android.content.SharedPreferences; import android.os.Build; import android.os.Bundle; @@ -35,17 +36,80 @@ public class SettingsFragment extends PreferenceFragment { super.onCreate(savedInstanceState); addPreferencesFromResource(R.xml.preferences); - final Preference homepagePreference = findPreference("homepage"); - // Initialize savedPreferences. savedPreferences = getPreferenceScreen().getSharedPreferences(); + + // 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": + // Get the user agent text from the webview (which changes based on the version of Android and WebView installed). + // Once API >= 17 we can use getDefaultUserAgent() instead of getUserAgentString(). + userAgentPreference.setSummary(MainWebViewActivity.mainWebView.getSettings().getUserAgentString()); + break; + + case "Custom user agent": + // We can't use the string from the array because it is referenced in code and can't be translated. + userAgentPreference.setSummary(R.string.custom_user_agent); + break; + + default: + // Display the user agent from the preference as the summary text. + userAgentPreference.setSummary(savedPreferences.getString("user_agent", "Default user agent")); + 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"); + if (savedPreferences.getString("javascript_disabled_search", "https://duckduckgo.com/html/?q=").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); + } else { + // Set the array value as the summary text. + javaScriptDisabledSearchPreference.setSummary(savedPreferences.getString("javascript_disabled_search", "https://duckduckgo.com/html/?q=")); + } + + // 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(javaScriptDisabledSearchPreference.getSummary().equals("Custom URL")); + + + // Set the JavaScript-enabed 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"); + if (savedPreferences.getString("javascript_enabled_search", "https://duckduckgo.com/?q=").equals("Custom URL")) { + // If set to "Custom URL", use R.string.custom_url, which will be tgranslated, 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(savedPreferences.getString("javascript_enabled_search", "https://duckduckgo.com/?q=")); + } + + // 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(javaScriptEnabledSearchPreference.getSummary().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")); + // Listen for preference changes. preferencesListener = new SharedPreferences.OnSharedPreferenceChangeListener() { @Override + // Remove Android Studio's warning about the dangers of using SetJavaScriptEnabled. + @SuppressLint("SetJavaScriptEnabled") public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { // Several keys need to update the toggleJavaScript icon. @@ -70,7 +134,7 @@ public class SettingsFragment extends PreferenceFragment { toggleJavaScript.setIcon(R.drawable.privacy_mode); } } - return; + break; case "first_party_cookies_enabled": // Set firstPartyCookiesEnabled to the new state. The default is false. @@ -94,7 +158,7 @@ public class SettingsFragment extends PreferenceFragment { toggleJavaScript.setIcon(R.drawable.privacy_mode); } } - return; + break; case "third_party_cookies_enabled": // Set thirdPartyCookiesEnabled to the new state. The default is false. @@ -109,7 +173,7 @@ public class SettingsFragment extends PreferenceFragment { MainWebViewActivity.cookieManager.setAcceptThirdPartyCookies(MainWebViewActivity.mainWebView, MainWebViewActivity.thirdPartyCookiesEnabled); MainWebViewActivity.mainWebView.reload(); } - return; + break; case "dom_storage_enabled": // Set domStorageEnabled to the new state. The default is false. @@ -133,7 +197,97 @@ public class SettingsFragment extends PreferenceFragment { toggleJavaScript.setIcon(R.drawable.privacy_mode); } } - return; + break; + + case "user_agent": + String userAgentString = sharedPreferences.getString("user_agent", "Default user agent"); + + switch (userAgentString) { + case "Default user agent": + // Set the default user agent on mainWebView, display the user agent as the summary text for userAgentPreference, and disable customUserAgent. + // Once API >= 17 we can use getDefaultUserAgent(). For now, setUserAgentString("") sets the WebView's default user agent. + MainWebViewActivity.mainWebView.getSettings().setUserAgentString(""); + userAgentPreference.setSummary(MainWebViewActivity.mainWebView.getSettings().getUserAgentString()); + customUserAgent.setEnabled(false); + break; + + case "Custom user agent": + // Set the custom user agent on mainWebView, display "Custom user agent" as the summary text for userAgentPreference, and enable customUserAgent. + MainWebViewActivity.mainWebView.getSettings().setUserAgentString(sharedPreferences.getString("custom_user_agent", "PrivacyBrowser/1.0")); + userAgentPreference.setSummary(R.string.custom_user_agent); + customUserAgent.setEnabled(true); + break; + + default: + // Set the user agent on mainWebView, display the user agent as the summary text for userAgentPreference, and disable customUserAgent. + MainWebViewActivity.mainWebView.getSettings().setUserAgentString(sharedPreferences.getString("user_agent", "Default user agent")); + userAgentPreference.setSummary(MainWebViewActivity.mainWebView.getSettings().getUserAgentString()); + 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". + customUserAgent.setSummary(sharedPreferences.getString("custom_user_agent", "PrivacyBrowser/1.0")); + + // Update mainWebView's user agent. The default is "PrivacyBrowser/1.0". + MainWebViewActivity.mainWebView.getSettings().setUserAgentString(sharedPreferences.getString("user_agent", "PrivacyBrowser/1.0")); + break; + + case "javascript_disabled_search": + if (sharedPreferences.getString("javascript_disabled_search", "https://duckduckgo.com/html/?q=").equals("Custom URL")) { + // Set the summary text to R.string.custom_url, which will be translated. + javaScriptDisabledSearchPreference.setSummary(R.string.custom_url); + + // Update the javaScriptDisabledSearchURL variable. The default is "". + MainWebViewActivity.javaScriptDisabledSearchURL = sharedPreferences.getString("javascript_disabled_search_custom_url", ""); + } else { // javascript_disabled_search is not set to Custom. + // Set the new search URL as the summary text for the JavaScript-disabled search preference. The default is "https://duckduckgo.com/html/?q=". + javaScriptDisabledSearchPreference.setSummary(sharedPreferences.getString("javascript_disabled_search", "https://duckduckgo.com/html/?q=")); + + // Update the javaScriptDisabledSearchURL variable. The default is "https://duckduckgo.com/html/?q=". + MainWebViewActivity.javaScriptDisabledSearchURL = sharedPreferences.getString("javascript_disabled_search", "https://duckduckgo.com/html/?q="); + } + + // Enable or disable javaScriptDisabledSearchCustomURLPreference. + javaScriptDisabledSearchCustomURLPreference.setEnabled(javaScriptDisabledSearchPreference.getSummary().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", "")); + + // Update javaScriptDisabledSearchCustomURL. The default is "". + MainWebViewActivity.javaScriptDisabledSearchURL = sharedPreferences.getString("javascript_disabled_search_custom_url", ""); + break; + + case "javascript_enabled_search": + if (sharedPreferences.getString("javascript_enabled_search", "https://duckduckgo.com/?q=").equals("Custom URL")) { + // Set the summary text to R.string.custom_url, which will be translated. + javaScriptEnabledSearchPreference.setSummary(R.string.custom_url); + + // Update the javaScriptEnabledSearchURL variable. The default is "". + MainWebViewActivity.javaScriptEnabledSearchURL = sharedPreferences.getString("javascript_enabled_search_custom_url", ""); + } else { // javascript_enabled_search is not set to Custom. + // Set the new search URL as the summary text for the JavaScript-enabled search preference. The default is "https://duckduckgo.com/?q=". + javaScriptEnabledSearchPreference.setSummary(sharedPreferences.getString("javascript_enabled_search", "https://duckduckgo.com/?q=")); + + // Update the javaScriptEnabledSearchURL variable. The default is "https://duckduckgo.com/?q=". + MainWebViewActivity.javaScriptEnabledSearchURL = sharedPreferences.getString("javascript_enabled_search", "https://duckduckgo.com/?q="); + } + + // Enable or disable javaScriptEnabledSearchCustomURLPreference. + javaScriptEnabledSearchCustomURLPreference.setEnabled(javaScriptEnabledSearchPreference.getSummary().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", "")); + + // Update javaScriptEnabledSearchCustomURL. The default is "". + MainWebViewActivity.javaScriptEnabledSearchURL = sharedPreferences.getString("javascript_enabled_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". @@ -141,7 +295,7 @@ public class SettingsFragment extends PreferenceFragment { // Update the homepage variable. The default is "https://www.duckduckgo.com". MainWebViewActivity.homepage = sharedPreferences.getString("homepage", "https://www.duckduckgo.com"); - return; + break; case "swipe_to_refresh_enabled": // Set swipeToRefreshEnabled to the new state. The default is true. @@ -149,9 +303,11 @@ public class SettingsFragment extends PreferenceFragment { // Update swipeRefreshLayout to match the new state. MainWebViewActivity.swipeToRefresh.setEnabled(MainWebViewActivity.swipeToRefreshEnabled); + break; - // If no match, do nothing. default: + // If no match, do nothing. + break; } } }; @@ -160,8 +316,8 @@ public class SettingsFragment extends PreferenceFragment { savedPreferences.registerOnSharedPreferenceChangeListener(preferencesListener); } - // It is necessary to reregister the listener on every resume or it will randomly stop working for the user because apps can be paused and resumed at any time, - // even when they are in the foreground. + // It is necessary to re-register the listener on every resume or it will randomly stop working because apps can be paused and resumed at any time + // even while running in the foreground. @Override public void onResume() { super.onResume();