Created CyclingCadenceHandler.

src/main/java/de/dennisguse/opentracks/sensors/CyclingCadenceHandler.java

@@ -0,0 +1,57 @@
+package de.dennisguse.opentracks.sensors;
+
+import androidx.annotation.NonNull;
+
+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.sensors.driver.Driver;
+import de.dennisguse.opentracks.sensors.driver.DriverObserver0;
+import de.dennisguse.opentracks.sensors.sensorData.Aggregator;
+import de.dennisguse.opentracks.sensors.sensorData.AggregatorCyclingCadence;
+
+public class CyclingCadenceHandler extends SensorHandler<BluetoothHandlerCyclingCadence.CrankData> {
+
+    protected CyclingCadenceHandler(SensorManager sensorManager) {
+        super(sensorManager);
+    }
+
+    @NonNull
+    @Override
+    protected Driver createDriverBluetooth(String address) {
+        return new BluetoothConnectionManager(
+                BluetoothUtils.getAdapter(getContext()),
+                new DriverObserver0() {
+                    @Override
+                    public void onConnect(Aggregator<?, ?> emptySensorData) {
+                        driverObserver.onConnect();
+                    }
+
+                    @Override
+                    public void onDisconnect(Aggregator<?, ?> emptySensorData) {
+                        driverObserver.onDisconnect();
+                    }
+
+                    @Override
+                    public void onRemove(Aggregator<?, ?> emptySensorData) {
+                        driverObserver.onRemove();
+                    }
+
+                    @Override
+                    public void onChange(Record value) {
+                        driverObserver.onData((BluetoothHandlerCyclingCadence.CrankData) value);
+                    }
+                },
+                new BluetoothHandlerCyclingCadence()
+        );
+    }
+
+    @NonNull
+    @Override
+    protected Aggregator<BluetoothHandlerCyclingCadence.CrankData, ?> createAggregator() {
+        return new AggregatorCyclingCadence("", null);
+    }
+
+    @Override
+    protected int getSensorPreferenceKey() {
+        return R.string.settings_sensor_bluetooth_cycling_cadence_key;
+    }
+}

src/main/java/de/dennisguse/opentracks/sensors/SensorManager.java

@@ -52,7 +52,7 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
 
     private HeartRateHandler heartRateHandler;
     private TemperatureHandler temperatureHandler;
-    private BluetoothConnectionManager cyclingCadenceManager;
+    private CyclingCadenceHandler cyclingCadenceHandler;
     private BluetoothConnectionManager cyclingSpeedManager;
     private BluetoothConnectionManager cyclingPowerManager;
     private BluetoothConnectionManager runningSpeedAndCadenceManager;
@@ -78,10 +78,10 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
         altitudeSumManager = new GainManager(this);
         this.heartRateHandler = new HeartRateHandler(this);
         this.temperatureHandler = new TemperatureHandler(this);
+        this.cyclingCadenceHandler = new CyclingCadenceHandler(this);
 
         BluetoothAdapter bluetoothAdapter = BluetoothUtils.getAdapter(context);
         new BluetoothConnectionManager(bluetoothAdapter, this, new BluetoothHandlerHeartRate());
-        this.cyclingCadenceManager = new BluetoothConnectionManager(bluetoothAdapter, this, new BluetoothHandlerCyclingCadence());
         this.cyclingSpeedManager = new BluetoothConnectionManager(bluetoothAdapter, this, new BluetoothHandlerCyclingDistanceSpeed());
         this.cyclingPowerManager = new BluetoothConnectionManager(bluetoothAdapter, this, new BluetoothHandlerCyclingPower());
         this.runningSpeedAndCadenceManager = new BluetoothConnectionManager(bluetoothAdapter, this, new BluetoothHandlerRunningSpeedAndCadence());
@@ -89,6 +89,7 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
         altitudeSumManager.start(context, handler);
         heartRateHandler.start(context, handler);
         temperatureHandler.start(context, handler);
+        cyclingCadenceHandler.start(context, handler);
         onSharedPreferenceChanged(null, null);
 
         gpsManager.start(context, handler);
@@ -103,8 +104,8 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
         temperatureHandler.stop();
         temperatureHandler = null;
 
-        cyclingCadenceManager.disconnect();
+        cyclingCadenceHandler.stop();
-        cyclingCadenceManager = null;
+        cyclingCadenceHandler = null;
 
         cyclingSpeedManager.disconnect();
         cyclingSpeedManager = null;
@@ -137,7 +138,7 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
 
         if (heartRateHandler.getAggregator() != null) heartRateHandler.getAggregator().resetAggregated();
         if (temperatureHandler.getAggregator() != null) temperatureHandler.getAggregator().resetAggregated();
-        if (cyclingCadence != null) cyclingCadence.resetAggregated();
+        if (cyclingCadenceHandler.getAggregator() != null) cyclingCadenceHandler.getAggregator().resetAggregated();
         if (cyclingDistanceSpeed != null) cyclingDistanceSpeed.resetAggregated();
         if (cyclingPower != null) cyclingPower.resetAggregated();
         if (runningDistanceSpeedCadence != null) runningDistanceSpeedCadence.resetAggregated();
@@ -182,9 +183,8 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
                 temperatureHandler.connect();
             }
 
-            if (PreferencesUtils.isKey(R.string.settings_sensor_bluetooth_cycling_cadence_key, key)) {
+            if (PreferencesUtils.isKey(cyclingCadenceHandler.getSensorPreferenceKey(), key)) {
-                String address = PreferencesUtils.getBluetoothCyclingCadenceSensorAddress();
+                cyclingCadenceHandler.connect();
-                connect(cyclingCadenceManager, address);
             }
 
             if (PreferencesUtils.isKey(R.string.settings_sensor_bluetooth_cycling_speed_key, key)) {
@@ -227,9 +227,6 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
         return observer.getNow();
     }
 
-    @VisibleForTesting
-    public AggregatorCyclingCadence cyclingCadence;
-
     @VisibleForTesting
     public AggregatorCyclingDistanceSpeed cyclingDistanceSpeed;
 
@@ -251,8 +248,8 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
     }
 
     private SensorData<Cadence> getCadence(Instant now) {
-        if (cyclingCadence != null) {
+        if (cyclingCadenceHandler.getAggregator() != null) {
-            return cyclingCadence.getAggregatedValueWithSensorName(now);
+            return (SensorData<Cadence>) cyclingCadenceHandler.getAggregator().getAggregatedValueWithSensorName(now);
         }
 
         if (runningDistanceSpeedCadence != null && runningDistanceSpeedCadence.hasReceivedData() && runningDistanceSpeedCadence.getAggregatedValue(now).cadence() != null) {
@@ -301,6 +298,10 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
             temperatureHandler.setAggregator((AggregatorTemperature) data);
             return;
         }
+        if (data instanceof AggregatorCyclingCadence) {
+            cyclingCadenceHandler.setAggregator((AggregatorCyclingCadence) data);
+            return;
+        }
         set(data, data);
     }
 
@@ -319,10 +320,6 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
     private void update(@NonNull Record value) {
         Instant now = getNow();
 
-        if (value instanceof BluetoothHandlerCyclingCadence.CrankData) {
-            this.cyclingCadence.add(now, (BluetoothHandlerCyclingCadence.CrankData) value);
-            return;
-        }
         if (value instanceof BluetoothHandlerCyclingDistanceSpeed.WheelData) {
             this.cyclingDistanceSpeed.setWheelCircumference(PreferencesUtils.getWheelCircumference()); //TODO Fetch once and then listen for changes.
             this.cyclingDistanceSpeed.add(now, (BluetoothHandlerCyclingDistanceSpeed.WheelData) value);
@@ -350,7 +347,6 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
     @VisibleForTesting
     public void clear() {
         Log.i(TAG, "Removing all aggregators");
-        this.cyclingCadence = null;
         this.cyclingDistanceSpeed = null;
         this.cyclingPower = null;
         this.runningDistanceSpeedCadence = null;
@@ -365,6 +361,9 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
         if (this.temperatureHandler != null) {
             this.temperatureHandler.setAggregator(null);
         }
+        if (this.cyclingCadenceHandler != null) {
+            this.cyclingCadenceHandler.setAggregator(null);
+        }
         if (this.gpsManager != null) {
             this.gpsManager.setAggregatorGPS();
         }
@@ -390,10 +389,6 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
     private void set(@NonNull Aggregator<?, ?> type, @Nullable Aggregator<?, ?> sensorData) {
         Log.i(TAG, "Setting aggregator " + type.getClass().getCanonicalName() + " to " + sensorData);
 
-        if (type instanceof AggregatorCyclingCadence) {
-            cyclingCadence = (AggregatorCyclingCadence) sensorData;
-            return;
-        }
         if (type instanceof AggregatorCyclingDistanceSpeed) {
             cyclingDistanceSpeed = (AggregatorCyclingDistanceSpeed) sensorData;
             return;

src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java

@@ -264,10 +264,6 @@ public class PreferencesUtils {
                 .orElse(SensorType.REMOTE);
     }
 
-    public static String getBluetoothCyclingCadenceSensorAddress() {
-        return getString(R.string.settings_sensor_bluetooth_cycling_cadence_key, getBluetoothSensorAddressNone());
-    }
-
     public static String getBluetoothCyclingSpeedSensorAddress() {
         return getString(R.string.settings_sensor_bluetooth_cycling_speed_key, getBluetoothSensorAddressNone());
     }