Combine JavaScript-enabled and JavaScript-disabled search into one. Fixes https...
authorSoren Stoutner <soren@stoutner.com>
Wed, 26 Apr 2017 23:54:06 +0000 (16:54 -0700)
committerSoren Stoutner <soren@stoutner.com>
Wed, 26 Apr 2017 23:54:06 +0000 (16:54 -0700)
app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java
app/src/main/res/values-de/strings.xml
app/src/main/res/values-es/strings.xml
app/src/main/res/values-it/strings.xml
app/src/main/res/values-zh-rTW/strings.xml
app/src/main/res/values/strings.xml
app/src/main/res/xml/preferences.xml

index 1a77420d89b673938509a1a75335c53a492498cd..c576b89aab6fa192aedc59bdc69173232bec580b 100644 (file)
@@ -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"`.
index 784996d6137f712990826aadad1b0d0236077fe7..3710531751d1b1041ea468a1f45070669439757b 100644 (file)
@@ -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":
index d43de584afbbf630f94078817e593193d04d69a9..f7270e7ffb525a23457947d4df95108a4587b8c6 100644 (file)
         <string name="proxy_through_orbot">Proxy durch Orbot</string>
         <string name="proxy_through_orbot_summary">Sämtlichen Web-Verkehr durch Orbot mittels localhost:8118 leiten.</string>
     <string name="search">Suche</string>
-        <string name="javascript_disabled_search">Suchmaschine bei deaktiviertem JavaScript</string>
-        <string-array name="javascript_disabled_search_entries">
-            <item>DuckDuckGo</item>
+        <string-array name="search_entries">
+            <item>DuckDuckGo JavaScript disabled</item>
+            <item>DuckDuckGo JavaScript enabled</item>
             <item>StartPage</item>
             <item>Google</item>
             <item>Bing</item>
-            <item>Yahoo</item>
-            <item>Qwant</item>
+            <item>Yahoo JavaScript disabled</item>
+            <item>Yahoo JavaScript enabled</item>
+            <item>Qwant JavaScript disabled</item>
+            <item>Qwant JavaScript enabled</item>
             <item>Eigene</item>
         </string-array>
-        <string name="javascript_disabled_search_custom_url">Suchmaschinen-URL bei deaktiviertem JavaScript</string>
-        <string name="javascript_enabled_search">Suchmaschine bei aktiviertem JavaScript</string>
-        <string-array name="javascript_enabled_search_entries">
-            <item>DuckDuckGo</item>
-            <item>StartPage</item>
-            <item>Google</item>
-            <item>Bing</item>
-            <item>Yahoo</item>
-            <item>Qwant</item>
-            <item>Eigene</item>
-        </string-array>
-        <string name="javascript_enabled_search_custom_url">Suchmaschinen-URL bei aktivertem JavaScript</string>
+        <string name="search_custom_url">Suchmaschinen-URL</string>
         <string name="custom_url">Eigene URL</string>
     <string name="general">Allgemein</string>
         <string name="homepage">Startseite</string>
             <string name="security_patch">Sicherheits-Patch:</string>
             <string name="webkit">WebKit:</string>
             <string name="chrome">Chrome:</string>
+            <string name="orbot">Orbot:</string>
     <string name="permissions">Berechtigungen</string>
     <string name="privacy_policy">Datenschutzrichtlinie</string>
     <string name="changelog">Changelog</string>
index 1e2d699dc9b0108105a4dfe1679906dd0214d99a..4e39ae2b8eee946cd6d4585a68a07e2bc7a20135 100644 (file)
         <string name="proxy_through_orbot">Enviar a través de Orbot</string>
         <string name="proxy_through_orbot_summary">Enviar todo el tráfico web a través de Orbot en localhost:8118.</string>
         <string name="tor_homepage">Página de inicio de Tor</string>
-        <string name="tor_javascript_disabled_search">Buscar en Tor con Javascript deshabilitado.</string>
-        <string-array name="tor_javascript_disabled_search_entries">
-            <item>DuckDuckGo</item>
+        <string name="tor_search">Búsqueda en Tor</string>
+        <string-array name="tor_search_entries">
+            <item>DuckDuckGo Javascript deshabilitado</item>
+            <item>DuckDuckGo Javascript habilitado</item>
             <item>Personalizado</item>
         </string-array>
