From dfa80d61d746b7718c3d9ce46ab27e618dc3b154 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Sun, 1 Feb 2026 09:13:03 +0100
Subject: [PATCH] Restored functionality: sensor name/address is shown AFTER
 connecting.

---
 .../opentracks/sensors/AltitudeChangeHandler.java           | 4 ++--
 .../opentracks/sensors/CyclingCadenceHandler.java           | 4 ++--
 .../opentracks/sensors/CyclingDistanceSpeedHandler.java     | 4 ++--
 .../dennisguse/opentracks/sensors/CyclingPowerHandler.java  | 4 ++--
 .../java/de/dennisguse/opentracks/sensors/GpsManager.java   | 2 +-
 .../de/dennisguse/opentracks/sensors/HeartRateHandler.java  | 4 ++--
 .../sensors/RunningSpeedCadenceDistanceHandler.java         | 2 +-
 .../de/dennisguse/opentracks/sensors/SensorHandler.java     | 6 +++---
 .../dennisguse/opentracks/sensors/TemperatureHandler.java   | 4 ++--
 .../opentracks/sensors/driver/BarometerInternal.java        | 2 +-
 .../opentracks/sensors/driver/BluetoothDriver.java          | 2 +-
 .../opentracks/sensors/driver/DriverObserver.java           | 2 +-
 .../dennisguse/opentracks/sensors/driver/GpsInternal.java   | 2 +-
 13 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/sensors/AltitudeChangeHandler.java b/src/main/java/de/dennisguse/opentracks/sensors/AltitudeChangeHandler.java
index c79550143..af429029a 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/AltitudeChangeHandler.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/AltitudeChangeHandler.java
@@ -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);
     }
 }
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/CyclingCadenceHandler.java b/src/main/java/de/dennisguse/opentracks/sensors/CyclingCadenceHandler.java
index 64de38dad..48e957981 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/CyclingCadenceHandler.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/CyclingCadenceHandler.java
@@ -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
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/CyclingDistanceSpeedHandler.java b/src/main/java/de/dennisguse/opentracks/sensors/CyclingDistanceSpeedHandler.java
index 76ba0c82d..7bef5c16d 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/CyclingDistanceSpeedHandler.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/CyclingDistanceSpeedHandler.java
@@ -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
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/CyclingPowerHandler.java b/src/main/java/de/dennisguse/opentracks/sensors/CyclingPowerHandler.java
index 1d5065c79..f1de5561c 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/CyclingPowerHandler.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/CyclingPowerHandler.java
@@ -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
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/GpsManager.java b/src/main/java/de/dennisguse/opentracks/sensors/GpsManager.java
index 8106bae7c..a79b29680 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/GpsManager.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/GpsManager.java
@@ -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();
     }
 
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/HeartRateHandler.java b/src/main/java/de/dennisguse/opentracks/sensors/HeartRateHandler.java
index 5f61fccd6..4241cd16d 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/HeartRateHandler.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/HeartRateHandler.java
@@ -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
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/RunningSpeedCadenceDistanceHandler.java b/src/main/java/de/dennisguse/opentracks/sensors/RunningSpeedCadenceDistanceHandler.java
index c39c246cd..2fa8c5712 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/RunningSpeedCadenceDistanceHandler.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/RunningSpeedCadenceDistanceHandler.java
@@ -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);
     }
 
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/SensorHandler.java b/src/main/java/de/dennisguse/opentracks/sensors/SensorHandler.java
index 6cbe671d7..cbb5d5b98 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/SensorHandler.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/SensorHandler.java
@@ -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();
 
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/TemperatureHandler.java b/src/main/java/de/dennisguse/opentracks/sensors/TemperatureHandler.java
index 823732b20..7c1a6d972 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/TemperatureHandler.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/TemperatureHandler.java
@@ -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
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/driver/BarometerInternal.java b/src/main/java/de/dennisguse/opentracks/sensors/driver/BarometerInternal.java
index 4da4e4fd6..fbcb5a839 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/driver/BarometerInternal.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/driver/BarometerInternal.java
@@ -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;
         }
 
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/driver/BluetoothDriver.java b/src/main/java/de/dennisguse/opentracks/sensors/driver/BluetoothDriver.java
index 811bdc769..37d1d264f 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/driver/BluetoothDriver.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/driver/BluetoothDriver.java
@@ -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() {
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/driver/DriverObserver.java b/src/main/java/de/dennisguse/opentracks/sensors/driver/DriverObserver.java
index ba066142b..eecf89096 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/driver/DriverObserver.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/driver/DriverObserver.java
@@ -2,7 +2,7 @@ package de.dennisguse.opentracks.sensors.driver;
 
 
 public interface DriverObserver<T> {
-    void onConnect();
+    void onConnect(String sensorAddress, String sensorName);
 
     void onDisconnect();
 
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/driver/GpsInternal.java b/src/main/java/de/dennisguse/opentracks/sensors/driver/GpsInternal.java
index 216c9a562..cbde65a29 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/driver/GpsInternal.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/driver/GpsInternal.java
@@ -28,7 +28,7 @@ public class GpsInternal implements Driver {
 
         @Override
         public void onProviderEnabled(@NonNull String provider) {
-            driverObserver.onConnect();
+            driverObserver.onConnect(null, provider);
         }
 
         @Override