diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2018-01-09 14:02:41 -0500 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2018-01-09 14:02:41 -0500 |
| commit | 8a537d2da05897a96154fe9da6b3db761072108a (patch) | |
| tree | 946e086e048438214f561b643e83815408c2dbea /www/js/EventServer.js | |
| parent | af2b59902e50264a9a34f4ca0a5bdf06ecc13b8d (diff) | |
#499 - handle proper push handling for when app is exited or alive (iOS testing is TBD)
Diffstat (limited to 'www/js/EventServer.js')
| -rw-r--r-- | www/js/EventServer.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/www/js/EventServer.js b/www/js/EventServer.js index e3febfb6..c09ad7ee 100644 --- a/www/js/EventServer.js +++ b/www/js/EventServer.js @@ -583,7 +583,7 @@ angular.module('zmApp.controllers') // set tappedMid to monitor //*** PUSH DATA>>>>{"sound":"blop","message":"Alarms: Basement (2854) ","additionalData":{"mid":"2","coldstart":false,"collapse_key":"do_not_collapse","foreground":false}} - if (data.additionalData.dismissed != undefined) // user tapped on notification + if (data.additionalData.dismissed != undefined || data.additionalData.coldstart == true) // user tapped on notification { NVRDataModel.debug("Notification Tapped"); $rootScope.alarmCount = "0"; @@ -622,7 +622,7 @@ angular.module('zmApp.controllers') $rootScope.tappedEid = 0; $rootScope.tappedMid = 0; } - + $rootScope.$emit('process-push'); } else // app is foreground @@ -631,7 +631,7 @@ angular.module('zmApp.controllers') // this flag honors the HW mute button. Go figure // http://ilee.co.uk/phonegap-plays-sound-on-mute/ - NVRDataModel.debug ("--> Either app icon tapped, or app is already in foreground"); + NVRDataModel.debug ("--> *** PUSH IN FOREGROUND"); $rootScope.tappedNotification = 0; $rootScope.tappedEid = 0; |