Commit 62ec69b0 authored by Matthew Finkel's avatar Matthew Finkel Committed by Georg Koppen
Browse files

Bug 28640: Do not load Torbutton from the user's profile (only on Android)

parent e5659b39

toolkit/mozapps/extensions/internal/XPIProvider.jsm

+11 −0
Original line number Diff line number Diff line
@@ -1601,6 +1601,17 @@ var XPIStates = { 
      for (let [id, file] of location.getAddonLocations(true)) {

        knownIds.delete(id);



#if defined(TOR_BROWSER_VERSION) && defined(ANDROID)

        // Remove Torbutton if it is installed in the user profile

        if (id === "torbutton@torproject.org" &&

            location.name === KEY_APP_PROFILE) {

          logger.debug("Uninstalling Torbutton from user profile.");

          location.uninstallAddon(id);

          changed = true;

          continue;

        }

#endif



        let xpiState = loc.get(id);

        if (!xpiState) {

          logger.debug("New add-on ${id} in ${location}", {id, location: location.name});

toolkit/mozapps/extensions/internal/moz.build

+4 −1
Original line number Diff line number Diff line
@@ -15,10 +15,13 @@ EXTRA_JS_MODULES.addons += [ 
    'ProductAddonChecker.jsm',

    'SpellCheckDictionaryBootstrap.js',

    'XPIInstall.jsm',

    'XPIProvider.jsm',

    'XPIProviderUtils.js',

]



EXTRA_PP_JS_MODULES.addons += [

    'XPIProvider.jsm',

]



TESTING_JS_MODULES += [

    'AddonTestUtils.jsm',

]