#83 - cleaned up push management while switching

Former-commit-id: 36d07bef08c5ecef75df7f3d5d610946bcfbd694

1 files changed, 44 insertions, 5 deletions

diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js
index 97b79658..34c29eec 100644
--- a/www/js/LoginCtrl.js
+++ b/www/js/LoginCtrl.js
@@ -61,11 +61,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
                 $scope.loginData = zmServers[serverbuttons[index].text];
                 $scope.check.isUseAuth = ($scope.loginData.isUseAuth == '1') ? true : false;
                 $scope.check.isUseEventServer = ($scope.loginData.isUseEventServer == '1') ? true : false;
-                if (!$scope.check.isUseEventServer)
-                        $rootScope.isAlarm = 0;
                 
-                if ($scope.check.isUseEventServer)
-                    EventServer.init();
                 return true;
             },
             
@@ -242,6 +238,9 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
                 
                 console.log('Saving login');
                 ZMDataModel.setFirstUse(false);
+        
+        
+       
 
         /*if (parseInt($scope.loginData.maxMontage) > zm.safeMontageLimit) {
             $ionicPopup.alert({
@@ -333,7 +332,47 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
             $scope.loginData.maxMontage ="10";
         }
 
+        
+        // do this before setLogin so message is sent
+        
+         if (!$scope.check.isUseEventServer)
+        {
+                $rootScope.isAlarm = 0;
+                if ($rootScope.apnsToken)
+                {
+                    ZMDataModel.zmLog ("Making sure we don't get push notifications");
+                     EventServer.sendMessage('push', {
+                        type: 'token',
+                        platform: $rootScope.platformOS,
+                        token: $rootScope.apnsToken,
+                        state: "disabled"
+                    });
+                }
+        }
+        
         ZMDataModel.setLogin($scope.loginData);
+                
+        if ($scope.check.isUseEventServer)
+        {
+            EventServer.init();
+            if ($rootScope.apnsToken && $scope.loginData.disablePush != '1')
+            {
+                ZMDataModel.zmLog ("Making sure we get push notifications");
+                 EventServer.sendMessage('push', {
+                    type: 'token',
+                    platform: $rootScope.platformOS,
+                    token: $rootScope.apnsToken,
+                    state: "enabled"
+                });
+            }
+            EventServer.sendMessage("control", {
+                type: 'filter',
+                monlist: $scope.loginData.eventServerMonitors,
+                intlist: $scope.loginData.eventServerInterval
+            });
+
+        }
+        
 
         // now grab and report PATH_ZMS
         ZMDataModel.getPathZms()
@@ -406,7 +445,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
             for (var servIter=0; servIter<availableServers.length; servIter++)
             {
                 serverbuttons.push({text: availableServers[servIter]});
-                console.log ("ADDING : "+availableServers[servIter]);
+               // console.log ("ADDING : "+availableServers[servIter]);
             }
             
         }