-        <string name="tor_javascript_disabled_search_custom_url">URL personalizada de búsqueda en Tor con Javascript deshabilitado</string>
-        <string name="tor_javascript_enabled_search">Buscar en Tor con JavaScript habilitado</string>
-        <string-array name="tor_javascript_enabled_search_entries">
-            <item>DuckDuckGo</item>
-            <item>Personalizado</item>
-        </string-array>
-        <string name="tor_javascript_enabled_search_custom_url">URL personalizada de búsqueda en Tor con JavaScript habilitado</string>
+        <string name="tor_search_custom_url">URL personalizada de búsqueda en Tor</string>
     <string name="search">Buscar</string>
-        <string name="javascript_disabled_search">Búsqueda de Javascript deshabilitado</string>
-        <string-array name="javascript_disabled_search_entries">
-            <item>DuckDuckGo</item>
-            <item>StartPage</item>
-            <item>Google</item>
-            <item>Bing</item>
-            <item>Yahoo</item>
-            <item>Qwant</item>
-            <item>Personalizado</item>
-        </string-array>
-        <string name="javascript_disabled_search_custom_url">URL personalizado de búsqueda de Javascript deshabilitado</string>
-        <string name="javascript_enabled_search">Búsqueda de Javascript habilitado</string>
-        <string-array name="javascript_enabled_search_entries">
-            <item>DuckDuckGo</item>
+        <string-array name="search_entries">
+            <item>DuckDuckGo Javascript deshabilitado</item>
+            <item>DuckDuckGo Javascript habilitado</item>
             <item>StartPage</item>
             <item>Google</item>
             <item>Bing</item>
-            <item>Yahoo</item>
-            <item>Qwant</item>
+            <item>Yahoo Javascript deshabilitado</item>
+            <item>Yahoo Javascript habilitado</item>
+            <item>Qwant Javascript deshatilitado</item>
+            <item>Qwant Javascript habilitado</item>
             <item>Personalizado</item>
         </string-array>
-        <string name="javascript_enabled_search_custom_url">URL personalizado de búsqueda de Javascript habilitado</string>
+        <string name="search_custom_url">URL personalizado de búsqueda</string>
         <string name="custom_url">URL personalizado</string>
     <string name="full_screen">Pantalla Completa</string>
         <string name="enable_full_screen_browsing_mode">Habilitar pantalla completa</string>
             <string name="security_patch">Parche de seguridad:</string>
             <string name="webkit">WebKit:</string>
             <string name="chrome">Chrome:</string>
+            <string name="orbot">Orbot:</string>
         <string name="package_signature">Firma del paquete</string>
             <string name="issuer_dn">DN del emisor:</string>
             <string name="subject_dn">DN del sujeto:</string>
index 6cad129c375e02a00d6345fc85ee8923966930db..1013079eb466ea4cc117580e61682fe5cea8d16f 100644 (file)
         <string name="proxy_through_orbot">Utilizza Proxy con Orbot</string>
         <string name="proxy_through_orbot_summary">Utilizza Proxy attraverso Orbot su localhost:8118.</string>
         <string name="tor_homepage">Tor Homepage</string>
-        <string name="tor_javascript_disabled_search">Tor - Ricerca con JavaScript disabilitato</string>
-        <string-array name="tor_javascript_disabled_search_entries">
-            <item>DuckDuckGo</item>
+        <string name="tor_search">Tor - Ricerca</string>
+        <string-array name="tor_search_entries">
+            <item>DuckDuckGo JavaScript disabled</item>
+            <item>DuckDuckGo JavaScript enabled</item>
             <item>Custom</item>
         </string-array>
-        <string name="tor_javascript_disabled_search_custom_url">Tor - Ricerca personalizzata con JavaScript disabilitato</string>
-        <string name="tor_javascript_enabled_search">Tor - Ricerca con JavaScript abilitato</string>
-        <string-array name="tor_javascript_enabled_search_entries">
-            <item>DuckDuckGo</item>
-            <item>Custom</item>
-        </string-array>
-        <string name="tor_javascript_enabled_search_custom_url">Tor - Ricerca personalizzata con JavaScript abilitato</string>
+        <string name="tor_search_custom_url">Tor - Ricerca personalizzata</string>
     <string name="search">Ricerca</string>
-        <string name="javascript_disabled_search">Ricerca con JavaScript disabilitato</string>
-        <string-array name="javascript_disabled_search_entries">
-            <item>DuckDuckGo</item>
-            <item>StartPage</item>
-            <item>Google</item>
-            <item>Bing</item>
-            <item>Yahoo</item>
-            <item>Qwant</item>
-            <item>Custom</item>
-        </string-array>
-        <string name="javascript_disabled_search_custom_url">Ricerca personalizzata con JavaScript disabilitato</string>
-        <string name="javascript_enabled_search">Ricerca con JavaScript abilitato</string>
-        <string-array name="javascript_enabled_search_entries">
-            <item>DuckDuckGo</item>
+        <string-array name="search_entries">
+            <item>DuckDuckGo JavaScript disabled</item>
+            <item>DuckDuckGo JavaScript enabled</item>
             <item>StartPage</item>
             <item>Google</item>
             <item>Bing</item>
