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

Fix Conflicts:

Browse source 
index.html
This commit is contained in:
Gustavo Cortez 2014-06-02 22:19:15 -03:00
commit 7aebf032ef
16 changed files with 225 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

11
js/controllers/import.js
View file

@ -6,7 +6,15 @@ angular.module('copay.import').controller('ImportController',
var reader = new FileReader();
var _importBackup = function(encryptedObj) {
Passphrase.getBase64Async($scope.password, function(passphrase){
$rootScope.wallet = walletFactory.fromEncryptedObj(encryptedObj, passphrase);
var w = walletFactory.fromEncryptedObj(encryptedObj, passphrase);
if (!w) {
$scope.loading = false;
$rootScope.$flashMessage = { message: 'Wrong password', type: 'error'};
$rootScope.$digest();
return;
}
$rootScope.wallet = w;
controllerUtils.startNetwork($rootScope.wallet);
});
};
@ -33,6 +41,7 @@ angular.module('copay.import').controller('ImportController',
var password = form.password.$modelValue;
if (!backupFile && !backupText) {
$scope.loading = false;
$rootScope.$flashMessage = { message: 'Please, select your backup file or paste the text', type: 'error'};
$scope.loading = false;
return;

6
js/controllers/signin.js
View file

@ -23,17 +23,15 @@ angular.module('copay.signin').controller('SigninController',
console.log('## Obtaining passphrase...');
Passphrase.getBase64Async(password, function(passphrase){
console.log('## Done.');
console.log('## Passphrase obtained');
var w = walletFactory.open($scope.selectedWalletId, { passphrase: passphrase});
if (!w) {
$scope.loading = $scope.failure = false;
$rootScope.$flashMessage = { message: 'Bad password or connection error', type: 'error'};
$rootScope.$flashMessage = { message: 'Wrong password', type: 'error'};
$rootScope.$digest();
return;
}
console.log('[signin.js.49]'); //TODO
installStartupHandlers(w);
console.log('[signin.js.52]'); //TODO
controllerUtils.startNetwork(w);
});
};