From e4c5ab88fb78ad83acdaf05bac8a9604a680f3b3 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 25 Oct 2016 23:17:46 -0400
Subject: [PATCH] update icon when vault is locked/unlocked

---
 src/_locales/en/messages.json        |   4 +++
 src/background.js                    |  48 ++++++++++++++-------------
 src/images/icon19_locked.png         | Bin 0 -> 584 bytes
 src/images/icon38_locked.png         | Bin 0 -> 996 bytes
 src/popup/app/lock/lockController.js |   1 +
 src/services/i18nService.js          |   1 +
 6 files changed, 31 insertions(+), 23 deletions(-)
 create mode 100644 src/images/icon19_locked.png
 create mode 100644 src/images/icon38_locked.png

diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index e32b13431d..14c6ccd334 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -103,6 +103,10 @@
     "message": "No matching sites.",
     "description": "No matching sites."
   },
+  "vaultLocked": {
+    "message": "Vault is locked.",
+    "description": "Vault is locked."
+  },
   "autoFillInfo": {
     "message": "There are no sites available to auto-fill for the current browser tab.",
     "description": "There are no sites available to auto-fill for the current browser tab."
diff --git a/src/background.js b/src/background.js
index 99f87b2cd4..a47d40da66 100644
--- a/src/background.js
+++ b/src/background.js
@@ -27,13 +27,10 @@ chrome.commands.onCommand.addListener(function (command) {
 });
 
 chrome.runtime.onMessage.addListener(function (msg, sender, sendResponse) {
-    if (msg.command === 'loggedOut') {
-        setIcon(true);
+    if (msg.command === 'loggedOut' || msg.command === 'loggedIn' || msg.command === 'unlocked' || msg.command === 'locked') {
+        setIcon();
         refreshBadgeAndMenu();
     }
-    else if (msg.command === 'loggedIn') {
-        setIcon(false);
-    }
     else if (msg.command === 'syncCompleted' && msg.successfully) {
         setTimeout(refreshBadgeAndMenu, 2000);
     }
@@ -45,21 +42,25 @@ chrome.runtime.onMessage.addListener(function (msg, sender, sendResponse) {
     }
 });
 
-userService.isAuthenticated(function (isAuthenticated) {
-    setIcon(!isAuthenticated);
-});
+setIcon();
+function setIcon() {
+    userService.isAuthenticated(function (isAuthenticated) {
+        cryptoService.getKey(false, function (key) {
+            var suffix = '';
+            if (!isAuthenticated) {
+                suffix = '_gray';
+            }
+            else if (!key) {
+                suffix = '_locked';
+            }
 
-function setIcon(grayedOut) {
-    var suffix = '';
-    if (grayedOut) {
-        suffix = '_gray';
-    }
-
-    chrome.browserAction.setIcon({
-        path: {
-            '19': 'images/icon19' + suffix + '.png',
-            '38': 'images/icon38' + suffix + '.png',
-        }
+            chrome.browserAction.setIcon({
+                path: {
+                    '19': 'images/icon19' + suffix + '.png',
+                    '38': 'images/icon38' + suffix + '.png',
+                }
+            });
+        });
     });
 }
 
@@ -190,14 +191,14 @@ function loadMenuAndUpdateBadge(url, tabId, loadContextMenuOptions) {
             });
         }
         else {
-            loadNoSitesContextMenuOptions();
+            loadNoSitesContextMenuOptions(i18nService.noMatchingSites);
             chrome.browserAction.setBadgeText({
                 text: '',
                 tabId: tabId
             });
         }
     }, function () {
-        loadNoSitesContextMenuOptions();
+        loadNoSitesContextMenuOptions(i18nService.vaultLocked);
         chrome.browserAction.setBadgeText({
             text: '',
             tabId: tabId
@@ -334,8 +335,8 @@ function loadSiteContextMenuOptions(site) {
     loadContextMenuOptions(title, site.id, site);
 }
 
-function loadNoSitesContextMenuOptions() {
-    loadContextMenuOptions(i18nService.noMatchingSites, 'noop', null);
+function loadNoSitesContextMenuOptions(noSitesMessage) {
+    loadContextMenuOptions(noSitesMessage, 'noop', null);
 }
 
 function loadContextMenuOptions(title, idSuffix, site) {
@@ -444,6 +445,7 @@ function checkLock() {
                     if (diffSeconds >= lockOptionSeconds) {
                         // need to lock now
                         cryptoService.clearKey(function () {
+                            setIcon();
                             folderService.clearCache();
                             siteService.clearCache();
                             refreshBadgeAndMenu();
diff --git a/src/images/icon19_locked.png b/src/images/icon19_locked.png
new file mode 100644
index 0000000000000000000000000000000000000000..11c92080acdf0360c6078e1b0abb44b958b93862
GIT binary patch
literal 584
zcmV-O0=NB%P)<h;3K|Lk000e1NJLTq000vJ000vR1^@s6a!@wR00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz+DSw~RCwBA
zwCUZ$%)r2q55$>3tinJ#xC6w~fp{VdkSGG;E(Y=e$N{}T%nUND6een|B*NgTDZ%jT
z&p%Y<jF={{F*7mjx$%<W$lcd4p;C}xqA;GViYSA#x;W8J`tkcOvSFeu#Aw=n?K#8x
z3r`q0S(zDr{r$(FA<oB;@2JMW$cXA>q6~ZS@dv~87oXsKCPqfA>X;a)2nMfVEaYgC
zeRP`P_0)9?0^gY#M8B&uyylj`H0<xc{{#*4ys?@g@X~ySkGz5m0>GH9{qvWh*S?M6
zp`Z$?H?P0^gx4UhUthq6eKPi9P+WJN;c(V+hOewV48cIdF~aP?tyc`sKYqt)nAXel
zU;|ZMy%|0*aWQOt!^Uu3+>k-^%X3V_zWn^dFmeAaoQ9cmegV_JpWbKK+S|dPdu1bo
z$k!K;<PW47fu#mUK)Gs2FjRSHF|aT}66c1CPZ*e9Jz`L=b;M~AD9o_N=I$FWz}~I#
z)Mk(t;A9BUmjSxwH^V&w;R*8QYiyENo_}OWSagzM!HN3}FFyTXSbymW{sjB~-(Qen
zeK<=6V6@LYc8?)+&QXRHXCC1-jPuX8k08Ukfw%^U@8eSpN&?^5cyJr`>+1u600RKa
W>!YT{5&wPw0000<MNUMnLSTZC3l_`(

literal 0
HcmV?d00001

diff --git a/src/images/icon38_locked.png b/src/images/icon38_locked.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b4ed7b3a1f8c10bb964e0eb03a2661ab7a61aa9
GIT binary patch
literal 996
zcmV<A0~`E_P)<h;3K|Lk000e1NJLTq001Tc001Tk1^@s6s6FYf00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#c1c7*RCwC#
zn0rW5Q5?s=cbjjQx-uu>W+J2^fzOy3MFkOp1(LlW>_O!p_D2?!f7Rc$u%Z_jMM_92
z1tI>SMJD*De5Hk;Ic?K?<fcuhZMt>N^=>9^?djtWfAHNsyXTyHKKy>?@w=BvlUL&(
z+eLJVNJbQj<*^Z>dZODzHRhW<?&?P*Cwfnmv5ZjQ#>(KvmUAo+aFvBb$FcH8qa`Lf
zK|PkfN}$X}S<<P;a;(*E6#611QiOzv5X{V)JUX&~&*1C8I2wCLp&FaA)+9&3P4q>!
zJ#sycBt}3g3Rn`i#Dxa|3<Fh*(pq&24W-ChO{`c5$r3?P3lH)`bZDT>1;MjbV=_^h
zmJG~f`LPjhPYq<4HKL^H2lO*W8X+t7CL~HikR%Z~HV-`qW<v4DUg-3*w!K6m;3yc+
zQ()9f3>Z6Y7>A$7!z#5kur;tXur)A8GmzyRjISGqy66_PZ_C;Lk|_f&7=uw6a~ORg
z(T;(!JGm1(wLOz+x{-Y6CPqf*(;Oe7Br0Vs3s=7Fl>Ja@r)TiTFzcD5esU0bHTm%6
zp!mWN_-u)XP7-HnbD*=7m0hrQl416#bshoB{PGn3`U$oieCRBqs|Fz`c!$c<MR+8;
z2Ay}Hr5*LG9k4Mr_4S0eXsD?9C+|Vn)%$F@NvT0={}?_;?8NiLTuXa%Tbp3xWMWoy
z46u2YTXRd@Who2yW?IUx+f?{DK9}!PIJ4Kb4z<|dE(S=)H|+y%fdzQauP-{cs8x3k
zp?hRv;ahKj*tvbIu<knse^0v>MxhU~Wt$h=8=KPO!G|vQ_c6LUZ&Y;PZdL-k_>S+#
zDN+&gcWeSv)xdrOpr-HdK}o?qNQbqM{--YuCzB?xcIb^GHEIK{r^mt1i*L1_rql-?
z*RtvJnbas8O_D;983RMVVrh@0x}IM+|Kbydw9_{8`TenC6lcqDj6fN+8keD*J}VWY
zlQ>7<+Q>3rG|7DgxV$e0;&r|&bBL=a^|<)58BgkZ*jF`MW;B}I22(rR$w<QXtU-b7
zqDC|*7H`6>Dh+Z=o88VX>bWmIPMcDr!<AR9kdcLvl@I{|k3m_B3N>BB<OrH{8|<O0
zU}mc)3xmqjiDCs&*=o&TPh##H=&A#wr)eJ1Zq9=f?mn0v%HP7`UG1*<E5HEk?k{v^
SfJH9=0000<MNUMnLSTYB+s&K+

literal 0
HcmV?d00001

diff --git a/src/popup/app/lock/lockController.js b/src/popup/app/lock/lockController.js
index b321f52526..d21b1ce503 100644
--- a/src/popup/app/lock/lockController.js
+++ b/src/popup/app/lock/lockController.js
@@ -32,6 +32,7 @@
                     cryptoService.getKeyHash(true, function (storedKeyHash) {
                         if (storedKeyHash && keyHash && storedKeyHash === keyHash) {
                             cryptoService.setKey(key, function () {
+                                chrome.runtime.sendMessage({ command: 'unlocked' });
                                 $state.go('tabs.current');
                             });
                         }
diff --git a/src/services/i18nService.js b/src/services/i18nService.js
index 39ad962f11..905c87587b 100644
--- a/src/services/i18nService.js
+++ b/src/services/i18nService.js
@@ -23,6 +23,7 @@ function i18nService() {
         autoFill: chrome.i18n.getMessage('autoFill'),
         generatePasswordCopied: chrome.i18n.getMessage('generatePasswordCopied'),
         noMatchingSites: chrome.i18n.getMessage('noMatchingSites'),
+        vaultLocked: chrome.i18n.getMessage('vaultLocked'),
         autoFillInfo: chrome.i18n.getMessage('autoFillInfo'),
         addSite: chrome.i18n.getMessage('addSite'),
         passwordHint: chrome.i18n.getMessage('passwordHint'),