-            <item>Yahoo</item>
-            <item>Qwant</item>
+            <item>Yahoo JavaScript disabled</item>
+            <item>Yahoo JavaScript enabled</item>
+            <item>Qwant JavaScript disabled</item>
+            <item>Qwant JavaScript enabled</item>
             <item>Custom</item>
         </string-array>
-        <string name="javascript_enabled_search_custom_url">Ricerca personalizzata con JavaScript abilitato</string>
+        <string name="search_custom_url">Ricerca personalizzata</string>
         <string name="custom_url">URL Personalizzata</string>
     <string name="full_screen">Schermo intero</string>
         <string name="enable_full_screen_browsing_mode">Abilita la navigazione a schermo intero</string>
             <string name="security_patch">Patch si sicurezza:</string>
             <string name="webkit">WebKit:</string>
             <string name="chrome">Chrome:</string>
+            <string name="orbot">Orbot:</string>
         <string name="package_signature">Firma del Pacchetto</string>
             <string name="issuer_dn">Emittente:</string>
             <string name="subject_dn">Soggetto:</string>
index 542ff1db980d854744fb6daaa1898e3660808696..4a719eb6cd9b103206f2bf2c1791a4fc3a0b9e47 100644 (file)
     <string name="tor">Tor</string>
         <string name="proxy_through_orbot">Proxy through Orbot</string>
         <string name="proxy_through_orbot_summary">Proxy all web traffic through Orbot on localhost:8118.</string>
-        <string name="tor_homepage">Tor Homepage</string>
-        <string name="tor_javascript_disabled_search">Tor JavaScript-disabled search</string>
-        <string-array name="tor_javascript_disabled_search_entries">
-            <item>DuckDuckGo</item>
+        <string name="tor_homepage">Tor homepage</string>
+        <string name="tor_search">Tor search</string>
+        <string-array name="tor_search_entries">
+            <item>DuckDuckGo JavaScript disabled</item>
+            <item>DuckDuckGo JavaScript enabled</item>
             <item>Custom</item>
         </string-array>
-        <string name="tor_javascript_disabled_search_custom_url">Tor JavaScript-disabled search custom URL</string>
-        <string name="tor_javascript_enabled_search">Tor JavaScript-enabled search</string>
-        <string-array name="tor_javascript_enabled_search_entries">
-            <item>DuckDuckGo</item>
-            <item>Custom</item>
-        </string-array>
-        <string name="tor_javascript_enabled_search_custom_url">Tor JavaScript-enabled search custom URL</string>
+        <string name="tor_search_custom_url">Tor search custom URL</string>
     <string name="search">Search</string>
-        <string name="javascript_disabled_search">JavaScript-disabled search</string>
-        <string-array name="javascript_disabled_search_entries">
-            <item>DuckDuckGo</item>
-            <item>StartPage</item>
-            <item>Google</item>
-            <item>Bing</item>
-            <item>Yahoo</item>
-            <item>Qwant</item>
-            <item>Custom</item>
-        </string-array>
-        <string name="javascript_disabled_search_custom_url">JavaScript-disabled search custom URL</string>
-        <string name="javascript_enabled_search">JavaScript-enabled search</string>
-        <string-array name="javascript_enabled_search_entries">
-            <item>DuckDuckGo</item>
+        <string-array name="search_entries">
+            <item>DuckDuckGo JavaScript disabled</item>
+            <item>DuckDuckGo JavaScript enabled</item>
             <item>StartPage</item>
             <item>Google</item>
             <item>Bing</item>
-            <item>Yahoo</item>
-            <item>Qwant</item>
+            <item>Yahoo JavaScript disabled</item>
+            <item>Yahoo JavaScript enabled</item>
+            <item>Qwant JavaScript disabled</item>
+            <item>Qwant JavaScript enabled</item>
             <item>Custom</item>
         </string-array>
-        <string name="javascript_enabled_search_custom_url">JavaScript-enabled search custom URL</string>
+        <string name="search_custom_url">Search custom URL</string>
         <string name="custom_url">Custom URL</string>
     <string name="full_screen">Full Screen</string>
         <string name="enable_full_screen_browsing_mode">Enable full screen browsing mode</string>
             <string name="security_patch">Security Patch:</string>
             <string name="webkit">WebKit:</string>
             <string name="chrome">Chrome:</string>
