Created CyclingDistanceSpeedHandler.

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

@@ -0,0 +1,59 @@
+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.AggregatorCyclingDistanceSpeed;
+import de.dennisguse.opentracks.settings.PreferencesUtils;
+
+public class CyclingDistanceSpeedHandler extends SensorHandler<BluetoothHandlerCyclingDistanceSpeed.WheelData> {
+
+    protected CyclingDistanceSpeedHandler(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) {
+                        ((AggregatorCyclingDistanceSpeed) getAggregator()).setWheelCircumference(PreferencesUtils.getWheelCircumference()); //TODO Fetch once and then listen for changes.);
+                        driverObserver.onData((BluetoothHandlerCyclingDistanceSpeed.WheelData) value);
+                    }
+                },
+                new BluetoothHandlerCyclingDistanceSpeed()
+        );
+    }
+
+    @NonNull
+    @Override
+    protected AggregatorCyclingDistanceSpeed createAggregator() {
+        return new AggregatorCyclingDistanceSpeed("", null);
+    }
+
+    @Override
+    protected int getSensorPreferenceKey() {
+        return R.string.settings_sensor_bluetooth_cycling_speed_key;
+    }
+}

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

@@ -53,7 +53,7 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
     private HeartRateHandler heartRateHandler;
     private TemperatureHandler temperatureHandler;
     private CyclingCadenceHandler cyclingCadenceHandler;
-    private BluetoothConnectionManager cyclingSpeedManager;
+    private CyclingDistanceSpeedHandler cyclingDistanceSpeedHandler;
     private BluetoothConnectionManager cyclingPowerManager;
     private BluetoothConnectionManager runningSpeedAndCadenceManager;
 
@@ -79,10 +79,9 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
         this.heartRateHandler = new HeartRateHandler(this);
         this.temperatureHandler = new TemperatureHandler(this);
         this.cyclingCadenceHandler = new CyclingCadenceHandler(this);
+        this.cyclingDistanceSpeedHandler = new CyclingDistanceSpeedHandler(this);
 
         BluetoothAdapter bluetoothAdapter = BluetoothUtils.getAdapter(context);
-        new BluetoothConnectionManager(bluetoothAdapter, this, new BluetoothHandlerHeartRate());
-        this.cyclingSpeedManager = new BluetoothConnectionManager(bluetoothAdapter, this, new BluetoothHandlerCyclingDistanceSpeed());
         this.cyclingPowerManager = new BluetoothConnectionManager(bluetoothAdapter, this, new BluetoothHandlerCyclingPower());
         this.runningSpeedAndCadenceManager = new BluetoothConnectionManager(bluetoothAdapter, this, new BluetoothHandlerRunningSpeedAndCadence());
 
@@ -90,6 +89,7 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
         heartRateHandler.start(context, handler);
         temperatureHandler.start(context, handler);
         cyclingCadenceHandler.start(context, handler);
+        cyclingDistanceSpeedHandler.start(context, handler);
         onSharedPreferenceChanged(null, null);
 
         gpsManager.start(context, handler);
@@ -107,8 +107,8 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
         cyclingCadenceHandler.stop();
         cyclingCadenceHandler = null;
 
-        cyclingSpeedManager.disconnect();
+        cyclingDistanceSpeedHandler.stop();
-        cyclingSpeedManager = null;
+        cyclingDistanceSpeedHandler = null;
 
         cyclingPowerManager.disconnect();
         cyclingPowerManager = null;
@@ -139,7 +139,7 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
         if (heartRateHandler.getAggregator() != null) heartRateHandler.getAggregator().resetAggregated();
         if (temperatureHandler.getAggregator() != null) temperatureHandler.getAggregator().resetAggregated();
         if (cyclingCadenceHandler.getAggregator() != null) cyclingCadenceHandler.getAggregator().resetAggregated();
-        if (cyclingDistanceSpeed != null) cyclingDistanceSpeed.resetAggregated();
+        if (cyclingDistanceSpeedHandler.getAggregator() != null) cyclingDistanceSpeedHandler.getAggregator().resetAggregated();
         if (cyclingPower != null) cyclingPower.resetAggregated();
         if (runningDistanceSpeedCadence != null) runningDistanceSpeedCadence.resetAggregated();
         if (altitudeSumManager.getAggregator() != null) altitudeSumManager.getAggregator().resetAggregated();
@@ -187,10 +187,8 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
                 cyclingCadenceHandler.connect();
             }
 
