Add Searx to the list of search engines. Implements https://redmine.stoutner.com...
authorSoren Stoutner <soren@stoutner.com>
Wed, 5 Jul 2017 21:36:31 +0000 (14:36 -0700)
committerSoren Stoutner <soren@stoutner.com>
Wed, 5 Jul 2017 21:36:31 +0000 (14:36 -0700)
app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.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/strings.xml
app/src/main/res/xml/preferences.xml

index 67a4700d6ae7a219596ab9e661f3b44ea5d2c77c..f826f6d130ab63e969ac5c6ae31e723ea0af2441 100644 (file)
@@ -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);
         }
index f6cf1220a9e1aed23f1684e766c2aae732d42846..25129dfe68fbf2a3ee4790e0f2cdd8d8f8f5dce8 100644 (file)
             <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>
index 045131823c079d457434c97391fdbb1f3df952b4..ed5790dc03824b72f71a197b57fe2da8461ef75e 100644 (file)
             <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>
index e291221b66bd7a16dec3525bef8596acea95e020..6ae6b91cc03d991a47e905eccbdc6e63781b1a51 100644 (file)
             <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>
index 1c6e1eeae2c00c8bb4a55d1f2b414b8aac4b599d..dcbabfcc3a021f433ccd0ee80dccd0617a342b49 100644 (file)
             <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>
index 2b0c713d64ecfd4a46dd6b5c9bb1f3432f6748bc..fbf3e01c4d672d9de9398d408f925dfa47a4b85f 100644 (file)
         <EditTextPreference
             android:key="tor_homepage"
             android:title="@string/tor_homepage"
-            android:defaultValue="https://3g2upl4pq6kufc4m.onion"
+            android:defaultValue="https://3g2upl4pq6kufc4m.onion/"
             android:inputType="textUri" />
 
         <ListPreference
         <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" />