From 75a88ca0e1ceae77318c0fa120b3d650307a1fb2 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Wed, 14 Jun 2023 22:35:38 +0200
Subject: [PATCH] Bugfix: prevent crash if sensor that need computation
 disconnect (or connection timeout).

java.lang.Object.equals(java.lang.Object)' on a null object reference
	at de.dennisguse.opentracks.sensors.sensorData.SensorDataSet.set(SensorDataSet.java:171)
	at de.dennisguse.opentracks.sensors.sensorData.SensorDataSet.remove(SensorDataSet.java:93)
	at de.dennisguse.opentracks.sensors.SensorManager$1.onDisconnect(SensorManager.java:35)
	at de.dennisguse.opentracks.sensors.BluetoothRemoteSensorManager.onDisconnecting(BluetoothRemoteSensorManager.java:173)
---
 .../opentracks/sensors/sensorData/SensorDataSet.java     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataSet.java b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataSet.java
index f730a5760..05992ba8f 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataSet.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataSet.java
@@ -4,6 +4,7 @@ import android.util.Log;
 import android.util.Pair;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import de.dennisguse.opentracks.data.models.Cadence;
 import de.dennisguse.opentracks.data.models.Distance;
@@ -145,7 +146,7 @@ public final class SensorDataSet {
                 + (runningDistanceSpeedCadence != null ? " " + runningDistanceSpeedCadence : "");
     }
 
-    private void set(@NonNull SensorData<?> type, SensorData<?> sensorData) {
+    private void set(@NonNull SensorData<?> type, @Nullable SensorData<?> sensorData) {
         if (type instanceof SensorDataHeartRate) {
             this.heartRate = (SensorDataHeartRate) sensorData;
             return;
@@ -155,7 +156,7 @@ public final class SensorDataSet {
             SensorDataCyclingCadence previous = getCyclingCadence();
             Log.d(TAG, "Previous: " + previous + "; current: " + sensorData);
 
-            if (sensorData.equals(previous)) {
+            if (sensorData != null && sensorData.equals(previous)) {
                 Log.d(TAG, "onChanged: cadence data repeated.");
                 return;
             }
@@ -168,7 +169,7 @@ public final class SensorDataSet {
         if (type instanceof SensorDataCyclingDistanceSpeed) {
             SensorDataCyclingDistanceSpeed previous = getCyclingDistanceSpeed();
             Log.d(TAG, "Previous: " + previous + "; Current" + sensorData);
-            if (sensorData.equals(previous)) {
+            if (sensorData != null && sensorData.equals(previous)) {
                 Log.d(TAG, "onChanged: cycling speed data repeated.");
                 return;
             }
@@ -187,7 +188,7 @@ public final class SensorDataSet {
         if (type instanceof SensorDataRunning) {
             SensorDataRunning previous = getRunningDistanceSpeedCadence();
             Log.d(TAG, "Previous: " + previous + "; Current" + sensorData);
-            if (sensorData.equals(previous)) {
+            if (sensorData != null && sensorData.equals(previous)) {
                 Log.d(TAG, "onChanged: running speed data repeated.");
                 return;
             }