Verified Commit cd92f30e authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

fixup! Bug 41668: Tweaks to the Base Browser updater for Tor Browser 

Removed TorMonitorService reference
parent fa105e4f

toolkit/mozapps/update/UpdateService.sys.mjs

+5 −12
Original line number Diff line number Diff line
@@ -23,18 +23,13 @@ ChromeUtils.defineESModuleGetters(lazy, { 
  AsyncShutdown: "resource://gre/modules/AsyncShutdown.sys.mjs",

  CertUtils: "resource://gre/modules/CertUtils.sys.mjs",

  DeferredTask: "resource://gre/modules/DeferredTask.sys.mjs",

  TorProviderBuilder: "resource://gre/modules/TorProviderBuilder.sys.mjs",

  UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",

  WindowsRegistry: "resource://gre/modules/WindowsRegistry.sys.mjs",

  ctypes: "resource://gre/modules/ctypes.sys.mjs",

  setTimeout: "resource://gre/modules/Timer.sys.mjs",

});



ChromeUtils.defineModuleGetter(

  lazy,

  "TorMonitorService",

  "resource://gre/modules/TorMonitorService.jsm"

);



XPCOMUtils.defineLazyServiceGetter(

  lazy,

  "AUS",
@@ -394,10 +389,11 @@ XPCOMUtils.defineLazyGetter( 
);



function _shouldRegisterBootstrapObserver(errorCode) {

  const provider = lazy.TorProviderBuilder.build();

  return (

    errorCode == PROXY_SERVER_CONNECTION_REFUSED &&

    !lazy.TorMonitorService.isBootstrapDone &&

    lazy.TorMonitorService.ownsTorDaemon

    !provider.isBootstrapDone &&

    provider.ownsTorDaemon

  );

}
@@ -5833,10 +5829,7 @@ Downloader.prototype = { 
      // we choose to compute these hashes.

      hash = hash.finish(false);

      digest = Array.from(hash, (c, i) =>

        hash

          .charCodeAt(i)

          .toString(16)

          .padStart(2, "0")

        hash.charCodeAt(i).toString(16).padStart(2, "0")

      ).join("");

    } catch (e) {

      LOG(