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

Merge branch 'master' of github.com:bitpay/copay into bitpay

Browse source
This commit is contained in:
Jason Dreyzehner 2016-10-25 17:45:01 -04:00
commit f4041f6dbc
2 changed files with 14 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/js/services/profileService.js
View file

@ -619,6 +619,20 @@ angular.module('copayApp.services')
return cb(gettext('Could not import. Check input file and spending password'));
}
if (walletClient.hasPrivKeyEncrypted()) {
try {
walletClient.disablePrivateKeyEncryption();
} catch (e) {
$log.warn(e);
}
}
str = JSON.parse(str);
if (!str.n) {
return cb("Backup format not recognized. If you are using a Copay Beta backup and version is older than 0.10, please see: https://github.com/bitpay/copay/issues/4730#issuecomment-244522614");
}
var addressBook = str.addressBook || {};
addAndBindWalletClient(walletClient, {