summaryrefslogtreecommitdiff
path: root/www/js
diff options
context:
space:
mode:
Diffstat (limited to 'www/js')
-rw-r--r--www/js/EventServer.js39
-rw-r--r--www/js/EventServerSettingsCtrl.js2
-rw-r--r--www/js/LoginCtrl.js8
-rw-r--r--www/js/app.js6
4 files changed, 20 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'});
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-06 22:12:09 +0000