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

Starting to migrate profile storage.

Browse source
This commit is contained in:
Brendon Duncan 2018-06-04 15:31:51 +12:00
commit afe433d909
1 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/js/services/storageService.js
View file

@ -131,20 +131,31 @@ angular.module('copayApp.services')
/**
*
* @param {Profile} oldProfile
* @param {Profile} oldProfile
* @param {Profile} secureProfile - may be falsy if no secure profile found.
* @param {getProfileCallback} cb
*/
function _migrateProfiles(oldProfile, secureProfile, cb) {
if (secureProfile) {
secureProfile.merge(oldProfile);
} else {
root.storeNewProfile(oldProfile, function(err) {
root.storeNewProfile(secureProfile, function(err) {
if (err) {
cb(err, null);
return;
}
storage.remove('profile', function(err){
if (err) {
cb(err, null);
return;
}
cb(null, securePofile);
});
return;
});
}
@ -161,18 +172,22 @@ angular.module('copayApp.services')
var oldProfile;
if (secureErr) {
return cb(secureErr);
return cb(secureErr, null);
}
if (secureStr) {
try {
secureProfile = Profile.fromString(secureStr);
$log.error('profile: ' + JSON.stringify(secureProfile));
} catch (e) {
var profileError = new Error('Could not read secure profile.');
return cb(profileError, null);
$log.error(e);
return cb(e, null);
}
}
// Ignore insecure stuff for now
return cb(null, secureProfile);
storage.get('profile', function(getErr, str) {
if (getErr) {
return cb(getErr);