diff options
Diffstat (limited to 'mobile/android/android-components/components/feature/search/src')
17 files changed, 554 insertions, 636 deletions
diff --git a/mobile/android/android-components/components/feature/search/src/main/assets/extensions/ads/adsTelemetry.js b/mobile/android/android-components/components/feature/search/src/main/assets/extensions/ads/adsTelemetry.js index 65bf306835..0778799326 100644 --- a/mobile/android/android-components/components/feature/search/src/main/assets/extensions/ads/adsTelemetry.js +++ b/mobile/android/android-components/components/feature/search/src/main/assets/extensions/ads/adsTelemetry.js @@ -10,12 +10,12 @@ * to the native application. */ function sendCurrentState() { - let message = { - 'url': document.location.href, - 'urls': getLinks(), - 'cookies': getCookies() - }; - browser.runtime.sendNativeMessage("MozacBrowserAdsMessage", message); + let message = { + url: document.location.href, + urls: getLinks(), + cookies: getCookies(), + }; + browser.runtime.sendNativeMessage("MozacBrowserAdsMessage", message); } /** @@ -24,17 +24,17 @@ function sendCurrentState() { * @return {Array<string>} containing all current links in the current page. */ function getLinks() { - let urls = []; + let urls = []; - let anchors = document.getElementsByTagName("a"); - for (let anchor of anchors) { - if (!anchor.href) { - continue; - } - urls.push(anchor.href); + let anchors = document.getElementsByTagName("a"); + for (let anchor of anchors) { + if (!anchor.href) { + continue; } + urls.push(anchor.href); + } - return urls; + return urls; } /** @@ -43,40 +43,38 @@ function getLinks() { * @return {Array<{name: string, value: string}>} containing all cookies. */ function getCookies() { - let cookiesList = document.cookie.split("; "); - let result = []; + let cookiesList = document.cookie.split("; "); + let result = []; - cookiesList.forEach(cookie => { - var [name, ...value] = cookie.split('='); - // For that special cases where the value contains '='. - value = value.join("=") + cookiesList.forEach(cookie => { + var [name, ...value] = cookie.split("="); + // For that special cases where the value contains '='. + value = value.join("="); - result.push({ - "name" : name, - "value" : value - }); + result.push({ + name: name, + value: value, }); + }); - return result; + return result; } // Whenever a page is first accessed or when loaded from cache // send all needed data about the ads provider to the app. const events = ["pageshow", "load"]; const eventLogger = event => { - switch (event.type) { + switch (event.type) { case "load": - sendCurrentState(); - break; + sendCurrentState(); + break; case "pageshow": - if (event.persisted) { - sendCurrentState(); - } - break; + if (event.persisted) { + sendCurrentState(); + } + break; default: - console.log('Event:', event.type); - } + console.log("Event:", event.type); + } }; -events.forEach(eventName => - window.addEventListener(eventName, eventLogger) -); +events.forEach(eventName => window.addEventListener(eventName, eventLogger)); diff --git a/mobile/android/android-components/components/feature/search/src/main/assets/extensions/search/searchTelemetry.js b/mobile/android/android-components/components/feature/search/src/main/assets/extensions/search/searchTelemetry.js index 3199335fdf..355f378b9c 100644 --- a/mobile/android/android-components/components/feature/search/src/main/assets/extensions/search/searchTelemetry.js +++ b/mobile/android/android-components/components/feature/search/src/main/assets/extensions/search/searchTelemetry.js @@ -9,11 +9,11 @@ * to the native application. */ function sendCurrentState() { - let message = { - 'url': document.location.href, - 'cookies': getCookies() - }; - browser.runtime.sendNativeMessage("MozacBrowserSearchMessage", message); + let message = { + url: document.location.href, + cookies: getCookies(), + }; + browser.runtime.sendNativeMessage("MozacBrowserSearchMessage", message); } /** @@ -22,40 +22,38 @@ function sendCurrentState() { * @return {Array<{name: string, value: string}>} containing all cookies. */ function getCookies() { - let cookiesList = document.cookie.split("; "); - let result = []; + let cookiesList = document.cookie.split("; "); + let result = []; - cookiesList.forEach(cookie => { - var [name, ...value] = cookie.split('='); - // For that special cases where the cookie value contains '='. - value = value.join("="); + cookiesList.forEach(cookie => { + var [name, ...value] = cookie.split("="); + // For that special cases where the cookie value contains '='. + value = value.join("="); - result.push({ - "name" : name, - "value" : value - }); + result.push({ + name: name, + value: value, }); + }); - return result; + return result; } // Whenever a page is first accessed or when loaded from cache // send all needed data about the search provider to the app. const events = ["pageshow", "load"]; const eventLogger = event => { - switch (event.type) { + switch (event.type) { case "load": - sendCurrentState(); - break; + sendCurrentState(); + break; case "pageshow": - if (event.persisted) { - sendCurrentState(); - } - break; + if (event.persisted) { + sendCurrentState(); + } + break; default: - console.log('Event:', event.type); - } + console.log("Event:", event.type); + } }; -events.forEach(eventName => - window.addEventListener(eventName, eventLogger) -); +events.forEach(eventName => window.addEventListener(eventName, eventLogger)); diff --git a/mobile/android/android-components/components/feature/search/src/main/assets/search/list.json b/mobile/android/android-components/components/feature/search/src/main/assets/search/list.json index b2bb3d4698..5bd6349fe5 100644 --- a/mobile/android/android-components/components/feature/search/src/main/assets/search/list.json +++ b/mobile/android/android-components/components/feature/search/src/main/assets/search/list.json @@ -2,9 +2,7 @@ "default": { "searchDefault": "Google", "searchOrder": ["Google", "Bing"], - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia"] }, "regionOverrides": { "US": { @@ -14,898 +12,1038 @@ "locales": { "ach": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia"] } }, "an": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "ebay-es","wikipedia-an" + "google-b-m", + "bing", + "ddg", + "ebay-es", + "wikipedia-an" ] } }, "ar": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-ar" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-ar"] } }, "as": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-as" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-as"] } }, "ast": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "ebay-es", "wikipedia-ast" + "google-b-m", + "bing", + "ddg", + "ebay-es", + "wikipedia-ast" ] } }, "az": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "azerdict", "wikipedia-az" + "google-b-m", + "bing", + "ddg", + "azerdict", + "wikipedia-az" ] } }, "be": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-be" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-be"] }, "BY": { "visibleDefaultEngines": [ - "google-com-nocodes", "bing", "ddg", "wikipedia-be" + "google-com-nocodes", + "bing", + "ddg", + "wikipedia-be" ] }, "KZ": { "visibleDefaultEngines": [ - "google-com-nocodes", "bing", "ddg", "wikipedia-be" + "google-com-nocodes", + "bing", + "ddg", + "wikipedia-be" ] }, "RU": { "visibleDefaultEngines": [ - "google-com-nocodes", "bing", "ddg", "wikipedia-be" + "google-com-nocodes", + "bing", + "ddg", + "wikipedia-be" ] }, "TR": { "visibleDefaultEngines": [ - "google-com-nocodes", "bing", "ddg", "wikipedia-be" + "google-com-nocodes", + "bing", + "ddg", + "wikipedia-be" ] } }, "bg": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "pazaruvaj", "wikipedia-bg" + "google-b-m", + "bing", + "ddg", + "pazaruvaj", + "wikipedia-bg" ] } }, "bn": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-bn" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-bn"] } }, "bn-BD": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-bn" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-bn"] } }, "bn-IN": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-bn" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-bn"] } }, "br": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-br" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-br"] } }, "bs": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-bs" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-bs"] } }, "ca": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "ebay-es", "wikipedia-ca" + "google-b-m", + "bing", + "ddg", + "ebay-es", + "wikipedia-ca" ] } }, "cak": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-es" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-es"] } }, "cs": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "mapy-cz", "seznam-cz", "wikipedia-cz" + "google-b-m", + "bing", + "ddg", + "mapy-cz", + "seznam-cz", + "wikipedia-cz" ] } }, "cy": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-co-uk", "ddg", "ebay-co-uk", "wikipedia-cy" + "google-b-m", + "bing", + "ddg", + "ebay-co-uk", + "wikipedia-cy" ] } }, "da": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "amazon-co-uk", "bing", "ddg", "wikipedia-da" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-da"] } }, "de": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-de", "ddg", "ecosia", "qwant", "wikipedia-de", "ebay-de" + "google-b-m", + "bing", + "ddg", + "ecosia", + "qwant", + "wikipedia-de", + "ebay-de" ] } }, "de-AT": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-de", "ddg", "ecosia", "qwant", "wikipedia-de", "ebay-at" + "google-b-m", + "bing", + "ddg", + "ecosia", + "qwant", + "wikipedia-de", + "ebay-at" ] } }, "dsb": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-de", "ddg", "wikipedia-dsb", "ebay-de" + "google-b-m", + "bing", + "ddg", + "wikipedia-dsb", + "ebay-de" ] } }, "el": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-el" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-el"] } }, "en-AU": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-au", "ddg", "wikipedia", "ebay-au" + "google-b-m", + "bing", + "ddg", + "wikipedia", + "ebay-au" ] } }, "en-CA": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-ca", "ddg", "wikipedia", "ebay-ca" + "google-b-m", + "bing", + "ddg", + "wikipedia", + "ebay-ca" ] } }, "en-IE": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-co-uk", "ddg", "qwant", "wikipedia", "ebay-ie" + "google-b-m", + "bing", + "ddg", + "qwant", + "wikipedia", + "ebay-ie" ] } }, "en-GB": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-co-uk", "ddg", "qwant", "wikipedia", "ebay-co-uk" + "google-b-m", + "bing", + "ddg", + "qwant", + "wikipedia", + "ebay-co-uk" ] }, "BY": { "visibleDefaultEngines": [ - "google-com-nocodes", "bing", "amazon-co-uk", "ddg", "qwant", "wikipedia" + "google-com-nocodes", + "bing", + "ddg", + "qwant", + "wikipedia" ] }, "KZ": { "visibleDefaultEngines": [ - "google-com-nocodes", "bing", "amazon-co-uk", "ddg", "qwant", "wikipedia" + "google-com-nocodes", + "bing", + "ddg", + "qwant", + "wikipedia" ] }, "RU": { "visibleDefaultEngines": [ - "google-com-nocodes", "bing", "amazon-co-uk", "ddg", "qwant", "wikipedia" + "google-com-nocodes", + "bing", + "ddg", + "qwant", + "wikipedia" ] }, "TR": { "visibleDefaultEngines": [ - "google-com-nocodes", "bing", "amazon-co-uk", "ddg", "qwant", "wikipedia" + "google-com-nocodes", + "bing", + "ddg", + "qwant", + "wikipedia" ] } }, "en-US": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "ebay", "wikipedia" + "google-b-m", + "bing", + "ddg", + "ebay", + "wikipedia" ] }, "BY": { "visibleDefaultEngines": [ - "google-com-nocodes", "bing", "amazondotcom", "ddg", "wikipedia" + "google-com-nocodes", + "bing", + "ddg", + "wikipedia" ] }, "KZ": { "visibleDefaultEngines": [ - "google-com-nocodes", "bing", "amazondotcom", "ddg", "wikipedia" + "google-com-nocodes", + "bing", + "ddg", + "wikipedia" ] }, "RU": { "visibleDefaultEngines": [ - "google-com-nocodes", "bing", "amazondotcom", "ddg", "wikipedia" + "google-com-nocodes", + "bing", + "ddg", + "wikipedia" ] }, "TR": { "visibleDefaultEngines": [ - "google-com-nocodes", "bing", "amazondotcom", "ddg", "wikipedia" + "google-com-nocodes", + "bing", + "ddg", + "wikipedia" ] } }, "en-ZA": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "wikipedia" - ] + "visibleDefaultEngines": ["google-b-m", "ddg", "wikipedia"] } }, "eo": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-eo" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-eo"] } }, "es-AR": { "default": { "visibleDefaultEngines": [ - "google-b-m", "ddg", "mercadolibre-ar", "wikipedia-es" + "google-b-m", + "ddg", + "mercadolibre-ar", + "wikipedia-es" ] } }, "es-CL": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "mercadolibre-cl", "wikipedia-es" + "google-b-m", + "bing", + "ddg", + "mercadolibre-cl", + "wikipedia-es" ] } }, "es-ES": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-es", "amazon-es", "ebay-es" + "google-b-m", + "bing", + "ddg", + "wikipedia-es", + "ebay-es" ] } }, "es-MX": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "mercadolibre-mx", "wikipedia-es" + "google-b-m", + "bing", + "ddg", + "mercadolibre-mx", + "wikipedia-es" ] } }, "et": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "amazon-co-uk", "ddg", "wikipedia-et" - ] + "visibleDefaultEngines": ["google-b-m", "ddg", "wikipedia-et"] } }, "eu": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "ebay-es", "wikipedia-eu" + "google-b-m", + "bing", + "ddg", + "ebay-es", + "wikipedia-eu" ] } }, "fa": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-fa" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-fa"] } }, "ff": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-fr", "ddg", "wikipedia-fr" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-fr"] } }, "fi": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "amazondotcom", "bing", "ddg", "wikipedia-fi" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-fi"] } }, "fr-BE": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "qwant", "wikipedia-fr", "ebay-befr" + "google-b-m", + "bing", + "ddg", + "qwant", + "wikipedia-fr", + "ebay-befr" ] } }, "fr-CA": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-ca", "ddg", "wikipedia-fr", "ebay-ca" + "google-b-m", + "bing", + "ddg", + "wikipedia-fr", + "ebay-ca" ] } }, "fr-FR": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "qwant", "wikipedia-fr", "amazon-fr", "ebay-fr" + "google-b-m", + "bing", + "ddg", + "qwant", + "wikipedia-fr", + "ebay-fr" ] } }, "fr": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "ebay-fr", "qwant", "wikipedia-fr" + "google-b-m", + "bing", + "ddg", + "ebay-fr", + "qwant", + "wikipedia-fr" ] } }, "fy-NL": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "ebay-nl", "wikipedia-fy-NL" + "google-b-m", + "bing", + "ddg", + "ebay-nl", + "wikipedia-fy-NL" ] } }, "ga-IE": { "default": { "visibleDefaultEngines": [ - "google-b-m", "amazon-co-uk", "ddg", "ebay-ie", "wikipedia-ga-IE" + "google-b-m", + "ddg", + "ebay-ie", + "wikipedia-ga-IE" ] } }, "gd": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "ebay-co-uk", "faclair-beag", "wikipedia-gd" + "google-b-m", + "bing", + "ddg", + "ebay-co-uk", + "faclair-beag", + "wikipedia-gd" ] } }, "gl": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "ebay-es", "wikipedia-gl" + "google-b-m", + "bing", + "ddg", + "ebay-es", + "wikipedia-gl" ] } }, "gn": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-gn" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-gn"] } }, "gu-IN": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-gu" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-gu"] } }, "he": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-he" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-he"] } }, "hi-IN": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-hi" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-hi"] } }, "hr": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-co-uk", "ddg", "wikipedia-hr" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-hr"] } }, "hsb": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-de", "ddg", "wikipedia-hsb", "ebay-de" + "google-b-m", + "bing", + "ddg", + "wikipedia-hsb", + "ebay-de" ] } }, "hu": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "vatera", "wikipedia-hu" - ] + "visibleDefaultEngines": ["google-b-m", "ddg", "vatera", "wikipedia-hu"] } }, "hy-AM": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-hy-AM" + "google-b-m", + "bing", + "ddg", + "wikipedia-hy-AM" ] } }, "ia": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-ia" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-ia"] } }, "id": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-id" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-id"] } }, "is": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-is" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-is"] } }, "it": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-it", "amazon-it", "ebay-it" + "google-b-m", + "bing", + "ddg", + "wikipedia-it", + "ebay-it" ] } }, "ja": { "default": { "visibleDefaultEngines": [ - "google-b-m", "amazon-jp", "bing", "ddg", "rakuten", "wikipedia-ja", "yahoo-jp", "yahoo-jp-auctions" + "google-b-m", + "amazon-jp", + "bing", + "ddg", + "rakuten", + "wikipedia-ja", + "yahoo-jp", + "yahoo-jp-auctions" ] } }, "ka": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-ka" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-ka"] } }, "kab": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-kab" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-kab"] } }, "kk": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-kk" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-kk"] }, "KZ": { "visibleDefaultEngines": [ - "google-com-nocodes", "bing", "ddg", "wikipedia-kk" + "google-com-nocodes", + "bing", + "ddg", + "wikipedia-kk" ] }, "BY": { "visibleDefaultEngines": [ - "google-com-nocodes", "bing", "ddg", "wikipedia-kk" + "google-com-nocodes", + "bing", + "ddg", + "wikipedia-kk" ] }, "RU": { "visibleDefaultEngines": [ - "google-com-nocodes", "bing", "ddg", "wikipedia-kk" + "google-com-nocodes", + "bing", + "ddg", + "wikipedia-kk" ] }, "TR": { "visibleDefaultEngines": [ - "google-com-nocodes", "bing", "ddg", "wikipedia-kk" + "google-com-nocodes", + "bing", + "ddg", + "wikipedia-kk" ] } }, "km": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-km" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-km"] } }, "kn": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-kn", "wiktionary-kn" + "google-b-m", + "bing", + "ddg", + "wikipedia-kn", + "wiktionary-kn" ] } }, "ko": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "daum-kr" - ] + "visibleDefaultEngines": ["google-b-m", "ddg", "daum-kr"] } }, "lij": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-it", "ddg", "wikipedia-lij", "ebay-it" + "google-b-m", + "bing", + "ddg", + "wikipedia-lij", + "ebay-it" ] } }, "lo": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-lo" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-lo"] } }, "lt": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-lt" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-lt"] } }, "ltg": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-co-uk", "wikipedia-ltg" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "wikipedia-ltg"] } }, "lv": { "default": { "visibleDefaultEngines": [ - "google-b-m", "ddg", "salidzinilv", "wikipedia-lv" + "google-b-m", + "ddg", + "salidzinilv", + "wikipedia-lv" ] } }, "mai": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-hi" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-hi"] } }, "meh": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-es" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-es"] } }, "mix": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-es" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-es"] } }, "ml": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-ml" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-ml"] } }, "mr": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-mr" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-mr"] } }, "ms": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-ms" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-ms"] } }, "my": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-my" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-my"] } }, "nb-NO": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "gulesider-mobile-NO", "wikipedia-NO" + "google-b-m", + "bing", + "ddg", + "gulesider-mobile-NO", + "wikipedia-NO" ] } }, "ne-NP": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-ne" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-ne"] } }, "nl-NL": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-nl", "amazon-nl", "ebay-nl" + "google-b-m", + "bing", + "ddg", + "wikipedia-nl", + "ebay-nl" ] } }, "nl": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "ebay-nl", "wikipedia-nl" + "google-b-m", + "bing", + "ddg", + "ebay-nl", + "wikipedia-nl" ] } }, "nn-NO": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "gulesider-mobile-NO", "wikipedia-NN" + "google-b-m", + "bing", + "ddg", + "gulesider-mobile-NO", + "wikipedia-NN" ] } }, "oc": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-oc", "wiktionary-oc" + "google-b-m", + "bing", + "ddg", + "wikipedia-oc", + "wiktionary-oc" ] } }, "or": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-or", "wiktionary-or" + "google-b-m", + "bing", + "ddg", + "wikipedia-or", + "wiktionary-or" ] } }, "pa-IN": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-pa" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-pa"] } }, "pl": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-pl", "ebay-pl" + "google-b-m", + "bing", + "ddg", + "wikipedia-pl", + "ebay-pl" ] } }, "pt-BR": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-pt" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-pt"] } }, "pt-PT": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "wikipedia-pt" - ] + "visibleDefaultEngines": ["google-b-m", "ddg", "wikipedia-pt"] } }, "rm": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "ebay-ch", "leo_ende_de", "wikipedia-rm" + "google-b-m", + "bing", + "ddg", + "ebay-ch", + "leo_ende_de", + "wikipedia-rm" ] } }, "ro": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-ro" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-ro"] } }, "ru": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "wikipedia-ru" - ] + "visibleDefaultEngines": ["google-b-m", "ddg", "wikipedia-ru"] }, "RU": { - "visibleDefaultEngines": [ - "google-com-nocodes", "ddg", "wikipedia-ru" - ] + "visibleDefaultEngines": ["google-com-nocodes", "ddg", "wikipedia-ru"] }, "BY": { - "visibleDefaultEngines": [ - "google-com-nocodes", "ddg", "wikipedia-ru" - ] + "visibleDefaultEngines": ["google-com-nocodes", "ddg", "wikipedia-ru"] }, "KZ": { - "visibleDefaultEngines": [ - "google-com-nocodes", "ddg", "wikipedia-ru" - ] + "visibleDefaultEngines": ["google-com-nocodes", "ddg", "wikipedia-ru"] }, "TR": { - "visibleDefaultEngines": [ - "google-com-nocodes", "ddg", "wikipedia-ru" - ] + "visibleDefaultEngines": ["google-com-nocodes", "ddg", "wikipedia-ru"] } }, "sk": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "wikipedia-sk" - ] + "visibleDefaultEngines": ["google-b-m", "ddg", "wikipedia-sk"] } }, "sl": { "default": { "visibleDefaultEngines": [ - "google-b-m", "ddg", "ceneje", "odpiralni", "wikipedia-sl" + "google-b-m", + "ddg", + "ceneje", + "odpiralni", + "wikipedia-sl" ] } }, "son": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "ddg", "bing", "amazon-fr", "wikipedia-fr" - ] + "visibleDefaultEngines": ["google-b-m", "ddg", "bing", "wikipedia-fr"] } }, "sq": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-co-uk", "ddg", "wikipedia-sq" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-sq"] } }, "sr": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-sr" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-sr"] } }, "sv-SE": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "prisjakt-sv-SE", "ddg", "wikipedia-sv-SE", "amazon-se", "ebay-ch" + "google-b-m", + "bing", + "prisjakt-sv-SE", + "ddg", + "wikipedia-sv-SE", + "ebay-ch" ] } }, "ta": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-ta", "wiktionary-ta" + "google-b-m", + "bing", + "ddg", + "wikipedia-ta", + "wiktionary-ta" ] } }, "te": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-te", "wiktionary-te" + "google-b-m", + "bing", + "ddg", + "wikipedia-te", + "wiktionary-te" ] } }, "th": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-th" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-th"] } }, "tl": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg"] } }, "tr": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-tr" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-tr"] }, "TR": { "visibleDefaultEngines": [ - "google-com-nocodes", "ddg", "bing", "wikipedia-tr" + "google-com-nocodes", + "ddg", + "bing", + "wikipedia-tr" ] }, "BY": { "visibleDefaultEngines": [ - "google-com-nocodes", "ddg", "bing", "wikipedia-tr" + "google-com-nocodes", + "ddg", + "bing", + "wikipedia-tr" ] }, "KZ": { "visibleDefaultEngines": [ - "google-com-nocodes", "ddg", "bing", "wikipedia-tr" + "google-com-nocodes", + "ddg", + "bing", + "wikipedia-tr" ] }, "RU": { "visibleDefaultEngines": [ - "google-com-nocodes", "ddg", "bing", "wikipedia-tr" + "google-com-nocodes", + "ddg", + "bing", + "wikipedia-tr" ] } }, "trs": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-es" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-es"] } }, "uk": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-uk" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-uk"] } }, "ur": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-ur" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-ur"] } }, "uz": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-uz" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-uz"] } }, "vi": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "coccoc", "ddg", "wikipedia-vi" - ] + "visibleDefaultEngines": ["google-b-m", "coccoc", "ddg", "wikipedia-vi"] } }, "wo": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "ebay-fr", "wikipedia-wo" + "google-b-m", + "bing", + "ddg", + "ebay-fr", + "wikipedia-wo" ] } }, "xh": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia"] } }, "zam": { "default": { - "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-es" - ] + "visibleDefaultEngines": ["google-b-m", "bing", "ddg", "wikipedia-es"] } }, "zh-CN": { "default": { "visibleDefaultEngines": [ - "google-b-m", "baidu", "bing", "ddg", "wikipedia-zh-CN" + "google-b-m", + "baidu", + "bing", + "ddg", + "wikipedia-zh-CN" ] }, "CN": { @@ -915,7 +1053,10 @@ "zh-TW": { "default": { "visibleDefaultEngines": [ - "google-b-m", "bing", "ddg", "wikipedia-zh-TW" + "google-b-m", + "bing", + "ddg", + "wikipedia-zh-TW" ] } } diff --git a/mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/amazon-au.xml b/mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/amazon-au.xml deleted file mode 100644 index 6e8801d893..0000000000 --- a/mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/amazon-au.xml +++ /dev/null @@ -1,12 +0,0 @@ -<!-- 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>Amazon.com.au</ShortName> -<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAMAAADVRocKAAABaFBMVEUAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////mQACAgH7+/uEhIT9mACFhYX9/f0JCQkFBQWwagBtQgAJBQANDQ36lgDr6+vj4+O7u7u3t7dDQ0M9PT0oKCgbGxvVgADGdwCqZgBYNQBCKAAkFgAcEQARCgDw8PDS0tKysrKtra2Xl5eSkpJtbW1dXV1aWlpLS0tHR0c5OTkzMzMuLi4qKirrjQDniwDehgC7cACZXACKUwBjOwBPLwA8JAAsGwAgEwD19fXn5+fZ2dnPz8/Ly8vHx8ekpKSdnZ2JiYl/f394eHggICD7lwD2lADRfgDPfACeXwCETwBdOAA4IgA0IAAWDgDd3d3W1ta/v7+oqKiPj497e3twcHBpaWljY2NWVlYUFBTsjgDiiADZgwDAcwC3bgCmYwCPVgB2RwBnPgBKLQAMCADt7e1fX19SUlIWFhYSEhLwkADujwCRVwB8SwB6SgBSMgAPCQBOQY7nAAAABnRSTlMA8si8ZBgxEvPEAAADLklEQVRo3u2aZ1MiMRiA0dO8WeWkd6miNEVF6c3ee++ent3r9e/fgm6iggJuMjfO7PMxs+wTkrcEJiqRluYmxIGm5hZVidZ3iBvvWkUBj/dTg7g+iCstqmbElWZVE+JKkwpxRhEoAkWgCBTBfxBoNVpEYCz41hexbbUBfBoPtQ8KzAUOm/huyui+kanAaYWn9HxmKBgwQxUizAT2NqjKHCNBZw9UZ2SejcAGzzHNROAAgqU92n8wDgSzwEIwBRLvNUhEmKGGGAOBQCJoRhqaJIIvDARDJPBJah0SQS8DgWbnPkjDZGiQCGaZRJEw7+ibnZ5yVn4paOdTrofptqO3JdAOH89O28ZHO7gIBtsnSEliL9AeBYDAQeAYA+ApmOsAroJ9oHQErFORMNs8sAPBfPC13CCYCjRbIGE1kjxgKOgDiQkNl1KxAxJ2aSjGUqAhEWShhwyWAlqag2Ssl4yF5QuOQSJU5RQQlC+ge2wlxxhakyzyBVF6VpTO1SGgDMgW2OFpA56DBwS0cgUfaB1qi5aOwXvwiD3ZeRAAyvautaInxOQKeuFl+uUKjKNQwcQuSMzIr6YDFd0gqDGO3W/LIYt+cPRk3SMCQvMWEBnpZ9PR7GNAmXTcZZsZwDJEzmaFnF6vv/HXFnQJVXt+NDhS7mfbYTLn2GTIKX0oHcd3eGoKXK7ccwnR6TSiqmQWsMRiTUFxGbt9qDGuvfmC/7Z7PY3x99p7YLjAeClrQK+gG+Ozejb5So3xj0wRNULxt6cbFTFerSuKfEmMsVr35xbVx6beLT6/gdYwvqkvTA2XaixiSum7aq9LNlV6OOlDaAUnhXrzYH0Z3+HK5PzoOfze9HJ5KgsZA0LCCdY3kGjej1gicb66lvcLj1ZlY23Vc4rv0RWQSA4nDI1kspAtKSjquMud0ul05+6lU9PD8YsCKqMzrTdaKnweE65B4meXtBmm7Ctq0aY+9YLjJO0TaGTkX1ns/npXlhZwBXHdVZ68XfYPEMPG9aXHnYwvYvViwnW28stL4peJgFJ9zm/qb01FgJAiUASKACFFUAH3SwPcrz1wv7jB++oJ/8sz3K///AMH5R5E/GGrogAAAABJRU5ErkJggg==</Image> -<Url type="text/html" method="GET" template="https://www.amazon.com.au/s"> - <Param name="k" value="{searchTerms}"/> -</Url> -<SearchForm>https://www.amazon.com.au/</SearchForm> -</SearchPlugin> diff --git a/mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/amazon-ca.xml b/mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/amazon-ca.xml deleted file mode 100644 index 932f62b276..0000000000 --- a/mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/amazon-ca.xml +++ /dev/null @@ -1,13 +0,0 @@ -<!-- 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>Amazon.ca</ShortName> -<InputEncoding>UTF-8</InputEncoding> -<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAMAAADVRocKAAABaFBMVEUAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////mQACAgH7+/uEhIT9mACFhYX9/f0JCQkFBQWwagBtQgAJBQANDQ36lgDr6+vj4+O7u7u3t7dDQ0M9PT0oKCgbGxvVgADGdwCqZgBYNQBCKAAkFgAcEQARCgDw8PDS0tKysrKtra2Xl5eSkpJtbW1dXV1aWlpLS0tHR0c5OTkzMzMuLi4qKirrjQDniwDehgC7cACZXACKUwBjOwBPLwA8JAAsGwAgEwD19fXn5+fZ2dnPz8/Ly8vHx8ekpKSdnZ2JiYl/f394eHggICD7lwD2lADRfgDPfACeXwCETwBdOAA4IgA0IAAWDgDd3d3W1ta/v7+oqKiPj497e3twcHBpaWljY2NWVlYUFBTsjgDiiADZgwDAcwC3bgCmYwCPVgB2RwBnPgBKLQAMCADt7e1fX19SUlIWFhYSEhLwkADujwCRVwB8SwB6SgBSMgAPCQBOQY7nAAAABnRSTlMA8si8ZBgxEvPEAAADLklEQVRo3u2aZ1MiMRiA0dO8WeWkd6miNEVF6c3ee++ent3r9e/fgm6iggJuMjfO7PMxs+wTkrcEJiqRluYmxIGm5hZVidZ3iBvvWkUBj/dTg7g+iCstqmbElWZVE+JKkwpxRhEoAkWgCBTBfxBoNVpEYCz41hexbbUBfBoPtQ8KzAUOm/huyui+kanAaYWn9HxmKBgwQxUizAT2NqjKHCNBZw9UZ2SejcAGzzHNROAAgqU92n8wDgSzwEIwBRLvNUhEmKGGGAOBQCJoRhqaJIIvDARDJPBJah0SQS8DgWbnPkjDZGiQCGaZRJEw7+ibnZ5yVn4paOdTrofptqO3JdAOH89O28ZHO7gIBtsnSEliL9AeBYDAQeAYA+ApmOsAroJ9oHQErFORMNs8sAPBfPC13CCYCjRbIGE1kjxgKOgDiQkNl1KxAxJ2aSjGUqAhEWShhwyWAlqag2Ssl4yF5QuOQSJU5RQQlC+ge2wlxxhakyzyBVF6VpTO1SGgDMgW2OFpA56DBwS0cgUfaB1qi5aOwXvwiD3ZeRAAyvautaInxOQKeuFl+uUKjKNQwcQuSMzIr6YDFd0gqDGO3W/LIYt+cPRk3SMCQvMWEBnpZ9PR7GNAmXTcZZsZwDJEzmaFnF6vv/HXFnQJVXt+NDhS7mfbYTLn2GTIKX0oHcd3eGoKXK7ccwnR6TSiqmQWsMRiTUFxGbt9qDGuvfmC/7Z7PY3x99p7YLjAeClrQK+gG+Ozejb5So3xj0wRNULxt6cbFTFerSuKfEmMsVr35xbVx6beLT6/gdYwvqkvTA2XaixiSum7aq9LNlV6OOlDaAUnhXrzYH0Z3+HK5PzoOfze9HJ5KgsZA0LCCdY3kGjej1gicb66lvcLj1ZlY23Vc4rv0RWQSA4nDI1kspAtKSjquMud0ul05+6lU9PD8YsCKqMzrTdaKnweE65B4meXtBmm7Ctq0aY+9YLjJO0TaGTkX1ns/npXlhZwBXHdVZ68XfYPEMPG9aXHnYwvYvViwnW28stL4peJgFJ9zm/qb01FgJAiUASKACFFUAH3SwPcrz1wv7jB++oJ/8sz3K///AMH5R5E/GGrogAAAABJRU5ErkJggg==</Image> -<Url type="text/html" method="GET" template="https://www.amazon.ca/s" resultdomain="amazon.ca"> - <Param name="k" value="{searchTerms}"/> -</Url> -<SearchForm>https://www.amazon.ca/</SearchForm> -</SearchPlugin> diff --git a/mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/amazon-co-uk.xml b/mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/amazon-co-uk.xml deleted file mode 100644 index 5ff238cc73..0000000000 --- a/mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/amazon-co-uk.xml +++ /dev/null @@ -1,13 +0,0 @@ -<!-- 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>Amazon.co.uk</ShortName> -<InputEncoding>UTF-8</InputEncoding> -<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAMAAADVRocKAAABaFBMVEUAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////mQACAgH7+/uEhIT9mACFhYX9/f0JCQkFBQWwagBtQgAJBQANDQ36lgDr6+vj4+O7u7u3t7dDQ0M9PT0oKCgbGxvVgADGdwCqZgBYNQBCKAAkFgAcEQARCgDw8PDS0tKysrKtra2Xl5eSkpJtbW1dXV1aWlpLS0tHR0c5OTkzMzMuLi4qKirrjQDniwDehgC7cACZXACKUwBjOwBPLwA8JAAsGwAgEwD19fXn5+fZ2dnPz8/Ly8vHx8ekpKSdnZ2JiYl/f394eHggICD7lwD2lADRfgDPfACeXwCETwBdOAA4IgA0IAAWDgDd3d3W1ta/v7+oqKiPj497e3twcHBpaWljY2NWVlYUFBTsjgDiiADZgwDAcwC3bgCmYwCPVgB2RwBnPgBKLQAMCADt7e1fX19SUlIWFhYSEhLwkADujwCRVwB8SwB6SgBSMgAPCQBOQY7nAAAABnRSTlMA8si8ZBgxEvPEAAADLklEQVRo3u2aZ1MiMRiA0dO8WeWkd6miNEVF6c3ee++ent3r9e/fgm6iggJuMjfO7PMxs+wTkrcEJiqRluYmxIGm5hZVidZ3iBvvWkUBj/dTg7g+iCstqmbElWZVE+JKkwpxRhEoAkWgCBTBfxBoNVpEYCz41hexbbUBfBoPtQ8KzAUOm/huyui+kanAaYWn9HxmKBgwQxUizAT2NqjKHCNBZw9UZ2SejcAGzzHNROAAgqU92n8wDgSzwEIwBRLvNUhEmKGGGAOBQCJoRhqaJIIvDARDJPBJah0SQS8DgWbnPkjDZGiQCGaZRJEw7+ibnZ5yVn4paOdTrofptqO3JdAOH89O28ZHO7gIBtsnSEliL9AeBYDAQeAYA+ApmOsAroJ9oHQErFORMNs8sAPBfPC13CCYCjRbIGE1kjxgKOgDiQkNl1KxAxJ2aSjGUqAhEWShhwyWAlqag2Ssl4yF5QuOQSJU5RQQlC+ge2wlxxhakyzyBVF6VpTO1SGgDMgW2OFpA56DBwS0cgUfaB1qi5aOwXvwiD3ZeRAAyvautaInxOQKeuFl+uUKjKNQwcQuSMzIr6YDFd0gqDGO3W/LIYt+cPRk3SMCQvMWEBnpZ9PR7GNAmXTcZZsZwDJEzmaFnF6vv/HXFnQJVXt+NDhS7mfbYTLn2GTIKX0oHcd3eGoKXK7ccwnR6TSiqmQWsMRiTUFxGbt9qDGuvfmC/7Z7PY3x99p7YLjAeClrQK+gG+Ozejb5So3xj0wRNULxt6cbFTFerSuKfEmMsVr35xbVx6beLT6/gdYwvqkvTA2XaixiSum7aq9LNlV6OOlDaAUnhXrzYH0Z3+HK5PzoOfze9HJ5KgsZA0LCCdY3kGjej1gicb66lvcLj1ZlY23Vc4rv0RWQSA4nDI1kspAtKSjquMud0ul05+6lU9PD8YsCKqMzrTdaKnweE65B4meXtBmm7Ctq0aY+9YLjJO0TaGTkX1ns/npXlhZwBXHdVZ68XfYPEMPG9aXHnYwvYvViwnW28stL4peJgFJ9zm/qb01FgJAiUASKACFFUAH3SwPcrz1wv7jB++oJ/8sz3K///AMH5R5E/GGrogAAAABJRU5ErkJggg==</Image> -<Url type="text/html" method="GET" template="https://www.amazon.co.uk/s" resultdomain="amazon.co.uk"> - <Param name="k" value="{searchTerms}"/> -</Url> -<SearchForm>https://www.amazon.co.uk/</SearchForm> -</SearchPlugin> diff --git a/mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/amazon-de.xml b/mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/amazon-de.xml deleted file mode 100644 index 137abd4b94..0000000000 --- a/mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/amazon-de.xml +++ /dev/null @@ -1,13 +0,0 @@ -<!-- 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>Amazon.de</ShortName> -<InputEncoding>UTF-8</InputEncoding> -<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAMAAADVRocKAAABaFBMVEUAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////mQACAgH7+/uEhIT9mACFhYX9/f0JCQkFBQWwagBtQgAJBQANDQ36lgDr6+vj4+O7u7u3t7dDQ0M9PT0oKCgbGxvVgADGdwCqZgBYNQBCKAAkFgAcEQARCgDw8PDS0tKysrKtra2Xl5eSkpJtbW1dXV1aWlpLS0tHR0c5OTkzMzMuLi4qKirrjQDniwDehgC7cACZXACKUwBjOwBPLwA8JAAsGwAgEwD19fXn5+fZ2dnPz8/Ly8vHx8ekpKSdnZ2JiYl/f394eHggICD7lwD2lADRfgDPfACeXwCETwBdOAA4IgA0IAAWDgDd3d3W1ta/v7+oqKiPj497e3twcHBpaWljY2NWVlYUFBTsjgDiiADZgwDAcwC3bgCmYwCPVgB2RwBnPgBKLQAMCADt7e1fX19SUlIWFhYSEhLwkADujwCRVwB8SwB6SgBSMgAPCQBOQY7nAAAABnRSTlMA8si8ZBgxEvPEAAADLklEQVRo3u2aZ1MiMRiA0dO8WeWkd6miNEVF6c3ee++ent3r9e/fgm6iggJuMjfO7PMxs+wTkrcEJiqRluYmxIGm5hZVidZ3iBvvWkUBj/dTg7g+iCstqmbElWZVE+JKkwpxRhEoAkWgCBTBfxBoNVpEYCz41hexbbUBfBoPtQ8KzAUOm/huyui+kanAaYWn9HxmKBgwQxUizAT2NqjKHCNBZw9UZ2SejcAGzzHNROAAgqU92n8wDgSzwEIwBRLvNUhEmKGGGAOBQCJoRhqaJIIvDARDJPBJah0SQS8DgWbnPkjDZGiQCGaZRJEw7+ibnZ5yVn4paOdTrofptqO3JdAOH89O28ZHO7gIBtsnSEliL9AeBYDAQeAYA+ApmOsAroJ9oHQErFORMNs8sAPBfPC13CCYCjRbIGE1kjxgKOgDiQkNl1KxAxJ2aSjGUqAhEWShhwyWAlqag2Ssl4yF5QuOQSJU5RQQlC+ge2wlxxhakyzyBVF6VpTO1SGgDMgW2OFpA56DBwS0cgUfaB1qi5aOwXvwiD3ZeRAAyvautaInxOQKeuFl+uUKjKNQwcQuSMzIr6YDFd0gqDGO3W/LIYt+cPRk3SMCQvMWEBnpZ9PR7GNAmXTcZZsZwDJEzmaFnF6vv/HXFnQJVXt+NDhS7mfbYTLn2GTIKX0oHcd3eGoKXK7ccwnR6TSiqmQWsMRiTUFxGbt9qDGuvfmC/7Z7PY3x99p7YLjAeClrQK+gG+Ozejb5So3xj0wRNULxt6cbFTFerSuKfEmMsVr35xbVx6beLT6/gdYwvqkvTA2XaixiSum7aq9LNlV6OOlDaAUnhXrzYH0Z3+HK5PzoOfze9HJ5KgsZA0LCCdY3kGjej1gicb66lvcLj1ZlY23Vc4rv0RWQSA4nDI1kspAtKSjquMud0ul05+6lU9PD8YsCKqMzrTdaKnweE65B4meXtBmm7Ctq0aY+9YLjJO0TaGTkX1ns/npXlhZwBXHdVZ68XfYPEMPG9aXHnYwvYvViwnW28stL4peJgFJ9zm/qb01FgJAiUASKACFFUAH3SwPcrz1wv7jB++oJ/8sz3K///AMH5R5E/GGrogAAAABJRU5ErkJggg==</Image> -<Url type="text/html" method="GET" template="https://www.amazon.de/s" resultdomain="amazon.de"> - <Param name="k" value="{searchTerms}"/> -</Url> -<SearchForm>https://www.amazon.de/</SearchForm> -</SearchPlugin> diff --git a/mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/amazon-es.xml b/mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/amazon-es.xml deleted file mode 100644 index c989b9f361..0000000000 --- a/mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/amazon-es.xml +++ /dev/null @@ -1,13 +0,0 @@ -<!-- 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>Amazon.es</ShortName> -<InputEncoding>UTF-8</InputEncoding> -<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAMAAADVRocKAAABaFBMVEUAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////mQACAgH7+/uEhIT9mACFhYX9/f0JCQkFBQWwagBtQgAJBQANDQ36lgDr6+vj4+O7u7u3t7dDQ0M9PT0oKCgbGxvVgADGdwCqZgBYNQBCKAAkFgAcEQARCgDw8PDS0tKysrKtra2Xl5eSkpJtbW1dXV1aWlpLS0tHR0c5OTkzMzMuLi4qKirrjQDniwDehgC7cACZXACKUwBjOwBPLwA8JAAsGwAgEwD19fXn5+fZ2dnPz8/Ly8vHx8ekpKSdnZ2JiYl/f394eHggICD7lwD2lADRfgDPfACeXwCETwBdOAA4IgA0IAAWDgDd3d3W1ta/v7+oqKiPj497e3twcHBpaWljY2NWVlYUFBTsjgDiiADZgwDAcwC3bgCmYwCPVgB2RwBnPgBKLQAMCADt7e1fX19SUlIWFhYSEhLwkADujwCRVwB8SwB6SgBSMgAPCQBOQY7nAAAABnRSTlMA8si8ZBgxEvPEAAADLklEQVRo3u2aZ1MiMRiA0dO8WeWkd6miNEVF6c3ee++ent3r9e/fgm6iggJuMjfO7PMxs+wTkrcEJiqRluYmxIGm5hZVidZ3iBvvWkUBj/dTg7g+iCstqmbElWZVE+JKkwpxRhEoAkWgCBTBfxBoNVpEYCz41hexbbUBfBoPtQ8KzAUOm/huyui+kanAaYWn9HxmKBgwQxUizAT2NqjKHCNBZw9UZ2SejcAGzzHNROAAgqU92n8wDgSzwEIwBRLvNUhEmKGGGAOBQCJoRhqaJIIvDARDJPBJah0SQS8DgWbnPkjDZGiQCGaZRJEw7+ibnZ5yVn4paOdTrofptqO3JdAOH89O28ZHO7gIBtsnSEliL9AeBYDAQeAYA+ApmOsAroJ9oHQErFORMNs8sAPBfPC13CCYCjRbIGE1kjxgKOgDiQkNl1KxAxJ2aSjGUqAhEWShhwyWAlqag2Ssl4yF5QuOQSJU5RQQlC+ge2wlxxhakyzyBVF6VpTO1SGgDMgW2OFpA56DBwS0cgUfaB1qi5aOwXvwiD3ZeRAAyvautaInxOQKeuFl+uUKjKNQwcQuSMzIr6YDFd0gqDGO3W/LIYt+cPRk3SMCQvMWEBnpZ9PR7GNAmXTcZZsZwDJEzmaFnF6vv/HXFnQJVXt+NDhS7mfbYTLn2GTIKX0oHcd3eGoKXK7ccwnR6TSiqmQWsMRiTUFxGbt9qDGuvfmC/7Z7PY3x99p7YLjAeClrQK+gG+Ozejb5So3xj0wRNULxt6cbFTFerSuKfEmMsVr35xbVx6beLT6/gdYwvqkvTA2XaixiSum7aq9LNlV6OOlDaAUnhXrzYH0Z3+HK5PzoOfze9HJ5KgsZA0LCCdY3kGjej1gicb66lvcLj1ZlY23Vc4rv0RWQSA4nDI1kspAtKSjquMud0ul05+6lU9PD8YsCKqMzrTdaKnweE65B4meXtBmm7Ctq0aY+9YLjJO0TaGTkX1ns/npXlhZwBXHdVZ68XfYPEMPG9aXHnYwvYvViwnW28stL4peJgFJ9zm/qb01FgJAiUASKACFFUAH3SwPcrz1wv7jB++oJ/8sz3K///AMH5R5E/GGrogAAAABJRU5ErkJggg==</Image> -<Url type="text/html" method="GET" template="https://www.amazon.es/s" resultdomain="amazon.es"> - <Param name="k" value="{searchTerms}"/> -</Url> -<SearchForm>https://www.amazon.es/</SearchForm> -</SearchPlugin> diff --git a/mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/amazon-fr.xml b/mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/amazon-fr.xml deleted file mode 100644 index abfb75bee5..0000000000 --- a/mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/amazon-fr.xml +++ /dev/null @@ -1,13 +0,0 @@ -<!-- 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>Amazon.fr</ShortName> -<InputEncoding>UTF-8</InputEncoding> -<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAMAAADVRocKAAABaFBMVEUAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////mQACAgH7+/uEhIT9mACFhYX9/f0JCQkFBQWwagBtQgAJBQANDQ36lgDr6+vj4+O7u7u3t7dDQ0M9PT0oKCgbGxvVgADGdwCqZgBYNQBCKAAkFgAcEQARCgDw8PDS0tKysrKtra2Xl5eSkpJtbW1dXV1aWlpLS0tHR0c5OTkzMzMuLi4qKirrjQDniwDehgC7cACZXACKUwBjOwBPLwA8JAAsGwAgEwD19fXn5+fZ2dnPz8/Ly8vHx8ekpKSdnZ2JiYl/f394eHggICD7lwD2lADRfgDPfACeXwCETwBdOAA4IgA0IAAWDgDd3d3W1ta/v7+oqKiPj497e3twcHBpaWljY2NWVlYUFBTsjgDiiADZgwDAcwC3bgCmYwCPVgB2RwBnPgBKLQAMCADt7e1fX19SUlIWFhYSEhLwkADujwCRVwB8SwB6SgBSMgAPCQBOQY7nAAAABnRSTlMA8si8ZBgxEvPEAAADLklEQVRo3u2aZ1MiMRiA0dO8WeWkd6miNEVF6c3ee++ent3r9e/fgm6iggJuMjfO7PMxs+wTkrcEJiqRluYmxIGm5hZVidZ3iBvvWkUBj/dTg7g+iCstqmbElWZVE+JKkwpxRhEoAkWgCBTBfxBoNVpEYCz41hexbbUBfBoPtQ8KzAUOm/huyui+kanAaYWn9HxmKBgwQxUizAT2NqjKHCNBZw9UZ2SejcAGzzHNROAAgqU92n8wDgSzwEIwBRLvNUhEmKGGGAOBQCJoRhqaJIIvDARDJPBJah0SQS8DgWbnPkjDZGiQCGaZRJEw7+ibnZ5yVn4paOdTrofptqO3JdAOH89O28ZHO7gIBtsnSEliL9AeBYDAQeAYA+ApmOsAroJ9oHQErFORMNs8sAPBfPC13CCYCjRbIGE1kjxgKOgDiQkNl1KxAxJ2aSjGUqAhEWShhwyWAlqag2Ssl4yF5QuOQSJU5RQQlC+ge2wlxxhakyzyBVF6VpTO1SGgDMgW2OFpA56DBwS0cgUfaB1qi5aOwXvwiD3ZeRAAyvautaInxOQKeuFl+uUKjKNQwcQuSMzIr6YDFd0gqDGO3W/LIYt+cPRk3SMCQvMWEBnpZ9PR7GNAmXTcZZsZwDJEzmaFnF6vv/HXFnQJVXt+NDhS7mfbYTLn2GTIKX0oHcd3eGoKXK7ccwnR6TSiqmQWsMRiTUFxGbt9qDGuvfmC/7Z7PY3x99p7YLjAeClrQK+gG+Ozejb5So3xj0wRNULxt6cbFTFerSuKfEmMsVr35xbVx6beLT6/gdYwvqkvTA2XaixiSum7aq9LNlV6OOlDaAUnhXrzYH0Z3+HK5PzoOfze9HJ5KgsZA0LCCdY3kGjej1gicb66lvcLj1ZlY23Vc4rv0RWQSA4nDI1kspAtKSjquMud0ul05+6lU9PD8YsCKqMzrTdaKnweE65B4meXtBmm7Ctq0aY+9YLjJO0TaGTkX1ns/npXlhZwBXHdVZ68XfYPEMPG9aXHnYwvYvViwnW28stL4peJgFJ9zm/qb01FgJAiUASKACFFUAH3SwPcrz1wv7jB++oJ/8sz3K///AMH5R5E/GGrogAAAABJRU5ErkJggg==</Image> -<Url type="text/html" method="GET" template="https://www.amazon.fr/s" resultdomain="amazon.fr"> - <Param name="k" value="{searchTerms}"/> -</Url> -<SearchForm>https://www.amazon.fr/</SearchForm> -</SearchPlugin> diff --git a/mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/amazon-in.xml b/mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/amazon-in.xml deleted file mode 100644 index 2c1be1f73a..0000000000 --- a/mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/amazon-in.xml +++ /dev/null @@ -1,13 +0,0 @@ -<!-- 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>Amazon.in</ShortName> -<InputEncoding>utf-8</InputEncoding> -<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAMAAADVRocKAAABaFBMVEUAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////mQACAgH7+/uEhIT9mACFhYX9/f0JCQkFBQWwagBtQgAJBQANDQ36lgDr6+vj4+O7u7u3t7dDQ0M9PT0oKCgbGxvVgADGdwCqZgBYNQBCKAAkFgAcEQARCgDw8PDS0tKysrKtra2Xl5eSkpJtbW1dXV1aWlpLS0tHR0c5OTkzMzMuLi4qKirrjQDniwDehgC7cACZXACKUwBjOwBPLwA8JAAsGwAgEwD19fXn5+fZ2dnPz8/Ly8vHx8ekpKSdnZ2JiYl/f394eHggICD7lwD2lADRfgDPfACeXwCETwBdOAA4IgA0IAAWDgDd3d3W1ta/v7+oqKiPj497e3twcHBpaWljY2NWVlYUFBTsjgDiiADZgwDAcwC3bgCmYwCPVgB2RwBnPgBKLQAMCADt7e1fX19SUlIWFhYSEhLwkADujwCRVwB8SwB6SgBSMgAPCQBOQY7nAAAABnRSTlMA8si8ZBgxEvPEAAADLklEQVRo3u2aZ1MiMRiA0dO8WeWkd6miNEVF6c3ee++ent3r9e/fgm6iggJuMjfO7PMxs+wTkrcEJiqRluYmxIGm5hZVidZ3iBvvWkUBj/dTg7g+iCstqmbElWZVE+JKkwpxRhEoAkWgCBTBfxBoNVpEYCz41hexbbUBfBoPtQ8KzAUOm/huyui+kanAaYWn9HxmKBgwQxUizAT2NqjKHCNBZw9UZ2SejcAGzzHNROAAgqU92n8wDgSzwEIwBRLvNUhEmKGGGAOBQCJoRhqaJIIvDARDJPBJah0SQS8DgWbnPkjDZGiQCGaZRJEw7+ibnZ5yVn4paOdTrofptqO3JdAOH89O28ZHO7gIBtsnSEliL9AeBYDAQeAYA+ApmOsAroJ9oHQErFORMNs8sAPBfPC13CCYCjRbIGE1kjxgKOgDiQkNl1KxAxJ2aSjGUqAhEWShhwyWAlqag2Ssl4yF5QuOQSJU5RQQlC+ge2wlxxhakyzyBVF6VpTO1SGgDMgW2OFpA56DBwS0cgUfaB1qi5aOwXvwiD3ZeRAAyvautaInxOQKeuFl+uUKjKNQwcQuSMzIr6YDFd0gqDGO3W/LIYt+cPRk3SMCQvMWEBnpZ9PR7GNAmXTcZZsZwDJEzmaFnF6vv/HXFnQJVXt+NDhS7mfbYTLn2GTIKX0oHcd3eGoKXK7ccwnR6TSiqmQWsMRiTUFxGbt9qDGuvfmC/7Z7PY3x99p7YLjAeClrQK+gG+Ozejb5So3xj0wRNULxt6cbFTFerSuKfEmMsVr35xbVx6beLT6/gdYwvqkvTA2XaixiSum7aq9LNlV6OOlDaAUnhXrzYH0Z3+HK5PzoOfze9HJ5KgsZA0LCCdY3kGjej1gicb66lvcLj1ZlY23Vc4rv0RWQSA4nDI1kspAtKSjquMud0ul05+6lU9PD8YsCKqMzrTdaKnweE65B4meXtBmm7Ctq0aY+9YLjJO0TaGTkX1ns/npXlhZwBXHdVZ68XfYPEMPG9aXHnYwvYvViwnW28stL4peJgFJ9zm/qb01FgJAiUASKACFFUAH3SwPcrz1wv7jB++oJ/8sz3K///AMH5R5E/GGrogAAAABJRU5ErkJggg==</Image> -<Url type="text/html" method="GET" template="https://www.amazon.in/s"> - <Param name="k" value="{searchTerms}"/> -</Url> -<SearchForm>https://www.amazon.in/</SearchForm> -</SearchPlugin> diff --git a/mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/amazon-it.xml b/mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/amazon-it.xml deleted file mode 100644 index 805bbf0af2..0000000000 --- a/mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/amazon-it.xml +++ /dev/null @@ -1,13 +0,0 @@ -<!-- 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>Amazon.it</ShortName> -<InputEncoding>UTF-8</InputEncoding> -<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAMAAADVRocKAAABaFBMVEUAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////mQACAgH7+/uEhIT9mACFhYX9/f0JCQkFBQWwagBtQgAJBQANDQ36lgDr6+vj4+O7u7u3t7dDQ0M9PT0oKCgbGxvVgADGdwCqZgBYNQBCKAAkFgAcEQARCgDw8PDS0tKysrKtra2Xl5eSkpJtbW1dXV1aWlpLS0tHR0c5OTkzMzMuLi4qKirrjQDniwDehgC7cACZXACKUwBjOwBPLwA8JAAsGwAgEwD19fXn5+fZ2dnPz8/Ly8vHx8ekpKSdnZ2JiYl/f394eHggICD7lwD2lADRfgDPfACeXwCETwBdOAA4IgA0IAAWDgDd3d3W1ta/v7+oqKiPj497e3twcHBpaWljY2NWVlYUFBTsjgDiiADZgwDAcwC3bgCmYwCPVgB2RwBnPgBKLQAMCADt7e1fX19SUlIWFhYSEhLwkADujwCRVwB8SwB6SgBSMgAPCQBOQY7nAAAABnRSTlMA8si8ZBgxEvPEAAADLklEQVRo3u2aZ1MiMRiA0dO8WeWkd6miNEVF6c3ee++ent3r9e/fgm6iggJuMjfO7PMxs+wTkrcEJiqRluYmxIGm5hZVidZ3iBvvWkUBj/dTg7g+iCstqmbElWZVE+JKkwpxRhEoAkWgCBTBfxBoNVpEYCz41hexbbUBfBoPtQ8KzAUOm/huyui+kanAaYWn9HxmKBgwQxUizAT2NqjKHCNBZw9UZ2SejcAGzzHNROAAgqU92n8wDgSzwEIwBRLvNUhEmKGGGAOBQCJoRhqaJIIvDARDJPBJah0SQS8DgWbnPkjDZGiQCGaZRJEw7+ibnZ5yVn4paOdTrofptqO3JdAOH89O28ZHO7gIBtsnSEliL9AeBYDAQeAYA+ApmOsAroJ9oHQErFORMNs8sAPBfPC13CCYCjRbIGE1kjxgKOgDiQkNl1KxAxJ2aSjGUqAhEWShhwyWAlqag2Ssl4yF5QuOQSJU5RQQlC+ge2wlxxhakyzyBVF6VpTO1SGgDMgW2OFpA56DBwS0cgUfaB1qi5aOwXvwiD3ZeRAAyvautaInxOQKeuFl+uUKjKNQwcQuSMzIr6YDFd0gqDGO3W/LIYt+cPRk3SMCQvMWEBnpZ9PR7GNAmXTcZZsZwDJEzmaFnF6vv/HXFnQJVXt+NDhS7mfbYTLn2GTIKX0oHcd3eGoKXK7ccwnR6TSiqmQWsMRiTUFxGbt9qDGuvfmC/7Z7PY3x99p7YLjAeClrQK+gG+Ozejb5So3xj0wRNULxt6cbFTFerSuKfEmMsVr35xbVx6beLT6/gdYwvqkvTA2XaixiSum7aq9LNlV6OOlDaAUnhXrzYH0Z3+HK5PzoOfze9HJ5KgsZA0LCCdY3kGjej1gicb66lvcLj1ZlY23Vc4rv0RWQSA4nDI1kspAtKSjquMud0ul05+6lU9PD8YsCKqMzrTdaKnweE65B4meXtBmm7Ctq0aY+9YLjJO0TaGTkX1ns/npXlhZwBXHdVZ68XfYPEMPG9aXHnYwvYvViwnW28stL4peJgFJ9zm/qb01FgJAiUASKACFFUAH3SwPcrz1wv7jB++oJ/8sz3K///AMH5R5E/GGrogAAAABJRU5ErkJggg==</Image> -<Url type="text/html" method="GET" template="https://www.amazon.it/s" resultdomain="amazon.it"> - <Param name="k" value="{searchTerms}"/> -</Url> -<SearchForm>https://www.amazon.it/</SearchForm> -</SearchPlugin> diff --git a/mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/amazon-nl.xml b/mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/amazon-nl.xml deleted file mode 100644 index 75530332cc..0000000000 --- a/mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/amazon-nl.xml +++ /dev/null @@ -1,13 +0,0 @@ -<!-- 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>Amazon.nl</ShortName> -<InputEncoding>UTF-8</InputEncoding> -<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAMAAADVRocKAAABaFBMVEUAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////mQACAgH7+/uEhIT9mACFhYX9/f0JCQkFBQWwagBtQgAJBQANDQ36lgDr6+vj4+O7u7u3t7dDQ0M9PT0oKCgbGxvVgADGdwCqZgBYNQBCKAAkFgAcEQARCgDw8PDS0tKysrKtra2Xl5eSkpJtbW1dXV1aWlpLS0tHR0c5OTkzMzMuLi4qKirrjQDniwDehgC7cACZXACKUwBjOwBPLwA8JAAsGwAgEwD19fXn5+fZ2dnPz8/Ly8vHx8ekpKSdnZ2JiYl/f394eHggICD7lwD2lADRfgDPfACeXwCETwBdOAA4IgA0IAAWDgDd3d3W1ta/v7+oqKiPj497e3twcHBpaWljY2NWVlYUFBTsjgDiiADZgwDAcwC3bgCmYwCPVgB2RwBnPgBKLQAMCADt7e1fX19SUlIWFhYSEhLwkADujwCRVwB8SwB6SgBSMgAPCQBOQY7nAAAABnRSTlMA8si8ZBgxEvPEAAADLklEQVRo3u2aZ1MiMRiA0dO8WeWkd6miNEVF6c3ee++ent3r9e/fgm6iggJuMjfO7PMxs+wTkrcEJiqRluYmxIGm5hZVidZ3iBvvWkUBj/dTg7g+iCstqmbElWZVE+JKkwpxRhEoAkWgCBTBfxBoNVpEYCz41hexbbUBfBoPtQ8KzAUOm/huyui+kanAaYWn9HxmKBgwQxUizAT2NqjKHCNBZw9UZ2SejcAGzzHNROAAgqU92n8wDgSzwEIwBRLvNUhEmKGGGAOBQCJoRhqaJIIvDARDJPBJah0SQS8DgWbnPkjDZGiQCGaZRJEw7+ibnZ5yVn4paOdTrofptqO3JdAOH89O28ZHO7gIBtsnSEliL9AeBYDAQeAYA+ApmOsAroJ9oHQErFORMNs8sAPBfPC13CCYCjRbIGE1kjxgKOgDiQkNl1KxAxJ2aSjGUqAhEWShhwyWAlqag2Ssl4yF5QuOQSJU5RQQlC+ge2wlxxhakyzyBVF6VpTO1SGgDMgW2OFpA56DBwS0cgUfaB1qi5aOwXvwiD3ZeRAAyvautaInxOQKeuFl+uUKjKNQwcQuSMzIr6YDFd0gqDGO3W/LIYt+cPRk3SMCQvMWEBnpZ9PR7GNAmXTcZZsZwDJEzmaFnF6vv/HXFnQJVXt+NDhS7mfbYTLn2GTIKX0oHcd3eGoKXK7ccwnR6TSiqmQWsMRiTUFxGbt9qDGuvfmC/7Z7PY3x99p7YLjAeClrQK+gG+Ozejb5So3xj0wRNULxt6cbFTFerSuKfEmMsVr35xbVx6beLT6/gdYwvqkvTA2XaixiSum7aq9LNlV6OOlDaAUnhXrzYH0Z3+HK5PzoOfze9HJ5KgsZA0LCCdY3kGjej1gicb66lvcLj1ZlY23Vc4rv0RWQSA4nDI1kspAtKSjquMud0ul05+6lU9PD8YsCKqMzrTdaKnweE65B4meXtBmm7Ctq0aY+9YLjJO0TaGTkX1ns/npXlhZwBXHdVZ68XfYPEMPG9aXHnYwvYvViwnW28stL4peJgFJ9zm/qb01FgJAiUASKACFFUAH3SwPcrz1wv7jB++oJ/8sz3K///AMH5R5E/GGrogAAAABJRU5ErkJggg==</Image> -<Url type="text/html" method="GET" template="https://www.amazon.nl/s"> - <Param name="k" value="{searchTerms}"/> -</Url> -<SearchForm>https://www.amazon.nl/</SearchForm> -</SearchPlugin> diff --git a/mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/amazon-se.xml b/mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/amazon-se.xml deleted file mode 100644 index 98f7b2d35a..0000000000 --- a/mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/amazon-se.xml +++ /dev/null @@ -1,13 +0,0 @@ -<!-- 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>Amazon.se</ShortName> -<InputEncoding>UTF-8</InputEncoding> -<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAMAAADVRocKAAABaFBMVEUAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////mQACAgH7+/uEhIT9mACFhYX9/f0JCQkFBQWwagBtQgAJBQANDQ36lgDr6+vj4+O7u7u3t7dDQ0M9PT0oKCgbGxvVgADGdwCqZgBYNQBCKAAkFgAcEQARCgDw8PDS0tKysrKtra2Xl5eSkpJtbW1dXV1aWlpLS0tHR0c5OTkzMzMuLi4qKirrjQDniwDehgC7cACZXACKUwBjOwBPLwA8JAAsGwAgEwD19fXn5+fZ2dnPz8/Ly8vHx8ekpKSdnZ2JiYl/f394eHggICD7lwD2lADRfgDPfACeXwCETwBdOAA4IgA0IAAWDgDd3d3W1ta/v7+oqKiPj497e3twcHBpaWljY2NWVlYUFBTsjgDiiADZgwDAcwC3bgCmYwCPVgB2RwBnPgBKLQAMCADt7e1fX19SUlIWFhYSEhLwkADujwCRVwB8SwB6SgBSMgAPCQBOQY7nAAAABnRSTlMA8si8ZBgxEvPEAAADLklEQVRo3u2aZ1MiMRiA0dO8WeWkd6miNEVF6c3ee++ent3r9e/fgm6iggJuMjfO7PMxs+wTkrcEJiqRluYmxIGm5hZVidZ3iBvvWkUBj/dTg7g+iCstqmbElWZVE+JKkwpxRhEoAkWgCBTBfxBoNVpEYCz41hexbbUBfBoPtQ8KzAUOm/huyui+kanAaYWn9HxmKBgwQxUizAT2NqjKHCNBZw9UZ2SejcAGzzHNROAAgqU92n8wDgSzwEIwBRLvNUhEmKGGGAOBQCJoRhqaJIIvDARDJPBJah0SQS8DgWbnPkjDZGiQCGaZRJEw7+ibnZ5yVn4paOdTrofptqO3JdAOH89O28ZHO7gIBtsnSEliL9AeBYDAQeAYA+ApmOsAroJ9oHQErFORMNs8sAPBfPC13CCYCjRbIGE1kjxgKOgDiQkNl1KxAxJ2aSjGUqAhEWShhwyWAlqag2Ssl4yF5QuOQSJU5RQQlC+ge2wlxxhakyzyBVF6VpTO1SGgDMgW2OFpA56DBwS0cgUfaB1qi5aOwXvwiD3ZeRAAyvautaInxOQKeuFl+uUKjKNQwcQuSMzIr6YDFd0gqDGO3W/LIYt+cPRk3SMCQvMWEBnpZ9PR7GNAmXTcZZsZwDJEzmaFnF6vv/HXFnQJVXt+NDhS7mfbYTLn2GTIKX0oHcd3eGoKXK7ccwnR6TSiqmQWsMRiTUFxGbt9qDGuvfmC/7Z7PY3x99p7YLjAeClrQK+gG+Ozejb5So3xj0wRNULxt6cbFTFerSuKfEmMsVr35xbVx6beLT6/gdYwvqkvTA2XaixiSum7aq9LNlV6OOlDaAUnhXrzYH0Z3+HK5PzoOfze9HJ5KgsZA0LCCdY3kGjej1gicb66lvcLj1ZlY23Vc4rv0RWQSA4nDI1kspAtKSjquMud0ul05+6lU9PD8YsCKqMzrTdaKnweE65B4meXtBmm7Ctq0aY+9YLjJO0TaGTkX1ns/npXlhZwBXHdVZ68XfYPEMPG9aXHnYwvYvViwnW28stL4peJgFJ9zm/qb01FgJAiUASKACFFUAH3SwPcrz1wv7jB++oJ/8sz3K///AMH5R5E/GGrogAAAABJRU5ErkJggg==</Image> -<Url type="text/html" method="GET" template="https://www.amazon.se/s" resultdomain="amazon.se"> - <Param name="k" value="{searchTerms}"/> -</Url> -<SearchForm>https://www.amazon.se/</SearchForm> -</SearchPlugin> diff --git a/mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/amazondotcom.xml b/mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/amazondotcom.xml deleted file mode 100644 index 2af84b936c..0000000000 --- a/mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/amazondotcom.xml +++ /dev/null @@ -1,13 +0,0 @@ -<!-- 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>Amazon.com</ShortName> -<InputEncoding>UTF-8</InputEncoding> -<Image width="32" height="32">data:image/png;base64,AAABAAIAEBAAAAEACACtAQAAJgAAACAgAAABACAArAMAANMBAACJUE5HDQoaCgAAAA1JSERSAAAAEAAAABAIBgAAAB/z/2EAAAF0SURBVDiNpVM9S8NQFD2RvC6KCE6V5gdUHBonF6eQrQ4q6dbVjkKH/gN3oVmLk8VFK7gKuiklU6lguliHpliXhrRLKxyH1NB8aEUP3OHdd+9559z3niQLgelkQvwBIpWSJJKx5k6ng1qthpduFwCwl8+jWCwmszACy7IoCxGLSqUSLSVJxgiOSiXKQlDTddq2HawzipJIELPQ7/fhOA5c14XneTiv19FoNAAA08lksQXbtplT1UQbv7JgFAqUhWBOVek4Dqum+SPBUlTRl1zDMJBOp9FqtYK90Wi02MK8fE3XQxaqpvmNhXEvSFiWxYyiBJOvmiaNQoGartPzPLJzRjbLfgQEN1ly+JzoMYS7fb/x6ZS8wBxB79ZPNMshNTGMe2T3yj/scp3k/Dt4bQCPB/5g1nYB5TA8rLd7YHAN7FwBYhUYtoHNY4Qf0rsFtE/8wiiWs8B2FdjQgI/ZbcgrSPxMcG1g8ABM3ZmiLb8xAdJ/v/Mnx1XnNJorMikAAAAASUVORK5CYIKJUE5HDQoaCgAAAA1JSERSAAAAIAAAACAIBgAAAHN6evQAAANzSURBVFiFtZdPaBRXHMc/r+4GlGAbylYWXZFQaCOt7CSK/+hJt/XSogUDvfTQ0OzBg2hgblEQFA9iLeauBDyYUB3x0kv6J0pr4gZLum0yFIpt3V3cUJoymxwS4edhMnEn+3bmJSFfGNj3m9+832d+7/d7bxaWJCKbRaRPRP6QjdPkUozN1EtE2jc4sA6kHUAt0UwCb2OoWq2G67rLY6UU6XSadDptOgXAr8B+ROScKbbjOHI0l5NEMqm9juZy4jjOajLRhxik3vO8yMArL9u2TQEKmHid7O4OBdiUSMRCGGZiPhbAcRxtgKxlycnu7qaZOZLLmQBILMCXvb2xKbZtWwthotfiSlUp1WDr7+8PjXt6elZT/eH5RUTinOrbTilFZ2dng0+ypaXBtriwEAuQMKFsbW2lq6treVypVCiXy/z86BEAo6OjAIiINmPrBgiC3rh5k+HhYYrFotZntcEBjNrQcRzZkckY7wOrKcLYGpiYmODAwYPae2fPnCGzcye7Ozr46NixhvsmNRCbgaxlabfcUqkU8ltrBiIBXNfVTlwoFEJ+5XJ5Y/aBqakprb2+I6L8KpVK7ApEAvzz7JnWXqvVQuPbQ0Nav/Hx8ViAyCUYGRnRHj71W/Hg4GDTAyprWeJ5XuQSRAI0W9tgcpPWvD4wsHYAkcajOApopW1HJiOu664PoNnHSH3KbdsWz/NCp2LWsmKDGwEEENcHBpZBNiUSkrUs6c3nG1ry4qVL0pvPh9d+riRSfSxSHRdZDNdEeCf8/WvYkoFdn8ZXr4nmyzB2CqoOBFH2XIPdp5t0wey0yDdvinx33CderxY9f565kv/7fofIb9dCLuF94PV34JOnsPAvjOyD70/A0zvwItz3xqqOQfEi3N8OcyWoTUHqUMhFfxi9qMGT8/Dn1Vepy3wBbXsgdRja3oVEa+Mz/03DbBGqD+D5Pf9FFHDgDiS3QvECfPhj/VP/KxGZBN7XvsFMAcY+98mDo34lrqqzrfwc2HYcrMt+ZmceQ8tW//crPVQi0gdc0QIE+usuTH8Fsw/8YEFQHZQC2s/Crs8gtTdyWiAf/DX7CcjGeTNfhpkxmPsbnv+wFFBBss1fnjfeg7f2Ny6PXg+VUh/4LyCSEpF76y97Y90SkVSQsGWJyAngY2Avzepi7foFeAIMKaW+DYwvASfwPtL4PwlOAAAAAElFTkSuQmCC</Image> -<Url type="text/html" method="GET" template="https://www.amazon.com/s" resultdomain="amazon.com"> - <Param name="k" value="{searchTerms}"/> -</Url> -<SearchForm>https://www.amazon.com/</SearchForm> -</SearchPlugin> diff --git a/mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/internal/SearchUrlBuilder.kt b/mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/internal/SearchUrlBuilder.kt index 9fc9f61dd5..40eec1a13c 100644 --- a/mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/internal/SearchUrlBuilder.kt +++ b/mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/internal/SearchUrlBuilder.kt @@ -17,10 +17,8 @@ import java.util.Locale // be inconsistent between Kotlin versions. So to be safe we avoid this completely by // constructing the strings manually. -// Parameters copied from nsSearchService.js +// Parameters copied from SearchEngine.sys.mjs on desktop. private const val MOZ_PARAM_LOCALE = "{" + "moz:locale" + "}" -private const val MOZ_PARAM_DIST_ID = "{" + "moz:distributionID" + "}" -private const val MOZ_PARAM_OFFICIAL = "{" + "moz:official" + "}" // Supported OpenSearch parameters // See http://opensearch.a9.com/spec/1.1/querysyntax/#core @@ -66,8 +64,6 @@ private fun paramSubstitution(template: String, query: String, inputEncoding: St val locale = Locale.getDefault().toString() result = result.replace(MOZ_PARAM_LOCALE, locale) - result = result.replace(MOZ_PARAM_DIST_ID, "") - result = result.replace(MOZ_PARAM_OFFICIAL, "unofficial") result = result.replace(OS_PARAM_USER_DEFINED, query) result = result.replace(OS_PARAM_INPUT_ENCODING, inputEncoding) diff --git a/mobile/android/android-components/components/feature/search/src/test/java/mozilla/components/feature/search/middleware/SearchMiddlewareTest.kt b/mobile/android/android-components/components/feature/search/src/test/java/mozilla/components/feature/search/middleware/SearchMiddlewareTest.kt index a93a6e1700..78b4e53e51 100644 --- a/mobile/android/android-components/components/feature/search/src/test/java/mozilla/components/feature/search/middleware/SearchMiddlewareTest.kt +++ b/mobile/android/android-components/components/feature/search/src/test/java/mozilla/components/feature/search/middleware/SearchMiddlewareTest.kt @@ -222,14 +222,13 @@ class SearchMiddlewareTest { assertTrue(store.state.search.additionalAvailableSearchEngines.isEmpty()) assertTrue(store.state.search.additionalSearchEngines.isEmpty()) - assertEquals(6, store.state.search.regionSearchEngines.size) + assertEquals(5, store.state.search.regionSearchEngines.size) assertEquals("Google", store.state.search.regionSearchEngines[0].name) assertEquals("Bing", store.state.search.regionSearchEngines[1].name) - assertEquals("Amazon.co.uk", store.state.search.regionSearchEngines[2].name) - assertEquals("DuckDuckGo", store.state.search.regionSearchEngines[3].name) - assertEquals("eBay", store.state.search.regionSearchEngines[4].name) - assertEquals("Wicipedia (cy)", store.state.search.regionSearchEngines[5].name) + assertEquals("DuckDuckGo", store.state.search.regionSearchEngines[2].name) + assertEquals("eBay", store.state.search.regionSearchEngines[3].name) + assertEquals("Wicipedia (cy)", store.state.search.regionSearchEngines[4].name) assertEquals("Google", store.state.search.selectedOrDefaultSearchEngine!!.name) } @@ -299,14 +298,13 @@ class SearchMiddlewareTest { assertTrue(store.state.search.additionalAvailableSearchEngines.isEmpty()) assertTrue(store.state.search.additionalSearchEngines.isEmpty()) - assertEquals(6, store.state.search.regionSearchEngines.size) + assertEquals(5, store.state.search.regionSearchEngines.size) assertEquals("Google", store.state.search.regionSearchEngines[0].name) assertEquals("Bing", store.state.search.regionSearchEngines[1].name) - assertEquals("Amazon.com.au", store.state.search.regionSearchEngines[2].name) - assertEquals("DuckDuckGo", store.state.search.regionSearchEngines[3].name) - assertEquals("Wikipedia", store.state.search.regionSearchEngines[4].name) - assertEquals("eBay", store.state.search.regionSearchEngines[5].name) + assertEquals("DuckDuckGo", store.state.search.regionSearchEngines[2].name) + assertEquals("Wikipedia", store.state.search.regionSearchEngines[3].name) + assertEquals("eBay", store.state.search.regionSearchEngines[4].name) assertEquals("Google", store.state.search.selectedOrDefaultSearchEngine!!.name) } @@ -338,15 +336,14 @@ class SearchMiddlewareTest { assertTrue(store.state.search.additionalAvailableSearchEngines.isEmpty()) assertTrue(store.state.search.additionalSearchEngines.isEmpty()) - assertEquals(7, store.state.search.regionSearchEngines.size) + assertEquals(6, store.state.search.regionSearchEngines.size) assertEquals("Google", store.state.search.regionSearchEngines[0].name) assertEquals("Bing", store.state.search.regionSearchEngines[1].name) - assertEquals("Amazon.co.uk", store.state.search.regionSearchEngines[2].name) - assertEquals("DuckDuckGo", store.state.search.regionSearchEngines[3].name) - assertEquals("Qwant", store.state.search.regionSearchEngines[4].name) - assertEquals("Wikipedia", store.state.search.regionSearchEngines[5].name) - assertEquals("eBay", store.state.search.regionSearchEngines[6].name) + assertEquals("DuckDuckGo", store.state.search.regionSearchEngines[2].name) + assertEquals("Qwant", store.state.search.regionSearchEngines[3].name) + assertEquals("Wikipedia", store.state.search.regionSearchEngines[4].name) + assertEquals("eBay", store.state.search.regionSearchEngines[5].name) assertEquals("Google", store.state.search.selectedOrDefaultSearchEngine!!.name) } @@ -378,15 +375,14 @@ class SearchMiddlewareTest { assertTrue(store.state.search.additionalAvailableSearchEngines.isEmpty()) assertTrue(store.state.search.additionalSearchEngines.isEmpty()) - assertEquals(7, store.state.search.regionSearchEngines.size) + assertEquals(6, store.state.search.regionSearchEngines.size) assertEquals("Google", store.state.search.regionSearchEngines[0].name) assertEquals("Bing", store.state.search.regionSearchEngines[1].name) - assertEquals("Amazon.co.uk", store.state.search.regionSearchEngines[2].name) - assertEquals("DuckDuckGo", store.state.search.regionSearchEngines[3].name) - assertEquals("Qwant", store.state.search.regionSearchEngines[4].name) - assertEquals("Wikipedia", store.state.search.regionSearchEngines[5].name) - assertEquals("eBay", store.state.search.regionSearchEngines[6].name) + assertEquals("DuckDuckGo", store.state.search.regionSearchEngines[2].name) + assertEquals("Qwant", store.state.search.regionSearchEngines[3].name) + assertEquals("Wikipedia", store.state.search.regionSearchEngines[4].name) + assertEquals("eBay", store.state.search.regionSearchEngines[5].name) assertEquals("Google", store.state.search.selectedOrDefaultSearchEngine!!.name) } @@ -457,14 +453,13 @@ class SearchMiddlewareTest { assertTrue(store.state.search.additionalAvailableSearchEngines.isEmpty()) assertTrue(store.state.search.additionalSearchEngines.isEmpty()) - assertEquals(6, store.state.search.regionSearchEngines.size) + assertEquals(5, store.state.search.regionSearchEngines.size) assertEquals("Google", store.state.search.regionSearchEngines[0].name) assertEquals("Bing", store.state.search.regionSearchEngines[1].name) - assertEquals("Amazon.ca", store.state.search.regionSearchEngines[2].name) - assertEquals("DuckDuckGo", store.state.search.regionSearchEngines[3].name) - assertEquals("Wikipédia (fr)", store.state.search.regionSearchEngines[4].name) - assertEquals("eBay", store.state.search.regionSearchEngines[5].name) + assertEquals("DuckDuckGo", store.state.search.regionSearchEngines[2].name) + assertEquals("Wikipédia (fr)", store.state.search.regionSearchEngines[3].name) + assertEquals("eBay", store.state.search.regionSearchEngines[4].name) assertEquals("Google", store.state.search.selectedOrDefaultSearchEngine!!.name) } @@ -496,15 +491,14 @@ class SearchMiddlewareTest { assertTrue(store.state.search.additionalAvailableSearchEngines.isEmpty()) assertTrue(store.state.search.additionalSearchEngines.isEmpty()) - assertEquals(7, store.state.search.regionSearchEngines.size) + assertEquals(6, store.state.search.regionSearchEngines.size) assertEquals("Google", store.state.search.regionSearchEngines[0].name) assertEquals("Bing", store.state.search.regionSearchEngines[1].name) assertEquals("DuckDuckGo", store.state.search.regionSearchEngines[2].name) assertEquals("Qwant", store.state.search.regionSearchEngines[3].name) assertEquals("Wikipédia (fr)", store.state.search.regionSearchEngines[4].name) - assertEquals("Amazon.fr", store.state.search.regionSearchEngines[5].name) - assertEquals("eBay", store.state.search.regionSearchEngines[6].name) + assertEquals("eBay", store.state.search.regionSearchEngines[5].name) assertEquals("Google", store.state.search.selectedOrDefaultSearchEngine!!.name) } @@ -536,15 +530,15 @@ class SearchMiddlewareTest { assertTrue(store.state.search.additionalAvailableSearchEngines.isEmpty()) assertTrue(store.state.search.additionalSearchEngines.isEmpty()) - assertEquals(8, store.state.search.regionSearchEngines.size) + assertEquals(7, store.state.search.regionSearchEngines.size) + assertEquals("Google", store.state.search.regionSearchEngines[0].name) assertEquals("Bing", store.state.search.regionSearchEngines[1].name) - assertEquals("Amazon.de", store.state.search.regionSearchEngines[2].name) - assertEquals("DuckDuckGo", store.state.search.regionSearchEngines[3].name) - assertEquals("Ecosia", store.state.search.regionSearchEngines[4].name) - assertEquals("Qwant", store.state.search.regionSearchEngines[5].name) - assertEquals("Wikipedia (de)", store.state.search.regionSearchEngines[6].name) - assertEquals("eBay", store.state.search.regionSearchEngines[7].name) + assertEquals("DuckDuckGo", store.state.search.regionSearchEngines[2].name) + assertEquals("Ecosia", store.state.search.regionSearchEngines[3].name) + assertEquals("Qwant", store.state.search.regionSearchEngines[4].name) + assertEquals("Wikipedia (de)", store.state.search.regionSearchEngines[5].name) + assertEquals("eBay", store.state.search.regionSearchEngines[6].name) assertEquals("Google", store.state.search.selectedOrDefaultSearchEngine!!.name) } @@ -576,15 +570,15 @@ class SearchMiddlewareTest { assertTrue(store.state.search.additionalAvailableSearchEngines.isEmpty()) assertTrue(store.state.search.additionalSearchEngines.isEmpty()) - assertEquals(8, store.state.search.regionSearchEngines.size) + assertEquals(7, store.state.search.regionSearchEngines.size) + assertEquals("Google", store.state.search.regionSearchEngines[0].name) assertEquals("Bing", store.state.search.regionSearchEngines[1].name) - assertEquals("Amazon.de", store.state.search.regionSearchEngines[2].name) - assertEquals("DuckDuckGo", store.state.search.regionSearchEngines[3].name) - assertEquals("Ecosia", store.state.search.regionSearchEngines[4].name) - assertEquals("Qwant", store.state.search.regionSearchEngines[5].name) - assertEquals("Wikipedia (de)", store.state.search.regionSearchEngines[6].name) - assertEquals("eBay", store.state.search.regionSearchEngines[7].name) + assertEquals("DuckDuckGo", store.state.search.regionSearchEngines[2].name) + assertEquals("Ecosia", store.state.search.regionSearchEngines[3].name) + assertEquals("Qwant", store.state.search.regionSearchEngines[4].name) + assertEquals("Wikipedia (de)", store.state.search.regionSearchEngines[5].name) + assertEquals("eBay", store.state.search.regionSearchEngines[6].name) assertEquals("Google", store.state.search.selectedOrDefaultSearchEngine!!.name) } @@ -615,13 +609,14 @@ class SearchMiddlewareTest { assertTrue(store.state.search.regionSearchEngines.isNotEmpty()) assertTrue(store.state.search.additionalAvailableSearchEngines.isEmpty()) assertTrue(store.state.search.additionalSearchEngines.isEmpty()) - assertEquals(6, store.state.search.regionSearchEngines.size) + + assertEquals(5, store.state.search.regionSearchEngines.size) + assertEquals("Google", store.state.search.regionSearchEngines[0].name) assertEquals("Bing", store.state.search.regionSearchEngines[1].name) - assertEquals("Amazon.de", store.state.search.regionSearchEngines[2].name) - assertEquals("DuckDuckGo", store.state.search.regionSearchEngines[3].name) - assertEquals("Wikipedija (dsb)", store.state.search.regionSearchEngines[4].name) - assertEquals("eBay", store.state.search.regionSearchEngines[5].name) + assertEquals("DuckDuckGo", store.state.search.regionSearchEngines[2].name) + assertEquals("Wikipedija (dsb)", store.state.search.regionSearchEngines[3].name) + assertEquals("eBay", store.state.search.regionSearchEngines[4].name) assertEquals("Google", store.state.search.selectedOrDefaultSearchEngine!!.name) } @@ -652,13 +647,14 @@ class SearchMiddlewareTest { assertTrue(store.state.search.regionSearchEngines.isNotEmpty()) assertTrue(store.state.search.additionalAvailableSearchEngines.isEmpty()) assertTrue(store.state.search.additionalSearchEngines.isEmpty()) - assertEquals(6, store.state.search.regionSearchEngines.size) + + assertEquals(5, store.state.search.regionSearchEngines.size) + assertEquals("Google", store.state.search.regionSearchEngines[0].name) assertEquals("Bing", store.state.search.regionSearchEngines[1].name) - assertEquals("Amazon.de", store.state.search.regionSearchEngines[2].name) - assertEquals("DuckDuckGo", store.state.search.regionSearchEngines[3].name) - assertEquals("Wikipedija (hsb)", store.state.search.regionSearchEngines[4].name) - assertEquals("eBay", store.state.search.regionSearchEngines[5].name) + assertEquals("DuckDuckGo", store.state.search.regionSearchEngines[2].name) + assertEquals("Wikipedija (hsb)", store.state.search.regionSearchEngines[3].name) + assertEquals("eBay", store.state.search.regionSearchEngines[4].name) assertEquals("Google", store.state.search.selectedOrDefaultSearchEngine!!.name) } @@ -690,14 +686,13 @@ class SearchMiddlewareTest { assertTrue(store.state.search.additionalAvailableSearchEngines.isEmpty()) assertTrue(store.state.search.additionalSearchEngines.isEmpty()) - assertEquals(6, store.state.search.regionSearchEngines.size) + assertEquals(5, store.state.search.regionSearchEngines.size) assertEquals("Google", store.state.search.regionSearchEngines[0].name) assertEquals("Bing", store.state.search.regionSearchEngines[1].name) assertEquals("DuckDuckGo", store.state.search.regionSearchEngines[2].name) assertEquals("Wikipedia (es)", store.state.search.regionSearchEngines[3].name) - assertEquals("Amazon.es", store.state.search.regionSearchEngines[4].name) - assertEquals("eBay", store.state.search.regionSearchEngines[5].name) + assertEquals("eBay", store.state.search.regionSearchEngines[4].name) assertEquals("Google", store.state.search.selectedOrDefaultSearchEngine!!.name) } @@ -729,14 +724,13 @@ class SearchMiddlewareTest { assertTrue(store.state.search.additionalAvailableSearchEngines.isEmpty()) assertTrue(store.state.search.additionalSearchEngines.isEmpty()) - assertEquals(6, store.state.search.regionSearchEngines.size) + assertEquals(5, store.state.search.regionSearchEngines.size) assertEquals("Google", store.state.search.regionSearchEngines[0].name) assertEquals("Bing", store.state.search.regionSearchEngines[1].name) assertEquals("DuckDuckGo", store.state.search.regionSearchEngines[2].name) assertEquals("Wikipedia (it)", store.state.search.regionSearchEngines[3].name) - assertEquals("Amazon.it", store.state.search.regionSearchEngines[4].name) - assertEquals("eBay", store.state.search.regionSearchEngines[5].name) + assertEquals("eBay", store.state.search.regionSearchEngines[4].name) assertEquals("Google", store.state.search.selectedOrDefaultSearchEngine!!.name) } @@ -768,14 +762,13 @@ class SearchMiddlewareTest { assertTrue(store.state.search.additionalAvailableSearchEngines.isEmpty()) assertTrue(store.state.search.additionalSearchEngines.isEmpty()) - assertEquals(6, store.state.search.regionSearchEngines.size) + assertEquals(5, store.state.search.regionSearchEngines.size) assertEquals("Google", store.state.search.regionSearchEngines[0].name) assertEquals("Bing", store.state.search.regionSearchEngines[1].name) - assertEquals("Amazon.it", store.state.search.regionSearchEngines[2].name) - assertEquals("DuckDuckGo", store.state.search.regionSearchEngines[3].name) - assertEquals("Wikipedia (lij)", store.state.search.regionSearchEngines[4].name) - assertEquals("eBay", store.state.search.regionSearchEngines[5].name) + assertEquals("DuckDuckGo", store.state.search.regionSearchEngines[2].name) + assertEquals("Wikipedia (lij)", store.state.search.regionSearchEngines[3].name) + assertEquals("eBay", store.state.search.regionSearchEngines[4].name) assertEquals("Google", store.state.search.selectedOrDefaultSearchEngine!!.name) } @@ -807,15 +800,14 @@ class SearchMiddlewareTest { assertTrue(store.state.search.additionalAvailableSearchEngines.isEmpty()) assertTrue(store.state.search.additionalSearchEngines.isEmpty()) - assertEquals(7, store.state.search.regionSearchEngines.size) + assertEquals(6, store.state.search.regionSearchEngines.size) assertEquals("Google", store.state.search.regionSearchEngines[0].name) assertEquals("Bing", store.state.search.regionSearchEngines[1].name) assertEquals("Prisjakt", store.state.search.regionSearchEngines[2].name) assertEquals("DuckDuckGo", store.state.search.regionSearchEngines[3].name) assertEquals("Wikipedia (sv)", store.state.search.regionSearchEngines[4].name) - assertEquals("Amazon.se", store.state.search.regionSearchEngines[5].name) - assertEquals("eBay", store.state.search.regionSearchEngines[6].name) + assertEquals("eBay", store.state.search.regionSearchEngines[5].name) assertEquals("Google", store.state.search.selectedOrDefaultSearchEngine!!.name) } @@ -1718,68 +1710,6 @@ class SearchMiddlewareTest { } @Test - fun `Migration - default search engine`() { - val customStorage = CustomSearchEngineStorage(testContext, dispatcher) - val metadataStorage = SearchMetadataStorage(testContext) - - run { - val searchMiddleware = SearchMiddleware( - testContext, - ioDispatcher = dispatcher, - customStorage = customStorage, - metadataStorage = metadataStorage, - migration = object : SearchMiddleware.Migration { - override fun getValuesToMigrate() = SearchMiddleware.Migration.MigrationValues( - customSearchEngines = listOf(), - defaultSearchEngineName = "Amazon.com", - ) - }, - ) - - val store = BrowserStore(middleware = listOf(searchMiddleware)) - - store.dispatch( - SearchAction.SetRegionAction( - RegionState("US", "US"), - ), - ).joinBlocking() - - wait(store, dispatcher) - - val selectedSearchEngine = store.state.search.selectedOrDefaultSearchEngine - assertNotNull(selectedSearchEngine!!) - - assertEquals("Amazon.com", selectedSearchEngine.name) - assertTrue(selectedSearchEngine.resultUrls[0].startsWith("https://www.amazon.com/")) - } - - run { - val searchMiddleware = SearchMiddleware( - testContext, - ioDispatcher = dispatcher, - customStorage = customStorage, - metadataStorage = metadataStorage, - ) - - val store = BrowserStore(middleware = listOf(searchMiddleware)) - - store.dispatch( - SearchAction.SetRegionAction( - RegionState("US", "US"), - ), - ).joinBlocking() - - wait(store, dispatcher) - - val selectedSearchEngine = store.state.search.selectedOrDefaultSearchEngine - assertNotNull(selectedSearchEngine!!) - - assertEquals("Amazon.com", selectedSearchEngine.name) - assertTrue(selectedSearchEngine.resultUrls[0].startsWith("https://www.amazon.com/")) - } - } - - @Test fun `Reorders list of region search engines after adding previously removed search engines`() { val searchMiddleware = SearchMiddleware( testContext, @@ -1805,14 +1735,13 @@ class SearchMiddlewareTest { // Verify initial state // /////////////////////////////////////////////////////////////////////////////////////////// - assertEquals(6, store.state.search.regionSearchEngines.size) + assertEquals(5, store.state.search.regionSearchEngines.size) assertEquals("Google", store.state.search.regionSearchEngines[0].name) assertEquals("Bing", store.state.search.regionSearchEngines[1].name) - assertEquals("Amazon.com", store.state.search.regionSearchEngines[2].name) - assertEquals("DuckDuckGo", store.state.search.regionSearchEngines[3].name) - assertEquals("eBay", store.state.search.regionSearchEngines[4].name) - assertEquals("Wikipedia", store.state.search.regionSearchEngines[5].name) + assertEquals("DuckDuckGo", store.state.search.regionSearchEngines[2].name) + assertEquals("eBay", store.state.search.regionSearchEngines[3].name) + assertEquals("Wikipedia", store.state.search.regionSearchEngines[4].name) assertEquals("Google", store.state.search.selectedOrDefaultSearchEngine!!.name) @@ -1832,12 +1761,11 @@ class SearchMiddlewareTest { // Verify after hiding search engines // /////////////////////////////////////////////////////////////////////////////////////////// - assertEquals(4, store.state.search.regionSearchEngines.size) + assertEquals(3, store.state.search.regionSearchEngines.size) assertEquals("Bing", store.state.search.regionSearchEngines[0].name) - assertEquals("Amazon.com", store.state.search.regionSearchEngines[1].name) - assertEquals("eBay", store.state.search.regionSearchEngines[2].name) - assertEquals("Wikipedia", store.state.search.regionSearchEngines[3].name) + assertEquals("eBay", store.state.search.regionSearchEngines[1].name) + assertEquals("Wikipedia", store.state.search.regionSearchEngines[2].name) assertEquals("Bing", store.state.search.selectedOrDefaultSearchEngine!!.name) @@ -1855,14 +1783,13 @@ class SearchMiddlewareTest { // Verify state after adding search engines back // /////////////////////////////////////////////////////////////////////////////////////////// - assertEquals(6, store.state.search.regionSearchEngines.size) + assertEquals(5, store.state.search.regionSearchEngines.size) assertEquals("Google", store.state.search.regionSearchEngines[0].name) assertEquals("Bing", store.state.search.regionSearchEngines[1].name) - assertEquals("Amazon.com", store.state.search.regionSearchEngines[2].name) - assertEquals("DuckDuckGo", store.state.search.regionSearchEngines[3].name) - assertEquals("eBay", store.state.search.regionSearchEngines[4].name) - assertEquals("Wikipedia", store.state.search.regionSearchEngines[5].name) + assertEquals("DuckDuckGo", store.state.search.regionSearchEngines[2].name) + assertEquals("eBay", store.state.search.regionSearchEngines[3].name) + assertEquals("Wikipedia", store.state.search.regionSearchEngines[4].name) assertEquals("Google", store.state.search.selectedOrDefaultSearchEngine!!.name) } diff --git a/mobile/android/android-components/components/feature/search/src/test/java/mozilla/components/feature/search/storage/BundledSearchEnginesStorageTest.kt b/mobile/android/android-components/components/feature/search/src/test/java/mozilla/components/feature/search/storage/BundledSearchEnginesStorageTest.kt index bfd6691432..bea87fea9c 100644 --- a/mobile/android/android-components/components/feature/search/src/test/java/mozilla/components/feature/search/storage/BundledSearchEnginesStorageTest.kt +++ b/mobile/android/android-components/components/feature/search/src/test/java/mozilla/components/feature/search/storage/BundledSearchEnginesStorageTest.kt @@ -26,7 +26,7 @@ class BundledSearchEnginesStorageTest { val engines = storage.load(RegionState("US", "US"), Locale("en", "US")) val searchEngines = engines.list - assertEquals(6, searchEngines.size) + assertEquals(5, searchEngines.size) } @Test @@ -50,7 +50,7 @@ class BundledSearchEnginesStorageTest { val engines = storage.load(RegionState.Default, Locale("de", "DE")) val searchEngines = engines.list - assertEquals(8, searchEngines.size) + assertEquals(7, searchEngines.size) assertContainsSearchEngine("google-b-m", searchEngines) assertContainsNotSearchEngine("google-2018", searchEngines) } @@ -60,7 +60,7 @@ class BundledSearchEnginesStorageTest { val engines = storage.load(RegionState("US", "US"), Locale("de", "DE")) val searchEngines = engines.list - assertEquals(8, searchEngines.size) + assertEquals(7, searchEngines.size) assertContainsSearchEngine("google-b-1-m", searchEngines) assertContainsNotSearchEngine("google", searchEngines) } @@ -75,7 +75,7 @@ class BundledSearchEnginesStorageTest { val searchEngines = engines.list println("searchEngines = $searchEngines") - assertEquals(6, searchEngines.size) + assertEquals(5, searchEngines.size) assertContainsNotSearchEngine("yandex-en", searchEngines) } // With region @@ -85,7 +85,7 @@ class BundledSearchEnginesStorageTest { val searchEngines = engines.list println("searchEngines = $searchEngines") - assertEquals(5, searchEngines.size) + assertEquals(4, searchEngines.size) assertContainsSearchEngine("google-com-nocodes", searchEngines) assertContainsNotSearchEngine("yandex-en", searchEngines) } @@ -134,11 +134,11 @@ class BundledSearchEnginesStorageTest { val engines = storage.load(RegionState.Default, Locale("trs", "")) val searchEngines = engines.list - // visibleDefaultEngines: ["google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-es"] + // visibleDefaultEngines: ["google-b-m", "bing", "ddg", "wikipedia-es"] // searchOrder (default): ["Google", "Bing"] assertEquals( - listOf("google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-es"), + listOf("google-b-m", "bing", "ddg", "wikipedia-es"), searchEngines.map { it.id }, ) @@ -154,7 +154,7 @@ class BundledSearchEnginesStorageTest { val engines = storage.load(RegionState.Default, Locale("xx", "XX")) val searchEngines = engines.list - assertEquals(5, searchEngines.size) + assertEquals(4, searchEngines.size) } private fun assertContainsSearchEngine(identifier: String, searchEngines: List<SearchEngine>) { @@ -181,7 +181,7 @@ class BundledSearchEnginesStorageTest { val engines = storage.load(RegionState("US", "US"), Locale("en", "US")) val searchEngines = engines.list - assertEquals(6, searchEngines.size) + assertEquals(5, searchEngines.size) val google = searchEngines.find { it.name == "Google" } assertNotNull(google!!) |