Moving bulk of removeIdentity code into popup.js

webextension/background.js

@@ -59,18 +59,25 @@ const assignManager = {
   },
 
   init() {
-    browser.runtime.onMessage.addListener((neverAskMessage) => {
-      const pageUrl = neverAskMessage.pageUrl;
-      if (neverAskMessage.neverAsk === true) {
-        // If we have existing data and for some reason it hasn't been deleted etc lets update it
-        this.storageArea.get(pageUrl).then((siteSettings) => {
-          if (siteSettings) {
-            siteSettings.neverAsk = true;
-            this.storageArea.set(pageUrl, siteSettings);
+    browser.runtime.onMessage.addListener((m) => {
+      switch (m.type) {
+        case "delete-container":
+          assignManager.deleteContainer(m.message.userContextId);
+          break;
+        case "never-ask":
+          const pageUrl = m.pageUrl;
+          if (m.neverAsk === true) {
+            // If we have existing data and for some reason it hasn't been deleted etc lets update it
+            this.storageArea.get(pageUrl).then((siteSettings) => {
+              if (siteSettings) {
+                siteSettings.neverAsk = true;
+                this.storageArea.set(pageUrl, siteSettings);
+              }
+            }).catch((e) => {
+              throw e;
+            });
           }
-        }).catch((e) => {
-          throw e;
-        });
+          break;
       }
     });
 
@@ -254,9 +261,6 @@ const messageHandler = {
       case "lightweight-theme-changed":
         themeManager.update(m.message);
         break;
-      case "delete-container":
-        assignManager.deleteContainer(m.message.userContextId);
-        break;
       default:
         throw new Error(`Unhandled message type: ${m.message}`);
       }