commit b2148509da11c2f9188e609edbeca386880f61cc Author: Matthew Finkel <matthew.fin...@gmail.com> Date: Thu Nov 29 20:33:05 2018 +0000
Bug 28640 - Uninstall torbutton in the user profile on Android --- toolkit/mozapps/extensions/internal/XPIProvider.jsm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm index ddd337038659..c9b01bdc7395 100644 --- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm +++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm @@ -1603,6 +1603,16 @@ var XPIStates = { for (let [id, file] of location.getAddonLocations(true)) { knownIds.delete(id); + // Uninstall torbutton if it is installed in the user profile on Android + if (AppConstants.platform === "android" && + id === "torbut...@torproject.org" && + location.name === KEY_APP_PROFILE) { + logger.debug("Uninstalling torbutton from user profile."); + location.uninstallAddon(id); + changed = true; + continue; + } + let xpiState = loc.get(id); if (!xpiState) { logger.debug("New add-on ${id} in ${location}", {id, location: location.name}); _______________________________________________ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits