From d6325113d408c53255c9fbca8bb311059b9fde6a Mon Sep 17 00:00:00 2001 From: Javier Date: Fri, 19 Feb 2016 10:27:59 -0300 Subject: [PATCH] move function to profileService --- src/js/controllers/index.js | 17 +---------------- src/js/controllers/walletHome.js | 4 ++++ src/js/services/profileService.js | 12 ++++++++++++ 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index cc6f40efc..c059c83d0 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -136,28 +136,13 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.initGlidera(); self.setCustomBWSFlag(); - self.isBackupNeeded(fc, function(needsBackup) { + profileService.isBackupNeeded(self.walletId, function(needsBackup) { self.needsBackup = needsBackup; self.openWallet(); }); }); }; - self.isBackupNeeded = function(fc, cb) { - if (fc.isPrivKeyExternal()) return cb(false); - - if (!fc.credentials.mnemonic) { - storageService.setBackupFlag(self.walletId, function(err) { - $log.debug('Backup stored'); - return cb(false); - }); - } else { - storageService.getBackupFlag(self.walletId, function(err, val) { - return cb(self.network == 'testnet' ? false : !val); - }); - } - }; - self.setCustomBWSFlag = function() { var defaults = configService.getDefaults(); var config = configService.getSync(); diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index e8e595b2b..6b2d565f5 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -250,6 +250,10 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi } $modalInstance.close(addr); + profileService.isBackupNeeded(walletId, function(needsBackup) { + self.destinationWalletNeedsBackup = needsBackup; + $modalInstance.close(addr); + }); }); }; }; diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index 4c9033503..72ce940a3 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -174,6 +174,18 @@ angular.module('copayApp.services') }); }; + root.isBackupNeeded = function(walletId, cb) { + var c = root.getClient(walletId); + if (c.isPrivKeyExternal()) return cb(false); + if (!c.credentials.mnemonic) return cb(false); + if (c.credentials.network == 'testnet') return cb(false); + + storageService.getBackupFlag(walletId, function(err, val) { + if (err || val) return cb(false); + return cb(true); + }); + }; + root._seedWallet = function(opts, cb) { opts = opts || {}; if (opts.bwsurl)