From 0dd7f74a110ec7ca05aac821c28bacec0eb20e8f Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Tue, 22 Oct 2019 21:13:23 +0200 Subject: [PATCH] Removed temporary sensor manager (was not used anymore). --- .../services/sensors/RemoteSensorManager.java | 16 ++++++------ .../sensors/RemoteSensorManagerFactory.java | 26 ------------------- .../opentracks/util/StatsUtils.java | 2 +- 3 files changed, 9 insertions(+), 35 deletions(-) diff --git a/src/main/java/de/dennisguse/opentracks/services/sensors/RemoteSensorManager.java b/src/main/java/de/dennisguse/opentracks/services/sensors/RemoteSensorManager.java index fcc34a463..2ef82f91d 100644 --- a/src/main/java/de/dennisguse/opentracks/services/sensors/RemoteSensorManager.java +++ b/src/main/java/de/dennisguse/opentracks/services/sensors/RemoteSensorManager.java @@ -31,14 +31,14 @@ import de.dennisguse.opentracks.content.sensor.SensorState; */ public abstract class RemoteSensorManager { - public static final long MAX_SENSOR_DATE_SET_AGE = 5000; - public static final long MAX_SENSOR_STATE_AGE = 20000; + public static final long MAX_SENSOR_DATE_SET_AGE_MS = 5000; + public static final long MAX_SENSOR_STATE_AGE_MS = 20000; private static final String TAG = RemoteSensorManager.class.getSimpleName(); - private static final int RETRY_PERIOD = 20000; + private static final int RETRY_PERIOD_MS = 20000; private SensorState sensorState = SensorState.NONE; - private long sensorStateTimestamp = System.currentTimeMillis(); + private long sensorStateTimestamp_ms = System.currentTimeMillis(); private TimerTask timerTask; private Timer timer; @@ -73,7 +73,7 @@ public abstract class RemoteSensorManager { public void run() { switch (getSensorState()) { case CONNECTING: - if (System.currentTimeMillis() - sensorStateTimestamp > MAX_SENSOR_STATE_AGE) { + if (System.currentTimeMillis() - sensorStateTimestamp_ms > MAX_SENSOR_STATE_AGE_MS) { Log.i(TAG, "Retry setUpChannel"); setUpChannel(); } @@ -86,7 +86,7 @@ public abstract class RemoteSensorManager { } }; timer = new Timer(RemoteSensorManager.class.getSimpleName()); - timer.schedule(timerTask, RETRY_PERIOD, RETRY_PERIOD); + timer.schedule(timerTask, RETRY_PERIOD_MS, RETRY_PERIOD_MS); } /** @@ -118,7 +118,7 @@ public abstract class RemoteSensorManager { * @param sensorState the sensor state */ public void setSensorState(SensorState sensorState) { - sensorStateTimestamp = System.currentTimeMillis(); + sensorStateTimestamp_ms = System.currentTimeMillis(); this.sensorState = sensorState; } @@ -130,6 +130,6 @@ public abstract class RemoteSensorManager { if (sensorDataSet == null) { return false; } - return sensorDataSet.isRecent(MAX_SENSOR_DATE_SET_AGE); + return sensorDataSet.isRecent(MAX_SENSOR_DATE_SET_AGE_MS); } } diff --git a/src/main/java/de/dennisguse/opentracks/services/sensors/RemoteSensorManagerFactory.java b/src/main/java/de/dennisguse/opentracks/services/sensors/RemoteSensorManagerFactory.java index 10c2cc1ff..fd344c5d4 100644 --- a/src/main/java/de/dennisguse/opentracks/services/sensors/RemoteSensorManagerFactory.java +++ b/src/main/java/de/dennisguse/opentracks/services/sensors/RemoteSensorManagerFactory.java @@ -27,8 +27,6 @@ public class RemoteSensorManagerFactory { private static RemoteSensorManager remoteSensorManagerSystem = null; - //TODO Check if still needed? Is there a missing features? - private static RemoteSensorManager remoteSensorManagerTemporary = null; private RemoteSensorManagerFactory() { } @@ -39,7 +37,6 @@ public class RemoteSensorManagerFactory { * @param context the context */ public static RemoteSensorManager getSystemSensorManager(Context context) { - releaseSensorManagerTemporary(); releaseSystemSensorManager(); remoteSensorManagerSystem = getSensorManager(context); remoteSensorManagerSystem.startSensor(); @@ -56,29 +53,6 @@ public class RemoteSensorManagerFactory { remoteSensorManagerSystem = null; } - /** - * Gets the temp sensor manager. - */ - public static RemoteSensorManager getSensorManagerTemporary(Context context) { - releaseSensorManagerTemporary(); - if (remoteSensorManagerSystem != null) { - return null; - } - remoteSensorManagerTemporary = getSensorManager(context); - remoteSensorManagerTemporary.startSensor(); - return remoteSensorManagerTemporary; - } - - /** - * Releases the temp sensor manager. - */ - private static void releaseSensorManagerTemporary() { - if (remoteSensorManagerTemporary != null) { - remoteSensorManagerTemporary.stopSensor(); - } - remoteSensorManagerTemporary = null; - } - /** * Gets the sensor manager. * diff --git a/src/main/java/de/dennisguse/opentracks/util/StatsUtils.java b/src/main/java/de/dennisguse/opentracks/util/StatsUtils.java index d389db446..29ed559a2 100644 --- a/src/main/java/de/dennisguse/opentracks/util/StatsUtils.java +++ b/src/main/java/de/dennisguse/opentracks/util/StatsUtils.java @@ -119,7 +119,7 @@ public class StatsUtils { TextView heartRateSensor = activity.findViewById(R.id.stats_sensor_heart_rate_sensor_value); String heartRate = activity.getString(R.string.value_unknown); String sensor = activity.getString(R.string.value_unknown); - if (sensorDataSet != null && sensorDataSet.hasHeartRate() && sensorDataSet.isRecent(RemoteSensorManager.MAX_SENSOR_DATE_SET_AGE)) { + if (sensorDataSet != null && sensorDataSet.hasHeartRate() && sensorDataSet.isRecent(RemoteSensorManager.MAX_SENSOR_DATE_SET_AGE_MS)) { heartRate = StringUtils.formatDecimal(sensorDataSet.getHeartRate(), 0); sensor = sensorDataSet.getSensorName(); }