From a4e79d47381b4898c591d6e6088b7f0ec8b318a2 Mon Sep 17 00:00:00 2001 From: "mr. m" Date: Wed, 30 Apr 2025 21:16:28 +0200 Subject: [PATCH] chore: Removed installer / uninstaller telemetry from firefox, b=(bug #7000), c=no-component --- src/browser/app/profile/zen-browser.js | 8 +++----- .../windows/nsis/installer-nsi.patch | 20 +++++++++++++++++++ .../windows/nsis/uninstaller-nsi.patch | 15 +++++++++++++- 3 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 src/browser/installer/windows/nsis/installer-nsi.patch diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js index 2b4010c8a..fc105711b 100644 --- a/src/browser/app/profile/zen-browser.js +++ b/src/browser/app/profile/zen-browser.js @@ -326,10 +326,8 @@ pref('browser.preferences.experimental', true); // Prefetching: pref("network.dns.disablePrefetch", false); pref("network.prefetch-next", true); -pref("network.predictor.enabled", true); pref("network.dns.disablePrefetchFromHTTPS", false); pref("network.predictor.enable-hover-on-ssl", true); -pref("network.http.speculative-parallel-limit", 10); pref("network.http.rcwn.enabled", false); // Disable Firefox's revamp @@ -389,9 +387,9 @@ pref("browser.urlbar.trimHttps", true); pref("browser.search.separatePrivateDefault.ui.enabled", true); pref("browser.urlbar.update2.engineAliasRefresh", true); pref("browser.search.suggest.enabled", false); -pref("browser.urlbar.quicksuggest.enabled", false); -pref("browser.urlbar.suggest.quicksuggest.sponsored", false); -pref("browser.urlbar.suggest.quicksuggest.nonsponsored", false); +pref("browser.urlbar.quicksuggest.enabled", false, locked); +pref("browser.urlbar.suggest.quicksuggest.sponsored", false, locked); +pref("browser.urlbar.suggest.quicksuggest.nonsponsored", false, locked); pref("browser.urlbar.groupLabels.enabled", false); pref("browser.urlbar.keepPanelOpenDuringImeComposition", true); // IMPORTANT: Fixes closing the urlbar when on some languages pref("browser.formfill.enable", false); diff --git a/src/browser/installer/windows/nsis/installer-nsi.patch b/src/browser/installer/windows/nsis/installer-nsi.patch new file mode 100644 index 000000000..38fea55b7 --- /dev/null +++ b/src/browser/installer/windows/nsis/installer-nsi.patch @@ -0,0 +1,20 @@ +diff --git a/browser/installer/windows/nsis/installer.nsi b/browser/installer/windows/nsis/installer.nsi +index 491bcbbd8430410fa930e7b52491ea62f2c48bbc..905f46d711f94398c9b1c20d6387cd76fcdf4aa9 100755 +--- a/browser/installer/windows/nsis/installer.nsi ++++ b/browser/installer/windows/nsis/installer.nsi +@@ -836,9 +836,6 @@ Section "-InstallEndCleanup" + + ; When we're using the GUI, .onGUIEnd sends the ping, but of course that isn't + ; invoked when we're running silently. +- ${If} ${Silent} +- Call SendPing +- ${EndIf} + SectionEnd + + ################################################################################ +@@ -1965,5 +1962,4 @@ FunctionEnd + + Function .onGUIEnd + ${OnEndCommon} +- Call SendPing + FunctionEnd diff --git a/src/browser/installer/windows/nsis/uninstaller-nsi.patch b/src/browser/installer/windows/nsis/uninstaller-nsi.patch index efc934a82..23cbe56bc 100644 --- a/src/browser/installer/windows/nsis/uninstaller-nsi.patch +++ b/src/browser/installer/windows/nsis/uninstaller-nsi.patch @@ -1,7 +1,7 @@ diff --git a/browser/installer/windows/nsis/uninstaller.nsi b/browser/installer/windows/nsis/uninstaller.nsi old mode 100755 new mode 100644 -index 559c8b46ee06bc42c91da49b5d9e397fe8ff6126..62094a5d98712a41a607ba01ca2adfa1e4f51ccd +index 559c8b46ee06bc42c91da49b5d9e397fe8ff6126..2920621824af171588b1cd38ac8b2329fbdb6e25 --- a/browser/installer/windows/nsis/uninstaller.nsi +++ b/browser/installer/windows/nsis/uninstaller.nsi @@ -507,6 +507,7 @@ Section "Uninstall" @@ -12,3 +12,16 @@ index 559c8b46ee06bc42c91da49b5d9e397fe8ff6126..62094a5d98712a41a607ba01ca2adfa1 ${un.RegCleanFileHandler} ".pdf" "FirefoxPDF-$AppUserModelID" +@@ -980,12 +981,6 @@ FunctionEnd + + Function un.onUninstSuccess + ; Send a ping at un.onGUIEnd, to avoid freezing the GUI. +- StrCpy $ShouldSendPing "1" +- +- ${If} ${Silent} +- ; If this is a silent uninstall then un.onGUIEnd doesn't run, so do it now. +- Call un.SendUninstallPing +- ${EndIf} + FunctionEnd + + Function un.preFinish