X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Ffragments%2FSettingsFragment.java;h=65b18bae6e6604c7360ad998de0b68f436cc6a4f;hp=88d57994e0460532bd1a33e87713c2e7508711dd;hb=b4fc354bee486a2df17b3aae6760a3c61eba1e97;hpb=6ccecb3374c1988aef2650a87dac20923ce3aa2f 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 88d57994..65b18bae 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java @@ -26,6 +26,7 @@ import android.content.SharedPreferences; import android.os.Build; import android.os.Bundle; import android.preference.Preference; +import android.preference.PreferenceCategory; import android.preference.PreferenceFragment; import android.view.LayoutInflater; import android.view.View; @@ -41,7 +42,10 @@ public class SettingsFragment extends PreferenceFragment { @Override public void onCreate(Bundle savedInstanceState) { + // Run the default commands. super.onCreate(savedInstanceState); + + // Load the preferences from the XML file. addPreferencesFromResource(R.xml.preferences); // Get a handle for the context. @@ -50,20 +54,23 @@ public class SettingsFragment extends PreferenceFragment { // Initialize savedPreferences. savedPreferences = getPreferenceScreen().getSharedPreferences(); - // Get handles for the preferences we need to modify. + // Get handles for the preferences. final Preference javaScriptPreference = findPreference("javascript_enabled"); final Preference firstPartyCookiesPreference = findPreference("first_party_cookies_enabled"); final Preference thirdPartyCookiesPreference = findPreference("third_party_cookies_enabled"); final Preference domStoragePreference = findPreference("dom_storage_enabled"); - final Preference saveFormDataPreference = findPreference("save_form_data_enabled"); + final Preference saveFormDataPreference = findPreference("save_form_data_enabled"); // The form data preference can be removed once the minimum API >= 26. final Preference userAgentPreference = findPreference("user_agent"); final Preference customUserAgentPreference = findPreference("custom_user_agent"); final Preference incognitoModePreference = findPreference("incognito_mode"); final Preference doNotTrackPreference = findPreference("do_not_track"); + final Preference allowScreenshotsPreference = findPreference("allow_screenshots"); final Preference easyListPreference = findPreference("easylist"); final Preference easyPrivacyPreference = findPreference("easyprivacy"); final Preference fanboyAnnoyanceListPreference = findPreference("fanboy_annoyance_list"); final Preference fanboySocialBlockingListPreference = findPreference("fanboy_social_blocking_list"); + final Preference ultraPrivacyPreference = findPreference("ultraprivacy"); + final Preference blockAllThirdPartyRequestsPreference = findPreference("block_all_third_party_requests"); final Preference proxyThroughOrbotPreference = findPreference("proxy_through_orbot"); final Preference torHomepagePreference = findPreference("tor_homepage"); final Preference torSearchPreference = findPreference("tor_search"); @@ -76,7 +83,7 @@ public class SettingsFragment extends PreferenceFragment { final Preference clearEverythingPreference = findPreference("clear_everything"); final Preference clearCookiesPreference = findPreference("clear_cookies"); final Preference clearDomStoragePreference = findPreference("clear_dom_storage"); - final Preference clearFormDataPreference = findPreference("clear_form_data"); + final Preference clearFormDataPreference = findPreference("clear_form_data"); // The clear form data preference can be removed once the minimum API >= 26. final Preference clearCachePreference = findPreference("clear_cache"); final Preference homepagePreference = findPreference("homepage"); final Preference defaultFontSizePreference = findPreference("default_font_size"); @@ -92,10 +99,10 @@ public class SettingsFragment extends PreferenceFragment { hideSystemBarsPreference.setDependency("full_screen_browsing_mode"); // 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="); + String torSearchString = savedPreferences.getString("tor_search", "http://ulrn6sryqaifefld.onion/?q="); + String searchString = savedPreferences.getString("search", "https://searx.me/?q="); - // Get booleans from the preferences. + // Get booleans that are used in multiple places from the preferences. final boolean javaScriptEnabled = savedPreferences.getBoolean("javascript_enabled", false); boolean firstPartyCookiesEnabled = savedPreferences.getBoolean("first_party_cookies_enabled", false); boolean thirdPartyCookiesEnabled = savedPreferences.getBoolean("third_party_cookies_enabled", false); @@ -107,23 +114,34 @@ public class SettingsFragment extends PreferenceFragment { boolean clearEverything = savedPreferences.getBoolean("clear_everything", true); final boolean nightMode = savedPreferences.getBoolean("night_mode", false); - // Only enable the third-party preference if first-party cookies are enabled and API >= 21. + // Only enable the third-party cookies preference if first-party cookies are enabled and API >= 21. thirdPartyCookiesPreference.setEnabled(firstPartyCookiesEnabled && (Build.VERSION.SDK_INT >= 21)); // Only enable the DOM storage preference if either JavaScript or Night Mode is enabled. domStoragePreference.setEnabled(javaScriptEnabled || nightMode); + // Remove the form data preferences if the API is >= 26 as they no longer do anything. + if (Build.VERSION.SDK_INT >= 26) { + // Get the categories. + PreferenceCategory privacyCategory = (PreferenceCategory) findPreference("privacy"); + PreferenceCategory clearAndExitCategory = (PreferenceCategory) findPreference("clear_and_exit"); + + // Remove the form data preferences. + privacyCategory.removePreference(saveFormDataPreference); + clearAndExitCategory.removePreference(clearFormDataPreference); + } + // Only enable Fanboy's social blocking list preference if Fanboy's annoyance list is disabled. fanboySocialBlockingListPreference.setEnabled(!fanboyAnnoyanceListEnabled); - // We need to inflated a `WebView` to get the default user agent. + // Inflate 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. + // `@SuppressLint("InflateParams")` removes the warning about using `null` as the `ViewGroup`, which in this case makes sense because the `bare_webview` will not be displayed. @SuppressLint("InflateParams") View bareWebViewLayout = inflater.inflate(R.layout.bare_webview, null, false); final WebView bareWebView = bareWebViewLayout.findViewById(R.id.bare_webview); // Get the user agent arrays. - ArrayAdapter userAgentNamesArray = ArrayAdapter.createFromResource(context, R.array.user_agent_names, R.layout.domain_settings_spinner_item); + ArrayAdapter userAgentNamesArray = ArrayAdapter.createFromResource(context, R.array.user_agent_names, R.layout.spinner_item); String[] translatedUserAgentNamesArray = getResources().getStringArray(R.array.translated_user_agent_names); String[] userAgentDataArray = getResources().getStringArray(R.array.user_agent_data); @@ -160,11 +178,11 @@ public class SettingsFragment extends PreferenceFragment { customUserAgentPreference.setEnabled(userAgentPreference.getSummary().equals(getString(R.string.custom_user_agent))); - // 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 homepage URL as the summary text for the `tor_homepage` preference when the preference screen is loaded. The default is Searx: `http://ulrn6sryqaifefld.onion/`. + torHomepagePreference.setSummary(savedPreferences.getString("tor_homepage", "http://ulrn6sryqaifefld.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=` + // Set the Tor search URL as the summary text for the Tor preference when the preference screen is loaded. 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); @@ -180,7 +198,7 @@ public class SettingsFragment extends PreferenceFragment { torSearchCustomURLPreference.setEnabled(proxyThroughOrbot && torSearchString.equals("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=`. + // Set the search URL as the summary text for the search preference when the preference screen is loaded. 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); @@ -200,26 +218,26 @@ public class SettingsFragment extends PreferenceFragment { // Set the status of the `Clear and Exit` preferences. clearCookiesPreference.setEnabled(!clearEverything); clearDomStoragePreference.setEnabled(!clearEverything); - clearFormDataPreference.setEnabled(!clearEverything); + clearFormDataPreference.setEnabled(!clearEverything); // The form data line can be removed once the minimum API is >= 26. clearCachePreference.setEnabled(!clearEverything); // Set the homepage URL as the summary text for the homepage preference. - homepagePreference.setSummary(savedPreferences.getString("homepage", "https://duckduckgo.com/?kao=-1&kak=-1")); + homepagePreference.setSummary(savedPreferences.getString("homepage", "https://searx.me/")); // Set the default font size as the summary text for the preference. defaultFontSizePreference.setSummary(savedPreferences.getString("default_font_size", "100") + "%%"); - // Disable `javaScriptPreference` if `nightModeBoolean` is true. JavaScript will be enabled for all web pages. + // Disable the JavaScript preference if Night Mode is enabled. JavaScript will be enabled for all web pages. javaScriptPreference.setEnabled(!nightMode); - // Set the `javaScriptPreference` icon. + // Set the JavaScript icon. if (javaScriptEnabled || nightMode) { javaScriptPreference.setIcon(R.drawable.javascript_enabled); } else { javaScriptPreference.setIcon(R.drawable.privacy_mode); } - // Set the `firstPartyCookiesPreference` icon. + // Set the first-party cookies icon. if (firstPartyCookiesEnabled) { firstPartyCookiesPreference.setIcon(R.drawable.cookies_enabled); } else { @@ -230,7 +248,7 @@ public class SettingsFragment extends PreferenceFragment { } } - // Set the `thirdPartyCookiesPreference` icon. + // Set the third party cookies icon. if (firstPartyCookiesEnabled && Build.VERSION.SDK_INT >= 21) { if (thirdPartyCookiesEnabled) { thirdPartyCookiesPreference.setIcon(R.drawable.cookies_warning); @@ -249,7 +267,7 @@ public class SettingsFragment extends PreferenceFragment { } } - // Set the `domStoragePreference` icon. + // Set the DOM storage icon. if (javaScriptEnabled || nightMode) { // The preference is enabled. if (savedPreferences.getBoolean("dom_storage_enabled", false)) { // DOM storage is enabled. domStoragePreference.setIcon(R.drawable.dom_storage_enabled); @@ -268,18 +286,20 @@ public class SettingsFragment extends PreferenceFragment { } } - // Set the `saveFormDataPreference` icon. - if (savedPreferences.getBoolean("save_form_data_enabled", false)) { - saveFormDataPreference.setIcon(R.drawable.form_data_enabled); - } else { - if (MainWebViewActivity.darkTheme) { - saveFormDataPreference.setIcon(R.drawable.form_data_disabled_dark); + // Set the save form data icon if API < 26. Save form data has no effect on API >= 26. + if (Build.VERSION.SDK_INT < 26) { + if (savedPreferences.getBoolean("save_form_data_enabled", false)) { + saveFormDataPreference.setIcon(R.drawable.form_data_enabled); } else { - saveFormDataPreference.setIcon(R.drawable.form_data_disabled_light); + if (MainWebViewActivity.darkTheme) { + saveFormDataPreference.setIcon(R.drawable.form_data_disabled_dark); + } else { + saveFormDataPreference.setIcon(R.drawable.form_data_disabled_light); + } } } - // Set the `customUserAgentPreference` icon. + // Set the custom user agent icon. if (customUserAgentPreference.isEnabled()) { if (MainWebViewActivity.darkTheme) { customUserAgentPreference.setIcon(R.drawable.custom_user_agent_enabled_dark); @@ -294,7 +314,7 @@ public class SettingsFragment extends PreferenceFragment { } } - // Set the `incognitoModePreference` icon. + // Set the incognito mode icon. if (savedPreferences.getBoolean("incognito_mode", false)) { if (MainWebViewActivity.darkTheme) { incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled_dark); @@ -309,7 +329,7 @@ public class SettingsFragment extends PreferenceFragment { } } - // Set the `doNotTrackPreference` icon. + // Set the Do Not Track icon. if (savedPreferences.getBoolean("do_not_track", false)) { if (MainWebViewActivity.darkTheme) { doNotTrackPreference.setIcon(R.drawable.block_tracking_enabled_dark); @@ -324,6 +344,21 @@ public class SettingsFragment extends PreferenceFragment { } } + // Set the allow screenshots icon. + if (savedPreferences.getBoolean("allow_screenshots", false)) { + if (MainWebViewActivity.darkTheme) { + allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_dark); + } else { + allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_light); + } + } else { + if (MainWebViewActivity.darkTheme) { + allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_dark); + } else { + allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_light); + } + } + // Set the EasyList icon. if (savedPreferences.getBoolean("easylist", true)) { if (MainWebViewActivity.darkTheme) { @@ -354,7 +389,7 @@ public class SettingsFragment extends PreferenceFragment { } } - // Set the Fanboy list icons. + // Set the Fanboy lists icons. if (fanboyAnnoyanceListEnabled) { if (MainWebViewActivity.darkTheme) { // Set the Fanboy annoyance list icon. @@ -393,6 +428,36 @@ public class SettingsFragment extends PreferenceFragment { } } + // Set the UltraPrivacy icon. + if (savedPreferences.getBoolean("ultraprivacy", true)) { + if (MainWebViewActivity.darkTheme) { + ultraPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_dark); + } else { + ultraPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_light); + } + } else { + if (MainWebViewActivity.darkTheme) { + ultraPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_dark); + } else { + ultraPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_light); + } + } + + // Set the block all third-party requests icon. + if (savedPreferences.getBoolean("block_all_third_party_requests", false)) { + if (MainWebViewActivity.darkTheme) { + blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_enabled_dark); + } else { + blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_enabled_light); + } + } else { + if (MainWebViewActivity.darkTheme) { + blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_disabled_dark); + } else { + blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_disabled_light); + } + } + // Set the Tor icons according to the theme. if (proxyThroughOrbot) { // Proxying is enabled. if (MainWebViewActivity.darkTheme) { @@ -432,7 +497,7 @@ public class SettingsFragment extends PreferenceFragment { } } - // Set the `searchCustomURLPreference` icon. + // Set the search custom URL icon. if (searchCustomURLPreference.isEnabled()) { if (MainWebViewActivity.darkTheme) { searchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled_dark); @@ -535,15 +600,17 @@ public class SettingsFragment extends PreferenceFragment { clearDomStoragePreference.setIcon(R.drawable.dom_storage_warning); } - // Set the clear form data preference icon. - if (clearEverything || savedPreferences.getBoolean("clear_form_data", true)) { - if (MainWebViewActivity.darkTheme) { - clearFormDataPreference.setIcon(R.drawable.form_data_cleared_dark); + // Set the clear form data preference icon if the API < 26. It has no effect on newer versions of Android. + if (Build.VERSION.SDK_INT < 26) { + if (clearEverything || savedPreferences.getBoolean("clear_form_data", true)) { + if (MainWebViewActivity.darkTheme) { + clearFormDataPreference.setIcon(R.drawable.form_data_cleared_dark); + } else { + clearFormDataPreference.setIcon(R.drawable.form_data_cleared_light); + } } else { - clearFormDataPreference.setIcon(R.drawable.form_data_cleared_light); + clearFormDataPreference.setIcon(R.drawable.form_data_warning); } - } else { - clearFormDataPreference.setIcon(R.drawable.form_data_warning); } // Set the clear cache preference icon. @@ -733,6 +800,7 @@ public class SettingsFragment extends PreferenceFragment { } break; + // Save form data can be removed once the minimum API >= 26. case "save_form_data_enabled": // Update the icon. if (sharedPreferences.getBoolean("save_form_data_enabled", false)) { @@ -843,6 +911,35 @@ public class SettingsFragment extends PreferenceFragment { break; + case "allow_screenshots": + // Update the icon. + if (sharedPreferences.getBoolean("allow_screenshots", false)) { + if (MainWebViewActivity.darkTheme) { + allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_dark); + } else { + allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_light); + } + } else { + if (MainWebViewActivity.darkTheme) { + allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_dark); + } else { + allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_light); + } + } + + // Create an intent to restart Privacy Browser. + Intent allowScreenshotsRestartIntent = getActivity().getParentActivityIntent(); + + // Assert that the intent is not null to remove the lint error below. + assert allowScreenshotsRestartIntent != null; + + // `Intent.FLAG_ACTIVITY_CLEAR_TASK` removes all activities from the stack. It requires `Intent.FLAG_ACTIVITY_NEW_TASK`. + allowScreenshotsRestartIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); + + // Make it so. + startActivity(allowScreenshotsRestartIntent); + break; + case "easylist": // Update the icon. if (sharedPreferences.getBoolean("easylist", true)) { @@ -882,7 +979,7 @@ public class SettingsFragment extends PreferenceFragment { boolean currentFanboySocialBlockingList = sharedPreferences.getBoolean("fanboy_social_blocking_list", true); // Update the Fanboy icons. - if (sharedPreferences.getBoolean("fanboy_annoyance_list", true)) { + if (currentFanboyAnnoyanceList) { // Fanboy's annoyance list is enabled. if (MainWebViewActivity.darkTheme) { // Update the Fanboy's annoyance list icon. fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_enabled_dark); @@ -896,16 +993,16 @@ public class SettingsFragment extends PreferenceFragment { // Update the Fanboy's social blocking list icon. fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_ghosted_light); } - } else { + } else { // Fanboy's annoyance list is disabled. if (MainWebViewActivity.darkTheme) { // Update the Fanboy's annoyance list icon. fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_disabled_dark); // Update the Fanboy's social blocking list icon. if (currentFanboySocialBlockingList) { - fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_enabled_dark); + fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_enabled_dark); } else { - fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_disabled_dark); + fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_disabled_dark); } } else { // Update the Fanboy's annoyance list icon. @@ -913,9 +1010,9 @@ public class SettingsFragment extends PreferenceFragment { // Update the Fanboy's social blocking list icon. if (currentFanboySocialBlockingList) { - fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_enabled_light); + fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_enabled_light); } else { - fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_disabled_light); + fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_disabled_light); } } } @@ -941,10 +1038,44 @@ public class SettingsFragment extends PreferenceFragment { } break; + case "ultraprivacy": + // Update the icon. + if (sharedPreferences.getBoolean("ultraprivacy", true)) { + if (MainWebViewActivity.darkTheme) { + ultraPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_dark); + } else { + ultraPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_light); + } + } else { + if (MainWebViewActivity.darkTheme) { + ultraPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_dark); + } else { + ultraPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_light); + } + } + break; + + case "block_all_third_party_requests": + // Update the icon. + if (sharedPreferences.getBoolean("block_all_third_party_requests", false)) { + if (MainWebViewActivity.darkTheme) { + blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_enabled_dark); + } else { + blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_enabled_light); + } + } else { + if (MainWebViewActivity.darkTheme) { + blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_disabled_dark); + } else { + blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_disabled_light); + } + } + break; + 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="); + String currentTorSearchString = sharedPreferences.getString("tor_search", "http://ulrn6sryqaifefld.onion/?q="); // 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")); @@ -991,13 +1122,13 @@ public class SettingsFragment extends PreferenceFragment { break; 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")); + // Set the new tor homepage URL as the summary text for the `tor_homepage` preference. The default is Searx: `http://ulrn6sryqaifefld.onion/`. + torHomepagePreference.setSummary(sharedPreferences.getString("tor_homepage", "http://ulrn6sryqaifefld.onion/")); break; case "tor_search": // Get the present search string. - String presentTorSearchString = sharedPreferences.getString("tor_search", "https://3g2upl4pq6kufc4m.onion/html/?q="); + String presentTorSearchString = sharedPreferences.getString("tor_search", "http://ulrn6sryqaifefld.onion/?q="); // Update the preferences. if (presentTorSearchString.equals("Custom URL")) { @@ -1036,7 +1167,7 @@ public class SettingsFragment extends PreferenceFragment { case "search": // Store the new search string. - String newSearchString = sharedPreferences.getString("search", "https://duckduckgo.com/html/?q="); + String newSearchString = sharedPreferences.getString("search", "https://searx.me/?q="); // Update `searchPreference` and `searchCustomURLPreference`. if (newSearchString.equals("Custom URL")) { // `Custom URL` is selected. @@ -1204,7 +1335,7 @@ public class SettingsFragment extends PreferenceFragment { // Update the status of the `Clear and Exit` preferences. clearCookiesPreference.setEnabled(!newClearEverythingBoolean); clearDomStoragePreference.setEnabled(!newClearEverythingBoolean); - clearFormDataPreference.setEnabled(!newClearEverythingBoolean); + clearFormDataPreference.setEnabled(!newClearEverythingBoolean); // This line can be removed once the minimum API >= 26. clearCachePreference.setEnabled(!newClearEverythingBoolean); // Update the `clearEverythingPreference` icon. @@ -1240,15 +1371,17 @@ public class SettingsFragment extends PreferenceFragment { clearDomStoragePreference.setIcon(R.drawable.dom_storage_warning); } - // Update the `clearFormDataPreference` icon. - if (newClearEverythingBoolean || sharedPreferences.getBoolean("clear_form_data", true)) { - if (MainWebViewActivity.darkTheme) { - clearFormDataPreference.setIcon(R.drawable.form_data_cleared_dark); + // Update the clear form data preference icon if the API < 26. + if (Build.VERSION.SDK_INT < 26) { + if (newClearEverythingBoolean || sharedPreferences.getBoolean("clear_form_data", true)) { + if (MainWebViewActivity.darkTheme) { + clearFormDataPreference.setIcon(R.drawable.form_data_cleared_dark); + } else { + clearFormDataPreference.setIcon(R.drawable.form_data_cleared_light); + } } else { - clearFormDataPreference.setIcon(R.drawable.form_data_cleared_light); + clearFormDataPreference.setIcon(R.drawable.form_data_warning); } - } else { - clearFormDataPreference.setIcon(R.drawable.form_data_warning); } // Update the `clearCachePreference` icon. @@ -1289,6 +1422,7 @@ public class SettingsFragment extends PreferenceFragment { } break; + // This section can be removed once the minimum API >= 26. case "clear_form_data": // Update the icon. if (sharedPreferences.getBoolean("clear_form_data", true)) { @@ -1316,8 +1450,8 @@ public class SettingsFragment extends PreferenceFragment { 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")); + // Set the new homepage URL as the summary text for the Homepage preference. + homepagePreference.setSummary(sharedPreferences.getString("homepage", "https://searx.me/")); break; case "default_font_size": @@ -1367,17 +1501,17 @@ public class SettingsFragment extends PreferenceFragment { darkThemePreference.setIcon(R.drawable.theme_light); } - // Create an `Intent` to restart Privacy Browser. - Intent intent = getActivity().getParentActivityIntent(); + // Create an intent to restart Privacy Browser. + Intent changeThemeRestartIntent = getActivity().getParentActivityIntent(); - // Assert that `intent` is not `null` to remove the lint error below. - assert intent != null; + // Assert that the intent is not null to remove the lint error below. + assert changeThemeRestartIntent != null; // `Intent.FLAG_ACTIVITY_CLEAR_TASK` removes all activities from the stack. It requires `Intent.FLAG_ACTIVITY_NEW_TASK`. - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); + changeThemeRestartIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); // Make it so. - startActivity(intent); + startActivity(changeThemeRestartIntent); break; case "night_mode":