improve url checker

js/controllers/home.js

@@ -1,10 +1,9 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('HomeController',
-  function($scope, $rootScope, $location, walletFactory, notification) {
+  function($scope, $rootScope, $location, walletFactory, notification, controllerUtils) {
-    if ($rootScope.wallet) {
+    
-      $location.path('/addresses');
+    controllerUtils.redirIfLogged();
-    }
 
     $scope.loading = false;
     if ($rootScope.pendingPayment) {

js/controllers/import.js

@@ -2,9 +2,8 @@
 
 angular.module('copayApp.controllers').controller('ImportController',
   function($scope, $rootScope, $location, walletFactory, controllerUtils, Passphrase, notification) {
-    if ($rootScope.wallet) {
+
-      $location.path('/addresses');
+    controllerUtils.redirIfLogged();
-    }
 
     $scope.title = 'Import a backup';
     $scope.importStatus = 'Importing wallet - Reading backup...';

js/controllers/join.js

@@ -2,10 +2,8 @@
 
 angular.module('copayApp.controllers').controller('JoinController',
   function($scope, $rootScope, $timeout, $location, walletFactory, controllerUtils, Passphrase, notification) {
-    if ($rootScope.wallet) {
-      $location.path('/addresses');
-    }
 
+    controllerUtils.redirIfLogged();
     $scope.loading = false;
 
    // QR code Scanner

js/controllers/open.js

@@ -2,9 +2,7 @@
 
 angular.module('copayApp.controllers').controller('OpenController',
   function($scope, $rootScope, $location, walletFactory, controllerUtils, Passphrase, notification) {
-    if ($rootScope.wallet) {
+    controllerUtils.redirIfLogged();
-      $location.path('/addresses');
-    }
 
     var cmp = function(o1, o2) {
       var v1 = o1.show.toLowerCase(),

js/controllers/settings.js

@@ -2,10 +2,8 @@
 
 angular.module('copayApp.controllers').controller('SettingsController',
   function($scope, $rootScope, $window, $location) {
-    if ($rootScope.wallet) {
-      $location.path('/addresses');
-    }
 
+    controllerUtils.redirIfLogged();
     $scope.title = 'Settings';
     $scope.networkName = config.networkName;
     $scope.insightHost = config.blockchain.host;

js/controllers/setup.js

@@ -34,9 +34,7 @@ var valid_pairs = {
 
 angular.module('copayApp.controllers').controller('SetupController',
   function($scope, $rootScope, $location, $timeout, walletFactory, controllerUtils, Passphrase, backupService, notification) {
-    if ($rootScope.wallet) {
+    controllerUtils.redirIfLogged();
-      $location.path('/addresses');
-    }
 
     $rootScope.videoInfo = {};
     $scope.loading = false;

js/services/controllerUtils.js

@@ -14,6 +14,13 @@ angular.module('copayApp.services')
       return vi.muted;
     };
 
+    root.redirIfLogged = function() {
+      var w = $rootScope.wallet;
+      if (w) {
+        $location.path('addresses');
+      }
+    };
+
     root.logout = function() {
       Socket.removeAllListeners();