Fix upgrading issue whilst also ensuring dead objects won't happen. #373

index.js

@@ -119,11 +119,12 @@ const ContainerService = {
   _containerWasEnabled: false,
   _onThemeChangedCallback: null,
 
-  init(installation) {
+  init(installation, reason) {
     // If we are just been installed, we must store some information for the
     // uninstallation. This object contains also a version number, in case we
     // need to implement a migration in the future.
-    if (installation) {
+    // In 1.1.1 and less we deleted savedConfiguration on upgrade so we need to rebuild
+    if (installation && (reason !== "upgrade" || !ss.storage.savedConfiguration)) {
       let preInstalledIdentities = []; // eslint-disable-line prefer-const
       ContextualIdentityProxy.getIdentities().forEach(identity => {
         preInstalledIdentities.push(identity.userContextId);
@@ -286,13 +287,17 @@ const ContainerService = {
       return identity;
     };
 
+    if (!this._oldGetIdentityFromId) {
       this._oldGetIdentityFromId = ContextualIdentityService.getIdentityFromId;
+    }
     ContextualIdentityService.getIdentityFromId = function(userContextId) {
       return this.workaroundForCookieManager(ContainerService._oldGetIdentityFromId, userContextId);
     };
 
     if ("getPublicIdentityFromId" in ContextualIdentityService) {
+      if (!this._oldGetPublicIdentityFromId) {
         this._oldGetPublicIdentityFromId = ContextualIdentityService.getPublicIdentityFromId;
+      }
       ContextualIdentityService.getPublicIdentityFromId = function(userContextId) {
         return this.workaroundForCookieManager(ContainerService._oldGetPublicIdentityFromId, userContextId);
       };
@@ -1076,7 +1081,7 @@ const ContainerService = {
   },
 
   // Uninstallation
-  uninstall() {
+  uninstall(reason) {
     const data = ss.storage.savedConfiguration;
     if (!data) {
       throw new DOMError("ERROR - No saved configuration!!");
@@ -1086,11 +1091,13 @@ const ContainerService = {
       throw new DOMError("ERROR - Unknown version!!");
     }
 
+    if (reason !== "upgrade") {
       PREFS.forEach(pref => {
         if (pref[0] in data.prefs) {
           prefService.set(pref[0], data.prefs[pref[0]]);
         }
       });
+    }
 
     // Note: We cannot go back renaming the Finance identity back to Banking:
     // the locale system doesn't work with renamed containers.
@@ -1105,7 +1112,7 @@ const ContainerService = {
       // Let's close all the container tabs.
       // Note: We cannot use _closeTabs() because at this point tab.window is
       // null.
-      if (!this._containerWasEnabled) {
+      if (!this._containerWasEnabled && reason !== "upgrade") {
         for (let tab of window.tabs) { // eslint-disable-line prefer-const
           if (this._getUserContextIdFromTab(tab)) {
             tab.close();
@@ -1122,6 +1129,7 @@ const ContainerService = {
     // all the configuration must go away now.
     this._windowMap = new Map();
 
+    if (reason !== "upgrade") {
       // Let's forget all the previous closed tabs.
       this._forgetIdentity();
 
@@ -1138,6 +1146,7 @@ const ContainerService = {
 
       // Let's delete the configuration.
       delete ss.storage.savedConfiguration;
+    }
 
     // Begin-Of-Hack
     if (this._oldGetIdentityFromId) {
@@ -1557,7 +1566,7 @@ exports.main = function (options) {
                        options.loadReason === "upgrade";
 
   // Let's start :)
-  ContainerService.init(installation);
+  ContainerService.init(installation, options.loadReason);
 };
 
 exports.onUnload = function (reason) {
@@ -1565,6 +1574,6 @@ exports.onUnload = function (reason) {
       reason === "downgrade" ||
       reason === "uninstall" ||
       reason === "upgrade") {
-    ContainerService.uninstall();
+    ContainerService.uninstall(reason);
   }
 };

package.json

@@ -2,7 +2,7 @@
   "name": "testpilot-containers",
   "title": "Containers Experiment",
   "description": "Containers works by isolating cookie jars using separate origin-attributes defined visually by colored ‘Container Tabs’. This add-on is a modified version of the containers feature for Firefox Test Pilot.",
-  "version": "1.1.1",
+  "version": "2.0.0",
   "author": "Andrea Marchesini, Luke Crouch and Jonathan Kingston",
   "bugs": {
     "url": "https://github.com/mozilla/testpilot-containers/issues"

webextension/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Containers Experiment",
-  "version": "1.1.1",
+  "version": "2.0.0",
 
   "description": "Containers works by isolating cookie jars using separate origin-attributes defined visually by colored ‘Container Tabs’. This add-on is a modified version of the containers feature for Firefox Test Pilot.",
   "icons": {