X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FSettingsFragment.java;h=4eef49c2fa7a529d087c3b7ff7669837eafe2ff8;hb=826776d415157b99701dd19d2713a60db6fefe2c;hp=cd6a81e1e4dfae4ce34720711df7e350f0b783f4;hpb=9c582d802e641b2b6d27271310fc16898020b470;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 cd6a81e1..4eef49c2 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/SettingsFragment.java +++ b/app/src/main/java/com/stoutner/privacybrowser/SettingsFragment.java @@ -109,10 +109,15 @@ public class SettingsFragment extends PreferenceFragment { 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() { @@ -123,83 +128,84 @@ public class SettingsFragment extends PreferenceFragment { 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); - // Toggle the state of the "dom_storage_enabled" preference. The default is 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. + // Update `mainWebView`. MainWebViewActivity.mainWebView.getSettings().setJavaScriptEnabled(MainWebViewActivity.javaScriptEnabled); - MainWebViewActivity.mainWebView.reload(); - // Update the privacy icon. - updatePrivacyIcon(); + // 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. + // 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. + // Update `mainWebView`. MainWebViewActivity.cookieManager.setAcceptCookie(MainWebViewActivity.firstPartyCookiesEnabled); - MainWebViewActivity.mainWebView.reload(); // Update the checkbox in the options menu. MenuItem firstPartyCookiesMenuItem = MainWebViewActivity.mainMenu.findItem(R.id.toggleFirstPartyCookies); firstPartyCookiesMenuItem.setChecked(MainWebViewActivity.firstPartyCookiesEnabled); - // Update the privacy icon. - updatePrivacyIcon(); + // 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(); } + + // Update the privacy icons. + MainWebViewActivity.updatePrivacyIcons(MainWebViewActivity.privacyBrowserActivity); 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 privacy icon. - updatePrivacyIcon(); + // Update the privacy icons. + MainWebViewActivity.updatePrivacyIcons(MainWebViewActivity.privacyBrowserActivity); break; case "save_form_data_enabled": - // Set saveFormDataEnabled to the new state. The default is false. + // 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. + // Update `mainWebView`. MainWebViewActivity.mainWebView.getSettings().setSaveFormData(MainWebViewActivity.saveFormDataEnabled); - MainWebViewActivity.mainWebView.reload(); + + // Update the privacy icons. + MainWebViewActivity.updatePrivacyIcons(MainWebViewActivity.privacyBrowserActivity); break; case "user_agent": @@ -207,7 +213,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()); @@ -287,26 +293,44 @@ public class SettingsFragment extends PreferenceFragment { 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; @@ -334,19 +358,4 @@ 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); - } - } - } }