From 6fc639f17fbee32c845abafcc1120d62b83660cd Mon Sep 17 00:00:00 2001
From: Joseph Abbey <me@josephabbey.dev>
Date: Sun, 28 Jan 2024 13:05:34 +0000
Subject: [PATCH] Report -1 instead of null for no activity

---
 source/BackgroundServiceDelegate.mc | 6 ++++--
 source/WebhookManager.mc            | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/source/BackgroundServiceDelegate.mc b/source/BackgroundServiceDelegate.mc
index 5a78916..a783b5f 100644
--- a/source/BackgroundServiceDelegate.mc
+++ b/source/BackgroundServiceDelegate.mc
@@ -103,13 +103,15 @@ class BackgroundServiceDelegate extends System.ServiceDelegate {
                 }
             ];
             if (Activity has :getProfileInfo) {
+                var activity = Activity.getProfileInfo().sport;
+                var sub_activity = Activity.getProfileInfo().subSport;
                 data.add({
-                    "state"     => Activity.getProfileInfo().sport,
+                    "state"     => activity ? activity : -1,
                     "type"      => "sensor",
                     "unique_id" => "activity"
                 });
                 data.add({
-                    "state"     => Activity.getProfileInfo().subSport,
+                    "state"     => sub_activity ? sub_activity : -1,
                     "type"      => "sensor",
                     "unique_id" => "sub_activity"
                 });
diff --git a/source/WebhookManager.mc b/source/WebhookManager.mc
index 660d227..162e9c8 100644
--- a/source/WebhookManager.mc
+++ b/source/WebhookManager.mc
@@ -183,9 +183,10 @@ class WebhookManager {
                         case 1:
                             // System.println("WebhookManager onReturnRegisterWebhookSensor(): Registering next sensor: Activity");
                             if (Activity has :getProfileInfo) {
+                                var activity = Activity.getProfileInfo().sport;
                                 registerWebhookSensor({
                                     "name"      => "Activity",
-                                    "state"     => Activity.getProfileInfo().sport,
+                                    "state"     => activity ? activity : -1,
                                     "type"      => "sensor",
                                     "unique_id" => "activity",
                                     "disabled"  => false
@@ -195,9 +196,10 @@ class WebhookManager {
                         case 2:
                             // System.println("WebhookManager onReturnRegisterWebhookSensor(): Registering next sensor: Activity");
                             if (Activity has :getProfileInfo) {
+                                var sub_activity = Activity.getProfileInfo().subSport;
                                 registerWebhookSensor({
                                     "name"      => "Sub-activity",
-                                    "state"     => Activity.getProfileInfo().subSport,
+                                    "state"     => sub_activity ? sub_activity : -1,
                                     "type"      => "sensor",
                                     "unique_id" => "sub_activity",
                                     "disabled"  => false