From 1657bf5ec1e8545478b9d1f23aa21de0804a559a Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Sat, 27 May 2023 11:12:58 +0200
Subject: [PATCH] Cleanup: removed SensorDataSetChangeObserver interface.

Part of #1424.
---
 .../dennisguse/opentracks/sensors/SensorManager.java   | 10 +++-------
 .../services/handlers/TrackPointCreator.java           |  3 +--
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/sensors/SensorManager.java b/src/main/java/de/dennisguse/opentracks/sensors/SensorManager.java
index d2e02fdf6..2e2743c9d 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/SensorManager.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/SensorManager.java
@@ -9,6 +9,7 @@ import androidx.annotation.VisibleForTesting;
 import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.sensors.sensorData.SensorData;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet;
+import de.dennisguse.opentracks.services.handlers.TrackPointCreator;
 
 public class SensorManager {
 
@@ -18,7 +19,7 @@ public class SensorManager {
     @VisibleForTesting
     public SensorDataSet sensorDataSet = new SensorDataSet();
 
-    private final SensorManager.SensorDataSetChangeObserver observer;
+    private final TrackPointCreator observer;
 
     private final SensorDataChangedObserver listener = new SensorDataChangedObserver() {
 
@@ -39,7 +40,7 @@ public class SensorManager {
 
     private AltitudeSumManager altitudeSumManager;
 
-    public SensorManager(Context context, Handler handler, SensorDataSetChangeObserver observer) {
+    public SensorManager(Context context, Handler handler, TrackPointCreator observer) {
         this.observer = observer;
         bluetoothSensorManager = new BluetoothRemoteSensorManager(context, handler, listener);
         altitudeSumManager = new AltitudeSumManager();
@@ -102,9 +103,4 @@ public class SensorManager {
 
         void onDisconnect(SensorData<?> sensorData);
     }
-
-    @Deprecated
-    public interface SensorDataSetChangeObserver {
-        void onChange(SensorDataSet sensorDataSet);
-    }
 }
diff --git a/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java b/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java
index aab81ac6b..df8b3f120 100644
--- a/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java
+++ b/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java
@@ -22,7 +22,7 @@ import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet;
 /**
  * Creates TrackPoints while recording by fusing data from different sensors (e.g., GNSS, barometer, BLE sensors).
  */
-public class TrackPointCreator implements SensorManager.SensorDataSetChangeObserver {
+public class TrackPointCreator {
 
     private static final String TAG = TrackPointCreator.class.getSimpleName();
 
@@ -85,7 +85,6 @@ public class TrackPointCreator implements SensorManager.SensorDataSetChangeObser
     /**
      * Got a new TrackPoint from Bluetooth only; contains no GPS location.
      */
-    @Override
     public synchronized void onChange(@NonNull SensorDataSet unused) {
         onNewTrackPoint(new TrackPoint(TrackPoint.Type.SENSORPOINT, createNow()));
     }