From fc03ac11aaa1854c356a1d2aaec12c62ad49650e Mon Sep 17 00:00:00 2001
From: Thomas Kuehne <thomas.kuehne@gmx.li>
Date: Sun, 7 Sep 2025 00:00:00 +0200
Subject: [PATCH] Garmin: fix NullPointerException in getActivityKind

---
 .../devices/garmin/GarminWorkoutParser.java            | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/GarminWorkoutParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/GarminWorkoutParser.java
index a69cf069e1..89f732005b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/GarminWorkoutParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/GarminWorkoutParser.java
@@ -697,7 +697,15 @@ public class GarminWorkoutParser implements ActivitySummaryParser {
         return Math.round(number.doubleValue());
     }
 
-    private static ActivityKind getActivityKind(final Integer sport, final Integer subsport) {
+    private static ActivityKind getActivityKind(Integer sport, Integer subsport) {
+        // Garmin inReach Mini 2: sport and subsport are missing (null)
+        if (sport == null) {
+            sport = 0;
+        }
+        if (subsport == null) {
+            subsport = 0;
+        }
+
         final Optional<GarminSport> garminSport = GarminSport.fromCodes(sport, subsport);
         if (garminSport.isPresent()) {
             return garminSport.get().getActivityKind();