From 3a940b246f0027c85294931abb79ada28e7c343f Mon Sep 17 00:00:00 2001
From: Soren Stoutner <soren@stoutner.com>
Date: Sat, 26 Jun 2021 11:18:27 -0700
Subject: [PATCH] Make Mojeek the default homepage and search engine.
 https://redmine.stoutner.com/issues/577

---
 app/build.gradle                           | 4 ++--
 app/src/main/res/values-de/strings.xml     | 2 +-
 app/src/main/res/values-es/strings.xml     | 2 +-
 app/src/main/res/values-fr/strings.xml     | 2 +-
 app/src/main/res/values-it/strings.xml     | 2 +-
 app/src/main/res/values-pt-rBR/strings.xml | 2 +-
 app/src/main/res/values-ru/strings.xml     | 2 +-
 app/src/main/res/values-tr/strings.xml     | 2 +-
 app/src/main/res/values/strings.xml        | 8 ++++----
 build.gradle                               | 2 +-
 10 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 01b98033..302b478c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -83,11 +83,11 @@ dependencies {
     implementation 'androidx.webkit:webkit:1.4.0'
 
     // Include the Kotlin standard libraries.  This should be the same version number listed in project build.gradle.
-    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.10'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.20'
 
     // Include the Google material library.
     implementation 'com.google.android.material:material:1.3.0'
 
     // Only compile AdMob ads for the free flavor.
-    freeImplementation 'com.google.android.gms:play-services-ads:20.1.0'
+    freeImplementation 'com.google.android.gms:play-services-ads:20.2.0'
 }
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index cc16ee82..82a291fb 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -517,10 +517,10 @@
         <string name="twitter_amp_redirects_summary">Entfernt “?amp=1” sowie alles danach URLs.</string>
     <string name="search">Suche</string>
         <string-array name="search_entries">
+            <item>Mojeek</item>
             <item>Startpage</item>
             <item>Monocles</item>
             <item>Metager</item>
-            <item>Mojeek</item>
             <item>DuckDuckGo - JavaScript deaktiviert</item>
             <item>DuckDuckGo - JavaScript aktiviert</item>
             <item>Google</item>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 278b5229..afce7e0f 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -514,10 +514,10 @@
         <string name="twitter_amp_redirects_summary">Eliminar “?amp=1” y cualquier cosa después de esto de las URLs.</string>
     <string name="search">Búsqueda</string>
         <string-array name="search_entries">
+            <item>Mojeek</item>
             <item>Startpage</item>
             <item>Monocles</item>
             <item>Metager</item>
-            <item>Mojeek</item>
             <item>DuckDuckGo - Javascript deshabilitado</item>
             <item>DuckDuckGo - Javascript habilitado</item>
             <item>Google</item>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 0c62038f..21fd1629 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -514,10 +514,10 @@
         <string name="twitter_amp_redirects_summary">Supprimer “?amp=1” et tout ce qui suit après cette URL.</string>
     <string name="search">Moteur de Recherche</string>
         <string-array name="search_entries">
+            <item>Mojeek</item>
             <item>Startpage</item>
             <item>Monocles</item>
             <item>Metager</item>
-            <item>Mojeek</item>
             <item>DuckDuckGo - JavaScript désactivé</item>
             <item>DuckDuckGo - JavaScript activé</item>
             <item>Google</item>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 8e24b6fb..120b5a56 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -514,10 +514,10 @@
         <string name="twitter_amp_redirects_summary">Rimuovi “?amp=1”  e tutto quello che segue dalle URL.</string>
     <string name="search">Ricerca</string>
         <string-array name="search_entries">
+            <item>Mojeek</item>
             <item>Startpage</item>
             <item>Monocles</item>
             <item>Metager</item>
