From c256656f377d3c15a8c7537c65f45dc802904df7 Mon Sep 17 00:00:00 2001
From: fxbrit <fxbrit@tuta.io>
Date: Sat, 22 Jan 2022 15:20:09 +0100
Subject: [PATCH] enable query stripping and revisit sync disabling

---
 distribution/policies.json |  1 -
 docs/Changelog.md          | 18 ++++++++++++++++++
 librewolf.cfg              | 16 +++++++++++++++-
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/distribution/policies.json b/distribution/policies.json
index b742786..1abebc9 100644
--- a/distribution/policies.json
+++ b/distribution/policies.json
@@ -6,7 +6,6 @@
         "OverrideFirstRunPage": "",
         "OverridePostUpdatePage": "",
         "DisableSystemAddonUpdate": true,
-        "DisableFirefoxAccounts": true,
         "DisableProfileImport": false,
         "DisableFirefoxStudies": true,
         "DisableTelemetry": true,
diff --git a/docs/Changelog.md b/docs/Changelog.md
index 866b08c..a987ab5 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -1,6 +1,24 @@
 This changelog will be used from now on to document changes in a precise manner, with a list of changes for each setting version.
 Setting versions are documented using the pref `librewolf.cfg.version`, available in about:config.
 
+## 5.3
+
+**target commit**:
+
+**base librewolf version**: 96.x
+
+**References**:
+- [disable sync differently](https://gitlab.com/librewolf-community/settings/-/issues/132);
+- [remove tracking query params](https://gitlab.com/librewolf-community/settings/-/issues/128);
+
+
+#### Added preferences
+```
+defaultPref("identity.fxaccounts.enabled", false); // sync and firefox account
+defaultPref("privacy.query_stripping.enabled", true);
+defaultPref("privacy.query_stripping.strip_list", "__hsfp __hssc __hstc __s _hsenc _openstat dclid fbclid gclid hsCtaTracking igshid mc_eid ml_subscriber ml_subscriber_hash msclkid oly_anon_id oly_enc_id rb_clickid s_cid vero_conv vero_id wickedid yclid");
+```
+
 ## 5.2
 
 **target commit**: f3b4414d30953d1ea3eb64a9d75c62c242ee991b
diff --git a/librewolf.cfg b/librewolf.cfg
index 7bcd485..1668f72 100755
--- a/librewolf.cfg
+++ b/librewolf.cfg
@@ -9,7 +9,7 @@
  
  */
 
-defaultPref("librewolf.cfg.version", "5.2");
+defaultPref("librewolf.cfg.version", "5.3");
 
 // -------------------------------
 // # SANITIZING, TP, SESSIONS
@@ -50,6 +50,18 @@ defaultPref("browser.formfill.enable", false);
 defaultPref("browser.sessionstore.privacy_level", 2);
 defaultPref("browser.sessionstore.interval", 60000);
 
+// -----------------
+// QUERY STRIPPING
+// -----------------
+
+/**
+ * enable query stripping and set the strip list.
+ * currently we use the same one that brave uses:
+ * https://github.com/brave/brave-core/blob/f337a47cf84211807035581a9f609853752a32fb/browser/net/brave_site_hacks_network_delegate_helper.cc#L29
+ */ 
+defaultPref("privacy.query_stripping.enabled", true);
+defaultPref("privacy.query_stripping.strip_list", "__hsfp __hssc __hstc __s _hsenc _openstat dclid fbclid gclid hsCtaTracking igshid mc_eid ml_subscriber ml_subscriber_hash msclkid oly_anon_id oly_enc_id rb_clickid s_cid vero_conv vero_id wickedid yclid");
+
 // ----------------------
 // # NETWORKING
 // ----------------------
@@ -281,6 +293,8 @@ lockPref("browser.fixup.alternate.enabled", false);
 
 lockPref("app.update.auto", false); // disable update auto installs
 
+defaultPref("identity.fxaccounts.enabled", false); // sync and firefox account
+
 // password manager
 defaultPref("signon.rememberSignons", false); // disable saving passwords in the browser
 defaultPref("signon.autofillForms", false); // disable username and password autofills