From: Soren Stoutner <soren@stoutner.com>
Date: Wed, 5 Jul 2017 21:36:31 +0000 (-0700)
Subject: Add Searx to the list of search engines.  Implements https://redmine.stoutner.com... 
X-Git-Tag: v2.5~20
X-Git-Url: https://gitweb.stoutner.com/?a=commitdiff_plain;h=f0bd4776ebb80b72cda359797823f97bf95600f0;p=PrivacyBrowserAndroid.git

Add Searx to the list of search engines.  Implements https://redmine.stoutner.com/issues/163.
---

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 67a4700d..f826f6d1 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
@@ -2644,7 +2644,7 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation
 
         if (urlString.startsWith("http://")) {  // Highlight connections that are not encrypted.
             urlTextBox.getText().setSpan(redColorSpan, 0, 7, Spanned.SPAN_INCLUSIVE_INCLUSIVE);
-            urlTextBox.getText().setSpan(boldStyleSpan, 0, 7, Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+            // urlTextBox.getText().setSpan(boldStyleSpan, 0, 7, Spanned.SPAN_INCLUSIVE_INCLUSIVE);
         } else if (urlString.startsWith("https://")) {  // Highlight connections that are encrypted.
             urlTextBox.getText().setSpan(initialGrayColorSpan, 0, 8, Spanned.SPAN_INCLUSIVE_INCLUSIVE);
         }
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index f6cf1220..25129dfe 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -224,12 +224,13 @@
             <item>DuckDuckGo - JavaScript disabled</item>
             <item>DuckDuckGo - JavaScript enabled</item>
             <item>StartPage</item>
+            <item>Qwant - JavaScript disabled</item>
+            <item>Qwant - JavaScript enabled</item>
+            <item>Searx</item>
             <item>Google</item>
             <item>Bing</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="search_custom_url">Suchmaschinen-URL</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 04513182..ed5790dc 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -255,12 +255,13 @@
             <item>DuckDuckGo - Javascript deshabilitado</item>
             <item>DuckDuckGo - Javascript habilitado</item>
             <item>StartPage</item>
+            <item>Qwant - Javascript deshatilitado</item>
+            <item>Qwant - Javascript habilitado</item>
+            <item>Searx</item>
             <item>Google</item>
             <item>Bing</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="search_custom_url">URL personalizado de búsqueda</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index e291221b..6ae6b91c 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -257,12 +257,13 @@
             <item>DuckDuckGo - JavaScript disabilitato</item>
             <item>DuckDuckGo - JavaScript abilitato</item>
             <item>StartPage</item>
+            <item>Qwant - JavaScript disabilitato</item>
+            <item>Qwant - JavaScript abilitato</item>
+            <item>Searx</item>
             <item>Google</item>
             <item>Bing</item>
             <item>Yahoo - JavaScript disabilitato</item>
             <item>Yahoo - JavaScript abilitato</item>
-            <item>Qwant - JavaScript disabilitato</item>
-            <item>Qwant - JavaScript abilitato</item>
             <item>Personalizzata</item>
         </string-array>
         <string name="search_custom_url">Ricerca personalizzata</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1c6e1eea..dcbabfcc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -281,24 +281,26 @@
             <item>DuckDuckGo - JavaScript disabled</item>
             <item>DuckDuckGo - JavaScript enabled</item>
             <item>StartPage</item>
+            <item>Qwant - JavaScript disabled</item>
+            <item>Qwant - JavaScript enabled</item>
+            <item>Searx</item>
             <item>Google</item>
             <item>Bing</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="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://duckduckgo.com/?q=</item>
             <item>https://www.startpage.com/do/search?query=</item>
+            <item>https://lite.qwant.com/?q=</item>
+            <item>https://www.qwant.com/?q=</item>
+            <item>https://searx.me/?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="search_custom_url">Search custom URL</string>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 2b0c713d..fbf3e01c 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -100,7 +100,7 @@
         <EditTextPreference
             android:key="tor_homepage"
             android:title="@string/tor_homepage"
-            android:defaultValue="https://3g2upl4pq6kufc4m.onion"
+            android:defaultValue="https://3g2upl4pq6kufc4m.onion/"
             android:inputType="textUri" />
 
         <ListPreference
@@ -201,7 +201,7 @@
         <EditTextPreference
             android:key="homepage"
             android:title="@string/homepage"
-            android:defaultValue="https://start.duckduckgo.com"
+            android:defaultValue="https://start.duckduckgo.com/"
             android:inputType="textUri"
             android:icon="?attr/homepageIcon" />