rowan/multi-account-containers
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #189 from mozilla/remove-cookies-with-OA-174

Browse source 
fix #174: remove add-on containers on uninstall
This commit is contained in:
Andrea Marchesini 2017-02-18 15:45:15 +01:00 • committed by GitHub
commit 8787842b36
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
index.js
View file

@ -66,10 +66,16 @@ const ContainerService = {
// uninstallation. This object contains also a version number, in case we
// need to implement a migration in the future.
if (installation) {
let preInstalledIdentities = []; // eslint-disable-line prefer-const
ContextualIdentityService.getIdentities().forEach(identity => {
preInstalledIdentities.push(identity.userContextId);
});
const object = {
version: 1,
prefs: {},
metricsUUID: uuid.uuid().toString(),
preInstalledIdentities: preInstalledIdentities
};
PREFS.forEach(pref => {
@ -850,9 +856,6 @@ const ContainerService = {
CustomizableUI.createWidget(widget);
}
// Let's delete the configuration.
delete ss.storage.savedConfiguration;
for (let window of windows.browserWindows) { // eslint-disable-line prefer-const
this._getOrCreateContainerWindow(viewFor(window)).shutdown();
}
@ -869,6 +872,16 @@ const ContainerService = {
}
}
this._closeTabs(tabsToClose);
const preInstalledIdentities = data.preInstalledIdentities;
ContextualIdentityService.getIdentities().forEach(identity => {
if (!preInstalledIdentities.includes(identity.userContextId)) {
ContextualIdentityService.remove(identity.userContextId);
}
});
// Let's delete the configuration.
delete ss.storage.savedConfiguration;
},
};