BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix

This commit is contained in:
Gabriel Bazán 2015-11-06 17:45:23 -03:00
parent d669f86c7d
commit 0d81cf8e9c
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/js/services/backupService.js
View File

@ -53,6 +53,14 @@ angular.module('copayApp.services')
return cb();
};
root.addMetadata = function(b, opts) {
b = JSON.parse(b);
if (opts.historyCache) b.historyCache = opts.historyCache;
if (opts.addressBook) b.addressBook = opts.addressBook;
return JSON.stringify(b);
}
root.walletExport = function(password, opts) {
if (!password) {
return null;
@ -61,6 +69,8 @@ angular.module('copayApp.services')
try {
opts = opts || {};
var b = fc.export(opts);
if (opts.historyCache || opts.addressBook) b = root.addMetadata(b, opts);
var e = sjcl.encrypt(password, b, {
iter: 10000
});
@ -82,4 +92,4 @@ angular.module('copayApp.services')
_download(ew, filename, cb)
};
return root;
});
});

8
src/js/services/profileService.js
View File

@ -338,9 +338,10 @@ angular.module('copayApp.services')
};
root.setMetaData = function(walletClient, addressBook, historyCache, cb) {
storageService.setAddressbook(walletClient.credentials.network, addressBook, function(err) {
storageService.setAddressbook(walletClient.credentials.network, JSON.stringify(addressBook), function(err) {
if (err) return cb(err);
storageService.setTxHistory(historyCache, walletClient.credentials.walletId, function(err) {
storageService.setTxHistory(JSON.stringify(historyCache), walletClient.credentials.walletId, function(err) {
if (err) return cb(err);
return cb(null);
});
@ -393,6 +394,9 @@ angular.module('copayApp.services')
} catch (err) {
return cb(gettext('Could not import. Check input file and password'));
}
str = JSON.parse(str);
var addressBook = str.addressBook || [];
var historyCache = str.historyCache ||  [];