diff options
| author | Pliable Pixels <pliablepixels@users.noreply.github.com> | 2017-12-09 18:16:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-09 18:16:20 -0500 |
| commit | 30659a51cb9bf4d1b037acb876371a630f092b6d (patch) | |
| tree | 8e71d548378c4184239493716764a7befb9de394 /www/js/EventServer.js | |
| parent | 7b3618fe68f9b08292cffa6406756aa6ee14e373 (diff) | |
| parent | 02b539d381517228fec72235c3b8c5a5659bd711 (diff) | |
Merge pull request #564 from pliablepixels/fcm
Fcm
Diffstat (limited to 'www/js/EventServer.js')
| -rw-r--r-- | www/js/EventServer.js | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/www/js/EventServer.js b/www/js/EventServer.js index b0d0c83f..c07a3e06 100644 --- a/www/js/EventServer.js +++ b/www/js/EventServer.js @@ -166,7 +166,7 @@ angular.module('zmApp.controllers') $rootScope.zmPopup = $ionicPopup.alert( { title: $translate.instant('kEventServerVersionTitle'), - template: $translate.instant('kEventServerVersionBody1') + " " + str.version + ". " + $translate.instant('kEventServerVersionBody2') + + template: $translate.instant('kEventServerVersionBody1') + " " + str.version + ". " + $translate.instant('kEventServerVersionBody2') + " "+ zm.minEventServerVersion, okText: $translate.instant('kButtonOk'), cancelText: $translate.instant('kButtonCancel'), @@ -392,10 +392,12 @@ angular.module('zmApp.controllers') { "ios": { - "alert": true, - "badge": true, + "alert": "true", + "badge": "true", "sound": ld.soundOnPush, - "clearBadge": true + //"sound": "true", + "clearBadge": "true", + //"fcmSandbox": "true" } } @@ -412,9 +414,9 @@ angular.module('zmApp.controllers') { "android": { - "senderID": zm.gcmSenderId, + // "senderID": zm.gcmSenderId, "icon": "ic_stat_notification", - sound: ld.soundOnPush, + sound: "true", vibrate: ld.vibrateOnPush //"sound": android_media_file } |