Merge branch 'master' into MAC-x-MozillaVPN

2021-10-25 10:25:31 -05:00
parent 399bed93bd f7202d699f
commit 1d608f599b
7 changed files with 6 additions and 230 deletions
@@ -89,13 +89,13 @@ window.assignManager = {
      return;
    },

-    async remove(pageUrlorUrlKey) {
+    async remove(pageUrlorUrlKey, shouldSync = true) {
      const siteStoreKey = this.getSiteStoreKey(pageUrlorUrlKey);
      // When we remove an assignment we should clear all the exemptions
      this.removeExempted(pageUrlorUrlKey);
      await this.area.remove([siteStoreKey]);
      const syncEnabled = await this.getSyncEnabled();
-      if (syncEnabled) await sync.storageArea.backup({siteStoreKey});
+      if (shouldSync && syncEnabled) await sync.storageArea.backup({siteStoreKey});
      return;
    },