Cleanup: removed SensorDataSetChangeObserver interface.

Part of #1424.
This commit is contained in:
Dennis Guse
2023-05-27 11:12:58 +02:00
parent d046ca1cd8
commit 1657bf5ec1
2 changed files with 4 additions and 9 deletions
@@ -9,6 +9,7 @@ import androidx.annotation.VisibleForTesting;
import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.data.models.TrackPoint;
import de.dennisguse.opentracks.sensors.sensorData.SensorData; import de.dennisguse.opentracks.sensors.sensorData.SensorData;
import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet; import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet;
import de.dennisguse.opentracks.services.handlers.TrackPointCreator;
public class SensorManager { public class SensorManager {
@@ -18,7 +19,7 @@ public class SensorManager {
@VisibleForTesting @VisibleForTesting
public SensorDataSet sensorDataSet = new SensorDataSet(); public SensorDataSet sensorDataSet = new SensorDataSet();
private final SensorManager.SensorDataSetChangeObserver observer; private final TrackPointCreator observer;
private final SensorDataChangedObserver listener = new SensorDataChangedObserver() { private final SensorDataChangedObserver listener = new SensorDataChangedObserver() {
@@ -39,7 +40,7 @@ public class SensorManager {
private AltitudeSumManager altitudeSumManager; private AltitudeSumManager altitudeSumManager;
public SensorManager(Context context, Handler handler, SensorDataSetChangeObserver observer) { public SensorManager(Context context, Handler handler, TrackPointCreator observer) {
this.observer = observer; this.observer = observer;
bluetoothSensorManager = new BluetoothRemoteSensorManager(context, handler, listener); bluetoothSensorManager = new BluetoothRemoteSensorManager(context, handler, listener);
altitudeSumManager = new AltitudeSumManager(); altitudeSumManager = new AltitudeSumManager();
@@ -102,9 +103,4 @@ public class SensorManager {
void onDisconnect(SensorData<?> sensorData); void onDisconnect(SensorData<?> sensorData);
} }
@Deprecated
public interface SensorDataSetChangeObserver {
void onChange(SensorDataSet sensorDataSet);
}
} }
@@ -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). * 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(); 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. * Got a new TrackPoint from Bluetooth only; contains no GPS location.
*/ */
@Override
public synchronized void onChange(@NonNull SensorDataSet unused) { public synchronized void onChange(@NonNull SensorDataSet unused) {
onNewTrackPoint(new TrackPoint(TrackPoint.Type.SENSORPOINT, createNow())); onNewTrackPoint(new TrackPoint(TrackPoint.Type.SENSORPOINT, createNow()));
} }