Richard Pospesel pushed to branch tor-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: cc0c58ab by Richard Pospesel at 2023-02-24T11:29:13+00:00 Revert "Bug 41629: Fix errors with MOZ_SERVICES_SYNC=False" This reverts commit 8f61c9c0b06a1820caeb4683595cec98f0ad88b9. current implementation breaks about:preferences due to runtime errors - - - - - 4 changed files: - browser/base/content/browser-sync.js - browser/components/BrowserGlue.jsm - browser/installer/package-manifest.in - toolkit/modules/moz.build Changes: ===================================== browser/base/content/browser-sync.js ===================================== @@ -5,11 +5,7 @@ // This file is loaded into the browser window scope. /* eslint-env mozilla/browser-window */ -ChromeUtils.defineModuleGetter( - this, - "UIState", - "resource://services-sync/UIState.jsm" -); +const { UIState } = ChromeUtils.import("resource://services-sync/UIState.jsm"); ChromeUtils.defineModuleGetter( this, @@ -346,9 +342,7 @@ var gSync = { // once syncing completes (bug 1239042). _syncStartTime: 0, _syncAnimationTimer: 0, - _obs: AppConstants.MOZ_SERVICES_SYNC - ? ["weave:engine:sync:finish", "quit-application", UIState.ON_UPDATE] - : [], + _obs: ["weave:engine:sync:finish", "quit-application", UIState.ON_UPDATE], get log() { if (!this._log) { @@ -464,7 +458,7 @@ var gSync = { this._definePrefGetters(); - if (!AppConstants.MOZ_SERVICES_SYNC || !this.FXA_ENABLED) { + if (!this.FXA_ENABLED) { this.onFxaDisabled(); return; } @@ -1535,7 +1529,7 @@ var gSync = { // can lead to a empty label for 'Send To Device' Menu. this.init(); - if (!AppConstants.MOZ_SERVICES_SYNC || !this.FXA_ENABLED) { + if (!this.FXA_ENABLED) { // These items are hidden in onFxaDisabled(). No need to do anything. return; } @@ -1570,7 +1564,7 @@ var gSync = { // "Send Page to Device" and "Send Link to Device" menu items updateContentContextMenu(contextMenu) { - if (!AppConstants.MOZ_SERVICES_SYNC || !this.FXA_ENABLED) { + if (!this.FXA_ENABLED) { // These items are hidden by default. No need to do anything. return false; } ===================================== browser/components/BrowserGlue.jsm ===================================== @@ -791,10 +791,10 @@ if (AppConstants.TOR_BROWSER_UPDATE) { }; } -XPCOMUtils.defineLazyGetter(this, "WeaveService", () => - AppConstants.MOZ_SERVICES_SYNC - ? Cc["@mozilla.org/weave/service;1"].getService().wrappedJSObject - : null +XPCOMUtils.defineLazyGetter( + this, + "WeaveService", + () => Cc["@mozilla.org/weave/service;1"].getService().wrappedJSObject ); if (AppConstants.MOZ_CRASHREPORTER) { @@ -2795,7 +2795,7 @@ BrowserGlue.prototype = { // Schedule a sync (if enabled) after we've loaded { task: async () => { - if (WeaveService?.enabled) { + if (WeaveService.enabled) { await WeaveService.whenLoaded(); WeaveService.Weave.Service.scheduler.autoConnect(); } ===================================== browser/installer/package-manifest.in ===================================== @@ -181,17 +181,7 @@ @RESPATH@/browser/components/MacTouchBar.manifest @RESPATH@/browser/components/MacTouchBar.js #endif -; TODO: Remove this in ESR-115. -; If everything goes well, this patch will not be necessary in 115, because we -; have also an upstream bug. -; I suspect this is somehow incorrect, and that MOZ_SERVICES_SYNC is actually -; never defined for the makefile (it is not for Firefox 112, which builds -; correctly with MOZ_SERVICES_SYNC == False, even without this ifdef). -; But we are interested in disabling it, so using either this, or #if 0 would be -; fine for us. -#ifdef MOZ_SERVICES_SYNC @RESPATH@/components/SyncComponents.manifest -#endif @RESPATH@/components/servicesComponents.manifest @RESPATH@/components/servicesSettings.manifest @RESPATH@/components/cryptoComponents.manifest ===================================== toolkit/modules/moz.build ===================================== @@ -293,7 +293,6 @@ for var in ( for var in ( "MOZ_ALLOW_ADDON_SIDELOAD", "MOZ_BACKGROUNDTASKS", - "MOZ_SERVICES_SYNC", "MOZ_SYSTEM_NSS", "MOZ_SYSTEM_POLICIES", "MOZ_UNSIGNED_APP_SCOPE", View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/cc0c58ab... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/cc0c58ab... You're receiving this email because of your account on gitlab.torproject.org.