From 60e2fe57f92fdbab15bf8e6466ee4fd1dd59fa7c Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Tue, 10 Feb 2026 18:11:51 +0100
Subject: [PATCH] Bugfix: SensorHandler may receive a connectionLost from
 BluetoothDriver without being connected first.

---
 .../de/dennisguse/opentracks/sensors/SensorHandler.java   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/main/java/de/dennisguse/opentracks/sensors/SensorHandler.java b/src/main/java/de/dennisguse/opentracks/sensors/SensorHandler.java
index a94036425..31433932d 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/SensorHandler.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/SensorHandler.java
@@ -1,6 +1,7 @@
 package de.dennisguse.opentracks.sensors;
 
 import android.content.Context;
+import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -18,6 +19,8 @@ import de.dennisguse.opentracks.settings.PreferencesUtils;
 
 public abstract class SensorHandler<AggregatorInput, AggregatorOutput> implements DriverObserver<AggregatorInput> {
 
+    private static final String TAG = SensorHandler.class.getSimpleName();
+
     private final SensorManager sensorManager;
 
     @VisibleForTesting
@@ -107,6 +110,11 @@ public abstract class SensorHandler<AggregatorInput, AggregatorOutput> implement
 
     @Override
     public void onConnectionLost() {
+        if (SensorHandler.this.aggregator == null) {
+            Log.d(TAG, "Connection lost, but where not connected.");
+            return;
+        }
+
         SensorHandler.this.aggregator.resetAggregated();
     }