0
Fork 0
mirror of https://codeberg.org/librewolf/source.git synced 2024-12-22 13:43:04 -05:00

fixes multiple things

This commit is contained in:
Bert van der Weerd 2022-06-29 21:12:03 +02:00
parent 40d04c028b
commit 95413ffaf6
No known key found for this signature in database
GPG key ID: 73370A0B9E5516B0

View file

@ -1,5 +1,5 @@
diff --git a/browser/components/newtab/data/content/activity-stream.bundle.js b/browser/components/newtab/data/content/activity-stream.bundle.js
index d5a3f10..b5efa81 100644
index 3439547..7127947 100644
--- a/browser/components/newtab/data/content/activity-stream.bundle.js
+++ b/browser/components/newtab/data/content/activity-stream.bundle.js
@@ -1577,7 +1577,7 @@ class ASRouterAdminInner extends (external_React_default()).PureComponent {
@ -7,49 +7,50 @@ index d5a3f10..b5efa81 100644
className: "providerUrl",
target: "_blank",
- href: "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/nimbus-desktop-experiments/records",
+ href: "https://%.invalid",
+ href: "https://see.ticket.about.this.invalid",
rel: "noopener noreferrer"
}, "nimbus-desktop-experiments"), ")");
}
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 261e46f..22f8214 100644
index db545cd..05f408c 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -2181,7 +2181,7 @@ pref("security.insecure_field_warning.ignore_local_ip_address", true);
@@ -2055,6 +2055,7 @@ pref("security.insecure_field_warning.ignore_local_ip_address", true);
// Remote settings preferences
pref("services.settings.poll_interval", 86400); // 24H
-pref("services.settings.server", "https://firefox.settings.services.mozilla.com/v1");
+pref("services.settings.server", "https://%.invalid");
pref("services.settings.default_bucket", "main");
+pref("services.settings.server","https://see.ticket.about.this.invalid"); // LibreWolf override
// The percentage of clients who will report uptake telemetry as
// events instead of just a histogram. This only applies on Release;
diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm
index 2ce9e87..cd132a3 100644
index 31ad77d..cca446b 100644
--- a/services/settings/Utils.jsm
+++ b/services/settings/Utils.jsm
@@ -89,7 +89,7 @@ var Utils = {
get SERVER_URL() {
return allowServerURLOverride
? gServerURL
- : "https://firefox.settings.services.mozilla.com/v1";
+ : "https://%.invalid";
},
CHANGES_PATH: "/buckets/monitor/collections/changes/changeset",
@@ -60,6 +60,10 @@ XPCOMUtils.defineLazyGetter(this, "isRunningTests", () => {
// Overriding the server URL is normally disabled on Beta and Release channels,
// except under some conditions.
XPCOMUtils.defineLazyGetter(this, "allowServerURLOverride", () => {
+
+ // always allow this override for librewolf
+ return true;
+
if (!AppConstants.RELEASE_OR_BETA) {
// Always allow to override the server URL on Nightly/DevEdition.
return true;
diff --git a/toolkit/components/search/SearchUtils.jsm b/toolkit/components/search/SearchUtils.jsm
index 983d567..5fb6ae7 100644
index 0bf60e5..bcb685e 100644
--- a/toolkit/components/search/SearchUtils.jsm
+++ b/toolkit/components/search/SearchUtils.jsm
@@ -159,9 +159,9 @@ var SearchUtils = {
@@ -158,9 +158,9 @@ var SearchUtils = {
ENGINES_URLS: {
"prod-main":
- "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/search-config/records",
+ "https://%.invalid",
+ "https://see.ticket.about.this.invalid",
"prod-preview":
- "https://firefox.settings.services.mozilla.com/v1/buckets/main-preview/collections/search-config/records",
+ "https://%.invalid",
+ "https://see.ticket.about.this.invalid",
"stage-main":
"https://settings.stage.mozaws.net/v1/buckets/main/collections/search-config/records",
"stage-preview":