[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser][base-browser-102.7.0esr-12.5-1] 5 commits: fixup! Bug 31740: Remove some unnecessary RemoteSettings instances

Title: GitLab

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

Commits:

  • 0ee79644
    by cypherpunks1 at 2023-01-26T19:25:07+01:00 
    fixup! Bug 31740: Remove some unnecessary RemoteSettings instances

Disable activity stream
  • ca88729a
    by cypherpunks1 at 2023-01-26T19:25:15+01:00 
    fixup! Bug 40002: Remove about:ion

Remove this._monitorIonPref() and this._monitorIonStudies() from BrowserGlue
  • 125e7f8f
    by cypherpunks1 at 2023-01-26T19:25:15+01:00 
    fixup! Firefox preference overrides.

Disable toolkit.telemetry.enabled on all builds, set webextensions.storage.sync.enabled to false
  • 84ab5401
    by cypherpunks1 at 2023-01-26T19:25:34+01:00 
    Bug 41565: Gate Telemetry Tasks behind MOZ_TELEMETRY_REPORTING
  • de007ee5
    by Pier Angelo Vendrame at 2023-01-26T19:25:34+01:00 
    fixup! Firefox preference overrides.

Document why we are locking toolkit.telemetry.enabled.

5 changed files:

Changes:

  • browser/app/profile/001-base-profile.js
    ... ... @@ -119,7 +119,8 @@ pref("datareporting.healthreport.uploadEnabled", false);
    119 119 
     pref("datareporting.policy.dataSubmissionEnabled", false);
    120 120 
     // Make sure Unified Telemetry is really disabled, see: #18738.
    121 121 
     pref("toolkit.telemetry.unified", false);
    122 
    -pref("toolkit.telemetry.enabled", false);
    122 
    +// This needs to be locked, or nightly builds will automatically lock it to true
    123 
    +pref("toolkit.telemetry.enabled", false, locked);
    123 124 
     pref("toolkit.telemetry.server", "data:,");
    124 125 
     pref("toolkit.telemetry.archive.enabled", false);
    125 126 
     pref("toolkit.telemetry.updatePing.enabled", false); // Make sure updater telemetry is disabled; see #25909.
    ... ... @@ -422,6 +423,8 @@ pref("extensions.postDownloadThirdPartyPrompt", false);
    422 423 
     // Therefore, do not allow download of additional language packs. They are not a
    423 424 
     // privacy/security threat, we are disabling them for UX reasons. See bug 41377.
    424 425 
     pref("intl.multilingual.downloadEnabled", false);
    426 
    +// Disk activity: Disable storage.sync (tor-browser#41424)
    427 
    +pref("webextensions.storage.sync.enabled", false);
    425 428
    426 429 
     // Toolbar layout
    427 430 
     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}");

  • browser/base/content/browser.js
    ... ... @@ -6004,6 +6004,7 @@ var TabsProgressListener = {
    6004 6004 
       onStateChange(aBrowser, aWebProgress, aRequest, aStateFlags, aStatus) {
    6005 6005 
         // Collect telemetry data about tab load times.
    6006 6006 
         if (
    6007 
    +      AppConstants.MOZ_TELEMETRY_REPORTING &&
    6007 6008 
           aWebProgress.isTopLevel &&
    6008 6009 
           (!aRequest.originalURI || aRequest.originalURI.scheme != "about")
    6009 6010 
         ) {

  • browser/components/BrowserGlue.jsm
    ... ... @@ -22,9 +22,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
    22 22 
       ActorManagerParent: "resource://gre/modules/ActorManagerParent.jsm",
    23 23 
       AddonManager: "resource://gre/modules/AddonManager.jsm",
    24 24 
       AppMenuNotifications: "resource://gre/modules/AppMenuNotifications.jsm",
    25 
    -  ASRouterDefaultConfig:
    26 
    -    "resource://activity-stream/lib/ASRouterDefaultConfig.jsm",
    27 
    -  ASRouterNewTabHook: "resource://activity-stream/lib/ASRouterNewTabHook.jsm",
    28 25 
       ASRouter: "resource://activity-stream/lib/ASRouter.jsm",
    29 26 
       AsyncShutdown: "resource://gre/modules/AsyncShutdown.jsm",
    30 27 
       BackgroundUpdate: "resource://gre/modules/BackgroundUpdate.jsm",
    ... ... @@ -717,27 +714,6 @@ let JSWINDOWACTORS = {
    717 714 
         matches: ["about:studies*"],
    718 715 
       },
    719 716
    720 
    -  ASRouter: {
    721 
    -    parent: {
    722 
    -      moduleURI: "resource:///actors/ASRouterParent.jsm",
    723 
    -    },
    724 
    -    child: {
    725 
    -      moduleURI: "resource:///actors/ASRouterChild.jsm",
    726 
    -      events: {
    727 
    -        // This is added so the actor instantiates immediately and makes
    728 
    -        // methods available to the page js on load.
    729 
    -        DOMDocElementInserted: {},
    730 
    -      },
    731 
    -    },
    732 
    -    matches: [
    733 
    -      "about:home*",
    734 
    -      "about:newtab*",
    735 
    -      "about:welcome*",
    736 
    -      "about:privatebrowsing",
    737 
    -    ],
    738 
    -    remoteTypes: ["privilegedabout"],
    739 
    -  },
    740 
    -
    741 717 
       SwitchDocumentDirection: {
    742 718 
         child: {
    743 719 
           moduleURI: "resource:///actors/SwitchDocumentDirectionChild.jsm",
    ... ... @@ -1693,7 +1669,9 @@ BrowserGlue.prototype = {
    1693 1669 
         this._firstWindowTelemetry(aWindow);
    1694 1670 
         this._firstWindowLoaded();
    1695 1671
    1696 
    -    this._collectStartupConditionsTelemetry();
    1672 
    +    if (AppConstants.MOZ_TELEMETRY_REPORTING) {
    1673 
    +      this._collectStartupConditionsTelemetry();
    1674 
    +    }
    1697 1675
    1698 1676 
         // Set the default favicon size for UI views that use the page-icon protocol.
    1699 1677 
         PlacesUtils.favicons.setDefaultIconURIPreferredSize(
    ... ... @@ -2006,7 +1984,6 @@ BrowserGlue.prototype = {
    2006 1984 
           () => NewTabUtils.uninit(),
    2007 1985 
           () => Normandy.uninit(),
    2008 1986 
           () => RFPHelper.uninit(),
    2009 
    -      () => ASRouterNewTabHook.destroy(),
    2010 1987 
           () => UpdateListener.reset(),
    2011 1988 
         ];
    2012 1989
    ... ... @@ -2347,8 +2324,6 @@ BrowserGlue.prototype = {
    2347 2324 
         this._monitorScreenshotsPref();
    2348 2325 
         this._monitorWebcompatReporterPref();
    2349 2326 
         this._monitorHTTPSOnlyPref();
    2350 
    -    this._monitorIonPref();
    2351 
    -    this._monitorIonStudies();
    2352 2327 
         this._setupSearchDetection();
    2353 2328
    2354 2329 
         this._monitorGPCPref();
    ... ... @@ -2717,12 +2692,6 @@ BrowserGlue.prototype = {
    2717 2692 
             },
    2718 2693 
           },
    2719 2694
    2720 
    -      {
    2721 
    -        task: () => {
    2722 
    -          ASRouterNewTabHook.createInstance(ASRouterDefaultConfig());
    2723 
    -        },
    2724 
    -      },
    2725 
    -
    2726 2695 
           {
    2727 2696 
             condition: AppConstants.MOZ_UPDATE_AGENT,
    2728 2697 
             task: () => {
    ... ... @@ -2877,13 +2846,21 @@ BrowserGlue.prototype = {
    2877 2846 
             }
    2878 2847 
           },
    2879 2848
    2880 
    -      () => BrowserUsageTelemetry.reportProfileCount(),
    2849 
    +      () => {
    2850 
    +        if (AppConstants.MOZ_TELEMETRY_REPORTING) {
    2851 
    +          BrowserUsageTelemetry.reportProfileCount();
    2852 
    +        }
    2853 
    +      },
    2881 2854
    2882 2855 
           () => OsEnvironment.reportAllowedAppSources(),
    2883 2856
    2884 2857 
           () => Services.search.runBackgroundChecks(),
    2885 2858
    2886 
    -      () => BrowserUsageTelemetry.reportInstallationTelemetry(),
    2859 
    +      () => {
    2860 
    +        if (AppConstants.MOZ_TELEMETRY_REPORTING) {
    2861 
    +          BrowserUsageTelemetry.reportInstallationTelemetry();
    2862 
    +        }
    2863 
    +      },
    2887 2864 
         ];
    2888 2865
    2889 2866 
         for (let task of idleTasks) {

  • toolkit/components/telemetry/app/TelemetryEnvironment.jsm
    ... ... @@ -973,7 +973,9 @@ function EnvironmentCache() {
    973 973 
       p.push(this._addonBuilder.init());
    974 974
    975 975 
       this._currentEnvironment.profile = "">
    976 
    -  p.push(this._updateProfile());
    976 
    +  if (AppConstants.MOZ_TELEMETRY_REPORTING) {
    977 
    +    p.push(this._updateProfile());
    978 
    +  }
    977 979 
       if (AppConstants.MOZ_BUILD_APP == "browser") {
    978 980 
         p.push(this._loadAttributionAsync());
    979 981 
       }

  • toolkit/xre/nsAppRunner.cpp
    ... ... @@ -2800,7 +2800,9 @@ static ReturnAbortOnError ProfileLockedDialog(nsIFile* aProfileDir,
    2800 2800 
       rv = xpcom.Initialize();
    2801 2801 
       NS_ENSURE_SUCCESS(rv, rv);
    2802 2802
    2803 
    +#if defined(MOZ_TELEMETRY_REPORTING)
    2803 2804 
       if (aProfileDir) mozilla::Telemetry::WriteFailedProfileLock(aProfileDir);
    2805 
    +#endif
    2804 2806
    2805 2807 
       rv = xpcom.SetWindowCreator(aNative);
    2806 2808 
       NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE);

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help 

    _______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits