JoJo
/
LeOS-Ice-browser
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity
LeOS-Ice-browser/pacthes/0008-leosearch.patch

229 lines
108 KiB
Diff
Raw Permalink Normal View History

v125
2024-06-01 16:29:02 +02:00
From 2e3c3b7ba86baeb1cb4e4db0e123d8efda32e117 Mon Sep 17 00:00:00 2001
From: harvey186 <harvey186@hotmail.com>
Date: Sat, 1 Jun 2024 13:48:09 +0200
Subject: [PATCH] leosearch
---
android-components | 2 +-
.../org/mozilla/fenix/helpers/Constants.kt | 2 +-
.../ui/robots/SettingsSubMenuSearchRobot.kt | 4 +-
app/src/main/res/values-en-rCA/strings.xml | 2 +-
app/src/main/res/values-en-rGB/strings.xml | 2 +-
app/src/main/res/values/static_strings.xml | 2 +-
app/src/main/res/values/strings.xml | 2 +-
automation/iceraven/assets/list.json | 4 +-
pacthes/0000-COMPONENTS_search1.patch | 98 +++++++++++++++++++
9 files changed, 108 insertions(+), 10 deletions(-)
create mode 100644 pacthes/0000-COMPONENTS_search1.patch
diff --git a/android-components b/android-components
index d401a6485..10ac4712f 160000
--- a/android-components
+++ b/android-components
@@ -1 +1 @@
-Subproject commit d401a648540fcd1832ebfcb9ec7c8c6e17ed0df2
+Subproject commit 10ac4712f98dad8a508f9c17dd98a024c65aea7f
diff --git a/app/src/androidTest/java/org/mozilla/fenix/helpers/Constants.kt b/app/src/androidTest/java/org/mozilla/fenix/helpers/Constants.kt
index 037331d5b..32b5b3453 100755
--- a/app/src/androidTest/java/org/mozilla/fenix/helpers/Constants.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/helpers/Constants.kt
@@ -32,7 +32,7 @@ object Constants {
const val RETRY_COUNT = 3
val searchEngineCodes = mapOf(
- "Google" to "client=firefox-b-m",
+ "LeOSearch" to "client=firefox-b-m",
"Bing" to "firefox&pc=MOZB&form=MOZMBA",
"DuckDuckGo" to "t=fpas",
)
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuSearchRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuSearchRobot.kt
index b44226a8c..32ebdf908 100755
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuSearchRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuSearchRobot.kt
@@ -118,10 +118,10 @@ class SettingsSubMenuSearchRobot {
fun verifyDefaultSearchEngineList() {
Log.i(TAG, "verifyDefaultSearchEngineList: Trying to verify that the \"Google\" search engine option has a favicon")
- defaultSearchEngineOption("Google").check(matches(hasSibling(withId(R.id.engine_icon))))
+ defaultSearchEngineOption("LeOSearch").check(matches(hasSibling(withId(R.id.engine_icon))))
Log.i(TAG, "verifyDefaultSearchEngineList: Verified that the \"Google\" search engine option has a favicon")
Log.i(TAG, "verifyDefaultSearchEngineList: Trying to verify that the \"Google\" search engine option is displayed")
- defaultSearchEngineOption("Google").check(matches(isDisplayed()))
+ defaultSearchEngineOption("LeOSearch").check(matches(isDisplayed()))
Log.i(TAG, "verifyDefaultSearchEngineList: Verified that the \"Google\" search engine option is displayed")
Log.i(TAG, "verifyDefaultSearchEngineList: Trying to verify that the \"Bing\" search engine option has a favicon")
defaultSearchEngineOption("Bing").check(matches(hasSibling(withId(R.id.engine_icon))))
diff --git a/app/src/main/res/values-en-rCA/strings.xml b/app/src/main/res/values-en-rCA/strings.xml
index 7392b5992..1f59d5a3c 100755
--- a/app/src/main/res/values-en-rCA/strings.xml
+++ b/app/src/main/res/values-en-rCA/strings.xml
@@ -2206,7 +2206,7 @@
<string name="firefox_suggest_header">LeOSium Suggest</string>
<!-- Title for search suggestions when Google is the default search suggestion engine. -->
- <string name="google_search_engine_suggestion_header">Google Search</string>
+ <string name="google_search_engine_suggestion_header">LeOSearch</string>
<!-- Title for search suggestions when the default search suggestion engine is anything other than Google. The first parameter is default search engine name. -->
<string name="other_default_search_engine_suggestion_header">%s search</string>
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index e85b383a0..29e811c1b 100755
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -2210,7 +2210,7 @@
<string name="firefox_suggest_header">LeOSium Suggest</string>
<!-- Title for search suggestions when Google is the default search suggestion engine. -->
- <string name="google_search_engine_suggestion_header">Google Search</string>
+ <string name="google_search_engine_suggestion_header">LeOSearch</string>
<!-- Title for search suggestions when the default search suggestion engine is anything other than Google. The first parameter is default search engine name. -->
<string name="other_default_search_engine_suggestion_header">%s search</string>
diff --git a/app/src/main/res/values/static_strings.xml b/app/src/main/res/values/static_strings.xml
index 1bb4b1215..23cce5bab 100755
--- a/app/src/main/res/values/static_strings.xml
+++ b/app/src/main/res/values/static_strings.xml
@@ -21,7 +21,7 @@
<!-- Default title for pinned Wikipedia top site that links to Wikipedia home page -->
<string name="default_top_site_wikipedia" translatable="false">Wikipedia</string>
<!-- Default title for pinned Google top site that links to Google home page -->
- <string name="default_top_site_google" translatable="false">Google</string>
+ <string name="default_top_site_google" translatable="false">LeOSearch</string>
<!-- Application Services abbreviation used in AboutFragment -->
<string name="app_services_abbreviation" translatable="false">AS</string>
<!-- Name for the Pocket product -->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a784e9fe4..2df9a3428 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2099,7 +2099,7 @@
<!-- Search suggestions title for LeOSium Suggest. -->
<string name="firefox_suggest_header">LeOSium Suggest</string>
<!-- Title for search suggestions when Google is the default search suggestion engine. -->
- <string name="google_search_engine_suggestion_header">Google Search</string>
+ <string name="google_search_engine_suggestion_header">LeOSearch</string>
<!-- Title for search suggestions when the default search suggestion engine is anything other than Google. The first parameter is default search engine name. -->
<string name="other_default_search_engine_suggestion_header">%s search</string>
diff --git a/automation/iceraven/assets/list.json b/automation/iceraven/assets/list.json
index 4a629ef5a..a75d07fa4 100755
--- a/automation/iceraven/assets/list.json
+++ b/automation/iceraven/assets/list.json
@@ -1,7 +1,7 @@
{
"default": {
- "searchDefault": "DuckDuckGo",
- "searchOrder": ["Google", "Bing"],
+ "searchDefault": "LeOSearch",
+ "searchOrder": ["LeOSearch", "Bing"],
"visibleDefaultEngines": [
"google-b-m", "bing", "amazondotcom", "ddg", "wikipedia", "startpage", "brave"
]
diff --git a/pacthes/0000-COMPONENTS_search1.patch b/pacthes/0000-COMPONENTS_search1.patch
new file mode 100644
index 000000000..37fd4aa71
--- /dev/null
+++ b/pacthes/0000-COMPONENTS_search1.patch
@@ -0,0 +1,98 @@
+From 10ac4712f98dad8a508f9c17dd98a024c65aea7f Mon Sep 17 00:00:00 2001
+From: harvey186 <harvey186@hotmail.com>
+Date: Sat, 1 Jun 2024 10:55:13 +0200
+Subject: [PATCH] COMPONENTS_search1
+
+---
+ .../src/main/assets/searchplugins/google-b-1-m.xml | 8 ++++----
+ .../src/main/assets/searchplugins/google-b-m.xml | 8 ++++----
+ .../assets/searchplugins/google-com-nocodes.xml | 8 ++++----
+ .../src/main/assets/searchplugins/leosearch.xml | 13 +++++++++++++
+ 4 files changed, 25 insertions(+), 12 deletions(-)
+ create mode 100644 components/feature/search/src/main/assets/searchplugins/leosearch.xml
+
+diff --git a/components/feature/search/src/main/assets/searchplugins/google-b-1-m.xml b/components/feature/search/src/main/assets/searchplugins/google-b-1-m.xml
+index ed4ee58ad3..89ad17f982 100644
+--- a/components/feature/search/src/main/assets/searchplugins/google-b-1-m.xml
++++ b/components/feature/search/src/main/assets/searchplugins/google-b-1-m.xml
+@@ -5,13 +5,13 @@
+ <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
+ <ShortName>Google</ShortName>
+ <InputEncoding>UTF-8</InputEncoding>
+-<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAMAAADVRocKAAAB71BMVEUAAAD29vb29vb29vb39/f////39/f19fXqQzU0qFNChfT7vAX09PRjmvSVufXqSDr19PTywr41qVRVtnDrT0Lv8/D06unviYHufnQ7q1nrW07rV0rqRTZ4p/Xz9PPj7ub36sTvlo93w4xywYdnvH5euXZIsGQ/rVz6xSr7wRj6vQrk6/XR3/WnxfVUkfXg6fSQtvR+q/RHifPq8ez04d/N5dPE4svyx8Op17bxsq2X0KaAx5Nrv4FNsWbsa2BDrl9Brl/rSz77wBPo7fW90/W4zvWwyvWHsfVclvRMjPRFh/T18O/17+718+z06ejf7OLz4+Lb6+D1793V6Nr27tbz1NHzzMhipsi938a33cLyu7al1bLxt7L25K/25K6g067wrqjxrKaOzJ/woJqFyJj435X43Iv42oT42Xxju3rugnlPs2rtcmjtcGacwWXtZ1v50FnsYVXsXFD5zU/2sEvrU0b5vDz5xzb6xzPt8PXX4vXH2PVrn/RpnfT06+tMjurf7eNTleH03dzz2tjz2NZbnday2rzxwLxnrbid0qtosqer1KXwp6HwpJ6IyZnvn5jxspdltZRdtIPueW9yu26Hvm1etmuzwVjsY1f0oE/xj0/we0vGwkjua0bsW0DqTzrXwDX5wCnkvyX6wB3wvhYYaN+hAAAAB3RSTlMA8si8ZBhlc+JuAAAAA9xJREFUaN7dmmdT2zAchw2EysYuhCSQEDYkhNFC2Xu3UEYZpWxaZhezUKB77733Hh+0oclR21L0lzA+7vq8yyX6PbEkS7IlwY8lPAzBKNgHgLBwi7BBZARHOKckItIviGAP55dECMIuI+XhH1mEcKCoQUO4EIZMJUxAJIA/z1NA4M6HDbBAAfOBUoDAALCAs3bgwoKxfNgggPm8hp1vA/MERuuHHCOw5l8tn3YtvE+MSXIkLrnSx0pYDQJT/u305SRRi9s5ABiY2yB+ckkkkjgdDxaGBR1PHGJIGtNBhUCvIGtlokhlbYJSSbCgZ0EEeRUPCCj59xwiA+5+mkGg5KeLbMRUEg1QI1udIisxt7bQi6yz7PmxW+mmLkP5sOAZTz4owJs4NokY5lipq3M3suYrAQEp/6aDEO4c6wl82zXiXGP6/0rIKprH4pcnOrV3uJuSD7bBCDbmPLZivWwyBstnFXTqx5864ujf72bIRwKhCZ7r8l0d5LJdA+DcRryCQzmrmj7ktCIDEATHZXn967/8eSCfX5Aty/KvT2KQlXi0zYI0eYPcD0FBuaF4hSA4JQdY/7aRP4sMggvOy0F+fBHFpJJtFxyWN2n6KLqQYYH+Ljgqq1gtN5qvYFdwUi1owrvobioX4So6oxacRRhRVPbDgnNqwQlewV5YkK0WHOMV7IMFOWpBGq+gFRbkqgVHeAWFZguSza6iZLMbudDsbtpq9o0WDQiAoQIWtCC+wW6xDCsQradNLbiEDXa04fr3aykTQTS3qwUFPBPO91pJsnVDggPq/HykhzJlvkuQ/GRAgmRdL8UFCnnSfyMFKKPn76EPpkqoZcvPt1KQuWLoAvAmgBden+ulTTwplPwWTf4VhEFeOi7aJBXVSugKKiLUELz4fSRpyYwLlZ+vyW9rZlv8orhancHbTe6hReTpDH4AGZZ0JIzj1ZQ6M6jNb89jFiCPpMdeoa2n61U+yfYQGOhCPwT2NkgY9dV3U4NVWDruCXSDl9dUd/EFRH4IJBqGbBIJ35z3tD1L9V3tHcqSSKE9iFdJbCTcp7QwTYAyJEZe/O1LlxVeQQqzwX4jKupgHuIVIKWa1dAwSMyHX0hNsRq8BaQ/yPBKbaieKf9pCimf6aVgqgeO9w0jSj4gQEpFFpBf04sAAUDcgwZKfGYpVF5AIMWjXnK6LaMPKMr8crxvym7T38I1Famhu/gWXu8Xl1Vl+sehBJsvy14zM1pKm0gV0zco/t89HGT+Npf5G3WGtxp3vA38GN/u3fkNa8DAVcD0QwPmH3uw8BTl/5HF9KMn8OEZfjSHZ0w//vMHVqViODGkXAcAAAAASUVORK5CYII=</Image>
+-<Url type="application/x-suggestions+json" method="GET" template="https://www.google.com/complete/search?client=firefox&amp;q={searchTerms}"/>
+-<Url type="text/html" method="GET" template="https://www.google.com/search">
++<Image width="16" height="16">data:image/png;base64,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
++<Url type="application/x-suggestions+json" method="GET" template="http://leosearch.ddns.net/complete/search?client=firefox&amp;q={searchTerms}"/>
++<Url type="text/html" method="GET" template="http://leosearch.ddns.net/search">
+ <Param name="q" value="{searchTerms}"/>
+ <Param name="ie" value="utf-8"/>
+ <Param name="oe" value="utf-8"/>
+ <Param name="client" value="firefox-b-1-m"/>
+ </Url>
+-<SearchForm>https://www.google.com</SearchForm>
++<SearchForm>http://leosearch.ddns.net</SearchForm>
+ </SearchPlugin>
+diff --git a/components/feature/search/src/main/assets/searchplugins/google-b-m.xml b/components/feature/search/src/main/assets/searchplugins/google-b-m.xml
+index 232bbce214..99018f0c39 100644
+--- a/components/feature/search/src/main/assets/searchplugins/google-b-m.xml
++++ b/components/feature/search/src/main/assets/searchplugins/google-b-m.xml
+@@ -5,13 +5,13 @@
+ <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
+ <ShortName>Google</ShortName>
+ <InputEncoding>UTF-8</InputEncoding>
+-<Image width="16" height="16">data:image/png;base64,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</Image>
+-<Url type="application/x-suggestions+json" method="GET" template="https://www.google.com/complete/search?client=firefox&amp;q={searchTerms}"/>
+-<Url type="text/html" method="GET" template="https://www.google.com/search">
++<Image width="16" height="16">data:image/png;base64,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
++<Url type="application/x-suggestions+json" method="GET" template="https//leosearch.ddns.net/complete/search?client=firefox&amp;q={searchTerms}"/>
++<Url type="text/html" method="GET" template="http://leosearch.ddns.net/search">
+ <Param name="q" value="{searchTerms}"/>
+ <Param name="ie" value="utf-8"/>
+ <Param name="oe" value="utf-8"/>
+ <Param name="client" value="firefox-b-m"/>
+ </Url>
+-<SearchForm>https://www.google.com</SearchForm>
++<SearchForm>http://leosearch.ddns.net</SearchForm>
+ </SearchPlugin>
+diff --git a/components/feature/search/src/main/assets/searchplugins/google-com-nocodes.xml b/components/feature/search/src/main/assets/searchplugins/google-com-nocodes.xml
+index 2df8e9d277..eb95ccebe3 100644
+--- a/components/feature/search/src/main/assets/searchplugins/google-com-nocodes.xml
++++ b/components/feature/search/src/main/assets/searchplugins/google-com-nocodes.xml
+@@ -5,10 +5,10 @@
+ <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
+ <ShortName>Google</ShortName>
+ <InputEncoding>UTF-8</InputEncoding>
+-<Image width="16" height="16">data:image/png;base64,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</Image>
+-<Url type="application/x-suggestions+json" method="GET" template="https://www.google.com/complete/search?client=firefox&amp;q={searchTerms}"/>
+-<Url type="text/html" method="GET" template="https://www.google.com/search">
++<Image width="16" height="16">data:image/png;base64,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
++<Url type="application/x-suggestions+json" method="GET" template="https://leosearch.ddns.net/complete/search?client=firefox&amp;q={searchTerms}"/>
++<Url type="text/html" method="GET" template="http://leosearch.ddns.net/search">
+ <Param name="q" value="{searchTerms}"/>
+ </Url>
+-<SearchForm>https://www.google.com</SearchForm>
++<SearchForm>http://leosearch.ddns.net</SearchForm>
+ </SearchPlugin>
+diff --git a/components/feature/search/src/main/assets/searchplugins/leosearch.xml b/components/feature/search/src/main/assets/searchplugins/leosearch.xml
+new file mode 100644
+index 0000000000..13b5d3e7ec
+--- /dev/null
++++ b/components/feature/search/src/main/assets/searchplugins/leosearch.xml
+@@ -0,0 +1,13 @@
++<!-- This Source Code Form is subject to the terms of the Mozilla Public
++ - License, v. 2.0. If a copy of the MPL was not distributed with this
++ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
++
++<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
++<ShortName>LeOSearch</ShortName>
++<InputEncoding>UTF-8</InputEncoding>
++<Image width="16" height="16">data:image/png;base64,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
++<Url type="text/html" method="GET" template="http://62.178.96.192:5000/search?">
++ <Param name="q" value="{searchTerms}"/>
++</Url>
++<SearchForm>http://62.178.96.192:5000</SearchForm>
++</SearchPlugin>
+--
+2.34.1
+
--
2.34.1