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

fix import profile and wallet. digest fix

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2014-12-15 13:18:44 -03:00
commit 88edec1779
5 changed files with 38 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

38
js/controllers/import.js
View file

@ -34,8 +34,11 @@ angular.module('copayApp.controllers').controller('ImportController',
updateStatus('Importing wallet - Procesing backup...');
identityService.importWallet(encryptedObj, $scope.password, {}, function(err) {
if (err) {
$scope.loading = false;
$rootScope.starting = false;
$scope.error = 'Could not read wallet. Please check your password';
$timeout(function() {
$rootScope.$digest();
}, 1);
}
});
}
@ -43,10 +46,8 @@ angular.module('copayApp.controllers').controller('ImportController',
};
$scope.import = function(form) {
$scope.loading = true;
if (form.$invalid) {
$scope.loading = false;
$scope.error = 'There is an error in the form';
return;
}
@ -61,11 +62,12 @@ angular.module('copayApp.controllers').controller('ImportController',
}
if (!backupFile && !backupText) {
$scope.loading = false;
$scope.error = 'Please, select your backup file';
return;
}
$rootScope.starting = true;
$scope.importOpts = {};
var skipFields = [];
@ -79,21 +81,19 @@ angular.module('copayApp.controllers').controller('ImportController',
if (skipFields)
$scope.importOpts.skipFields = skipFields;
$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';
if (backupFile) {
reader.readAsBinaryString(backupFile);
} else {
updateStatus('Importing wallet - Procesing backup...');
identityService.importWallet(backupText, $scope.password, $scope.importOpts, function(err) {
if (err) {
$rootScope.starting = false;
$scope.error = 'Could not read wallet. Please check your password';
$timeout(function() {
$rootScope.$digest();
return;
}
});
}
}, 1);
}, 1);
}
});
}
};
});

22
js/controllers/importProfile.js
View file

@ -26,8 +26,8 @@ angular.module('copayApp.controllers').controller('ImportProfileController',
updateStatus('Importing profile - Setting things up...');
identityService.importProfile(str,password, function(err, iden) {
$scope.loading = false;
if (err) {
$rootScope.starting = false;
copay.logger.warn(err);
if ((err.toString() || '').match('BADSTR')) {
$scope.error = 'Bad password or corrupt profile file';
@ -36,6 +36,9 @@ angular.module('copayApp.controllers').controller('ImportProfileController',
} else {
$scope.error = 'Unknown error';
}
$timeout(function() {
$rootScope.$digest();
}, 1);
}
});
};
@ -51,10 +54,8 @@ 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;
}
@ -63,17 +64,16 @@ 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;
}
$rootScope.starting = true;
$timeout(function() {
if (backupFile) {
reader.readAsBinaryString(backupFile);
} else {
_importBackup(backupText);
}
}, 1);
if (backupFile) {
reader.readAsBinaryString(backupFile);
} else {
_importBackup(backupText);
}
};
});

2
js/services/identityService.js
View file

@ -136,7 +136,7 @@ angular.module('copayApp.services')
pendingTxsService.update();
$timeout(function() {
$rootScope.$digest();
})
}, 1);
};
root.notifyTxProposalEvent = function(w, e) {

7
views/import.html
View file

@ -1,9 +1,9 @@
<div class="import" ng-controller="ImportController">
<div ng-show="loading">
<div ng-show="$root.starting">
<div ng-include="'views/includes/loading.html'" ng-init="title = importStatus"></div>
</div>
<div ng-show="!loading">
<div ng-show="!$root.starting">
<div class="row hide-for-large-up">
<div class="large-12 medium-12 small-12 columns">
<h1>{{$root.title}}</h1>
@ -85,7 +85,8 @@
<div class="text-right m20t">
<button translate type="submit" class="button expand black m0" ng-disabled="importForm.$invalid">
<button translate type="submit" class="button expand black m0"
ng-disabled="importForm.$invalid || $root.starting">
Import backup
</button>
</div>

6
views/importProfile.html
View file

@ -1,10 +1,10 @@
<div class="import-profile" ng-controller="ImportProfileController">
<div ng-show="loading">
<div ng-show="$root.starting">
<div ng-include="'views/includes/loading.html'" ng-init="title = importStatus"></div>
</div>
<div ng-show="!loading">
<div ng-show="!$root.starting">
<div class="large-4 large-centered medium-6 medium-centered columns">
<div class="logo-setup show-for-large-up">
<img src="img/logo-negative-beta.svg" alt="Copay" width="100">
@ -47,7 +47,7 @@
<button translate type="submit"
class="button primary radius expand m0"
ng-disabled="importProfileForm.$invalid || loading">
ng-disabled="importProfileForm.$invalid || $root.starting">
Import backup
</button>
</form>