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

Handle error when the device id mismatch

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2015-10-28 16:19:16 -03:00
commit ca7ec8e392
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
3 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/js/controllers/index.js
View file

@ -787,8 +787,12 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.showAlert = {
msg: msg,
close: function(err) {
self.showAlert = null;
if (cb) return cb(err);
if (self.isCordova && navigator && navigator.app) {
navigator.app.exitApp();
} else {
self.showAlert = null;
if (cb) return cb(err);
}
},
};
$timeout(function() {
@ -1045,13 +1049,12 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.needsBackup = false;
$log.debug('Backup done');
storageService.setBackupFlag(self.walletId, function(err) {
if (err) root.showErrorPopup(err);
$log.debug('Backup done stored');
});
});
$rootScope.$on('Local/DeviceError', function(event, err) {
root.showErrorPopup(err);
self.showErrorPopup(err);
});
$rootScope.$on('Local/WalletImported', function(event, walletId) {

6
src/js/routes.js
View file

@ -515,10 +515,10 @@ angular
// Try to open local profile
profileService.loadAndBindProfile(function(err) {
if (err) {
if (err.message.match('NOPROFILE')) {
if (err.message && err.message.match('NOPROFILE')) {
$log.debug('No profile... redirecting');
$state.transitionTo('splash');
} else if (err.message.match('NONAGREEDDISCLAIMER')) {
} else if (err.message && err.message.match('NONAGREEDDISCLAIMER')) {
$log.debug('Display disclaimer... redirecting');
$state.transitionTo('disclaimer');
} else {
@ -545,4 +545,4 @@ angular
}, 50);
}
});
});
});

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

@ -41,15 +41,21 @@ angular.module('copayApp.services')
json = JSON.parse(text);
} catch (e) {};
if (!json) return cb('Could not access storage')
if (!json.iter || !json.ct)
return cb(null, text);
$log.debug('Profile is encrypted');
getUUID(function(uuid) {
if (!uuid)
return cb(new Error('Could not decrypt localstorage profile'));
return cb('Could not decrypt storage: could not get device ID');
text = sjcl.decrypt(uuid, text);
try {
text = sjcl.decrypt(uuid, text);
} catch(e) {
return cb('Could not decrypt storage: device ID mismatch');
};
return cb(null, text);
});
};