karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Removed temporary sensor manager (was not used anymore).

Browse Source
This commit is contained in:
Dennis Guse
2019-10-22 21:13:23 +02:00
parent 9bd4ba489c
commit 0dd7f74a11
3 changed files with 9 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/services/sensors/RemoteSensorManager.java
+8 -8
View File
@@ -31,14 +31,14 @@ import de.dennisguse.opentracks.content.sensor.SensorState;
*/ */
public abstract class RemoteSensorManager { public abstract class RemoteSensorManager {
public static final long MAX_SENSOR_DATE_SET_AGE = 5000; public static final long MAX_SENSOR_DATE_SET_AGE_MS = 5000;
public static final long MAX_SENSOR_STATE_AGE = 20000; public static final long MAX_SENSOR_STATE_AGE_MS = 20000;
private static final String TAG = RemoteSensorManager.class.getSimpleName(); 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 SensorState sensorState = SensorState.NONE;
private long sensorStateTimestamp = System.currentTimeMillis(); private long sensorStateTimestamp_ms = System.currentTimeMillis();
private TimerTask timerTask; private TimerTask timerTask;
private Timer timer; private Timer timer;
@@ -73,7 +73,7 @@ public abstract class RemoteSensorManager {
public void run() { public void run() {
switch (getSensorState()) { switch (getSensorState()) {
case CONNECTING: 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"); Log.i(TAG, "Retry setUpChannel");
setUpChannel(); setUpChannel();
} }
@@ -86,7 +86,7 @@ public abstract class RemoteSensorManager {
} }
}; };
timer = new Timer(RemoteSensorManager.class.getSimpleName()); 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 * @param sensorState the sensor state
*/ */
public void setSensorState(SensorState sensorState) { public void setSensorState(SensorState sensorState) {
sensorStateTimestamp = System.currentTimeMillis(); sensorStateTimestamp_ms = System.currentTimeMillis();
this.sensorState = sensorState; this.sensorState = sensorState;
} }
@@ -130,6 +130,6 @@ public abstract class RemoteSensorManager {
if (sensorDataSet == null) { if (sensorDataSet == null) {
return false; return false;
} }
return sensorDataSet.isRecent(MAX_SENSOR_DATE_SET_AGE); return sensorDataSet.isRecent(MAX_SENSOR_DATE_SET_AGE_MS);
} }
} }
src/main/java/de/dennisguse/opentracks/services/sensors/RemoteSensorManagerFactory.java
-26
View File
@@ -27,8 +27,6 @@ public class RemoteSensorManagerFactory {
private static RemoteSensorManager remoteSensorManagerSystem = null; private static RemoteSensorManager remoteSensorManagerSystem = null;
//TODO Check if still needed? Is there a missing features?
private static RemoteSensorManager remoteSensorManagerTemporary = null;
private RemoteSensorManagerFactory() { private RemoteSensorManagerFactory() {
} }
@@ -39,7 +37,6 @@ public class RemoteSensorManagerFactory {
* @param context the context * @param context the context
*/ */
public static RemoteSensorManager getSystemSensorManager(Context context) { public static RemoteSensorManager getSystemSensorManager(Context context) {
releaseSensorManagerTemporary();
releaseSystemSensorManager(); releaseSystemSensorManager();
remoteSensorManagerSystem = getSensorManager(context); remoteSensorManagerSystem = getSensorManager(context);
remoteSensorManagerSystem.startSensor(); remoteSensorManagerSystem.startSensor();
@@ -56,29 +53,6 @@ public class RemoteSensorManagerFactory {
remoteSensorManagerSystem = null; 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. * Gets the sensor manager.
* *
src/main/java/de/dennisguse/opentracks/util/StatsUtils.java
+1 -1
View File
@@ -119,7 +119,7 @@ public class StatsUtils {
TextView heartRateSensor = activity.findViewById(R.id.stats_sensor_heart_rate_sensor_value); TextView heartRateSensor = activity.findViewById(R.id.stats_sensor_heart_rate_sensor_value);
String heartRate = activity.getString(R.string.value_unknown); String heartRate = activity.getString(R.string.value_unknown);
String sensor = 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); heartRate = StringUtils.formatDecimal(sensorDataSet.getHeartRate(), 0);
sensor = sensorDataSet.getSensorName(); sensor = sensorDataSet.getSensorName();
} }