-            if (PreferencesUtils.isKey(R.string.settings_sensor_bluetooth_cycling_speed_key, key)) {
+            if (PreferencesUtils.isKey(cyclingDistanceSpeedHandler.getSensorPreferenceKey(), key)) {
-                String address = PreferencesUtils.getBluetoothCyclingSpeedSensorAddress();
+                cyclingDistanceSpeedHandler.connect();
-
-                connect(cyclingSpeedManager, address);
             }
 
             if (PreferencesUtils.isKey(R.string.settings_sensor_bluetooth_cycling_power_key, key)) {
@@ -227,9 +225,6 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
         return observer.getNow();
     }
 
-    @VisibleForTesting
-    public AggregatorCyclingDistanceSpeed cyclingDistanceSpeed;
-
     @VisibleForTesting
     public AggregatorCyclingPower cyclingPower;
 
@@ -260,8 +255,8 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
     }
 
     private SensorData<Distance> getDistance(Instant now) {
-        if (cyclingDistanceSpeed != null && cyclingDistanceSpeed.hasReceivedData()) {
+        if (cyclingDistanceSpeedHandler.getAggregator() != null && cyclingDistanceSpeedHandler.getAggregator().hasReceivedData()) {
-            return new SensorData<>(cyclingDistanceSpeed.getAggregatedValue(now).distanceOverall(), cyclingDistanceSpeed.getSensorNameOrAddress());
+            return new SensorData<>(((AggregatorCyclingDistanceSpeed)cyclingDistanceSpeedHandler.getAggregator()).getAggregatedValue(now).distanceOverall(), cyclingDistanceSpeedHandler.getAggregator().getSensorNameOrAddress());
         }
 
         if (runningDistanceSpeedCadence != null && runningDistanceSpeedCadence.hasReceivedData()) {
@@ -275,8 +270,8 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
     //TOOD simplify?
     private SensorData<Speed> getSpeed(Instant now) {
 
-        if (cyclingDistanceSpeed != null && cyclingDistanceSpeed.hasReceivedData() && cyclingDistanceSpeed.getAggregatedValue(now).speed() != null) {
+        if (cyclingDistanceSpeedHandler.getAggregator() != null && cyclingDistanceSpeedHandler.getAggregator().hasReceivedData() && ((AggregatorCyclingDistanceSpeed)cyclingDistanceSpeedHandler.getAggregator()).getAggregatedValue(now).speed() != null) {
-            return new SensorData<>(cyclingDistanceSpeed.getAggregatedValue(now).speed(), cyclingDistanceSpeed.getSensorNameOrAddress());
+            return new SensorData<>(((AggregatorCyclingDistanceSpeed)cyclingDistanceSpeedHandler.getAggregator()).getAggregatedValue(now).speed(), cyclingDistanceSpeedHandler.getAggregator().getSensorNameOrAddress());
         }
 
         if (runningDistanceSpeedCadence != null && runningDistanceSpeedCadence.hasReceivedData() && runningDistanceSpeedCadence.getAggregatedValue(now).speed() != null) {
@@ -302,6 +297,10 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
             cyclingCadenceHandler.setAggregator((AggregatorCyclingCadence) data);
             return;
         }
+        if (data instanceof AggregatorCyclingDistanceSpeed) {
+            cyclingDistanceSpeedHandler.setAggregator((AggregatorCyclingDistanceSpeed) data);
+            return;
+        }
         set(data, data);
     }
 
@@ -319,12 +318,6 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
     @Deprecated
     private void update(@NonNull Record value) {
         Instant now = getNow();
-
-        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);
-            return;
-        }
         if (value instanceof BluetoothHandlerRunningSpeedAndCadence.Data) {
             this.runningDistanceSpeedCadence.add(now, (BluetoothHandlerRunningSpeedAndCadence.Data) value);
 
@@ -347,7 +340,6 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
     @VisibleForTesting
     public void clear() {
         Log.i(TAG, "Removing all aggregators");
-        this.cyclingDistanceSpeed = null;
         this.cyclingPower = null;
         this.runningDistanceSpeedCadence = null;
 
@@ -364,6 +356,9 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
         if (this.cyclingCadenceHandler != null) {
             this.cyclingCadenceHandler.setAggregator(null);
         }
+        if (cyclingDistanceSpeedHandler != null) {
+            cyclingDistanceSpeedHandler.setAggregator(null);
+        }
         if (this.gpsManager != null) {
             this.gpsManager.setAggregatorGPS();
         }
@@ -389,10 +384,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 AggregatorCyclingDistanceSpeed) {
-            cyclingDistanceSpeed = (AggregatorCyclingDistanceSpeed) sensorData;
-            return;
-        }
         if (type instanceof AggregatorCyclingPower) {
             cyclingPower = (AggregatorCyclingPower) sensorData;
             return;

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

@@ -264,10 +264,6 @@ public class PreferencesUtils {
                 .orElse(SensorType.REMOTE);
     }
 
-    public static String getBluetoothCyclingSpeedSensorAddress() {
-        return getString(R.string.settings_sensor_bluetooth_cycling_speed_key, getBluetoothSensorAddressNone());
-    }
-
     public static Distance getWheelCircumference() {
         final int DEFAULT = Integer.parseInt(resources.getString(R.string.settings_sensor_bluetooth_cycling_speed_wheel_circumference_default));
         return Distance.ofMM(getInt(R.string.settings_sensor_bluetooth_cycling_speed_wheel_circumference_key, DEFAULT));