From cb32e1a9f70a1ff57a9eac28c46689d5a388ae66 Mon Sep 17 00:00:00 2001 From: Senad Uka Date: Tue, 15 Nov 2016 14:55:36 +0100 Subject: [PATCH] phone ping api flattened --- .../main/java/com/zoblak/farmalarm/AlarmPingResponse.java | 8 ++++++++ app/server/api.js | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/AlarmPingResponse.java diff --git a/android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/AlarmPingResponse.java b/android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/AlarmPingResponse.java new file mode 100644 index 0000000..f7a0ac3 --- /dev/null +++ b/android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/AlarmPingResponse.java @@ -0,0 +1,8 @@ +package com.zoblak.farmalarm; + +/** + * Created by senadu on 11/15/16. + */ + +public class AlarmPingResponse { +} diff --git a/app/server/api.js b/app/server/api.js index 87e9872..94a1e8e 100644 --- a/app/server/api.js +++ b/app/server/api.js @@ -46,7 +46,10 @@ Api.addRoute('alarm/:id/phonePing', { var state = stateOrDefault(this.urlParams.id).state; return { 'alarmTriggered': state['alarmTriggered'], - 'alarmReasons': state['alarmReasons'] + 'tooHot': state['alarmReasons']['tooHot'], + 'tooCold': state['alarmReasons']['tooCold'], + 'phoneSilent': state['alarmReasons']['phoneSilent'], + 'boxSilent': state['alarmReasons']['boxSilent'] } } });