[tbb-commits] [tor-browser/tor-browser-91.0-11.0-1] Bug 28044: Integrate Tor Launcher into tor-browser

[boklm at torproject.org]

commit 133904c8edb0761404e8a97ab03821567f0173bc
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Tue Feb 26 10:07:17 2019 -0500

    Bug 28044: Integrate Tor Launcher into tor-browser
    
    Build and package Tor Launcher as part of the browser (similar to
    how pdfjs is handled).
    
    If a Tor Launcher extension is present in the user's profile, it is
    removed.
---
 browser/extensions/moz.build                        |  3 +++
 browser/installer/package-manifest.in               |  5 +++++
 toolkit/mozapps/extensions/internal/XPIProvider.jsm | 10 ++++++++++
 3 files changed, 18 insertions(+)

diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build
index 1ab9167d870a..fa60184daea8 100644
--- a/browser/extensions/moz.build
+++ b/browser/extensions/moz.build
@@ -17,3 +17,6 @@ if CONFIG["NIGHTLY_BUILD"]:
     DIRS += [
         "translations",
     ]
+
+if not CONFIG["TOR_BROWSER_DISABLE_TOR_LAUNCHER"]:
+    DIRS += ["tor-launcher"]
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index deed2c129139..e31386ba0c40 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -239,6 +239,11 @@
 @RESPATH@/browser/chrome/browser.manifest
 @RESPATH@/chrome/pdfjs.manifest
 @RESPATH@/chrome/pdfjs/*
+#ifndef TOR_BROWSER_DISABLE_TOR_LAUNCHER
+ at RESPATH@/browser/chrome/torlauncher.manifest
+ at RESPATH@/browser/chrome/torlauncher/*
+ at RESPATH@/browser/@PREF_DIR@/torlauncher-prefs.js
+#endif
 @RESPATH@/chrome/toolkit at JAREXT@
 @RESPATH@/chrome/toolkit.manifest
 @RESPATH@/chrome/recording.manifest
diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index 5bd7cabb0f73..acabe8cad3bc 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -1472,6 +1472,16 @@ var XPIStates = {
       for (let [id, file] of loc.readAddons()) {
         knownIds.delete(id);
 
+        // Since it is now part of the browser, uninstall the Tor Launcher
+        // extension. This will remove the Tor Launcher .xpi from user
+        // profiles on macOS.
+        if (id === "tor-launcher at torproject.org") {
+          logger.debug("Uninstalling the Tor Launcher extension.");
+          loc.installer.uninstallAddon(id);
+          changed = true;
+          continue;
+        }
+
         let xpiState = loc.get(id);
         if (!xpiState) {
           // If the location is not supported for sideloading, skip new