GitLab

at 2023-01-26T19:25:07+01:00

fixup! Bug 31740: Remove some unnecessary RemoteSettings instances

Disable activity stream

fixup! Bug 40002: Remove about:ion

Remove this._monitorIonPref() and this._monitorIonStudies() from BrowserGlue

fixup! Firefox preference overrides.

Disable toolkit.telemetry.enabled on all builds, set webextensions.storage.sync.enabled to false

Bug 41565: Gate Telemetry Tasks behind MOZ_TELEMETRY_REPORTING

fixup! Firefox preference overrides.

Document why we are locking toolkit.telemetry.enabled.

 pref("datareporting.policy.dataSubmissionEnabled", false);

 // Make sure Unified Telemetry is really disabled, see: #18738.

 pref("toolkit.telemetry.unified", false);

-pref("toolkit.telemetry.enabled", false);

+// This needs to be locked, or nightly builds will automatically lock it to true

+pref("toolkit.telemetry.enabled", false, locked);

 pref("toolkit.telemetry.server", "data:,");

 pref("toolkit.telemetry.archive.enabled", false);

 pref("toolkit.telemetry.updatePing.enabled", false); // Make sure updater telemetry is disabled; see #25909.

 // Therefore, do not allow download of additional language packs. They are not a

 // privacy/security threat, we are disabling them for UX reasons. See bug 41377.

 pref("intl.multilingual.downloadEnabled", false);

+// Disk activity: Disable storage.sync (tor-browser#41424)

+pref("webextensions.storage.sync.enabled", false);

 // Toolbar layout

 pref("browser.uiCustomization.state", "{\"placements\":{\"widget-overflow-fixed-list\":[],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"security-level-button\",\"new-identity-button\",\"downloads-button\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"PanelUI-contents\":[\"home-button\",\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"]},\"seen\":[\"developer-button\"],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\"],\"currentVersion\":14,\"newElementCount\":1}");

   onStateChange(aBrowser, aWebProgress, aRequest, aStateFlags, aStatus) {

     // Collect telemetry data about tab load times.

     if (

+      AppConstants.MOZ_TELEMETRY_REPORTING &&

       aWebProgress.isTopLevel &&

       (!aRequest.originalURI || aRequest.originalURI.scheme != "about")

     ) {

   ActorManagerParent: "resource://gre/modules/ActorManagerParent.jsm",

   AddonManager: "resource://gre/modules/AddonManager.jsm",

   AppMenuNotifications: "resource://gre/modules/AppMenuNotifications.jsm",

-  ASRouterDefaultConfig:

-    "resource://activity-stream/lib/ASRouterDefaultConfig.jsm",

-  ASRouterNewTabHook: "resource://activity-stream/lib/ASRouterNewTabHook.jsm",

   ASRouter: "resource://activity-stream/lib/ASRouter.jsm",

   AsyncShutdown: "resource://gre/modules/AsyncShutdown.jsm",

   BackgroundUpdate: "resource://gre/modules/BackgroundUpdate.jsm",

     matches: ["about:studies*"],

   },

-  ASRouter: {

-    parent: {

-      moduleURI: "resource:///actors/ASRouterParent.jsm",

-    },

-    child: {

-      moduleURI: "resource:///actors/ASRouterChild.jsm",

-      events: {

-        // This is added so the actor instantiates immediately and makes

-        // methods available to the page js on load.

-        DOMDocElementInserted: {},

-      },

-    },

-    matches: [

-      "about:home*",

-      "about:newtab*",

-      "about:welcome*",

-      "about:privatebrowsing",

-    ],

-    remoteTypes: ["privilegedabout"],

-  },

-

   SwitchDocumentDirection: {

     child: {

       moduleURI: "resource:///actors/SwitchDocumentDirectionChild.jsm",

     this._firstWindowTelemetry(aWindow);

     this._firstWindowLoaded();

-    this._collectStartupConditionsTelemetry();

+    if (AppConstants.MOZ_TELEMETRY_REPORTING) {

+      this._collectStartupConditionsTelemetry();

+    }

     // Set the default favicon size for UI views that use the page-icon protocol.

     PlacesUtils.favicons.setDefaultIconURIPreferredSize(

       () => NewTabUtils.uninit(),

       () => Normandy.uninit(),

       () => RFPHelper.uninit(),

-      () => ASRouterNewTabHook.destroy(),

       () => UpdateListener.reset(),

     ];

     this._monitorScreenshotsPref();

     this._monitorWebcompatReporterPref();

     this._monitorHTTPSOnlyPref();

-    this._monitorIonPref();

-    this._monitorIonStudies();

     this._setupSearchDetection();

     this._monitorGPCPref();

         },

       },

-      {

-        task: () => {

-          ASRouterNewTabHook.createInstance(ASRouterDefaultConfig());

-        },

-      },

-

       {

         condition: AppConstants.MOZ_UPDATE_AGENT,

         task: () => {

         }

       },

-      () => BrowserUsageTelemetry.reportProfileCount(),

+      () => {

+        if (AppConstants.MOZ_TELEMETRY_REPORTING) {

+          BrowserUsageTelemetry.reportProfileCount();

+        }

+      },

       () => OsEnvironment.reportAllowedAppSources(),

       () => Services.search.runBackgroundChecks(),

-      () => BrowserUsageTelemetry.reportInstallationTelemetry(),

+      () => {

+        if (AppConstants.MOZ_TELEMETRY_REPORTING) {

+          BrowserUsageTelemetry.reportInstallationTelemetry();

+        }

+      },

     ];

     for (let task of idleTasks) {

   p.push(this._addonBuilder.init());

   this._currentEnvironment.profile = {};

-  p.push(this._updateProfile());

+  if (AppConstants.MOZ_TELEMETRY_REPORTING) {

+    p.push(this._updateProfile());

+  }

   if (AppConstants.MOZ_BUILD_APP == "browser") {

     p.push(this._loadAttributionAsync());

   }

   rv = xpcom.Initialize();

   NS_ENSURE_SUCCESS(rv, rv);

+#if defined(MOZ_TELEMETRY_REPORTING)

   if (aProfileDir) mozilla::Telemetry::WriteFailedProfileLock(aProfileDir);

+#endif

   rv = xpcom.SetWindowCreator(aNative);

   NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE);

Pier Angelo Vendrame pushed to branch base-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser

Commits:

5 changed files:

Changes: