From 0584f05ddc5f3d2acc272dcf1a326bf3ec947f0b Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Mon, 1 Jan 2024 14:38:59 +0100
Subject: [PATCH] Bugfix: Cycling Cadence and Distance sensor allow for
 repeated data.

Fixes #1790.
---
 .../sensors/sensorData/AggregatorCyclingCadence.java      | 6 +++++-
 .../sensorData/AggregatorCyclingDistanceSpeed.java        | 8 ++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorCyclingCadence.java b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorCyclingCadence.java
index ced035630..c0c0fe88c 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorCyclingCadence.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorCyclingCadence.java
@@ -23,7 +23,11 @@ public class AggregatorCyclingCadence extends Aggregator<BluetoothHandlerCycling
         if (previous != null) {
             float timeDiff_ms = UintUtils.diff(current.value().crankRevolutionsTime(), previous.value().crankRevolutionsTime(), UintUtils.UINT16_MAX) / 1024f * 1000;
             Duration timeDiff = Duration.ofMillis((long) timeDiff_ms);
-            if (timeDiff.isZero() || timeDiff.isNegative()) {
+
+            if (timeDiff.isZero()) {
+                return;
+            }
+            if (timeDiff.isNegative()) {
                 Log.e(TAG, "Timestamps difference is invalid: cannot compute cadence.");
                 value = null;
                 return;
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorCyclingDistanceSpeed.java b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorCyclingDistanceSpeed.java
index 021242784..348628ecb 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorCyclingDistanceSpeed.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorCyclingDistanceSpeed.java
@@ -26,8 +26,12 @@ public class AggregatorCyclingDistanceSpeed extends Aggregator<BluetoothHandlerC
         if (previous != null) {
             float timeDiff_ms = UintUtils.diff(current.value().wheelRevolutionsTime(), previous.value().wheelRevolutionsTime(), UintUtils.UINT16_MAX) / 1024f * 1000;
             Duration timeDiff = Duration.ofMillis((long) timeDiff_ms);
-            if (timeDiff.isZero() || timeDiff.isNegative()) {
-                Log.e(TAG, "Timestamps difference is invalid: cannot compute speed.");
+
+            if (timeDiff.isZero()) {
+                return;
+            }
+            if (timeDiff.isNegative()) {
+                Log.e(TAG, "Timestamps difference is invalid: cannot compute cadence.");
                 value = null;
                 return;
             }