From b97e2692f0ee3a93edde3076ed482baa2e2daacb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malte=20J=C3=BCrgens?= Date: Thu, 1 Aug 2024 22:13:40 +0200 Subject: [PATCH] Use remote settings dumps --- patches/sed-patches/stop-undesired-requests.patch | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/patches/sed-patches/stop-undesired-requests.patch b/patches/sed-patches/stop-undesired-requests.patch index c8867cc..c8632b2 100644 --- a/patches/sed-patches/stop-undesired-requests.patch +++ b/patches/sed-patches/stop-undesired-requests.patch @@ -1,6 +1,6 @@ --- a/browser/components/asrouter/content/asrouter-admin.bundle.js +++ b/browser/components/asrouter/content/asrouter-admin.bundle.js -@@ -1641,7 +1641,7 @@ class ASRouterAdminInner extends (react__WEBPACK_IMPORTED_MODULE_1___default().P +@@ -1650,7 +1650,7 @@ class ASRouterAdminInner extends (react__WEBPACK_IMPORTED_MODULE_1___default().P label = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement("span", null, "remote settings (", /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement("a", { className: "providerUrl", target: "_blank", @@ -21,9 +21,17 @@ if (!AppConstants.RELEASE_OR_BETA) { // Always allow to override the server URL on Nightly/DevEdition. return true; +@@ -134,6 +137,7 @@ export var Utils = { + // Load dumps only if pulling data from the production server, or in tests. + return ( + this.SERVER_URL == AppConstants.REMOTE_SETTINGS_SERVER_URL || ++ this.SERVER_URL == "https://%.invalid" || + lazy.isRunningTests + ); + }, --- a/toolkit/components/search/SearchUtils.sys.mjs +++ b/toolkit/components/search/SearchUtils.sys.mjs -@@ -193,9 +193,9 @@ export var SearchUtils = { +@@ -206,9 +206,9 @@ export var SearchUtils = { ENGINES_URLS: { "prod-main":