Merge pull request #2875 from cmgustavo/feat/scan-all-addresses

Clean last address and scann all addresses
This commit is contained in:
Matias Alejo Garcia 2015-06-10 14:55:01 -03:00
commit 9d575ecb7c
2 changed files with 28 additions and 4 deletions

View File

@ -481,7 +481,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
}); });
}; };
self.clientError = function(err) { self.clientError = function(err) {
if (isCordova) { if (isCordova) {
navigator.notification.confirm( navigator.notification.confirm(
@ -549,8 +548,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
c.startScan({ c.startScan({
includeCopayerBranches: true, includeCopayerBranches: true,
}, function(err) { }, function(err) {
if (err) { if (err && self.walletId == walletId) {
if (self.walletId == walletId)
self.setOngoingProcess('scanning', false); self.setOngoingProcess('scanning', false);
self.handleError(err); self.handleError(err);
$rootScope.$apply(); $rootScope.$apply();
@ -624,6 +622,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
$rootScope.$on('Local/BWSUpdated', function(event) { $rootScope.$on('Local/BWSUpdated', function(event) {
profileService.applyConfig(); profileService.applyConfig();
storageService.setCleanAndScanAddresses(function() {});
}); });
$rootScope.$on('Local/WalletCompleted', function(event) { $rootScope.$on('Local/WalletCompleted', function(event) {
@ -769,6 +768,19 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.setFocusedWallet(); self.setFocusedWallet();
self.updateTxHistory(); self.updateTxHistory();
go.walletHome(); go.walletHome();
storageService.getCleanAndScanAddresses(function(err, val) {
if (val) {
$log.debug('Clear last address cache and Scan');
var wallets = profileService.walletClients;
for (var walletId in wallets) {
storageService.clearLastAddress(walletId, function(err) {
self.startScan(walletId);
});
}
storageService.removeCleanAndScanAddresses(function() {});
}
});
}); });
$rootScope.$on('Local/SetTab', function(event, tab, reset) { $rootScope.$on('Local/SetTab', function(event, tab, reset) {

View File

@ -151,6 +151,18 @@ angular.module('copayApp.services')
storage.get('backup-' + walletId, cb); storage.get('backup-' + walletId, cb);
}; };
root.setCleanAndScanAddresses = function(cb) {
storage.set('CleanAndScanAddresses', Date.now(), cb);
};
root.getCleanAndScanAddresses = function(cb) {
storage.get('CleanAndScanAddresses', cb);
};
root.removeCleanAndScanAddresses = function(cb) {
storage.remove('CleanAndScanAddresses', cb);
};
root.getConfig = function(cb) { root.getConfig = function(cb) {
storage.get('config', cb); storage.get('config', cb);
}; };