From 76a37e5ce26f7d4ebe57d38cecc842e4c6c15819 Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Wed, 26 Apr 2017 16:54:06 -0700 Subject: [PATCH] Combine JavaScript-enabled and JavaScript-disabled search into one. Fixes https://redmine.stoutner.com/issues/122. --- .../activities/MainWebViewActivity.java | 57 ++--- .../fragments/SettingsFragment.java | 222 ++++++------------ app/src/main/res/values-de/strings.xml | 26 +- app/src/main/res/values-es/strings.xml | 41 ++-- app/src/main/res/values-it/strings.xml | 41 ++-- app/src/main/res/values-zh-rTW/strings.xml | 43 ++-- app/src/main/res/values/strings.xml | 61 ++--- app/src/main/res/xml/preferences.xml | 52 +--- 8 files changed, 172 insertions(+), 371 deletions(-) diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java index 1a77420d..c576b89a 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java @@ -194,11 +194,8 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // 'homepage' is used in `onCreate()`, `onNavigationItemSelected()`, and `applyAppSettings()`. private String homepage; - // `javaScriptDisabledSearchURL` is used in `loadURLFromTextBox()` and `applyAppSettings()`. - private String javaScriptDisabledSearchURL; - - // `javaScriptEnabledSearchURL` is used in `loadURLFromTextBox()` and `applyAppSettings()`. - private String javaScriptEnabledSearchURL; + // `searchURL` is used in `loadURLFromTextBox()` and `applyAppSettings()`. + private String searchURL; // `adBlockerEnabled` is used in `onCreate()` and `applyAppSettings()`. private boolean adBlockerEnabled; @@ -1896,12 +1893,8 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // Sanitize the search input and convert it to a search. final String encodedUrlString = URLEncoder.encode(unformattedUrlString, "UTF-8"); - // Use the correct search URL. - if (javaScriptEnabled) { // JavaScript is enabled. - formattedUrlString = javaScriptEnabledSearchURL + encodedUrlString; - } else { // JavaScript is disabled. - formattedUrlString = javaScriptDisabledSearchURL + encodedUrlString; - } + // Add the base search URL. + formattedUrlString = searchURL + encodedUrlString; } loadUrl(formattedUrlString); @@ -2130,16 +2123,12 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this); // Store the values from `sharedPreferences` in variables. - String javaScriptDisabledSearchString = sharedPreferences.getString("javascript_disabled_search", "https://duckduckgo.com/html/?q="); - String javaScriptDisabledSearchCustomURLString = sharedPreferences.getString("javascript_disabled_search_custom_url", ""); - String javaScriptEnabledSearchString = sharedPreferences.getString("javascript_enabled_search", "https://duckduckgo.com/?q="); - String javaScriptEnabledSearchCustomURLString = sharedPreferences.getString("javascript_enabled_search_custom_url", ""); String homepageString = sharedPreferences.getString("homepage", "https://duckduckgo.com"); String torHomepageString = sharedPreferences.getString("tor_homepage", "https://3g2upl4pq6kufc4m.onion"); - String torJavaScriptDisabledSearchString = sharedPreferences.getString("tor_javascript_disabled_search", "https://3g2upl4pq6kufc4m.onion/html/?q="); - String torJavaScriptDisabledSearchCustomURLString = sharedPreferences.getString("tor_javascript_disabled_search_custom_url", ""); - String torJavaScriptEnabledSearchString = sharedPreferences.getString("tor_javascript_enabled_search", "https://3g2upl4pq6kufc4m.onion/?q="); - String torJavaScriptEnabledSearchCustomURLString = sharedPreferences.getString("tor_javascript_enabled_search_custom_url", ""); + String torSearchString = sharedPreferences.getString("tor_search", "https://3g2upl4pq6kufc4m.onion/html/?q="); + String torSearchCustomURLString = sharedPreferences.getString("tor_search_custom_url", ""); + String searchString = sharedPreferences.getString("search", "https://duckduckgo.com/html/?q="); + String searchCustomURLString = sharedPreferences.getString("search_custom_url", ""); adBlockerEnabled = sharedPreferences.getBoolean("block_ads", true); incognitoModeEnabled = sharedPreferences.getBoolean("incognito_mode", false); boolean doNotTrackEnabled = sharedPreferences.getBoolean("do_not_track", false); @@ -2159,18 +2148,11 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation formattedUrlString = homepage; } - // Set JavaScript disabled search. - if (torJavaScriptDisabledSearchString.equals("Custom URL")) { // Get the custom URL string. - javaScriptDisabledSearchURL = torJavaScriptDisabledSearchCustomURLString; - } else { // Use the string from the pre-built list. - javaScriptDisabledSearchURL = torJavaScriptDisabledSearchString; - } - - // Set JavaScript enabled search. - if (torJavaScriptEnabledSearchString.equals("Custom URL")) { // Get the custom URL string. - javaScriptEnabledSearchURL = torJavaScriptEnabledSearchCustomURLString; + // Set the search URL. + if (torSearchString.equals("Custom URL")) { // Get the custom URL string. + searchURL = torSearchCustomURLString; } else { // Use the string from the pre-built list. - javaScriptEnabledSearchURL = torJavaScriptEnabledSearchString; + searchURL = torSearchString; } // Set the proxy. `this` refers to the current activity where an `AlertDialog` might be displayed. @@ -2193,18 +2175,11 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation formattedUrlString = homepage; } - // Set JavaScript disabled search. - if (javaScriptDisabledSearchString.equals("Custom URL")) { // Get the custom URL string. - javaScriptDisabledSearchURL = javaScriptDisabledSearchCustomURLString; - } else { // Use the string from the pre-built list. - javaScriptDisabledSearchURL = javaScriptDisabledSearchString; - } - - // Set JavaScript enabled search. - if (javaScriptEnabledSearchString.equals("Custom URL")) { // Get the custom URL string. - javaScriptEnabledSearchURL = javaScriptEnabledSearchCustomURLString; + // Set the search URL. + if (searchString.equals("Custom URL")) { // Get the custom URL string. + searchURL = searchCustomURLString; } else { // Use the string from the pre-built list. - javaScriptEnabledSearchURL = javaScriptEnabledSearchString; + searchURL = searchString; } // Reset the proxy to default. The host is `""` and the port is `"0"`. 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 784996d6..37105317 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java @@ -47,17 +47,13 @@ public class SettingsFragment extends PreferenceFragment { final Preference thirdPartyCookiesEnabled = findPreference("third_party_cookies_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"); @@ -66,10 +62,8 @@ public class SettingsFragment extends PreferenceFragment { final boolean proxyThroughOrbot = savedPreferences.getBoolean("proxy_through_orbot", false); // 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 torSearchString = savedPreferences.getString("tor_search", "https://3g2upl4pq6kufc4m.onion/html/?q="); + String searchString = savedPreferences.getString("search", "https://duckduckgo.com/html/?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. @@ -108,32 +102,42 @@ public class SettingsFragment extends PreferenceFragment { 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")) { + // 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 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. - javaScriptDisabledSearchPreference.setSummary(R.string.custom_url); + torSearchPreference.setSummary(R.string.custom_url); } else { // Set the array value as the summary text. - javaScriptDisabledSearchPreference.setSummary(javaScriptDisabledSearchString); + torSearchPreference.setSummary(torSearchString); } - // 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 summary text for `torsearch_custom_url`. The default is `""`. + torSearchCustomURLPreference.setSummary(savedPreferences.getString("tor_search_custom_url", "")); + + // Enable the Tor preferences only if `proxy_through_orbot` is enabled. The default is `false`. + torHomepagePreference.setEnabled(proxyThroughOrbot); + torSearchPreference.setEnabled(proxyThroughOrbot); + + // Enable the Tor custom URL search options only if `proxyThroughOrbot` is true and the search is set to `Custom URL`. + torSearchCustomURLPreference.setEnabled(proxyThroughOrbot && torSearchString.equals("Custom URL")); - // 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 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. + searchPreference.setSummary(R.string.custom_url); } else { // Set the array value as the summary text. - javaScriptEnabledSearchPreference.setSummary(javaScriptEnabledSearchString); + searchPreference.setSummary(searchString); } - // 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 `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")); // Enable the full screen options if full screen browsing mode is enabled. @@ -147,46 +151,6 @@ public class SettingsFragment extends PreferenceFragment { } - // 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")) { - // Use R.string.custom_url, which will be translated, instead of the array value, which will not. - torJavaScriptDisabledSearchPreference.setSummary(R.string.custom_url); - } else { - // Set the array value as the summary text. - torJavaScriptDisabledSearchPreference.setSummary(torJavaScriptDisabledSearchString); - } - - // 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 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); - } - - // Set the summary text for `tor_javascript_enabled_search_custom_url`. The default is `""`. - torJavaScriptEnabledSearchCustomURLPreference.setSummary(savedPreferences.getString("tor_javascript_enabled_search_custom_url", "")); - - - // Enable the Tor preferences only if `proxy_through_orbot` is enabled. The default is `false`. - torHomepagePreference.setEnabled(proxyThroughOrbot); - torJavaScriptDisabledSearchPreference.setEnabled(proxyThroughOrbot); - torJavaScriptEnabledSearchPreference.setEnabled(proxyThroughOrbot); - - // 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 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")); @@ -243,69 +207,17 @@ public class SettingsFragment extends PreferenceFragment { 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="); + String currentTorSearchString = sharedPreferences.getString("tor_search", "https://3g2upl4pq6kufc4m.onion/html/?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); + torSearchPreference.setEnabled(currentProxyThroughOrbot); - // 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": @@ -313,48 +225,58 @@ public class SettingsFragment extends PreferenceFragment { 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 "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 "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": + 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 "homepage": diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index d43de584..f7270e7f 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -220,28 +220,19 @@ Proxy durch Orbot Sämtlichen Web-Verkehr durch Orbot mittels localhost:8118 leiten. Suche - Suchmaschine bei deaktiviertem JavaScript - - DuckDuckGo + + DuckDuckGo JavaScript disabled + DuckDuckGo JavaScript enabled StartPage Google Bing - Yahoo - Qwant + Yahoo JavaScript disabled + Yahoo JavaScript enabled + Qwant JavaScript disabled + Qwant JavaScript enabled Eigene - Suchmaschinen-URL bei deaktiviertem JavaScript - Suchmaschine bei aktiviertem JavaScript - - DuckDuckGo - StartPage - Google - Bing - Yahoo - Qwant - Eigene - - Suchmaschinen-URL bei aktivertem JavaScript + Suchmaschinen-URL Eigene URL Allgemein Startseite @@ -282,6 +273,7 @@ Sicherheits-Patch: WebKit: Chrome: + Orbot: Berechtigungen Datenschutzrichtlinie Changelog diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 1e2d699d..4e39ae2b 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -237,41 +237,27 @@ Enviar a través de Orbot Enviar todo el tráfico web a través de Orbot en localhost:8118. Página de inicio de Tor - Buscar en Tor con Javascript deshabilitado. - - DuckDuckGo + Búsqueda en Tor + + DuckDuckGo Javascript deshabilitado + DuckDuckGo Javascript habilitado Personalizado - URL personalizada de búsqueda en Tor con Javascript deshabilitado - Buscar en Tor con JavaScript habilitado - - DuckDuckGo - Personalizado - - URL personalizada de búsqueda en Tor con JavaScript habilitado + URL personalizada de búsqueda en Tor Buscar - Búsqueda de Javascript deshabilitado - - DuckDuckGo - StartPage - Google - Bing - Yahoo - Qwant - Personalizado - - URL personalizado de búsqueda de Javascript deshabilitado - Búsqueda de Javascript habilitado - - DuckDuckGo + + DuckDuckGo Javascript deshabilitado + DuckDuckGo Javascript habilitado StartPage Google Bing - Yahoo - Qwant + Yahoo Javascript deshabilitado + Yahoo Javascript habilitado + Qwant Javascript deshatilitado + Qwant Javascript habilitado Personalizado - URL personalizado de búsqueda de Javascript habilitado + URL personalizado de búsqueda URL personalizado Pantalla Completa Habilitar pantalla completa @@ -320,6 +306,7 @@ Parche de seguridad: WebKit: Chrome: + Orbot: Firma del paquete DN del emisor: DN del sujeto: diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 6cad129c..1013079e 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -239,41 +239,27 @@ Utilizza Proxy con Orbot Utilizza Proxy attraverso Orbot su localhost:8118. Tor Homepage - Tor - Ricerca con JavaScript disabilitato - - DuckDuckGo + Tor - Ricerca + + DuckDuckGo JavaScript disabled + DuckDuckGo JavaScript enabled Custom - Tor - Ricerca personalizzata con JavaScript disabilitato - Tor - Ricerca con JavaScript abilitato - - DuckDuckGo - Custom - - Tor - Ricerca personalizzata con JavaScript abilitato + Tor - Ricerca personalizzata Ricerca - Ricerca con JavaScript disabilitato - - DuckDuckGo - StartPage - Google - Bing - Yahoo - Qwant - Custom - - Ricerca personalizzata con JavaScript disabilitato - Ricerca con JavaScript abilitato - - DuckDuckGo + + DuckDuckGo JavaScript disabled + DuckDuckGo JavaScript enabled StartPage Google Bing - Yahoo - Qwant + Yahoo JavaScript disabled + Yahoo JavaScript enabled + Qwant JavaScript disabled + Qwant JavaScript enabled Custom - Ricerca personalizzata con JavaScript abilitato + Ricerca personalizzata URL Personalizzata Schermo intero Abilita la navigazione a schermo intero @@ -322,6 +308,7 @@ Patch si sicurezza: WebKit: Chrome: + Orbot: Firma del Pacchetto Emittente: Soggetto: diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 542ff1db..4a719eb6 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -240,42 +240,28 @@ Tor Proxy through Orbot Proxy all web traffic through Orbot on localhost:8118. - Tor Homepage - Tor JavaScript-disabled search - - DuckDuckGo + Tor homepage + Tor search + + DuckDuckGo JavaScript disabled + DuckDuckGo JavaScript enabled Custom - Tor JavaScript-disabled search custom URL - Tor JavaScript-enabled search - - DuckDuckGo - Custom - - Tor JavaScript-enabled search custom URL + Tor search custom URL Search - JavaScript-disabled search - - DuckDuckGo - StartPage - Google - Bing - Yahoo - Qwant - Custom - - JavaScript-disabled search custom URL - JavaScript-enabled search - - DuckDuckGo + + DuckDuckGo JavaScript disabled + DuckDuckGo JavaScript enabled StartPage Google Bing - Yahoo - Qwant + Yahoo JavaScript disabled + Yahoo JavaScript enabled + Qwant JavaScript disabled + Qwant JavaScript enabled Custom - JavaScript-enabled search custom URL + Search custom URL Custom URL Full Screen Enable full screen browsing mode @@ -324,6 +310,7 @@ Security Patch: WebKit: Chrome: + Orbot: Package Signature Issuer DN: Subject DN: diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9264fbf6..1d867d4e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -257,68 +257,45 @@ Tor Proxy through Orbot Proxy all web traffic through Orbot on localhost:8118. - Tor Homepage - Tor JavaScript-disabled search - - DuckDuckGo + Tor homepage + Tor search + + DuckDuckGo JavaScript disabled + DuckDuckGo JavaScript enabled Custom - + https://3g2upl4pq6kufc4m.onion/html/?q= - Custom URL - - Tor JavaScript-disabled search custom URL - Tor JavaScript-enabled search - - DuckDuckGo - Custom - - https://3g2upl4pq6kufc4m.onion/?q= - Custom URL + Custom URL - Tor JavaScript-enabled search custom URL + Tor search custom URL Search - JavaScript-disabled search - - DuckDuckGo + + DuckDuckGo JavaScript disabled + DuckDuckGo JavaScript enabled StartPage Google Bing - Yahoo - Qwant + Yahoo JavaScript disabled + Yahoo JavaScript enabled + Qwant JavaScript disabled + Qwant JavaScript enabled Custom - + https://duckduckgo.com/html/?q= - https://www.startpage.com/do/search?q= - https://www.google.com/search?q= - https://www.bing.com/search?q= - https://search.yahoo.com/mobile/s?nojs=1&p= - https://lite.qwant.com/?q= - Custom URL - - JavaScript-disabled search custom URL - JavaScript-enabled search - - DuckDuckGo - StartPage - Google - Bing - Yahoo - Qwant - Custom - - https://duckduckgo.com/?q= https://www.startpage.com/do/search?q= https://www.google.com/search?q= https://www.bing.com/search?q= + https://search.yahoo.com/mobile/s?nojs=1&p= https://search.yahoo.com/mobile/s?p= + https://lite.qwant.com/?q= https://www.qwant.com/?q= Custom URL - JavaScript-enabled search custom URL + Search custom URL Custom URL Full Screen Enable full screen browsing mode diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 8f813b75..91717abf 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -103,59 +103,33 @@ android:inputType="textUri" /> - - - - - - - - -- 2.43.0