#135 - various changes and cleanup

Former-commit-id: 116d0c81481427115de9fade8f89f1e1a3ac08df

5 files changed, 22 insertions, 35 deletions

diff --git a/www/js/EventServer.js b/www/js/EventServer.js
index 1e847508..40882e15 100644
--- a/www/js/EventServer.js
+++ b/www/js/EventServer.js
@@ -52,7 +52,7 @@ angular.module('zmApp.controllers')
         //--------------------------------------------------------------------------
         function openHandshake() {
             var loginData = ZMDataModel.getLogin();
-            if (loginData.isUseEventServer == "0" || loginData.eventServer == "") {
+            if (loginData.isUseEventServer == false || loginData.eventServer == "") {
                 ZMDataModel.zmLog("openHandShake: no event server");
                 return;
             }
@@ -67,7 +67,7 @@ angular.module('zmApp.controllers')
                 var plat = $ionicPlatform.is('ios') ? 'ios' : 'android';
                 var ld = ZMDataModel.getLogin();
                 var pushstate = "enabled";
-                if (ld.disablePush == "1")
+                if (ld.disablePush == true)
                     pushstate = "disabled";
 
                 ZMDataModel.zmDebug("openHandShake: state of push is " + pushstate);
@@ -94,7 +94,7 @@ angular.module('zmApp.controllers')
 
             var loginData = ZMDataModel.getLogin();
 
-            if (loginData.isUseEventServer == '0' || !loginData.eventServer) {
+            if (loginData.isUseEventServer == false || !loginData.eventServer) {
                 ZMDataModel.zmLog("No Event Server present. Not initializing");
                 d.reject("false");
                 return d.promise;
@@ -261,7 +261,7 @@ angular.module('zmApp.controllers')
         //--------------------------------------------------------------------------
         function sendMessage(type, obj, isForce) {
             var ld = ZMDataModel.getLogin();
-            if (ld.isUseEventServer == "0" && isForce!=1) {
+            if (ld.isUseEventServer == false && isForce!=1) {
                 ZMDataModel.zmDebug("Not sending WSS message as event server is off");
                 return;
             }
@@ -308,7 +308,7 @@ angular.module('zmApp.controllers')
         function refresh() {
             var loginData = ZMDataModel.getLogin();
 
-            if ((!loginData.eventServer) || (loginData.isUseEventServer == "0")) {
+            if ((!loginData.eventServer) || (loginData.isUseEventServer == false)) {
                 ZMDataModel.zmLog("No Event Server configured, skipping refresh");
 
                 // Let's also make sure that if the socket was open 
@@ -383,40 +383,25 @@ angular.module('zmApp.controllers')
                 var ld = ZMDataModel.getLogin();
                 
                 
-                if (!ld.defaultPushSound)
-                {
-                    ZMDataModel.zmLog ("Using blop push sound");
+                
+                   
                     push = PushNotification.init(
 
                         {
                             "android": {
                                 "senderID": zm.gcmSenderId,
                                 "icon": "ic_stat_notification",
+                                "sound":"true"
                                 //"sound": android_media_file
                             }
                         }
 
                     );
-                }
-                else
-                {
-                    ZMDataModel.zmLog ("Using default push sound");
-                    push = PushNotification.init(
-
-                        {
-                            "android": {
-                                "senderID": zm.gcmSenderId,
-                                "icon": "ic_stat_notification",
-                                "sound": android_media_file
-                            }
-                        }
-
-                    );
-                }
+                
 
             }
 
-            console.log("*********** MEDIA BLOG IS " + mediasrc);
+           // console.log("*********** MEDIA BLOG IS " + mediasrc);
             media = $cordovaMedia.newMedia(mediasrc);
             /* var push = PushNotification.init(
                          { "android": 
@@ -444,7 +429,7 @@ angular.module('zmApp.controllers')
                 var plat = $ionicPlatform.is('ios') ? 'ios' : 'android';
                 var ld = ZMDataModel.getLogin();
                 var pushstate = "enabled";
-                if (ld.disablePush == '1')
+                if (ld.disablePush ==true)
                     pushstate = "disabled";
 
                 sendMessage('push', {
@@ -461,7 +446,7 @@ angular.module('zmApp.controllers')
             push.on('notification', function (data) {
 
                 var ld = ZMDataModel.getLogin();
-                if (ld.isUseEventServer == "0") {
+                if (ld.isUseEventServer ==false) {
                     ZMDataModel.zmDebug("received push notification, but event server disabled. Not acting on it");
                     return;
                 }
diff --git a/www/js/EventServerSettingsCtrl.js b/www/js/EventServerSettingsCtrl.js
index 20ec191f..e1e7d106 100644
--- a/www/js/EventServerSettingsCtrl.js
+++ b/www/js/EventServerSettingsCtrl.js
@@ -196,7 +196,7 @@ angular.module('zmApp.controllers').controller('zmApp.EventServerSettingsCtrl',
                 });
                 // Give the above some time to transmit
             $timeout (function() {
-                ZMDataModel.setLogin($scope.loginData);},3000);
+                ZMDataModel.setLogin($scope.loginData);},2000);
         }
         else
         {
diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js
index 4feb5da7..d6a41a9f 100644
--- a/www/js/LoginCtrl.js
+++ b/www/js/LoginCtrl.js
@@ -37,7 +37,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
     };
 
     $scope.check.isUseAuth = ($scope.loginData.isUseAuth == '1') ? true : false;
-    $scope.check.isUseEventServer = ($scope.loginData.isUseEventServer == '1') ? true : false;
+    $scope.check.isUseEventServer = ($scope.loginData.isUseEventServer == true) ? true : false;
 
     console.log("*************************************************");
 
@@ -76,7 +76,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
                 
                 
                 $scope.check.isUseAuth = ($scope.loginData.isUseAuth == '1') ? true : false;
-                $scope.check.isUseEventServer = ($scope.loginData.isUseEventServer == '1') ? true : false;
+                $scope.check.isUseEventServer = ($scope.loginData.isUseEventServer == true) ? true : false;
 
                 ZMDataModel.zmDebug("Retrieved state for this profile:" + JSON.stringify($scope.loginData));
 
@@ -301,7 +301,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
 
 
         $scope.loginData.isUseAuth = ($scope.check.isUseAuth) ? "1" : "0";
-        $scope.loginData.isUseEventServer = ($scope.check.isUseEventServer) ? "1" : "0";
+        $scope.loginData.isUseEventServer = ($scope.check.isUseEventServer) ? true : false;
 
         if ($scope.loginData.url.slice(-1) == '/') {
             $scope.loginData.url = $scope.loginData.url.slice(0, -1);
@@ -389,7 +389,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
 
         if ($scope.check.isUseEventServer) {
             EventServer.init();
-            if ($rootScope.apnsToken && $scope.loginData.disablePush != '1') {
+            if ($rootScope.apnsToken && $scope.loginData.disablePush != true) {
                 ZMDataModel.zmLog("Making sure we get push notifications");
                 EventServer.sendMessage('push', {
                     type: 'token',
diff --git a/www/js/app.js b/www/js/app.js
index b74c3ed4..f1f23c2e 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -31,7 +31,7 @@ angular.module('zmApp', [
 
 .constant('zm', {
     minAppVersion: '1.28.107', // if ZM is less than this, the app won't work
-    recommendedAppVersion: '1.30',
+    recommendedAppVersion: '1.29',
     minEventServerVersion: '0.5',
     alarmFlashTimer: 20000, // time to flash alarm
     gcmSenderId: '710936220256',
@@ -921,7 +921,7 @@ angular.module('zmApp', [
             document.addEventListener("resume", function () {
                 ZMDataModel.zmLog("App is resuming from background");
                 var ld = ZMDataModel.getLogin();
-                if ($rootScope.apnsToken && ld.isUseEventServer == "1") {
+                if ($rootScope.apnsToken && ld.isUseEventServer == true) {
                     // ZMDataModel.zmDebug("sending enable push to Event Server");
                     // EventServer.sendMessage('push', {type:'control', enablepush:'0'});
                 }
@@ -971,7 +971,7 @@ angular.module('zmApp', [
                     ionic.Platform.exitApp();   
                 }
                 
-                if ($rootScope.apnsToken && ld.isUseEventServer == "1") {
+                if ($rootScope.apnsToken && ld.isUseEventServer == true) {
                     //  ZMDataModel.zmDebug("sending enable push to Event Server");
                     //EventServer.sendMessage('push', {type:'control',enablepush:'1'});
                 }
diff --git a/www/templates/eventserversettings.html b/www/templates/eventserversettings.html
index e680b0a4..de6f43ce 100644
--- a/www/templates/eventserversettings.html
+++ b/www/templates/eventserversettings.html
@@ -30,7 +30,9 @@
         
             <ion-toggle ng-if="loginData.isUseEventServer" ng-model="loginData.disablePush"  ng-checked="{{loginData.disablePush}}" toggle-class="toggle-calm"  class="item-text-wrap">only use websockets<br/><p>disables APNS/GCM</p></ion-toggle>
         
+        <!--
              <ion-toggle  ng-model="loginData.defaultPushSound" toggle-class="toggle-calm" class="item-text-wrap" ng-checked="{{loginData.defaultPushSound}}">use system sound<p>please save and restart app</p></ion-toggle>
+        -->
         <ion-list>
             <div ng-repeat="monitor in monitors">