+            <string name="orbot">Orbot:</string>
         <string name="package_signature">Package Signature</string>
             <string name="issuer_dn">Issuer DN:</string>
             <string name="subject_dn">Subject DN:</string>
index 9264fbf66d9107b00317f1c7928fdfe83f8be4e2..1d867d4eae1f0054a826e0448c4aa6d48e437fde 100644 (file)
     <string name="tor">Tor</string>
         <string name="proxy_through_orbot">Proxy through Orbot</string>
         <string name="proxy_through_orbot_summary">Proxy all web traffic through Orbot on localhost:8118.</string>
-        <string name="tor_homepage">Tor Homepage</string>
-        <string name="tor_javascript_disabled_search">Tor JavaScript-disabled search</string>
-        <string-array name="tor_javascript_disabled_search_entries">
-            <item>DuckDuckGo</item>
+        <string name="tor_homepage">Tor homepage</string>
+        <string name="tor_search">Tor search</string>
+        <string-array name="tor_search_entries">
+            <item>DuckDuckGo JavaScript disabled</item>
+            <item>DuckDuckGo JavaScript enabled</item>
             <item>Custom</item>
         </string-array>
-        <string-array name="tor_javascript_disabled_search_entry_values" translatable="false">  <!-- None of the items in this `string-array` should be translated. -->
+        <string-array name="tor_search_entry_values" translatable="false">  <!-- None of the items in this `string-array` should be translated. -->
             <item>https://3g2upl4pq6kufc4m.onion/html/?q=</item>
-            <item>Custom URL</item><!-- This item must not be translated into other languages because it is referenced in code.  It is never displayed on the screen. -->
-        </string-array>
-        <string name="tor_javascript_disabled_search_custom_url">Tor JavaScript-disabled search custom URL</string>
-        <string name="tor_javascript_enabled_search">Tor JavaScript-enabled search</string>
-        <string-array name="tor_javascript_enabled_search_entries">
-            <item>DuckDuckGo</item>
-            <item>Custom</item>
-        </string-array>
-        <string-array name="tor_javascript_enabled_search_entry_values" translatable="false">  <!-- None of the items in this `string-array` should be translated. -->
             <item>https://3g2upl4pq6kufc4m.onion/?q=</item>
-            <item>Custom URL</item>  <!-- This item must not be translated into other languages because it is referenced in code.  It is never displayed on the screen. -->
+            <item>Custom URL</item><!-- This item must not be translated into other languages because it is referenced in code.  It is never displayed on the screen. -->
         </string-array>
-        <string name="tor_javascript_enabled_search_custom_url">Tor JavaScript-enabled search custom URL</string>
+        <string name="tor_search_custom_url">Tor search custom URL</string>
     <string name="search">Search</string>
-        <string name="javascript_disabled_search">JavaScript-disabled search</string>
-        <string-array name="javascript_disabled_search_entries">
-            <item>DuckDuckGo</item>
+        <string-array name="search_entries">
+            <item>DuckDuckGo JavaScript disabled</item>
+            <item>DuckDuckGo JavaScript enabled</item>
             <item>StartPage</item>
             <item>Google</item>
             <item>Bing</item>
-            <item>Yahoo</item>
-            <item>Qwant</item>
+            <item>Yahoo JavaScript disabled</item>
+            <item>Yahoo JavaScript enabled</item>
+            <item>Qwant JavaScript disabled</item>
+            <item>Qwant JavaScript enabled</item>
             <item>Custom</item>
         </string-array>
-        <string-array name="javascript_disabled_search_entry_values" translatable="false">  <!-- None of the items in this `string-array` should be translated. -->
+        <string-array name="search_entry_values" translatable="false">  <!-- None of the items in this `string-array` should be translated. -->
             <item>https://duckduckgo.com/html/?q=</item>
