remove temp state if setLogin called - this was causing issues in android with eventserver settings blanking out

3 files changed, 23 insertions, 4 deletions

diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index 7b46f4ee..f9a294f9 100755
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -384,6 +384,9 @@ angular.module('zmApp.controllers')
       function setLogin(newLogin) {
         //var d = $q.defer();
 
+        // if we are here, we should remove cache
+        localforage.removeItem("settings-temp-data");
+
         loginData = angular.copy(newLogin);
         serverGroupList[loginData.serverName] = angular.copy(loginData);
 
@@ -736,7 +739,7 @@ angular.module('zmApp.controllers')
                   if (loginData.onTapScreen != $translate.instant('kTapMontage') &&
                     loginData.onTapScreen != $translate.instant('kTapEvents') &&
                     loginData.onTapScreen != $translate.instant('kTapLiveMonitor')) {
-                    log("Invalid onTap setting found, resetting");
+                    log("Invalid onTap setting found, resetting. I got " + loginData.onTapScreen);
                     loginData.onTapScreen = $translate.instant('kMontage');
                   }
 
diff --git a/www/js/EventServer.js b/www/js/EventServer.js
index 91fcd694..45bca98b 100644
--- a/www/js/EventServer.js
+++ b/www/js/EventServer.js
@@ -32,6 +32,13 @@ angular.module('zmApp.controllers')
                 return;
             }
 
+            if (typeof ws == 'undefined') {
+                NVRDataModel.debug ("websocket is undefined, need to create ws before I can sent auth");
+                ws = $websocket(loginData.eventServer,{reconnectIfNotNormalClose: false});
+               // ws.onOpen(openHandshake);
+               // return;
+            }
+
             NVRDataModel.log("openHandshake: Websocket open, sending Auth");
             ws.send(
             {
@@ -117,7 +124,7 @@ angular.module('zmApp.controllers')
                 lazy: true
             });*/
 
-            ws = $websocket(loginData.eventServer,{reconnectIfNotNormalClose: true});
+            ws = $websocket(loginData.eventServer,{reconnectIfNotNormalClose: false});
             ws.onOpen(openHandshake);
 
             // Transmit auth information to server              
@@ -139,7 +146,7 @@ angular.module('zmApp.controllers')
                     }, 3000); // leave 3 seconds for transitions
                     firstError = false;
                     lastEventServerCheck = Date.now();
-                    ws.close();
+                    if (typeof ws !== 'undefined') ws.close();
                     ws = undefined;
                 
                    // NVRDataModel.log ("Will try to reconnect in 10 sec..");
@@ -541,6 +548,8 @@ angular.module('zmApp.controllers')
                     $rootScope.isAlarm = 0;
                     $rootScope.tappedNotification = 1;
                     var mid = data.additionalData.mid;
+                    var eid = data.additionalData.eid;
+
 
                     // if Multiple mids, take the first one
                     var mi = mid.indexOf(',');
@@ -551,6 +560,7 @@ angular.module('zmApp.controllers')
                     mid = parseInt(mid);
 
                     $rootScope.tappedMid = mid;
+                    $rootScope.tappedEid = eid;
                     NVRDataModel.log("Push notification: Tapped Monitor taken as:" + $rootScope.tappedMid);
 
                     if ($rootScope.platformOS == 'ios')
diff --git a/www/js/EventServerSettingsCtrl.js b/www/js/EventServerSettingsCtrl.js
index e80c9f01..dc88b30b 100644
--- a/www/js/EventServerSettingsCtrl.js
+++ b/www/js/EventServerSettingsCtrl.js
@@ -63,8 +63,14 @@
      $scope.$on('$ionicView.beforeEnter', function()
      {
 
+         
          $scope.loginData = NVRDataModel.getLogin();
          //console.log ("Event server - before Enter, loginData is " + JSON.stringify($scope.loginData));
+
+         console.log ("BEFORE ENTER I GOT " + JSON.stringify($scope.loginData));
+
+
+
          $scope.defScreen = $scope.loginData.onTapScreen;
 
          if ($scope.loginData.eventServer == "")
@@ -217,7 +223,7 @@
          $scope.loginData.eventServerMonitors = monstring;
          $scope.loginData.eventServerInterval = intervalstring;
 
-         //console.log ("SAVED: " + JSON.stringify($scope.loginData));
+         console.log ("SAVED: " + JSON.stringify($scope.loginData));
          NVRDataModel.setLogin($scope.loginData);
 
          var pushstate = "enabled";