From d3ba608c8f28b83cce4878fa26b0dcf2d4abe682 Mon Sep 17 00:00:00 2001
From: Aminda Suomalainen <suomalainen@aminda.eu>
Date: Tue, 4 Mar 2025 20:36:43 +0200
Subject: [PATCH] firefox: restore telemetry, enable DAP

---
 conf/firefox-forbidden-policies.js |  5 +++++
 etc/firefox/policies/policies.json | 10 ++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/conf/firefox-forbidden-policies.js b/conf/firefox-forbidden-policies.js
index 0b688ca3..a6f7ee9f 100644
--- a/conf/firefox-forbidden-policies.js
+++ b/conf/firefox-forbidden-policies.js
@@ -101,6 +101,11 @@ lockPref("reader.parse-on-load.force-enabled", true);
 // Ensure OCSP stapling is enabled, especially if the server has it
 lockPref("security.ssl.enable_ocsp_must_staple", true);
 
+// Distributed Aggregation Protocol for Privacy Preserving Measurement
+// https://github.com/ietf-wg-ppm/draft-ietf-ppm-dap
+// This should be better for privacy with telemetry enabled.
+lockPref("toolkit.telemetry.dap_enabled", true);
+
 // New sidebar
 lockPref("sidebar.revamp", true);
 lockPref("sidebar.verticalTabs", true);
diff --git a/etc/firefox/policies/policies.json b/etc/firefox/policies/policies.json
index 4ab554d2..24c69f6e 100644
--- a/etc/firefox/policies/policies.json
+++ b/etc/firefox/policies/policies.json
@@ -182,8 +182,8 @@
 			"InvalidCertificate": true,
 			"SafeBrowsing": false
 		},
-		"DisableTelemetry": true,
-		"DisableTelemetry_comment": "Mozilla Anonym ad attribution is disabled by this policy and starting from 25-04-2025 the promise to never sell user data expires.",
+		"DisableTelemetry": false,
+		"DisableTelemetry_comment": "Mozilla Anonym ad attribution is controlled by this policy (and dom.private-attribution.submission.enabled) and starting from 25-04-2025 the promise to never sell user data expires. And yet I am not convinced disabling telemetry is the right way to protest. https://blog.glyph.im/2023/03/telemetry-is-not-your-enemy.html",
 		"DisplayBookmarksToolbar": "never",
 		"DontCheckDefaultBrowser": true,
 		"EnableTrackingProtection": {
@@ -859,6 +859,12 @@
 				"Type": "boolean",
 				"Value": "always-show"
 			},
+			"toolkit.telemetry.dap_enabled": {
+				"Comment": "Preference not allowed for stability reasons. Distributed Aggregation Protocol for making telemetry more private. https://github.com/ietf-wg-ppm/draft-ietf-ppm-dap",
+				"Status": "default",
+				"Type": "boolean",
+				"Value": true
+			},
 			"ui.systemUsesDarkTheme": {
 				"Comment": "Another theme option that should be let to system, thus clear.",
 				"Status": "clear"