Restored functionality: sensor name/address is shown AFTER connecting.

This commit is contained in:
Dennis Guse
2026-02-01 09:13:03 +01:00
parent fa558c9ab7
commit dfa80d61d7
13 changed files with 21 additions and 21 deletions
@@ -44,7 +44,7 @@ public class AltitudeChangeHandler extends SensorHandler<AtmosphericPressure, Al
@NonNull
@Override
public AggregatorBarometer createAggregator() {
return new AggregatorBarometer("", null);
public AggregatorBarometer createAggregator(String sensorAddress, String sensorName) {
return new AggregatorBarometer(sensorAddress, sensorName);
}
}
@@ -27,8 +27,8 @@ public class CyclingCadenceHandler extends SensorHandler<CyclingCadenceBluetooth
@NonNull
@Override
protected AggregatorCyclingCadence createAggregator() {
return new AggregatorCyclingCadence("", null);
protected AggregatorCyclingCadence createAggregator(String sensorAddress, String sensorName) {
return new AggregatorCyclingCadence(sensorAddress, sensorName);
}
@Override
@@ -27,8 +27,8 @@ public class CyclingDistanceSpeedHandler extends SensorHandler<CyclingDistanceSp
@NonNull
@Override
protected AggregatorCyclingDistanceSpeed createAggregator() {
return new AggregatorCyclingDistanceSpeed("", null);
protected AggregatorCyclingDistanceSpeed createAggregator(String sensorAddress, String sensorName) {
return new AggregatorCyclingDistanceSpeed(sensorAddress, sensorName);
}
@Override
@@ -27,8 +27,8 @@ public class CyclingPowerHandler extends SensorHandler<CyclingPowerBluetooth.Dat
@NonNull
@Override
protected AggregatorCyclingPower createAggregator() {
return new AggregatorCyclingPower("", null);
protected AggregatorCyclingPower createAggregator(String sensorAddress, String sensorName) {
return new AggregatorCyclingPower(sensorAddress, sensorName);
}
@Override
@@ -120,7 +120,7 @@ public class GpsManager implements DriverObserver<Location>, GpsStatusManager.Gp
}
@Override
public void onConnect() {
public void onConnect(String sensorAddress, String sensorName) {
gpsStatusManager.onGpsEnabled();
}
@@ -27,8 +27,8 @@ public class HeartRateHandler extends SensorHandler<HeartRate, HeartRate> {
@NonNull
@Override
protected AggregatorHeartRate createAggregator() {
return new AggregatorHeartRate("", null);
protected AggregatorHeartRate createAggregator(String sensorAddress, String sensorName) {
return new AggregatorHeartRate(sensorAddress, sensorName);
}
@Override
@@ -26,7 +26,7 @@ public class RunningSpeedCadenceDistanceHandler extends SensorHandler<RunningSpe
@NonNull
@Override
protected AggregatorRunning createAggregator() {
protected AggregatorRunning createAggregator(String sensorAddress, String sensorName) {
return new AggregatorRunning("", null);
}
@@ -25,8 +25,8 @@ public abstract class SensorHandler<AggregatorInput, AggregatorOutput> {
protected final DriverObserver<AggregatorInput> driverObserver = new DriverObserver<>() {
@Override
public void onConnect() {
SensorHandler.this.aggregator = createAggregator();
public void onConnect(String sensorAddress, String sensorName) {
SensorHandler.this.aggregator = createAggregator(sensorAddress, sensorName);
}
@Override
@@ -89,7 +89,7 @@ public abstract class SensorHandler<AggregatorInput, AggregatorOutput> {
}
@NonNull
protected abstract Aggregator<AggregatorInput, AggregatorOutput> createAggregator();
protected abstract Aggregator<AggregatorInput, AggregatorOutput> createAggregator(String sensorAddress, String sensorName);
protected abstract int getSensorPreferenceKey();
@@ -27,8 +27,8 @@ public class TemperatureHandler extends SensorHandler<Temperature, Temperature>
@NonNull
@Override
protected AggregatorTemperature createAggregator() {
return new AggregatorTemperature("", null);
protected AggregatorTemperature createAggregator(String sensorAddress, String sensorName) {
return new AggregatorTemperature(sensorAddress, sensorName);
}
@Override
@@ -56,7 +56,7 @@ public class BarometerInternal implements Driver {
if (sensorManager.registerListener(sensorEventListener, pressureSensor, SAMPLING_PERIOD, handler)) {
this.context = context;
observer.onConnect();
observer.onConnect(null, null);
return;
}
@@ -166,7 +166,7 @@ public class BluetoothDriver<T> implements Driver {
bluetoothGatt = device.connectGatt(context, false, connectCallback, BluetoothDevice.TRANSPORT_AUTO, 0, handler);
observer.onConnect(); //TODO pass device.getAddress(), device.getName()
observer.onConnect(device.getAddress(), device.getName());
}
private synchronized void clearData() {
@@ -2,7 +2,7 @@ package de.dennisguse.opentracks.sensors.driver;
public interface DriverObserver<T> {
void onConnect();
void onConnect(String sensorAddress, String sensorName);
void onDisconnect();
@@ -28,7 +28,7 @@ public class GpsInternal implements Driver {
@Override
public void onProviderEnabled(@NonNull String provider) {
driverObserver.onConnect();
driverObserver.onConnect(null, provider);
}
@Override