Commit 3935f960 authored by Kathleen Brade's avatar Kathleen Brade Committed by Matthew Finkel
Browse files

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.
parent 4d2af2a5
......@@ -12,3 +12,8 @@ DIRS += [
'webcompat',
'report-site-issue'
]
if not CONFIG['TOR_BROWSER_DISABLE_TOR_LAUNCHER']:
DIRS += [
'tor-launcher',
]
......@@ -248,6 +248,11 @@
@RESPATH@/browser/chrome/browser.manifest
@RESPATH@/browser/chrome/pdfjs.manifest
@RESPATH@/browser/chrome/pdfjs/*
#ifndef TOR_BROWSER_DISABLE_TOR_LAUNCHER
@RESPATH@/browser/chrome/torlauncher.manifest
@RESPATH@/browser/chrome/torlauncher/*
@RESPATH@/browser/@PREF_DIR@/torlauncher-prefs.js
#endif
@RESPATH@/chrome/toolkit@JAREXT@
@RESPATH@/chrome/toolkit.manifest
@RESPATH@/chrome/recording.manifest
......
......@@ -1462,6 +1462,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@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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment