only clear memory org keys when locked

This commit is contained in:
Kyle Spearrin 2017-04-24 10:53:23 -04:00
parent 8c38480db8
commit 0ea89bf9da
2 changed files with 10 additions and 5 deletions

View File

@ -756,7 +756,7 @@ function checkLock() {
if (diffSeconds >= lockOptionSeconds) {
// need to lock now
Q.all([cryptoService.clearKey(), cryptoService.clearOrgKeys()]).then(function () {
Q.all([cryptoService.clearKey(), cryptoService.clearOrgKeys(true)]).then(function () {
cryptoService.clearPrivateKey();
setIcon();
folderService.clearCache();

View File

@ -236,13 +236,18 @@ function initCryptoService(constantsService) {
_privateKey = null;
};
CryptoService.prototype.clearOrgKeys = function () {
CryptoService.prototype.clearOrgKeys = function (memoryOnly) {
var deferred = Q.defer();
_orgKeys = {};
chrome.storage.local.remove('encOrgKeys', function () {
_orgKeys = null;
if (memoryOnly) {
deferred.resolve();
});
}
else {
chrome.storage.local.remove('encOrgKeys', function () {
deferred.resolve();
});
}
return deferred.promise;
};