X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FSettingsFragment.java;h=7446ce61c814219dc6ed37ed84901facb62d037a;hp=30a34f7628d1e152366381714c1b3adc4b211f05;hb=e29020961c70d97a06c810aaff28ef1fd6af4ae7;hpb=57b05bcbae9759d4b58ce3b96ede61992eb34eee diff --git a/app/src/main/java/com/stoutner/privacybrowser/SettingsFragment.java b/app/src/main/java/com/stoutner/privacybrowser/SettingsFragment.java index 30a34f76..7446ce61 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/SettingsFragment.java +++ b/app/src/main/java/com/stoutner/privacybrowser/SettingsFragment.java @@ -39,6 +39,13 @@ 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. + 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)); // 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"); @@ -69,134 +76,133 @@ public class SettingsFragment extends PreferenceFragment { // 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")) { + 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); } else { // Set the array value as the summary text. - javaScriptDisabledSearchPreference.setSummary(savedPreferences.getString("javascript_disabled_search", "https://duckduckgo.com/html/?q=")); + 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". 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")); + javaScriptDisabledSearchCustomURLPreference.setEnabled(javaScriptDisabledSearchString.equals("Custom URL")); - // Set the JavaScript-enabed searchURL as the summary text for the JavaScript-enabled search preference when the preference screen is loaded. + // 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"); - 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. + 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); } else { // Set the array value as the summary text. - javaScriptEnabledSearchPreference.setSummary(savedPreferences.getString("javascript_enabled_search", "https://duckduckgo.com/?q=")); + 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". 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")); + javaScriptEnabledSearchCustomURLPreference.setEnabled(javaScriptEnabledSearchString.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". + // 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")); + // 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 + "%%"); + // Listen for preference changes. preferencesListener = new SharedPreferences.OnSharedPreferenceChangeListener() { @Override - // Remove Android Studio's warning about the dangers of using SetJavaScriptEnabled. + // Remove Android Studio's warning about the dangers of using SetJavaScriptEnabled. We know. @SuppressLint("SetJavaScriptEnabled") public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { - // Several keys need to update the toggleJavaScript icon. - MenuItem toggleJavaScript = MainWebViewActivity.mainMenu.findItem(R.id.toggleJavaScript); - switch (key) { case "javascript_enabled": - // Set javaScriptEnabled to the new state. The default is false. + // Set `javaScriptEnabled` to the new state. The default is `false`. MainWebViewActivity.javaScriptEnabled = sharedPreferences.getBoolean("javascript_enabled", false); - // Update mainWebView and reload the website. + // 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)); + + // Update `mainWebView`. MainWebViewActivity.mainWebView.getSettings().setJavaScriptEnabled(MainWebViewActivity.javaScriptEnabled); - MainWebViewActivity.mainWebView.reload(); - - // Update the toggleJavaScript icon. - if (MainWebViewActivity.javaScriptEnabled) { - toggleJavaScript.setIcon(R.drawable.javascript_enabled); - } else { - if (MainWebViewActivity.firstPartyCookiesEnabled || MainWebViewActivity.domStorageEnabled) { - toggleJavaScript.setIcon(R.drawable.warning); - } else { - toggleJavaScript.setIcon(R.drawable.privacy_mode); - } - } + + // Update the privacy icons. + MainWebViewActivity.updatePrivacyIcons(MainWebViewActivity.privacyBrowserActivity); break; case "first_party_cookies_enabled": - // Set firstPartyCookiesEnabled to the new state. The default is false. + // Set `firstPartyCookiesEnabled` to the new state. The default is `false`. MainWebViewActivity.firstPartyCookiesEnabled = sharedPreferences.getBoolean("first_party_cookies_enabled", false); + // 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)); + + // Update `mainWebView`. + MainWebViewActivity.cookieManager.setAcceptCookie(MainWebViewActivity.firstPartyCookiesEnabled); + // Update the checkbox in the options menu. MenuItem firstPartyCookiesMenuItem = MainWebViewActivity.mainMenu.findItem(R.id.toggleFirstPartyCookies); firstPartyCookiesMenuItem.setChecked(MainWebViewActivity.firstPartyCookiesEnabled); - // Update mainWebView and reload the website. - MainWebViewActivity.cookieManager.setAcceptCookie(MainWebViewActivity.firstPartyCookiesEnabled); - MainWebViewActivity.mainWebView.reload(); - - // Update the toggleJavaScript icon. - if (MainWebViewActivity.javaScriptEnabled) { - toggleJavaScript.setIcon(R.drawable.javascript_enabled); - } else { - if (MainWebViewActivity.firstPartyCookiesEnabled || MainWebViewActivity.domStorageEnabled) { - toggleJavaScript.setIcon(R.drawable.warning); - } else { - toggleJavaScript.setIcon(R.drawable.privacy_mode); - } - } + // Update the privacy icons. + MainWebViewActivity.updatePrivacyIcons(MainWebViewActivity.privacyBrowserActivity); break; case "third_party_cookies_enabled": - // Set thirdPartyCookiesEnabled to the new state. The default is false. + // Set `thirdPartyCookiesEnabled` to the new state. The default is `false`. MainWebViewActivity.thirdPartyCookiesEnabled = sharedPreferences.getBoolean("third_party_cookies_enabled", false); // Update the checkbox in the options menu. MenuItem thirdPartyCookiesMenuItem = MainWebViewActivity.mainMenu.findItem(R.id.toggleThirdPartyCookies); thirdPartyCookiesMenuItem.setChecked(MainWebViewActivity.thirdPartyCookiesEnabled); - // Update mainWebView and reload the website if API >= 21. + // Update `mainWebView` if API >= 21. if (Build.VERSION.SDK_INT >= 21) { MainWebViewActivity.cookieManager.setAcceptThirdPartyCookies(MainWebViewActivity.mainWebView, MainWebViewActivity.thirdPartyCookiesEnabled); - MainWebViewActivity.mainWebView.reload(); } break; case "dom_storage_enabled": - // Set domStorageEnabled to the new state. The default is false. + // Set `domStorageEnabled` to the new state. The default is `false`. MainWebViewActivity.domStorageEnabled = sharedPreferences.getBoolean("dom_storage_enabled", false); // Update the checkbox in the options menu. MenuItem domStorageMenuItem = MainWebViewActivity.mainMenu.findItem(R.id.toggleDomStorage); domStorageMenuItem.setChecked(MainWebViewActivity.domStorageEnabled); - // Update mainWebView and reload the website. + // Update `mainWebView`. MainWebViewActivity.mainWebView.getSettings().setDomStorageEnabled(MainWebViewActivity.domStorageEnabled); - MainWebViewActivity.mainWebView.reload(); - - // Update the toggleJavaScript icon. - if (MainWebViewActivity.javaScriptEnabled) { - toggleJavaScript.setIcon(R.drawable.javascript_enabled); - } else { - if (MainWebViewActivity.firstPartyCookiesEnabled || MainWebViewActivity.domStorageEnabled) { - toggleJavaScript.setIcon(R.drawable.warning); - } else { - toggleJavaScript.setIcon(R.drawable.privacy_mode); - } - } + + // Update the privacy icons. + MainWebViewActivity.updatePrivacyIcons(MainWebViewActivity.privacyBrowserActivity); + break; + + case "save_form_data_enabled": + // Set `saveFormDataEnabled` to the new state. The default is `false`. + MainWebViewActivity.saveFormDataEnabled = sharedPreferences.getBoolean("save_form_data_enabled", false); + + // Update the checkbox in the options menu. + MenuItem saveFormDataMenuItem = MainWebViewActivity.mainMenu.findItem(R.id.toggleSaveFormData); + saveFormDataMenuItem.setChecked(MainWebViewActivity.saveFormDataEnabled); + + // Update `mainWebView`. + MainWebViewActivity.mainWebView.getSettings().setSaveFormData(MainWebViewActivity.saveFormDataEnabled); + + // Update the privacy icons. + MainWebViewActivity.updatePrivacyIcons(MainWebViewActivity.privacyBrowserActivity); break; case "user_agent": @@ -204,7 +210,7 @@ public class SettingsFragment extends PreferenceFragment { 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. + // 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()); @@ -232,11 +238,12 @@ public class SettingsFragment extends PreferenceFragment { 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")); + MainWebViewActivity.mainWebView.getSettings().setUserAgentString(sharedPreferences.getString("custom_user_agent", "PrivacyBrowser/1.0")); break; case "javascript_disabled_search": - if (sharedPreferences.getString("javascript_disabled_search", "https://duckduckgo.com/html/?q=").equals("Custom URL")) { + 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 will be translated. javaScriptDisabledSearchPreference.setSummary(R.string.custom_url); @@ -244,14 +251,14 @@ public class SettingsFragment extends PreferenceFragment { 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=")); + javaScriptDisabledSearchPreference.setSummary(newJavaScriptDisabledSearchString); // Update the javaScriptDisabledSearchURL variable. The default is "https://duckduckgo.com/html/?q=". - MainWebViewActivity.javaScriptDisabledSearchURL = sharedPreferences.getString("javascript_disabled_search", "https://duckduckgo.com/html/?q="); + MainWebViewActivity.javaScriptDisabledSearchURL = newJavaScriptDisabledSearchString; } // Enable or disable javaScriptDisabledSearchCustomURLPreference. - javaScriptDisabledSearchCustomURLPreference.setEnabled(javaScriptDisabledSearchPreference.getSummary().equals("Custom URL")); + javaScriptDisabledSearchCustomURLPreference.setEnabled(newJavaScriptDisabledSearchString.equals("Custom URL")); break; case "javascript_disabled_search_custom_url": @@ -263,7 +270,8 @@ public class SettingsFragment extends PreferenceFragment { break; case "javascript_enabled_search": - if (sharedPreferences.getString("javascript_enabled_search", "https://duckduckgo.com/?q=").equals("Custom URL")) { + 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 will be translated. javaScriptEnabledSearchPreference.setSummary(R.string.custom_url); @@ -271,37 +279,55 @@ public class SettingsFragment extends PreferenceFragment { 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=")); + javaScriptEnabledSearchPreference.setSummary(newJavaScriptEnabledSearchString); // Update the javaScriptEnabledSearchURL variable. The default is "https://duckduckgo.com/?q=". - MainWebViewActivity.javaScriptEnabledSearchURL = sharedPreferences.getString("javascript_enabled_search", "https://duckduckgo.com/?q="); + MainWebViewActivity.javaScriptEnabledSearchURL = newJavaScriptEnabledSearchString; } // Enable or disable javaScriptEnabledSearchCustomURLPreference. - javaScriptEnabledSearchCustomURLPreference.setEnabled(javaScriptEnabledSearchPreference.getSummary().equals("Custom URL")); + 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 "". + // 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 "". + // Update javaScriptEnabledSearchCustomURL. The default is ``. MainWebViewActivity.javaScriptEnabledSearchURL = sharedPreferences.getString("javascript_enabled_search_custom_url", ""); break; + case "do_not_track": + // Update `customHeaders`. The default is `true`. + if (sharedPreferences.getBoolean("do_not_track", true)) { + MainWebViewActivity.customHeaders.put("DNT", "1"); + } else { // Remove the Do Not Track header. + MainWebViewActivity.customHeaders.remove("DNT"); + } + case "homepage": - // Set the new homepage URL as the summary text for the Homepage preference. The default is "https://www.duckduckgo.com". + // 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")); - // Update the homepage variable. The default is "https://www.duckduckgo.com". + // Update the homepage variable. The default is `https://www.duckduckgo.com`. MainWebViewActivity.homepage = sharedPreferences.getString("homepage", "https://www.duckduckgo.com"); 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 font size on `mainWebView`. The default is `100`. + MainWebViewActivity.mainWebView.getSettings().setTextZoom(Integer.valueOf(newDefaultFontSizeString)); + + // Update the summary text of `default_font_size`. + defaultFontSizePreference.setSummary(newDefaultFontSizeString + "%%"); + case "swipe_to_refresh_enabled": - // Set swipeToRefreshEnabled to the new state. The default is true. + // Set `swipeToRefreshEnabled` to the new state. The default is `true`. MainWebViewActivity.swipeToRefreshEnabled = sharedPreferences.getBoolean("swipe_to_refresh_enabled", true); - // Update swipeRefreshLayout to match the new state. + // Update `swipeRefreshLayout` to match the new state. MainWebViewActivity.swipeToRefresh.setEnabled(MainWebViewActivity.swipeToRefreshEnabled); break; @@ -318,15 +344,15 @@ public class SettingsFragment extends PreferenceFragment { // 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(); - savedPreferences.registerOnSharedPreferenceChangeListener(preferencesListener); - } - @Override public void onPause() { super.onPause(); savedPreferences.unregisterOnSharedPreferenceChangeListener(preferencesListener); } + + @Override + public void onResume() { + super.onResume(); + savedPreferences.registerOnSharedPreferenceChangeListener(preferencesListener); + } }