From adc1f5ffe6562ac3a0c71726bd19d0c00350c75b Mon Sep 17 00:00:00 2001
From: Kendall Werts <kmwerts@gmail.com>
Date: Tue, 17 Dec 2019 16:30:43 -0600
Subject: [PATCH] made some requested changes

---
 src/js/background/assignManager.js | 61 +++++++++++-------------------
 src/js/background/identityState.js | 10 ++---
 2 files changed, 28 insertions(+), 43 deletions(-)

diff --git a/src/js/background/assignManager.js b/src/js/background/assignManager.js
index c517130..1809c08 100644
--- a/src/js/background/assignManager.js
+++ b/src/js/background/assignManager.js
@@ -107,21 +107,6 @@ const assignManager = {
       };
       return sites;
     },
-
-    // async getAssignedSites(userContextId = null) {
-    //   const sites = {};
-    //   const siteConfigs = await this.area.get();
-    //   for(const key of Object.keys(siteConfigs)) {
-    //     if (key.includes("siteContainerMap@@_")) {
-    //         if(userContextId==null) {
-    //         const site = siteConfigs[key];
-    //         sites[key] = site;
-    //       }
-    //     }
-    //   }
-    //   return sites;
-    // }
-
   },
 
   _neverAsk(m) {
@@ -273,8 +258,8 @@ const assignManager = {
     this.resetBookmarksMenuItem();
 
     // Run when installed and on startup
-    browser.runtime.onInstalled.addListener(()=>{this.initSync()});
-    browser.runtime.onStartup.addListener(()=>{this.initSync()});
+    browser.runtime.onInstalled.addListener(this.initSync);
+    browser.runtime.onStartup.addListener(this.initSync);
   },
 
   async resetBookmarksMenuItem() {
@@ -577,10 +562,10 @@ const assignManager = {
     const beenSynced = await assignManager.storageArea.getSynced();
     if (beenSynced){
       runSync();
-    } else {
-      runFirstSync();
+      return;
     }
-  }, 
+    runFirstSync();
+  },
 };
 
 assignManager.init();