-            <item>https://www.startpage.com/do/search?q=</item>
-            <item>https://www.google.com/search?q=</item>
-            <item>https://www.bing.com/search?q=</item>
-            <item>https://search.yahoo.com/mobile/s?nojs=1&amp;p=</item>
-            <item>https://lite.qwant.com/?q=</item>
-            <item>Custom URL</item>  <!-- This item must not be translated into other languages because it is referenced in code.  It is never displayed on the screen. -->
-        </string-array>
-        <string name="javascript_disabled_search_custom_url">JavaScript-disabled search custom URL</string>
-        <string name="javascript_enabled_search">JavaScript-enabled search</string>
-        <string-array name="javascript_enabled_search_entries">
-            <item>DuckDuckGo</item>
-            <item>StartPage</item>
-            <item>Google</item>
-            <item>Bing</item>
-            <item>Yahoo</item>
-            <item>Qwant</item>
-            <item>Custom</item>
-        </string-array>
-        <string-array name="javascript_enabled_search_entry_values" translatable="false">  <!-- None of the items in this `string-array` should be translated. -->
             <item>https://duckduckgo.com/?q=</item>
             <item>https://www.startpage.com/do/search?q=</item>
             <item>https://www.google.com/search?q=</item>
             <item>https://www.bing.com/search?q=</item>
+            <item>https://search.yahoo.com/mobile/s?nojs=1&amp;p=</item>
             <item>https://search.yahoo.com/mobile/s?p=</item>
+            <item>https://lite.qwant.com/?q=</item>
             <item>https://www.qwant.com/?q=</item>
             <item>Custom URL</item>  <!-- This item must not be translated into other languages because it is referenced in code.  It is never displayed on the screen. -->
         </string-array>
-        <string name="javascript_enabled_search_custom_url">JavaScript-enabled search custom URL</string>
+        <string name="search_custom_url">Search custom URL</string>
         <string name="custom_url">Custom URL</string>
     <string name="full_screen">Full Screen</string>
         <string name="enable_full_screen_browsing_mode">Enable full screen browsing mode</string>
index 8f813b7501920b4795542f5eb2d2b0bdb54a1df9..91717abfe60734689ff5147bf87342530bbbfe90 100644 (file)
             android:inputType="textUri" />
 
         <ListPreference
-            android:key="tor_javascript_disabled_search"
-            android:title="@string/tor_javascript_disabled_search"
-            android:entries="@array/tor_javascript_disabled_search_entries"
-            android:entryValues="@array/tor_javascript_disabled_search_entry_values"
+            android:key="tor_search"
+            android:title="@string/tor_search"
+            android:entries="@array/tor_search_entries"
+            android:entryValues="@array/tor_search_entry_values"
             android:defaultValue="https://3g2upl4pq6kufc4m.onion/html/?q=" />
 
         <EditTextPreference
-            android:key="tor_javascript_disabled_search_custom_url"
-            android:title="@string/tor_javascript_disabled_search_custom_url"
-            android:defaultValue=""
-            android:inputType="textUri" />
-
-        <ListPreference
-            android:key="tor_javascript_enabled_search"
-            android:title="@string/tor_javascript_enabled_search"
-            android:entries="@array/tor_javascript_enabled_search_entries"
-            android:entryValues="@array/tor_javascript_enabled_search_entry_values"
-            android:defaultValue="https://3g2upl4pq6kufc4m.onion/?q=" />
-
-        <EditTextPreference
-            android:key="tor_javascript_enabled_search_custom_url"
-            android:title="@string/tor_javascript_enabled_search_custom_url"
+            android:key="tor_search_custom_url"
+            android:title="@string/tor_search_custom_url"
             android:defaultValue=""
             android:inputType="textUri" />
     </PreferenceCategory>
 
     <PreferenceCategory
-        android:key="search"
+        android:key="search_category"
         android:title="@string/search">
 
         <ListPreference
-            android:key="javascript_disabled_search"
-            android:title="@string/javascript_disabled_search"
-            android:entries="@array/javascript_disabled_search_entries"
-            android:entryValues="@array/javascript_disabled_search_entry_values"
+            android:key="search"
+            android:title="@string/search"
+            android:entries="@array/search_entries"
+            android:entryValues="@array/search_entry_values"
             android:defaultValue="https://duckduckgo.com/html/?q=" />
 
         <EditTextPreference
-            android:key="javascript_disabled_search_custom_url"
-            android:title="@string/javascript_disabled_search_custom_url"
-            android:defaultValue=""
-            android:inputType="textUri" />
-
-        <ListPreference
-            android:key="javascript_enabled_search"
-            android:title="@string/javascript_enabled_search"
-            android:entries="@array/javascript_enabled_search_entries"
-            android:entryValues="@array/javascript_enabled_search_entry_values"
-            android:defaultValue="https://duckduckgo.com/?q=" />
-
-        <EditTextPreference
-            android:key="javascript_enabled_search_custom_url"
-            android:title="@string/javascript_enabled_search_custom_url"
+            android:key="search_custom_url"
+            android:title="@string/search_custom_url"
             android:defaultValue=""
             android:inputType="textUri" />
     </PreferenceCategory>