From 2618d54f94eaa7d1e01c86ab9f0e2ef2005d596d Mon Sep 17 00:00:00 2001
From: Arjan Schrijver <a_gadgetbridge@anymore.nl>
Date: Wed, 16 Oct 2024 22:18:56 +0200
Subject: [PATCH] Fix crash in LiveActivityFragment that was introduced by
 2398dd0fb

---
 .../activities/charts/LiveActivityFragment.java       | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/LiveActivityFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/LiveActivityFragment.java
index 775f8866a..a807249b9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/LiveActivityFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/LiveActivityFragment.java
@@ -367,8 +367,15 @@ public class LiveActivityFragment extends AbstractActivityChartFragment<ChartsDa
             return;
         }
 
-        GBApplication.deviceService(getChartsHost().getDevice()).onEnableRealtimeSteps(enable);
-        GBApplication.deviceService(getChartsHost().getDevice()).onEnableRealtimeHeartRateMeasurement(enable);
+        try {
+            GBApplication.deviceService(getChartsHost().getDevice()).onEnableRealtimeSteps(enable);
+            GBApplication.deviceService(getChartsHost().getDevice()).onEnableRealtimeHeartRateMeasurement(enable);
+        } catch (IllegalStateException e) {
+            LOG.error("IllegalStateException catched, setting realtime tracking globally to {}", enable);
+            GBApplication.deviceService().onEnableRealtimeSteps(enable);
+            GBApplication.deviceService().onEnableRealtimeHeartRateMeasurement(enable);
+        }
+
         if (enable) {
             if (getActivity() != null) {
                 getActivity().getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);