karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Bugfix: prevent crash if sensor that need computation disconnect (or connection timeout).

Browse Source 
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)
This commit is contained in:
Dennis Guse
2023-06-14 22:35:38 +02:00
parent 2af19b00e5
commit 75a88ca0e1
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataSet.java
+5 -4
View File
@@ -4,6 +4,7 @@ import android.util.Log;
import android.util.Pair; import android.util.Pair;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import de.dennisguse.opentracks.data.models.Cadence; import de.dennisguse.opentracks.data.models.Cadence;
import de.dennisguse.opentracks.data.models.Distance; import de.dennisguse.opentracks.data.models.Distance;
@@ -145,7 +146,7 @@ public final class SensorDataSet {
+ (runningDistanceSpeedCadence != null ? " " + runningDistanceSpeedCadence : ""); + (runningDistanceSpeedCadence != null ? " " + runningDistanceSpeedCadence : "");
} }
private void set(@NonNull SensorData<?> type, SensorData<?> sensorData) { private void set(@NonNull SensorData<?> type, @Nullable SensorData<?> sensorData) {
if (type instanceof SensorDataHeartRate) { if (type instanceof SensorDataHeartRate) {
this.heartRate = (SensorDataHeartRate) sensorData; this.heartRate = (SensorDataHeartRate) sensorData;
return; return;
@@ -155,7 +156,7 @@ public final class SensorDataSet {
SensorDataCyclingCadence previous = getCyclingCadence(); SensorDataCyclingCadence previous = getCyclingCadence();
Log.d(TAG, "Previous: " + previous + "; current: " + sensorData); Log.d(TAG, "Previous: " + previous + "; current: " + sensorData);
if (sensorData.equals(previous)) { if (sensorData != null && sensorData.equals(previous)) {
Log.d(TAG, "onChanged: cadence data repeated."); Log.d(TAG, "onChanged: cadence data repeated.");
return; return;
} }
@@ -168,7 +169,7 @@ public final class SensorDataSet {
if (type instanceof SensorDataCyclingDistanceSpeed) { if (type instanceof SensorDataCyclingDistanceSpeed) {
SensorDataCyclingDistanceSpeed previous = getCyclingDistanceSpeed(); SensorDataCyclingDistanceSpeed previous = getCyclingDistanceSpeed();
Log.d(TAG, "Previous: " + previous + "; Current" + sensorData); 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."); Log.d(TAG, "onChanged: cycling speed data repeated.");
return; return;
} }
@@ -187,7 +188,7 @@ public final class SensorDataSet {
if (type instanceof SensorDataRunning) { if (type instanceof SensorDataRunning) {
SensorDataRunning previous = getRunningDistanceSpeedCadence(); SensorDataRunning previous = getRunningDistanceSpeedCadence();
Log.d(TAG, "Previous: " + previous + "; Current" + sensorData); 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."); Log.d(TAG, "onChanged: running speed data repeated.");
return; return;
} }