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

Merge pull request #2619 from matiu/bug/legacy-chromeimport

Browse source 
Bug/legacy chromeimport
This commit is contained in:
Gustavo Maximiliano Cortez 2015-04-24 15:02:56 -03:00
commit 01ec54ce74
2 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -573,7 +573,11 @@ angular.module('copayApp.controllers').controller('indexController', function($r
} else if (err.code === 'ETIMEDOUT') {
$log.debug('Time out:', err);
} else {
self.clientError(err && err.message ? 'Error at Wallet Service:' + err.message : err);
var msg = 'Error at Wallet Service: ';
if (err.message) msg = msg + err.message;
else if (err.error) msg = msg + err.error;
else msg = msg + err;
self.clientError(msg);
}
$rootScope.$apply();
});

13
src/js/services/legacyImportService.js
View file

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.services')
.factory('legacyImportService', function($rootScope, $log, $timeout, $http, lodash, bitcore, bwcService, sjcl, profileService) {
.factory('legacyImportService', function($rootScope, $log, $timeout, $http, lodash, bitcore, bwcService, sjcl, profileService, isChromeApp) {
var root = {};
var wc = bwcService.getClient();
@ -126,8 +126,15 @@ angular.module('copayApp.services')
};
var localStorageGet = function(key, cb) {
var v = localStorage.getItem(key);
return cb(null, v);
if (isChromeApp) {
chrome.storage.local.get(key,
function(data) {
return cb(null, data[key]);
});
} else {
var v = localStorage.getItem(key);
return cb(null, v);
}
};
var get = fromCloud ? insightGet : localStorageGet;