@@ -622,7 +607,7 @@ browser.resetMAC2 = async function () {
   browser.storage.sync.set(syncData);
 
   // FF2 (intial sync w/ default 4 + 1 with some changes)
-  removeContextualIdentityListeners();
+  removeContextualIdentityListeners(backup);
   browser.contextualIdentities.update("firefox-container-2", {color:"purple"});
   browser.contextualIdentities.update("firefox-container-4", {icon:"pet"});
   browser.storage.local.clear();
@@ -632,7 +617,7 @@ browser.resetMAC2 = async function () {
 };
 
 async function restore(inSync) {
-  removeContextualIdentityListeners();
+  removeContextualIdentityListeners(backup);
   const syncIdentities = inSync.identities;
   const browserIdentities = await browser.contextualIdentities.query({});
 
@@ -652,11 +637,11 @@ async function restore(inSync) {
     }
   }
   backup();
-  addContextualIdentityListeners();
+  addContextualIdentityListeners(backup);
 }
 
 async function restoreFirstRun(inSync) {
-  removeContextualIdentityListeners();
+  removeContextualIdentityListeners(backup);
   const browserIdentities = await browser.contextualIdentities.query({});
   const syncIdentities = inSync.identities;
   for (const syncIdentity of inSync.identities) {
@@ -664,7 +649,7 @@ async function restoreFirstRun(inSync) {
     const match = browserIdentities.find(compareNames);
     if (!match) {
       newIdentity = await browser.contextualIdentities.create({name: syncIdentity.name, color: syncIdentity.color, icon: syncIdentity.icon});
-      identityState.updateUUID(newIdentity.cookieStoreId, syncIdentity.macUUID);
+      identityState.updateUUID(newIdentity.cookieStoreId, syncIdentity.macAddonUUID);
       continue;
     } else {
       if (syncIdentity.color === match.color && syncIdentity.icon === match.icon) {
@@ -683,7 +668,7 @@ async function restoreFirstRun(inSync) {
     if (assignedSitesBrowser.hasOwnProperty(key)) {
       const syncCookieStoreId = "firefox-container-" + syncAssignedSites[key].userContextId;
       const browserCookieStoreId = "firefox-container-" + assignedSitesBrowser[key].userContextId;
-      if (inSync.cookieStoreIDmap[syncCookieStoreId] === identityState.storageArea.get(browserCookieStoreId).macUUID) {
+      if (inSync.cookieStoreIDmap[syncCookieStoreId] === identityState.storageArea.get(browserCookieStoreId).macAddonUUID) {
         continue;
       } else {
         // ask user
@@ -702,7 +687,7 @@ async function restoreFirstRun(inSync) {
     }
   }
   backup();
-  addContextualIdentityListeners();
+  addContextualIdentityListeners(backup);
 }
 
 async function runSync() {
@@ -711,22 +696,22 @@ async function runSync() {
   if (Object.entries(inSync).length === 0){
     console.log("no sync storage, backing up...");
     backup();
-  } else {
-    console.log("storage found, attempting to restore ...");
-    restore(inSync);
+    return;
   }
+  console.log("storage found, attempting to restore ...");
+  restore(inSync);
 }
 
-function addContextualIdentityListeners() {
-  browser.contextualIdentities.onCreated.addListener(backup);
-  browser.contextualIdentities.onRemoved.addListener(backup);
-  browser.contextualIdentities.onUpdated.addListener(backup);
+function addContextualIdentityListeners(listener) {
+  browser.contextualIdentities.onCreated.addListener(listener);
+  browser.contextualIdentities.onRemoved.addListener(listener);
+  browser.contextualIdentities.onUpdated.addListener(listener);
 }
 
-function removeContextualIdentityListeners() {
-  browser.contextualIdentities.onCreated.removeListener(backup);
-  browser.contextualIdentities.onRemoved.removeListener(backup);
-  browser.contextualIdentities.onUpdated.removeListener(backup);
+function removeContextualIdentityListeners(listener) {
+  browser.contextualIdentities.onCreated.removeListener(listener);
+  browser.contextualIdentities.onRemoved.removeListener(listener);
+  browser.contextualIdentities.onUpdated.removeListener(listener);
 }
 
 async function runFirstSync() {
diff --git a/src/js/background/identityState.js b/src/js/background/identityState.js
index 843564a..f3251c2 100644
--- a/src/js/background/identityState.js
+++ b/src/js/background/identityState.js
@@ -44,7 +44,7 @@ const identityState = {
       if (key.includes("identitiesState@@_")) {
         const container = containerInfo[key];
         const cookieStoreId = key.replace(/^identitiesState@@_/, "");
-        containers[cookieStoreId] = container.macUUID;
+        containers[cookieStoreId] = container.macAddonUUID;
       }
     }
     return containers;
@@ -69,18 +69,18 @@ const identityState = {
   },
   async updateUUID(cookieStoreId, uuid) {
     const containerState = await this.storageArea.get(cookieStoreId);
-    containerState.macUUID = uuid;
+    containerState.macAddonUUID = uuid;
     return this.storageArea.set(cookieStoreId, containerState);
   },
   async addUUID(cookieStoreId) {
     return this.updateUUID(cookieStoreId, uuidv4());
   },
 
-  async lookupCookieStoreId(macUUID) {
+  async lookupCookieStoreId(macAddonUUID) {
     const macConfigs = await this.storageArea.area.get();
     for(const key of Object.keys(macConfigs)) {
       if (key.includes("identitiesState@@_")) {
-        if(macConfigs[key].macUUID === macUUID) {
+        if(macConfigs[key].macAddonUUID === macAddonUUID) {
           return key.replace(/^firefox-container-@@_/, "");
         }
       }
@@ -91,7 +91,7 @@ const identityState = {
   _createIdentityState() {
     return {
       hiddenTabs: [],
-      macUUID: uuidv4()
+      macAddonUUID: uuidv4()
     };
   },
 };