diff --git a/src/js/routes.js b/src/js/routes.js index c0e7f3e9c..f369a1618 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -38,6 +38,9 @@ angular return v; }); historicLog.add(level, args.join(' ')); + if (window.cordova) + console.log(args.join(' ')); + orig.apply(null, args) }; }); diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index 08e9ec4b8..7d488952a 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -285,7 +285,7 @@ angular.module('copayApp.services') root._createNewProfile(function(err, p) { if (err) return cb(err); -console.log('[profileService.js.287]'); //TODO + console.log('[profileService.js.287]'); //TODO root.bindProfile(p, function(err) { storageService.storeNewProfile(p, function(err) { return cb(err); diff --git a/src/js/services/storageService.js b/src/js/services/storageService.js index db72bf7c8..99a7f5fe7 100644 --- a/src/js/services/storageService.js +++ b/src/js/services/storageService.js @@ -52,21 +52,28 @@ angular.module('copayApp.services') root.tryToMigrate = function(cb) { if (!isCordova) return cb(); - localStorageService.get('profile', function(err, p) { - if (err) cb(err); - if (!p) return cb(); + localStorageService.get('profile', function(err, str) { + if (err) return cb(err); + if (!str) return cb(); + $log.info('Starting Migration profile to File storage...') - fileStorageService.create('profile', p, function(err) { + + fileStorageService.create('profile', str, function(err) { if (err) cb(err); $log.info('Profile Migrated successfully'); localStorageService.get('config', function(err, c) { - if (err) cb(err); - if (!c) return cb(null, p); + if (err) return cb(err); + if (!c) return root.getProfile(cb); + fileStorageService.create('config', c, function(err) { - if (err) cb(err); + + if (err) { + $log.info('Error migrating config: ignoring', err); + return root.getProfile(cb); + } $log.info('Config Migrated successfully'); - return cb(null, p) + return root.getProfile(cb); }); }); });