From 124ac064198a7de6887035d3895ff6ebfd8316ce Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 25 Oct 2016 23:03:21 -0400
Subject: [PATCH] Fixed issues where onReplaced and onUpdated are called
 multiple times

---
 src/background.js             | 100 ++++++++++++++++++----------------
 src/services/folderService.js |   4 +-
 src/services/siteService.js   |   4 +-
 3 files changed, 58 insertions(+), 50 deletions(-)

diff --git a/src/background.js b/src/background.js
index c3e0af0c3c..99f87b2cd4 100644
--- a/src/background.js
+++ b/src/background.js
@@ -72,48 +72,65 @@ if (chrome.runtime.onInstalled) {
     });
 }
 
-function buildContextMenu() {
-    chrome.contextMenus.removeAll();
-    chrome.contextMenus.create({
-        type: 'normal',
-        id: 'autofill',
-        contexts: ['all'],
-        title: i18nService.autoFill
-    });
+function buildContextMenu(callback) {
+    chrome.contextMenus.removeAll(function () {
+        chrome.contextMenus.create({
+            type: 'normal',
+            id: 'autofill',
+            contexts: ['all'],
+            title: i18nService.autoFill
+        }, function () {
+            chrome.contextMenus.create({
+                type: 'normal',
+                id: 'copy-username',
+                contexts: ['all'],
+                title: i18nService.copyUsername
+            }, function () {
+                chrome.contextMenus.create({
+                    type: 'normal',
+                    id: 'copy-password',
+                    contexts: ['all'],
+                    title: i18nService.copyPassword
+                }, function () {
+                    chrome.contextMenus.create({
+                        type: 'separator'
+                    });
 
-    chrome.contextMenus.create({
-        type: 'normal',
-        id: 'copy-username',
-        contexts: ['all'],
-        title: i18nService.copyUsername
-    });
-
-    chrome.contextMenus.create({
-        type: 'normal',
-        id: 'copy-password',
-        contexts: ['all'],
-        title: i18nService.copyPassword
-    });
-
-    chrome.contextMenus.create({
-        type: 'separator'
-    });
-
-    chrome.contextMenus.create({
-        type: 'normal',
-        id: 'generate-password',
-        contexts: ['all'],
-        title: i18nService.generatePasswordCopied
+                    chrome.contextMenus.create({
+                        type: 'normal',
+                        id: 'generate-password',
+                        contexts: ['all'],
+                        title: i18nService.generatePasswordCopied
+                    }, function () {
+                        if (callback) {
+                            callback();
+                        }
+                    });
+                });
+            });
+        });
     });
 }
 
 chrome.tabs.onActivated.addListener(function (activeInfo) {
-    buildContextMenu();
     refreshBadgeAndMenu();
 });
 
-var loadedMenu = false;
+var onReplacedRan = false;
 chrome.tabs.onReplaced.addListener(function (addedTabId, removedTabId) {
+    if (onReplacedRan) {
+        return;
+    }
+    onReplacedRan = true;
+    refreshBadgeAndMenu();
+});
+
+var onUpdatedRan = false;
+chrome.tabs.onUpdated.addListener(function (tabId, changeInfo, tab) {
+    if (onUpdatedRan) {
+        return;
+    }
+    onUpdatedRan = true;
     refreshBadgeAndMenu();
 });
 
@@ -128,18 +145,14 @@ function refreshBadgeAndMenu() {
             return;
         }
 
-        buildContextMenu();
-        loadMenuAndUpdateBadge(tab.url, tab.id, true);
+        buildContextMenu(function () {
+            loadMenuAndUpdateBadge(tab.url, tab.id, true);
+            onUpdatedRan = onReplacedRan = false;
+        });
     });
 }
 
-chrome.tabs.onUpdated.addListener(function (tabId, changeInfo, tab) {
-    buildContextMenu();
-    loadMenuAndUpdateBadge(tab.url, tabId, true);
-});
-
 function loadMenuAndUpdateBadge(url, tabId, loadContextMenuOptions) {
-    loadedMenu = false;
     if (!url) {
         return;
     }
@@ -153,11 +166,6 @@ function loadMenuAndUpdateBadge(url, tabId, loadContextMenuOptions) {
     chrome.browserAction.setBadgeBackgroundColor({ color: '#294e5f' });
 
     siteService.getAllDecrypted().then(function (sites) {
-        if (loadedMenu) {
-            return;
-        }
-        loadedMenu = true;
-
         sortSites(sites);
         for (var i = 0; i < sites.length; i++) {
             if (sites[i].domain && tabDomain === sites[i].domain) {
diff --git a/src/services/folderService.js b/src/services/folderService.js
index ce261e6d52..757cf82a63 100644
--- a/src/services/folderService.js
+++ b/src/services/folderService.js
@@ -71,12 +71,12 @@ function initFolderService() {
         cryptoService.getKey(false, function (key) {
             if (!key) {
                 deferred.reject();
-                return deferred.promise;
+                return;
             }
 
             if (self.decryptedFolderCache) {
                 deferred.resolve(self.decryptedFolderCache);
-                return deferred.promise;
+                return;
             }
 
             var promises = [];
diff --git a/src/services/siteService.js b/src/services/siteService.js
index 239d1f549e..f3e76ea587 100644
--- a/src/services/siteService.js
+++ b/src/services/siteService.js
@@ -88,12 +88,12 @@ function initSiteService() {
         cryptoService.getKey(false, function (key) {
             if (!key) {
                 deferred.reject();
-                return deferred.promise;
+                return;
             }
 
             if (self.decryptedSiteCache) {
                 deferred.resolve(self.decryptedSiteCache);
-                return deferred.promise;
+                return;
             }
 
             var promises = [];