anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Remove obsolete key on storage upgrade. Improve log output.

Browse source
This commit is contained in:
Andy Phillipson 2017-01-05 17:57:25 -05:00
commit 3bf8923f10
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/js/services/storageService.js
View file

@ -177,11 +177,14 @@ angular.module('copayApp.services')
});
}
});
if (upgraded.length > 0) {
cb(null, 'upgraded \'bitpayAccounts\':' + upgraded);
} else {
cb();
}
// Remove obsolete key.
storage.remove('bitpayAccounts-' + network, function() {
if (upgraded.length > 0) {
cb(null, 'upgraded to \'bitpayAccounts-v2-' + network + '\':' + upgraded);
} else {
cb();
}
});
});
};
//
@ -277,11 +280,11 @@ angular.module('copayApp.services')
var storagekey = key.split('_')[1];
_upgraders[key](storagekey, network, function(err, msg) {
if (err) {
_handleUpgradeError(storagekey, err);
_handleUpgradeError(storagekey + '-' + network, err);
errorCount++;
errorMessage = errorCount + ' storage upgrade failures';
}
if (msg) _handleUpgradeSuccess(storagekey, msg);
if (msg) _handleUpgradeSuccess(storagekey + '-' + network, msg);
});
});
});