Cleanup: removed DriverObserver0 and moved sensor drivers to separate package.

This commit is contained in:
Dennis Guse
2026-01-31 08:40:26 +01:00
parent ea27db13fa
commit 6d187fa66d
43 changed files with 285 additions and 551 deletions
@@ -3,12 +3,13 @@ package de.dennisguse.opentracks.sensors;
import androidx.annotation.NonNull;
import de.dennisguse.opentracks.R;
import de.dennisguse.opentracks.sensors.driver.BluetoothDriver;
import de.dennisguse.opentracks.sensors.driver.CyclingCadenceBluetooth;
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> {
public class CyclingCadenceHandler extends SensorHandler<CyclingCadenceBluetooth.CrankData> {
protected CyclingCadenceHandler(SensorManager sensorManager) {
super(sensorManager);
@@ -17,36 +18,16 @@ public class CyclingCadenceHandler extends SensorHandler<BluetoothHandlerCycling
@NonNull
@Override
protected Driver createDriverBluetooth(String address) {
return new BluetoothConnectionManager(
return new BluetoothDriver<>(
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()
driverObserver,
new CyclingCadenceBluetooth()
);
}
@NonNull
@Override
protected Aggregator<BluetoothHandlerCyclingCadence.CrankData, ?> createAggregator() {
protected Aggregator<CyclingCadenceBluetooth.CrankData, ?> createAggregator() {
return new AggregatorCyclingCadence("", null);
}