From f7cf87e0593878e77041df6b55fc41de3bf868df Mon Sep 17 00:00:00 2001
From: Aminda Suomalainen <suomalainen@aminda.eu>
Date: Wed, 19 Feb 2025 22:31:11 +0200
Subject: [PATCH] firefox: react to browser fingerprinting becoming real

---
 conf/firefox-forbidden-policies.js |  2 +-
 etc/firefox/policies/policies.json | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/conf/firefox-forbidden-policies.js b/conf/firefox-forbidden-policies.js
index b7895c5b..a1fb426a 100644
--- a/conf/firefox-forbidden-policies.js
+++ b/conf/firefox-forbidden-policies.js
@@ -77,7 +77,7 @@ lockPref("privacy.fingerprintingProtection", true);
 //lockPref("privacy.fingerprintingProtection", false);
 pref(
 	"privacy.fingerprintingProtection.overrides",
-	"+AllTargets,-KeyboardEvents,+SpeechSynthesis,-CSSPrefersColorScheme,-CSSPrefersReducedMotion,+NavigatorUserAgent,-JSDateTimeUTC,+HttpUserAgent",
+	"+AllTargets,-KeyboardEvents,-CSSPrefersColorScheme,-CSSPrefersReducedMotion,-JSDateTimeUTC",
 );
 //clearPref("privacy.fingerprintingProtection.overrides");
 lockPref("privacy.fingerprintingProtection.pbmode", true);
diff --git a/etc/firefox/policies/policies.json b/etc/firefox/policies/policies.json
index b76cb481..953ccf85 100644
--- a/etc/firefox/policies/policies.json
+++ b/etc/firefox/policies/policies.json
@@ -371,10 +371,9 @@
 				"Value": true
 			},
 			"browser.contentblocking.category": {
-				"Comment": "The best option would be strict, but amongst other things that disables system font visibility and may cause accessibility issues for me. There is also other content blocking already such as PrivacyBadger and uBlock Origin.",
-				"Status": "clear",
+				"Status": "user",
 				"Type": "string",
-				"Value": "standard"
+				"Value": "strict"
 			},
 			"browser.contentblocking.report.hide_vpn_banner": {
 				"Status": "default",
@@ -575,13 +574,13 @@
 				"Value": "once"
 			},
 			"intl.accept_languages": {
-				"Status": "clear",
+				"Status": "user",
 				"Type": "string",
-				"Value": "fi-FI, fi, en-FI, en-US, en, ru-RU, ru"
+				"Value": "en-US, en"
 			},
 			"javascript.use_us_english_locale": {
 				"Comment": "Preference not allowed for stability reasons. :(",
-				"Status": "default",
+				"Status": "user",
 				"Type": "boolean",
 				"Value": true
 			},
@@ -722,7 +721,7 @@
 				"Comment": "Preference not allowed for stability reasons. :( https://searchfox.org/mozilla-central/source/toolkit/components/resistfingerprinting/RFPTargets.inc",
 				"Status": "locked",
 				"Type": "string",
-				"Value": "+AllTargets,-KeyboardEvents,+SpeechSynthesis,-CSSPrefersColorScheme,-CSSPrefersReducedMotion,+NavigatorUserAgent,-JSDateTimeUTC,+HttpUserAgent"
+				"Value": "+AllTargets,-KeyboardEvents,-CSSPrefersColorScheme,-CSSPrefersReducedMotion,-JSDateTimeUTC"
 			},
 			"privacy.fingerprintingProtection.pbmode": {
 				"Comment": "Preference not allowed for stability reasons. :(",
@@ -839,7 +838,7 @@
 			}
 		},
 		"PromptForDownloadLocation": true,
-		"RequestedLocales": "fi-FI, fi, en-FI, en-US, en, ru-RU, ru",
+		"RequestedLocales": "en-US, en",
 		"SearchEngines": {
 			"Add": [
 				{