import android.annotation.SuppressLint;
import android.content.SharedPreferences;
+import android.os.Build;
import android.os.Bundle;
import android.preference.Preference;
import android.preference.PreferenceFragment;
savedPreferences = getPreferenceScreen().getSharedPreferences();
// Get handles for the preferences we need to modify.
- final Preference domStorageEnabled = findPreference("dom_storage_enabled");
+ final Preference javaScriptEnabled = findPreference("javascript_enabled");
+ final Preference firstPartyCookiesEnabled = findPreference("first_party_cookies_enabled");
final Preference thirdPartyCookiesEnabled = findPreference("third_party_cookies_enabled");
+ final Preference domStorageEnabled = findPreference("dom_storage_enabled");
final Preference userAgentPreference = findPreference("user_agent");
final Preference customUserAgent = findPreference("custom_user_agent");
- final Preference javaScriptDisabledSearchPreference = findPreference("javascript_disabled_search");
- final Preference javaScriptDisabledSearchCustomURLPreference = findPreference("javascript_disabled_search_custom_url");
- final Preference javaScriptEnabledSearchPreference = findPreference("javascript_enabled_search");
- final Preference javaScriptEnabledSearchCustomURLPreference = findPreference("javascript_enabled_search_custom_url");
+ final Preference torHomepagePreference = findPreference("tor_homepage");
+ final Preference torSearchPreference = findPreference("tor_search");
+ final Preference torSearchCustomURLPreference = findPreference("tor_search_custom_url");
+ final Preference searchPreference = findPreference("search");
+ final Preference searchCustomURLPreference = findPreference("search_custom_url");
final Preference hideSystemBarsPreference = findPreference("hide_system_bars");
final Preference translucentNavigationBarPreference = findPreference("translucent_navigation_bar");
- final Preference torHomepagePreference = findPreference("tor_homepage");
- final Preference torJavaScriptDisabledSearchPreference = findPreference("tor_javascript_disabled_search");
- final Preference torJavaScriptDisabledSearchCustomURLPreference = findPreference("tor_javascript_disabled_search_custom_url");
- final Preference torJavaScriptEnabledSearchPreference = findPreference("tor_javascript_enabled_search");
- final Preference torJavaScriptEnabledSearchCustomURLPreference = findPreference("tor_javascript_enabled_search_custom_url");
final Preference homepagePreference = findPreference("homepage");
final Preference defaultFontSizePreference = findPreference("default_font_size");
- // Get booleans from the preferences.
- final boolean fullScreenBrowsingModeEnabled = savedPreferences.getBoolean("enable_full_screen_browsing_mode", false);
- final boolean proxyThroughOrbot = savedPreferences.getBoolean("proxy_through_orbot", false);
+ // Set dependencies.
+ domStorageEnabled.setDependency("javascript_enabled");
+ torHomepagePreference.setDependency("proxy_through_orbot");
+ torSearchPreference.setDependency("proxy_through_orbot");
+ hideSystemBarsPreference.setDependency("enable_full_screen_browsing_mode");
// Get strings from the preferences.
- String javaScriptDisabledSearchString = savedPreferences.getString("javascript_disabled_search", "https://duckduckgo.com/html/?q=");
- String javaScriptEnabledSearchString = savedPreferences.getString("javascript_enabled_search", "https://duckduckgo.com/?q=");
- String torJavaScriptDisabledSearchString = savedPreferences.getString("tor_javascript_disabled_search", "https://3g2upl4pq6kufc4m.onion/html/?q=");
- String torJavaScriptEnabledSearchString = savedPreferences.getString("tor_javascript_enabled_search", "https://3g2upl4pq6kufc4m.onion/?q=");
- String defaultFontSizeString = savedPreferences.getString("default_font_size", "100");
-
- // Allow the user to access "dom_storage_enabled" if "javascript_enabled" is enabled. The default is false.
- domStorageEnabled.setEnabled(savedPreferences.getBoolean("javascript_enabled", false));
+ String torSearchString = savedPreferences.getString("tor_search", "https://3g2upl4pq6kufc4m.onion/html/?q=");
+ String searchString = savedPreferences.getString("search", "https://duckduckgo.com/html/?q=");
- // Allow the user to access "third_party_cookies_enabled" if "first_party_cookies_enabled" is enabled. The default is false.
- thirdPartyCookiesEnabled.setEnabled(savedPreferences.getBoolean("first_party_cookies_enabled", false));
+ // Get booleans from the preferences.
+ boolean javaScriptEnabledBoolean = savedPreferences.getBoolean("javascript_enabled", false);
+ boolean firstPartyCookiesEnabledBoolean = savedPreferences.getBoolean("first_party_cookies_enabled", false);
+ boolean thirdPartyCookiesEnabledBoolean = savedPreferences.getBoolean("third_party_cookies_enabled", false);
+ // Only enable `third_party_cookies_enabled` if `first_party_cookies_enabled` is `true` and API >= 21.
+ thirdPartyCookiesEnabled.setEnabled(firstPartyCookiesEnabledBoolean && (Build.VERSION.SDK_INT >= 21));
// We need to inflated a `WebView` to get the default user agent.
LayoutInflater inflater = getActivity().getLayoutInflater();
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=`.
- if (javaScriptDisabledSearchString.equals("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(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`.
- javaScriptDisabledSearchCustomURLPreference.setSummary(savedPreferences.getString("javascript_disabled_search_custom_url", ""));
- javaScriptDisabledSearchCustomURLPreference.setEnabled(javaScriptDisabledSearchString.equals("Custom URL"));
+ // 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 JavaScript-enabled search URL as the summary text for the JavaScript-enabled search preference when the preference screen is loaded. The default is `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);
+ // 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=`
+ 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);
} else {
// Set the array value as the summary text.
- javaScriptEnabledSearchPreference.setSummary(javaScriptEnabledSearchString);
+ torSearchPreference.setSummary(torSearchString);
}
- // 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`.
- javaScriptEnabledSearchCustomURLPreference.setSummary(savedPreferences.getString("javascript_enabled_search_custom_url", ""));
- javaScriptEnabledSearchCustomURLPreference.setEnabled(javaScriptEnabledSearchString.equals("Custom URL"));
+ // Set the summary text for `tor_search_custom_url`. The default is `""`.
+ torSearchCustomURLPreference.setSummary(savedPreferences.getString("tor_search_custom_url", ""));
-
- // Enable the full screen options if full screen browsing mode is enabled.
- if (!fullScreenBrowsingModeEnabled) {
- // Disable the full screen options.
- hideSystemBarsPreference.setEnabled(false);
- translucentNavigationBarPreference.setEnabled(false);
- } else {
- // Disable `transparent_navigation_bar` if `hide_system_bars` is `true`.
- translucentNavigationBarPreference.setEnabled(!savedPreferences.getBoolean("hide_system_bars", false));
- }
+ // Enable the Tor custom URL search options only if proxying through Orbot and the search is set to `Custom URL`.
+ torSearchCustomURLPreference.setEnabled(savedPreferences.getBoolean("proxy_through_orbot", false) && torSearchString.equals("Custom URL"));
- // 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 JavaScript-disabled search URL as the summary text for the Tor JavaScript-disabled search preference when the preference screen is loaded. The default is `https://3g2upl4pq6kufc4m.onion/html/?q=`
- if (torJavaScriptDisabledSearchString.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=`.
+ if (searchString.equals("Custom URL")) {
// Use R.string.custom_url, which will be translated, instead of the array value, which will not.
- torJavaScriptDisabledSearchPreference.setSummary(R.string.custom_url);
+ searchPreference.setSummary(R.string.custom_url);
} else {
// Set the array value as the summary text.
- torJavaScriptDisabledSearchPreference.setSummary(torJavaScriptDisabledSearchString);
+ searchPreference.setSummary(searchString);
}
- // Set the summary text for `tor_javascript_disabled_search_custom_url`. The default is `""`.
- torJavaScriptDisabledSearchCustomURLPreference.setSummary(savedPreferences.getString("tor_javascript_disabled_search_custom_url", ""));
+ // Set the summary text for `search_custom_url` (the default is `""`) and enable it if `search` is set to `Custom URL`.
+ searchCustomURLPreference.setSummary(savedPreferences.getString("search_custom_url", ""));
+ searchCustomURLPreference.setEnabled(searchString.equals("Custom URL"));
- // Set the Tor JavaScript-enabled search URL as the summary text for the Tor Javascript-enabled search preference when the preference screen is loaded. The default is `https://3g2upl4pq6kufc4m.onion/?q=`.
- if (torJavaScriptEnabledSearchString.equals("Custom URL")) {
- // Use R.string.custom_url, which will be translated, instead of the array value, which will not.
- torJavaScriptEnabledSearchPreference.setSummary(R.string.custom_url);
- } else {
- // Set the array value as the summary text.
- torJavaScriptEnabledSearchPreference.setSummary(torJavaScriptEnabledSearchString);
- }
+ // Enable `transparent_navigation_bar` only if full screen browsing mode is enabled and `hide_system_bars` is disabled.
+ translucentNavigationBarPreference.setEnabled(savedPreferences.getBoolean("enable_full_screen_browsing_mode", false) && !savedPreferences.getBoolean("hide_system_bars", false));
- // Set the summary text for `tor_javascript_enabled_search_custom_url`. The default is `""`.
- torJavaScriptEnabledSearchCustomURLPreference.setSummary(savedPreferences.getString("tor_javascript_enabled_search_custom_url", ""));
+ // Set the homepage URL as the summary text for the `Homepage` preference when the preference screen is loaded. The default is `https://duckduckgo.com`.
+ homepagePreference.setSummary(savedPreferences.getString("homepage", "https://duckduckgo.com"));
- // Enable the Tor preferences only if `proxy_through_orbot` is enabled. The default is `false`.
- torHomepagePreference.setEnabled(proxyThroughOrbot);
- torJavaScriptDisabledSearchPreference.setEnabled(proxyThroughOrbot);
- torJavaScriptEnabledSearchPreference.setEnabled(proxyThroughOrbot);
+ // 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`.
+ defaultFontSizePreference.setSummary(savedPreferences.getString("default_font_size", "100") + "%%");
- // Enable the Tor custom URL search options only if `proxyThroughOrbot` is true and the search is set to `Custom URL`.
- torJavaScriptDisabledSearchCustomURLPreference.setEnabled(proxyThroughOrbot && torJavaScriptDisabledSearchString.equals("Custom URL"));
- torJavaScriptEnabledSearchCustomURLPreference.setEnabled(proxyThroughOrbot && torJavaScriptEnabledSearchString.equals("Custom URL"));
+ // Set the `javascript_enabled` icon.
+ if (javaScriptEnabledBoolean) {
+ javaScriptEnabled.setIcon(R.drawable.javascript_enabled);
+ } else {
+ javaScriptEnabled.setIcon(R.drawable.privacy_mode);
+ }
- // 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`.
- homepagePreference.setSummary(savedPreferences.getString("homepage", "https://www.duckduckgo.com"));
+ // Set the `first_party_cookies_enabled` icon.
+ if (firstPartyCookiesEnabledBoolean) {
+ firstPartyCookiesEnabled.setIcon(R.drawable.cookies_enabled);
+ } else {
+ firstPartyCookiesEnabled.setIcon(R.drawable.cookies_disabled);
+ }
- // 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`.
- defaultFontSizePreference.setSummary(defaultFontSizeString + "%%");
+ // Set the `third_party_cookies_enabled` icon.
+ if (firstPartyCookiesEnabledBoolean && Build.VERSION.SDK_INT >= 21) {
+ if (thirdPartyCookiesEnabledBoolean) {
+ thirdPartyCookiesEnabled.setIcon(R.drawable.cookies_warning);
+ } else {
+ thirdPartyCookiesEnabled.setIcon(R.drawable.cookies_disabled);
+ }
+ } else {
+ thirdPartyCookiesEnabled.setIcon(R.drawable.cookies_ghosted);
+ }
+ // Set the `dom_storage_enabled` icon.
+ if (javaScriptEnabledBoolean) {
+ if (savedPreferences.getBoolean("dom_storage_enabled", false)) {
+ domStorageEnabled.setIcon(R.drawable.dom_storage_enabled);
+ } else {
+ domStorageEnabled.setIcon(R.drawable.dom_storage_disabled);
+ }
+ } else {
+ domStorageEnabled.setIcon(R.drawable.dom_storage_ghosted);
+ }
// Listen for preference changes.
preferencesListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
switch (key) {
case "javascript_enabled":
- // 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 the icons.
+ if (sharedPreferences.getBoolean("javascript_enabled", false)) {
+ // Update the icon for `javascript_enabled`.
+ javaScriptEnabled.setIcon(R.drawable.javascript_enabled);
+
+ // Update the icon for `dom_storage_enabled`.
+ if (sharedPreferences.getBoolean("dom_storage_enabled", false)) {
+ domStorageEnabled.setIcon(R.drawable.dom_storage_enabled);
+ } else {
+ domStorageEnabled.setIcon(R.drawable.dom_storage_disabled);
+ }
+ } else { // `javascript_enabled` is `false`.
+ // Update the icon for `javascript_enabled`.
+ javaScriptEnabled.setIcon(R.drawable.privacy_mode);
+
+ // Set the icon for `dom_storage_disabled` to be ghosted.
+ domStorageEnabled.setIcon(R.drawable.dom_storage_ghosted);
+ }
break;
case "first_party_cookies_enabled":
- // 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 the icons for `first_party_cookies_enabled` and `third_party_cookies_enabled`.
+ if (sharedPreferences.getBoolean("first_party_cookies_enabled", false)) {
+ // Set the icon for `first_party_cookies_enabled`.
+ firstPartyCookiesEnabled.setIcon(R.drawable.cookies_enabled);
+
+ // Update the icon for `third_party_cookies_enabled`.
+ if (Build.VERSION.SDK_INT >= 21) {
+ if (sharedPreferences.getBoolean("third_party_cookies_enabled", false)) {
+ thirdPartyCookiesEnabled.setIcon(R.drawable.cookies_warning);
+ } else {
+ thirdPartyCookiesEnabled.setIcon(R.drawable.cookies_disabled);
+ }
+ } else {
+ thirdPartyCookiesEnabled.setIcon(R.drawable.cookies_ghosted);
+ }
+ } else { // `first_party_cookies_enabled` is `false`.
+ // Update the icon for `first_party_cookies_enabled`.
+ firstPartyCookiesEnabled.setIcon(R.drawable.cookies_disabled);
+
+ // Set the icon for `third_party_cookies_enabled` to be ghosted.
+ thirdPartyCookiesEnabled.setIcon(R.drawable.cookies_ghosted);
+ }
+
+ // Enable `third_party_cookies_enabled` if `first_party_cookies_enabled` is `true` and API >= 21.
+ thirdPartyCookiesEnabled.setEnabled(sharedPreferences.getBoolean("first_party_cookies_enabled", false) && (Build.VERSION.SDK_INT >= 21));
+ break;
+
+ case "third_party_cookies_enabled":
+ // Update the icon.
+ if (sharedPreferences.getBoolean("third_party_cookies_enabled", false)) {
+ thirdPartyCookiesEnabled.setIcon(R.drawable.cookies_warning);
+ } else {
+ thirdPartyCookiesEnabled.setIcon(R.drawable.cookies_disabled);
+ }
+ break;
+
+ case "dom_storage_enabled":
+ // Update the icon.
+ if (sharedPreferences.getBoolean("dom_storage_enabled", false)) {
+ domStorageEnabled.setIcon(R.drawable.dom_storage_enabled);
+ } else {
+ domStorageEnabled.setIcon(R.drawable.dom_storage_disabled);
+ }
break;
case "user_agent":
break;
case "Custom user agent":
- // Display "Custom user agent" as the summary text for userAgentPreference, and enable customUserAgent.
+ // Display `Custom user agent` as the summary text for `userAgentPreference`, and enable `customUserAgent`.
userAgentPreference.setSummary(R.string.custom_user_agent);
customUserAgent.setEnabled(true);
break;
default:
- // Display the user agent as the summary text for userAgentPreference, and disable customUserAgent.
+ // Display the user agent as the summary text for `userAgentPreference`, and disable `customUserAgent`.
userAgentPreference.setSummary(sharedPreferences.getString("user_agent", "PrivacyBrowser/1.0"));
customUserAgent.setEnabled(false);
break;
customUserAgent.setSummary(sharedPreferences.getString("custom_user_agent", "PrivacyBrowser/1.0"));
break;
- case "javascript_disabled_search":
- 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 is translated.
- javaScriptDisabledSearchPreference.setSummary(R.string.custom_url);
- } else { // Set the new search URL as the summary text for the JavaScript-disabled search preference.
- javaScriptDisabledSearchPreference.setSummary(newJavaScriptDisabledSearchString);
- }
-
- // Enable or disable javaScriptDisabledSearchCustomURLPreference.
- javaScriptDisabledSearchCustomURLPreference.setEnabled(newJavaScriptDisabledSearchString.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", ""));
- break;
-
- case "javascript_enabled_search":
- 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 is translated.
- javaScriptEnabledSearchPreference.setSummary(R.string.custom_url);
- } else { // Set the new search URL as the summary text for the JavaScript-enabled search preference..
- javaScriptEnabledSearchPreference.setSummary(newJavaScriptEnabledSearchString);
- }
-
- // Enable or disable javaScriptEnabledSearchCustomURLPreference.
- 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 `""`.
- javaScriptEnabledSearchCustomURLPreference.setSummary(sharedPreferences.getString("javascript_enabled_search_custom_url", ""));
- break;
-
- case "enable_full_screen_browsing_mode":
- boolean newFullScreenBrowsingModeEnabled = sharedPreferences.getBoolean("enable_full_screen_browsing_mode", false);
- if (newFullScreenBrowsingModeEnabled) {
- // Enable `hideSystemBarsPreference`.
- hideSystemBarsPreference.setEnabled(true);
-
- // Only enable `transparent_navigation_bar` if `hide_system_bars` is `false`.
- translucentNavigationBarPreference.setEnabled(!sharedPreferences.getBoolean("hide_system_bars", false));
- } else {
- // Disable the full screen options.
- hideSystemBarsPreference.setEnabled(false);
- translucentNavigationBarPreference.setEnabled(false);
- }
- break;
-
case "proxy_through_orbot":
// Get current settings.
boolean currentProxyThroughOrbot = sharedPreferences.getBoolean("proxy_through_orbot", false);
- String currentTorJavaScriptDisabledSearchString = sharedPreferences.getString("tor_javascript_disabled_search", "https://3g2upl4pq6kufc4m.onion/html/?q=");
- String currentTorJavaScriptEnabledSearchString = sharedPreferences.getString("tor_javascript_enabled_search", "https://3g2upl4pq6kufc4m.onion/?q=");
-
- // Enable the Tor preferences only if `proxy_through_orbot` is enabled. The default is `false`.
- torHomepagePreference.setEnabled(currentProxyThroughOrbot);
- torJavaScriptDisabledSearchPreference.setEnabled(currentProxyThroughOrbot);
- torJavaScriptEnabledSearchPreference.setEnabled(currentProxyThroughOrbot);
+ String currentTorSearchString = sharedPreferences.getString("tor_search", "https://3g2upl4pq6kufc4m.onion/html/?q=");
- // Enable the Tor custom URL search options only if `currentProxyThroughOrbot` is true and the search is set to `Custom URL`.
- torJavaScriptDisabledSearchCustomURLPreference.setEnabled(currentProxyThroughOrbot && currentTorJavaScriptDisabledSearchString.equals("Custom URL"));
- torJavaScriptEnabledSearchCustomURLPreference.setEnabled(currentProxyThroughOrbot && currentTorJavaScriptEnabledSearchString.equals("Custom URL"));
+ // 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"));
break;
case "tor_homepage":
torHomepagePreference.setSummary(sharedPreferences.getString("tor_homepage", "https://3g2upl4pq6kufc4m.onion"));
break;
- case "tor_javascript_disabled_search":
+ case "tor_search":
// Get the present search string.
- String presentTorJavaScriptDisabledSearchString = sharedPreferences.getString("tor_javascript_disabled_search", "https://3g2upl4pq6kufc4m.onion/html/?q=");
+ String presentTorSearchString = sharedPreferences.getString("tor_search", "https://3g2upl4pq6kufc4m.onion/html/?q=");
- // Set the summary text for `tor_javascript_disabled_search`.
- if (presentTorJavaScriptDisabledSearchString.equals("Custom URL")) {
+ // Set the summary text for `tor_search`.
+ if (presentTorSearchString.equals("Custom URL")) {
// Use R.string.custom_url, which is translated, instead of the array value, which isn't.
- torJavaScriptDisabledSearchPreference.setSummary(R.string.custom_url);
+ torSearchPreference.setSummary(R.string.custom_url);
} else {
// Set the array value as the summary text.
- torJavaScriptDisabledSearchPreference.setSummary(presentTorJavaScriptDisabledSearchString);
+ torSearchPreference.setSummary(presentTorSearchString);
}
// Set the status of `torJavaScriptDisabledSearchCustomURLPreference`.
- torJavaScriptDisabledSearchCustomURLPreference.setEnabled(presentTorJavaScriptDisabledSearchString.equals("Custom URL"));
+ torSearchCustomURLPreference.setEnabled(presentTorSearchString.equals("Custom URL"));
break;
- case "tor_javascript_disabled_search_custom_url":
- // Set the summary text for `tor_javascript_disabled_search_custom_url`.
- torJavaScriptDisabledSearchCustomURLPreference.setSummary(sharedPreferences.getString("tor_javascript_disabled_search_custom_url", ""));
+ case "tor_search_custom_url":
+ // Set the summary text for `tor_search_custom_url`.
+ torSearchCustomURLPreference.setSummary(sharedPreferences.getString("tor_search_custom_url", ""));
break;
- case "tor_javascript_enabled_search":
- // Get the present search string.
- String presentTorJavaScriptEnabledSearchString = sharedPreferences.getString("tor_javascript_enabled_search", "https://3g2upl4pq6kufc4m.onion/?q=");
-
- // Set the summary text for `tor_javascript_enabled_search`.
- if (presentTorJavaScriptEnabledSearchString.equals("Custom URL")) {
- // Use R.string.custom_url, which is translated, instead of the array value, which isn't.
- torJavaScriptEnabledSearchPreference.setSummary(R.string.custom_url);
- } else {
- // Set the array value as the summary text.
- torJavaScriptEnabledSearchPreference.setSummary(presentTorJavaScriptEnabledSearchString);
+ case "search":
+ String newSearchString = sharedPreferences.getString("search", "https://duckduckgo.com/html/?q=");
+ if (newSearchString.equals("Custom URL")) { // Set the summary text to `R.string.custom_url`, which is translated.
+ searchPreference.setSummary(R.string.custom_url);
+ } else { // Set the new search URL as the summary text for the JavaScript-disabled search preference.
+ searchPreference.setSummary(newSearchString);
}
- // Set the status of `torJavaScriptEnabledSearchCustomURLPreference`.
- torJavaScriptEnabledSearchCustomURLPreference.setEnabled(presentTorJavaScriptEnabledSearchString.equals("Custom URL"));
+ // Enable or disable `searchCustomURLPreference`.
+ searchCustomURLPreference.setEnabled(newSearchString.equals("Custom URL"));
+ break;
+
+ case "search_custom_url":
+ // Set the new custom search URL as the summary text for `search_custom_url`. The default is `""`.
+ searchCustomURLPreference.setSummary(sharedPreferences.getString("search_custom_url", ""));
+ break;
+
+ case "enable_full_screen_browsing_mode":
+ // Enable `transparent_navigation_bar` only if full screen browsing mode is enabled and `hide_system_bars` is disabled.
+ translucentNavigationBarPreference.setEnabled(sharedPreferences.getBoolean("enable_full_screen_browsing_mode", false) && !sharedPreferences.getBoolean("hide_system_bars", false));
break;
- case "tor_javascript_enabled_search_custom_url":
- // Set the summary text for `tor_javascript_enabled_search_custom_url`.
- torJavaScriptEnabledSearchCustomURLPreference.setSummary(sharedPreferences.getString("tor_javascript_enabled_search_custom_url", ""));
+ case "hide_system_bars":
+ // Enable `translucentNavigationBarPreference` if `hide_system_bars` is disabled.
+ translucentNavigationBarPreference.setEnabled(!sharedPreferences.getBoolean("hide_system_bars", false));
break;
case "homepage":
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 summary text of `default_font_size`.
- defaultFontSizePreference.setSummary(newDefaultFontSizeString + "%%");
- break;
-
- case "hide_system_bars":
- // Enable `translucentNavigationBarPreference` if `hide_system_bars` is disabled.
- translucentNavigationBarPreference.setEnabled(!sharedPreferences.getBoolean("hide_system_bars", false));
+ defaultFontSizePreference.setSummary(sharedPreferences.getString("default_font_size", "100") + "%%");
break;
default:
projects / PrivacyBrowserAndroid.git / blobdiff