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

fix import wallet

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2014-12-15 10:48:41 -03:00
commit e5f4844ca5
4 changed files with 26 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

30
js/controllers/import.js
View file

@ -22,7 +22,6 @@ angular.module('copayApp.controllers').controller('ImportController',
var updateStatus = function(status) {
$scope.importStatus = status;
$scope.$digest();
}
@ -80,19 +79,20 @@ angular.module('copayApp.controllers').controller('ImportController',
$scope.importOpts.skipFields = skipFields;
if (backupFile) {
reader.readAsBinaryString(backupFile);
} else {
updateStatus('Importing wallet - Procesing backup...');
identityService.importWallet(encryptedObj, $scope.password, $scope.importOpts, function(err) {
if (err) {
$scope.loading = false;
$scope.error = 'Could not read wallet. Please check your password';
$rootScope.$digest();
return;
}
copay.Compatibility.deleteOldWallet(backupOldWallet);
});
}
$timeout(function() {
if (backupFile) {
reader.readAsBinaryString(backupFile);
} else {
updateStatus('Importing wallet - Procesing backup...');
identityService.importWallet(backupText, $scope.password, $scope.importOpts, function(err) {
if (err) {
$scope.loading = false;
$scope.error = 'Could not read wallet. Please check your password';
$rootScope.$digest();
return;
}
});
}
}, 1);
};
});

4
js/controllers/importProfile.js
View file

@ -50,8 +50,10 @@ angular.module('copayApp.controllers').controller('ImportProfileController',
};
$scope.import = function(form) {
$scope.loading = true;
if (form.$invalid) {
$scope.loading = false;
$scope.error = 'Please enter the required fields';
return;
}
@ -60,11 +62,11 @@ angular.module('copayApp.controllers').controller('ImportProfileController',
var password = form.password.$modelValue;
if (!backupFile && !backupText) {
$scope.loading = false;
$scope.error = 'Please, select your backup file';
return;
}
$scope.loading = true;
$timeout(function() {
if (backupFile) {
reader.readAsBinaryString(backupFile);