From cf0a2cc88acdbc51b138228353a0d7c9ea0db7c3 Mon Sep 17 00:00:00 2001
From: fxbrit <ft.compiled@simplelogin.co>
Date: Mon, 14 Jun 2021 15:29:22 +0200
Subject: [PATCH] address issue #54 (settings) and MR #5 (common)

---
 docs/Changelog.md | 29 ++++++++++++++++++++++++++++-
 librewolf.cfg     | 13 ++++---------
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/docs/Changelog.md b/docs/Changelog.md
index 4598ec3..17f9db2 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -6,4 +6,31 @@ Setting versions are documented using the pref `librewolf.cfg.version`, availabl
 
 **base librewolf version**: 89.x
 
-This is the initial release from which we start tagging and versioning settings.
\ No newline at end of file
+This is the initial release from which we start tagging and versioning settings.
+
+## 1.1
+**target commit**:
+
+**base librewolf version**: 89.x
+
+**References**:
+- issue [#54](https://gitlab.com/librewolf-community/settings/-/issues/54) from settings
+- merge request [#5](https://gitlab.com/librewolf-community/browser/common/-/merge_requests/5) from common
+
+#### Removed preferences
+```
+defaultPref("security.OCSP.require", false); // default value
+defaultPref("extensions.update.url", "");
+defaultPref("extensions.update.background.url", "");
+defaultPref("extensions.getAddons.search.browseURL", "");
+```
+
+#### Changed preferences
+```
+defaultPref("geo.provider.network.url", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");
+```
+
+#### Added preferences
+```
+lockPref("privacy.override_rfp_for_color_scheme", false);
+```
\ No newline at end of file
diff --git a/librewolf.cfg b/librewolf.cfg
index 616da4a..eba9ef0 100755
--- a/librewolf.cfg
+++ b/librewolf.cfg
@@ -27,7 +27,7 @@
 // # SETTINGS VERSION
 // -----------------------------------
 
-defaultPref("librewolf.cfg.version", "1.0");
+defaultPref("librewolf.cfg.version", "1.1");
 
 // -----------------------------------
 // # TRACKING PROTECTION
@@ -283,6 +283,7 @@ defaultPref("browser.xul.error_pages.expert_bad_cert", true); // advanced ui inf
 defaultPref("privacy.resistFingerprinting", true);
 defaultPref("privacy.resistFingerprinting.block_mozAddonManager", true);
 lockPref("browser.startup.blankWindow", false); // breaks RFP windows resizing
+lockPref("privacy.override_rfp_for_color_scheme", false); // librewolf specifc pref, prevents rfp from overriding your theme
 
 // --------------------------------------
 // # FISSION
@@ -315,17 +316,13 @@ defaultPref("extensions.webextensions.base-content-security-policy", "script-src
 defaultPref("extensions.enabledScopes", 5);
 defaultPref("extensions.autoDisableScopes", 11);
 
-// Relevant for addons and lang packs search
-defaultPref("extensions.getAddons.search.browseURL", ""); // https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION%
+// Relevant for lang packs search
 defaultPref("extensions.getAddons.langpacks.url", ""); // https://services.addons.mozilla.org/api/v3/addons/language-tools/?app=firefox&type=language&appversion=%VERSION%
 
 // other urls
 defaultPref("extensions.getAddons.get.url", ""); // https://services.addons.mozilla.org/api/v3/addons/search/?guid=%IDS%&lang=%LOCALE%
 defaultPref("extensions.getAddons.link.url", ""); // https://addons.mozilla.org/%LOCALE%/firefox/
 
-// probably better to have it, it still must be manually triggered
-defaultPref("extensions.update.url", ""); // https://versioncheck.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%&currentAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%
-
 // ui
 defaultPref("extensions.getAddons.showPane", false);
 lockPref("extensions.getAddons.discovery.api_url", "");
@@ -336,7 +333,6 @@ lockPref("extensions.webcompat-reporter.newIssueEndpoint", "");// https://webcom
 // background checking and updating
 defaultPref("extensions.update.enabled", false);
 defaultPref("extensions.update.autoUpdateDefault", false);
-defaultPref("extensions.update.background.url", "");
 defaultPref("extensions.getAddons.cache.enabled", false);
 
 // blocklist is a security feature, best left at default
@@ -370,7 +366,6 @@ lockPref("app.normandy.shieldLearnMoreUrl", "");
 // certificates
 defaultPref("security.cert_pinning.enforcement_level", 2);
 defaultPref("security.OCSP.enabled", 0);
-defaultPref("security.OCSP.require", false);
 defaultPref("security.pki.sha1_enforcement_level", 1);
 
 // mixed content
@@ -563,7 +558,7 @@ defaultPref("geo.enabled", false);
 lockPref("geo.provider.ms-windows-location", false); // [WINDOWS]
 lockPref("geo.provider.use_corelocation", false); // [MAC]
 lockPref("geo.provider.use_gpsd", false); // [LINUX]
-defaultPref("geo.provider.network.url", ""); // consider adding url, it doesn't do any harm
+defaultPref("geo.provider.network.url", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");
 lockPref("browser.region.network.url", "");
 lockPref("browser.region.update.enabled", false);