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

Merge pull request #2161 from cmgustavo/bug/import-text-plain-backup

Browse source 
Fixes importing a plain text backup
This commit is contained in:
Matias Alejo Garcia 2014-12-18 19:40:26 -03:00
commit abf552aa5c
9 changed files with 51 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
js/services/backupService.js
View file

@ -72,12 +72,12 @@ BackupService.prototype.walletDownload = function(wallet) {
};
BackupService.prototype.profileEncrypted = function(iden) {
iden.setBackupDone();
return iden.exportEncryptedWithWalletInfo(iden.password);
}
BackupService.prototype.profileDownload = function(iden) {
var ew = this.profileEncrypted(iden);
iden.setBackupDone();
var name = iden.fullName;
var filename = name + '-profile.json';
this._download(ew, name, filename)

2
js/services/identityService.js
View file

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