From 744853ee91a20a7adcae0a04362732d2a04a5bd6 Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Mon, 26 Jan 2026 19:37:38 +0100 Subject: [PATCH] Cleanup: removed SensorConnector interface. Preparation for refactoring. --- .../sensors/BluetoothRemoteSensorManager.java | 8 +++----- .../de/dennisguse/opentracks/sensors/GainManager.java | 4 ++-- .../de/dennisguse/opentracks/sensors/GpsManager.java | 4 ++-- .../opentracks/sensors/SensorConnector.java | 11 ----------- .../dennisguse/opentracks/sensors/SensorManager.java | 8 ++++---- 5 files changed, 11 insertions(+), 24 deletions(-) delete mode 100644 src/main/java/de/dennisguse/opentracks/sensors/SensorConnector.java diff --git a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManager.java b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManager.java index 66bccbdce..844653017 100644 --- a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManager.java +++ b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManager.java @@ -34,7 +34,7 @@ import de.dennisguse.opentracks.settings.PreferencesUtils; * TODO: listen for Bluetooth enabled/disabled events. * @author Sandor Dornbush */ -public class BluetoothRemoteSensorManager implements SensorConnector, SharedPreferences.OnSharedPreferenceChangeListener { +public class BluetoothRemoteSensorManager implements SharedPreferences.OnSharedPreferenceChangeListener { private static final String TAG = BluetoothRemoteSensorManager.class.getSimpleName(); @@ -62,16 +62,14 @@ public class BluetoothRemoteSensorManager implements SensorConnector, SharedPref this.runningSpeedAndCadence = new BluetoothConnectionManager(bluetoothAdapter, observer, new BluetoothHandlerRunningSpeedAndCadence()); } - @Override - public void start(Context context, Handler handler) { + public void start() { started = true; // Triggers connection startup onSharedPreferenceChanged(null, null); } - @Override - public synchronized void stop(Context context) { + public synchronized void stop() { heartRate.disconnect(); temperature.disconnect(); cyclingCadence.disconnect(); diff --git a/src/main/java/de/dennisguse/opentracks/sensors/GainManager.java b/src/main/java/de/dennisguse/opentracks/sensors/GainManager.java index 0d63227bf..6cace34bb 100644 --- a/src/main/java/de/dennisguse/opentracks/sensors/GainManager.java +++ b/src/main/java/de/dennisguse/opentracks/sensors/GainManager.java @@ -13,7 +13,7 @@ import de.dennisguse.opentracks.settings.PreferencesUtils; /** * Estimates the altitude gain and altitude loss using the device's pressure sensor (i.e., barometer). */ -public class GainManager implements SensorConnector { +public class GainManager { private static final String TAG = GainManager.class.getSimpleName(); @@ -36,7 +36,7 @@ public class GainManager implements SensorConnector { PreferencesUtils.registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener); } - public void stop(Context context) { + public void stop() { Log.d(TAG, "Stop"); this.context = null; this.handler = null; diff --git a/src/main/java/de/dennisguse/opentracks/sensors/GpsManager.java b/src/main/java/de/dennisguse/opentracks/sensors/GpsManager.java index e1c5ef717..7398db858 100644 --- a/src/main/java/de/dennisguse/opentracks/sensors/GpsManager.java +++ b/src/main/java/de/dennisguse/opentracks/sensors/GpsManager.java @@ -26,7 +26,7 @@ import de.dennisguse.opentracks.settings.PreferencesUtils; import de.dennisguse.opentracks.util.PermissionRequester; @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE) -public class GpsManager implements SensorConnector, LocationListenerCompat, GpsStatusManager.GpsStatusListener, SharedPreferences.OnSharedPreferenceChangeListener { +public class GpsManager implements LocationListenerCompat, GpsStatusManager.GpsStatusListener, SharedPreferences.OnSharedPreferenceChangeListener { private final String TAG = GpsManager.class.getSimpleName(); @@ -68,7 +68,7 @@ public class GpsManager implements SensorConnector, LocationListenerCompat, GpsS } @SuppressWarnings({"MissingPermission"}) - public void stop(Context context) { + public void stop() { if (isStarted()) { LocationManagerCompat.removeUpdates(locationManager, this); } diff --git a/src/main/java/de/dennisguse/opentracks/sensors/SensorConnector.java b/src/main/java/de/dennisguse/opentracks/sensors/SensorConnector.java deleted file mode 100644 index cea9f44ee..000000000 --- a/src/main/java/de/dennisguse/opentracks/sensors/SensorConnector.java +++ /dev/null @@ -1,11 +0,0 @@ -package de.dennisguse.opentracks.sensors; - -import android.content.Context; -import android.os.Handler; - -public interface SensorConnector { - - void start(Context context, Handler handler); - - void stop(Context context); -} diff --git a/src/main/java/de/dennisguse/opentracks/sensors/SensorManager.java b/src/main/java/de/dennisguse/opentracks/sensors/SensorManager.java index d645748ea..af804d493 100644 --- a/src/main/java/de/dennisguse/opentracks/sensors/SensorManager.java +++ b/src/main/java/de/dennisguse/opentracks/sensors/SensorManager.java @@ -85,19 +85,19 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange gpsManager.start(context, handler); altitudeSumManager.start(context, handler); - bluetoothSensorManager.start(context, handler); + bluetoothSensorManager.start(); } public void stop(Context context) { wakeLock = SystemUtils.releaseWakeLock(wakeLock); - bluetoothSensorManager.stop(context); + bluetoothSensorManager.stop(); bluetoothSensorManager = null; - altitudeSumManager.stop(context); + altitudeSumManager.stop(); altitudeSumManager = null; - gpsManager.stop(context); + gpsManager.stop(); gpsManager = null; sensorDataAggregator.clear();