mirror of https://github.com/BTCPrivate/copay.git
move update indexes to the loading screen
This commit is contained in:
parent
0958d9686e
commit
386a5bea6f
|
@ -6,22 +6,17 @@ angular.module('copayApp.controllers').controller('ImportController',
|
|||
var reader = new FileReader();
|
||||
var _importBackup = function(encryptedObj) {
|
||||
Passphrase.getBase64Async($scope.password, function(passphrase){
|
||||
var w, errMsg;
|
||||
try {
|
||||
w = walletFactory.fromEncryptedObj(encryptedObj, passphrase);
|
||||
} catch(e) {
|
||||
errMsg = e.message;
|
||||
}
|
||||
if (!w) {
|
||||
walletFactory.import(encryptedObj, passphrase, function(err, w) {
|
||||
if (err) {
|
||||
$scope.loading = false;
|
||||
$rootScope.$flashMessage = { message: errMsg || 'Wrong password', type: 'error'};
|
||||
$rootScope.$flashMessage = { message: err.errMsg || 'Wrong password', type: 'error'};
|
||||
$rootScope.$digest();
|
||||
return;
|
||||
}
|
||||
$rootScope.wallet = w;
|
||||
|
||||
controllerUtils.startNetwork($rootScope.wallet, $scope);
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
$scope.openFileDialog = function() {
|
||||
|
|
|
@ -71,14 +71,19 @@ WalletFactory.prototype.fromEncryptedObj = function(base64, password) {
|
|||
var walletObj = this.storage.import(base64);
|
||||
if (!walletObj) return false;
|
||||
var w = this.fromObj(walletObj);
|
||||
var self = this;
|
||||
w.updateIndexes(function(err) {
|
||||
if (err) throw err;
|
||||
self.log('Indexes updated');
|
||||
});
|
||||
return w;
|
||||
};
|
||||
|
||||
WalletFactory.prototype.import = function(base64, password, cb) {
|
||||
var self = this;
|
||||
var w = self.fromEncryptedObj(base64, password);
|
||||
w.updateIndexes(function(err) {
|
||||
if (err) return cb(err);
|
||||
self.log('Indexes updated');
|
||||
cb(null, w);
|
||||
});
|
||||
}
|
||||
|
||||
WalletFactory.prototype.read = function(walletId) {
|
||||
if (!this._checkRead(walletId))
|
||||
return false;
|
||||
|
|
Loading…
Reference in New Issue