From 3ce8806286cd69855ad5adc6669c8620d9fb32ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Wed, 11 Nov 2015 10:37:07 -0300 Subject: [PATCH] fix android import bug --- src/js/services/profileService.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index 9e85e5c6f..223443458 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -339,9 +339,13 @@ angular.module('copayApp.services') root.setMetaData = function(walletClient, addressBook, historyCache, cb) { storageService.getAddressbook(walletClient.credentials.network, function(err, localAddressBook) { - localAddressBook = JSON.parse(localAddressBook); - if (!localAddressBook) localAddressBook = {}; - addressBook = lodash.merge(addressBook, localAddressBook); + var localAddressBook1 = {}; + try { + localAddressBook1 = JSON.parse(localAddressBook); + } catch (ex) { + $log.warn(ex); + } + var mergeAddressBook = lodash.merge(addressBook, localAddressBook1); storageService.setAddressbook(walletClient.credentials.network, JSON.stringify(addressBook), function(err) { if (err) return cb(err); storageService.setTxHistory(JSON.stringify(historyCache), walletClient.credentials.walletId, function(err) {