-            <item>Mojeek</item>
             <item>DuckDuckGo - JavaScript disabilitato</item>
             <item>DuckDuckGo - JavaScript abilitato</item>
             <item>Google</item>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 7543c0d7..7bdae645 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -513,10 +513,10 @@
         <string name="twitter_amp_redirects_summary">Remover “?amp=1† e qualquer coisa depois de URLs.</string>
     <string name="search">Search</string>
         <string-array name="search_entries">
+            <item>Mojeek</item>
             <item>Startpage</item>
             <item>Monocles</item>
             <item>Metager</item>
-            <item>Mojeek</item>
             <item>DuckDuckGo - JavaScript desativado</item>
             <item>DuckDuckGo - JavaScript ativado</item>
             <item>Google</item>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 1ccbf84c..14ca602d 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -510,10 +510,10 @@
         <string name="twitter_amp_redirects_summary">Удалять из URL “?amp=1” и все что будет после.</string>
     <string name="search">Поиск</string>
         <string-array name="search_entries">
+            <item>Mojeek</item>
             <item>Startpage</item>
             <item>Monocles</item>
             <item>Metager</item>
-            <item>Mojeek</item>
             <item>DuckDuckGo - JavaScript выключен</item>
             <item>DuckDuckGo - JavaScript включен</item>
             <item>Google</item>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index f4287db5..21c76bbc 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -454,10 +454,10 @@
         <string name="twitter_amp_redirects_summary">URL\'den sonra gelen “?amp=1” ve diğer şeyleri kaldırır.</string>
     <string name="search">Arama</string>
         <string-array name="search_entries">
+            <item>Mojeek</item>
             <item>Startpage</item>
             <item>Monocles</item>
             <item>Metager</item>
-            <item>Mojeek</item>
             <item>DuckDuckGo - JavaScript devre dışı</item>
             <item>DuckDuckGo - JavaScript etkin</item>
             <item>Google</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6e06a3a0..b07d8e90 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -551,10 +551,10 @@
         <string name="twitter_amp_redirects_summary">Remove “?amp=1” and anything after it from URLs.</string>
     <string name="search">Search</string>
         <string-array name="search_entries">
+            <item>Mojeek</item>
             <item>Startpage</item>
             <item>Monocles</item>
             <item>Metager</item>
-            <item>Mojeek</item>
             <item>DuckDuckGo - JavaScript disabled</item>
             <item>DuckDuckGo - JavaScript enabled</item>
             <item>Google</item>
@@ -564,10 +564,10 @@
             <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://www.mojeek.com/search?q=</item>
             <item>https://www.startpage.com/do/search?query=</item>
             <item>https://monocles.de/search?q=</item>
             <item>https://metager.org/meta/meta.ger3?eingabe=</item>
-            <item>https://www.mojeek.com/search?q=</item>
             <item>https://duckduckgo.com/html/?q=</item>
             <item>https://duckduckgo.com/?q=</item>
             <item>https://www.google.com/search?q=</item>
@@ -673,11 +673,11 @@
     <string name="app_theme_default_value" translatable="false">System default</string>
     <string name="custom_user_agent_default_value" translatable="false">PrivacyBrowser/1.0</string>
     <string name="font_size_default_value" translatable="false">100</string>
-    <string name="homepage_default_value" translatable="false">https://www.startpage.com/</string>
+    <string name="homepage_default_value" translatable="false">https://www.mojeek.com/</string>
     <string name="proxy_custom_url_default_value" translatable="false">http://localhost:8118</string>
     <string name="proxy_default_value" translatable="false">None</string>
     <string name="search_custom_url_default_value" translatable="false" />
-    <string name="search_default_value" translatable="false">https://www.startpage.com/do/search?query=</string>
+    <string name="search_default_value" translatable="false">https://www.mojeek.com/search?q=</string>
     <string name="user_agent_default_value" translatable="false">Privacy Browser</string>
     <string name="webview_theme_default_value" translatable="false">System default</string>
 
diff --git a/build.gradle b/build.gradle
index bf9591ab..4b2296d2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.10"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.20"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
-- 
2.45.2