X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FSettingsFragment.java;h=cd6a81e1e4dfae4ce34720711df7e350f0b783f4;hb=c4ad9f457f41cbc86391e0099629cd94a235258a;hp=a6ea1a96a5dfec14c4eb304f157e95e1eaf7e214;hpb=77756d29db4d52a35a3999f67b101e22525c97e2;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 a6ea1a96..cd6a81e1 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,35 +76,37 @@ 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. // 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")) { + 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 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=")); + 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". @@ -108,56 +117,45 @@ public class SettingsFragment extends PreferenceFragment { // 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. MainWebViewActivity.javaScriptEnabled = sharedPreferences.getBoolean("javascript_enabled", false); + // 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 and reload the website. 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 icon. + updatePrivacyIcon(); break; case "first_party_cookies_enabled": // Set firstPartyCookiesEnabled to the new state. The default is false. MainWebViewActivity.firstPartyCookiesEnabled = sharedPreferences.getBoolean("first_party_cookies_enabled", false); - // Update the checkbox in the options menu. - MenuItem firstPartyCookiesMenuItem = MainWebViewActivity.mainMenu.findItem(R.id.toggleFirstPartyCookies); - firstPartyCookiesMenuItem.setChecked(MainWebViewActivity.firstPartyCookiesEnabled); + // 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 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 checkbox in the options menu. + MenuItem firstPartyCookiesMenuItem = MainWebViewActivity.mainMenu.findItem(R.id.toggleFirstPartyCookies); + firstPartyCookiesMenuItem.setChecked(MainWebViewActivity.firstPartyCookiesEnabled); + + // Update the privacy icon. + updatePrivacyIcon(); break; case "third_party_cookies_enabled": @@ -187,16 +185,21 @@ public class SettingsFragment extends PreferenceFragment { 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 icon. + updatePrivacyIcon(); + 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 and reload the website. + MainWebViewActivity.mainWebView.getSettings().setSaveFormData(MainWebViewActivity.saveFormDataEnabled); + MainWebViewActivity.mainWebView.reload(); break; case "user_agent": @@ -232,11 +235,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 +248,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 +267,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,14 +276,14 @@ 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": @@ -329,4 +334,19 @@ public class SettingsFragment extends PreferenceFragment { super.onResume(); savedPreferences.registerOnSharedPreferenceChangeListener(preferencesListener); } + + private void updatePrivacyIcon() { + // Define a reference to the toggleJavaScript icon. + MenuItem toggleJavaScript = MainWebViewActivity.mainMenu.findItem(R.id.toggleJavaScript); + + if (MainWebViewActivity.javaScriptEnabled) { + toggleJavaScript.setIcon(R.drawable.javascript_enabled); + } else { + if (MainWebViewActivity.firstPartyCookiesEnabled) { + toggleJavaScript.setIcon(R.drawable.warning); + } else { + toggleJavaScript.setIcon(R.drawable.privacy_mode); + } + } + } }