From 0f2c5adf26e306dcacd19058504fdfc6208d3e5f Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Mon, 26 Jan 2026 22:07:59 +0100 Subject: [PATCH] Cleanup: SensorManager.SensorDataChangedObserver inlined into SensorManager. Preparation for refactoring. --- .../opentracks/sensors/SensorManager.java | 40 +++++++++---------- .../services/handlers/TrackPointCreator.java | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main/java/de/dennisguse/opentracks/sensors/SensorManager.java b/src/main/java/de/dennisguse/opentracks/sensors/SensorManager.java index 1c03fad49..da2d228fa 100644 --- a/src/main/java/de/dennisguse/opentracks/sensors/SensorManager.java +++ b/src/main/java/de/dennisguse/opentracks/sensors/SensorManager.java @@ -71,7 +71,7 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange bluetoothSensorManager.start(); } - public void stop(Context context) { + public void stop() { wakeLock = SystemUtils.releaseWakeLock(wakeLock); bluetoothSensorManager.stop(); @@ -104,25 +104,6 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange if (gps != null) gps.resetAggregated(); } - @Deprecated - public void onConnect(Aggregator aggregator) { - add(aggregator); - } - - @Deprecated - public void onDisconnect(Aggregator aggregator) { - add(aggregator); - } - - @Deprecated - public void onRemove(Aggregator aggregator) { - remove(aggregator); - } - - public Instant getNow() { - return observer.createNow(); - } - public GpsManager getGpsManager() { return gpsManager; } @@ -148,6 +129,25 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange } //TODO Inlined from SensorDataAggregator; Aggregators will be moved into Drivers. + @Deprecated + public void onConnect(Aggregator aggregator) { + add(aggregator); + } + + @Deprecated + public void onDisconnect(Aggregator aggregator) { + add(aggregator); + } + + @Deprecated + public void onRemove(Aggregator aggregator) { + remove(aggregator); + } + + public Instant getNow() { + return observer.createNow(); + } + @VisibleForTesting public AggregatorHeartRate heartRate; 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 ff1e6191a..5105ed9f5 100644 --- a/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java +++ b/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java @@ -56,7 +56,7 @@ public class TrackPointCreator implements SharedPreferences.OnSharedPreferenceCh } public void stop() { - sensorManager.stop(context); + sensorManager.stop(); this.context = null; }