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

Code cleanup.

Browse Source
This commit is contained in:
Dennis Guse
2019-07-07 13:51:43 +02:00
parent cc0bef8546
commit 199f74ffad
2 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
myTracks/src/main/java/com/google/android/apps/mytracks/SensorStateActivity.java
+2 -2
View File
@@ -118,7 +118,7 @@ public class SensorStateActivity extends AbstractMyTracksActivity {
*/ */
private void stopTempSensorManager() { private void stopTempSensorManager() {
if (tempSensorManager != null) { if (tempSensorManager != null) {
SensorManagerFactory.releaseTempSensorManager(); SensorManagerFactory.releaseSensorManagerTemporary();
tempSensorManager = null; tempSensorManager = null;
} }
} }
@@ -131,7 +131,7 @@ public class SensorStateActivity extends AbstractMyTracksActivity {
Sensor.SensorDataSet sensorDataSet = null; Sensor.SensorDataSet sensorDataSet = null;
if (tempSensorManager == null) { if (tempSensorManager == null) {
tempSensorManager = SensorManagerFactory.getTempSensorManager(this); tempSensorManager = SensorManagerFactory.getSensorManagerTemporary(this);
} }
if (tempSensorManager != null) { if (tempSensorManager != null) {
myTracks/src/main/java/com/google/android/apps/mytracks/services/sensors/SensorManagerFactory.java
+12 -15
View File
@@ -16,9 +16,6 @@
package com.google.android.apps.mytracks.services.sensors; package com.google.android.apps.mytracks.services.sensors;
import com.google.android.apps.mytracks.util.PreferencesUtils;
import com.google.android.maps.mytracks.R;
import android.content.Context; import android.content.Context;
/** /**
@@ -29,7 +26,7 @@ import android.content.Context;
public class SensorManagerFactory { public class SensorManagerFactory {
private static SensorManager systemSensorManager = null; private static SensorManager systemSensorManager = null;
private static SensorManager tempSensorManager = null; private static SensorManager sensorManagerTemporary = null;
private SensorManagerFactory() {} private SensorManagerFactory() {}
@@ -39,7 +36,7 @@ public class SensorManagerFactory {
* @param context the context * @param context the context
*/ */
public static SensorManager getSystemSensorManager(Context context) { public static SensorManager getSystemSensorManager(Context context) {
releaseTempSensorManager(); releaseSensorManagerTemporary();
releaseSystemSensorManager(); releaseSystemSensorManager();
systemSensorManager = getSensorManager(context); systemSensorManager = getSensorManager(context);
if (systemSensorManager != null) { if (systemSensorManager != null) {
@@ -63,26 +60,26 @@ public class SensorManagerFactory {
* *
* @param context * @param context
*/ */
public static SensorManager getTempSensorManager(Context context) { public static SensorManager getSensorManagerTemporary(Context context) {
releaseTempSensorManager(); releaseSensorManagerTemporary();
if (systemSensorManager != null) { if (systemSensorManager != null) {
return null; return null;
} }
tempSensorManager = getSensorManager(context); sensorManagerTemporary = getSensorManager(context);
if (tempSensorManager != null) { if (sensorManagerTemporary != null) {
tempSensorManager.startSensor(); sensorManagerTemporary.startSensor();
} }
return tempSensorManager; return sensorManagerTemporary;
} }
/** /**
* Releases the temp sensor manager. * Releases the temp sensor manager.
*/ */
public static void releaseTempSensorManager() { public static void releaseSensorManagerTemporary() {
if (tempSensorManager != null) { if (sensorManagerTemporary != null) {
tempSensorManager.stopSensor(); sensorManagerTemporary.stopSensor();
} }
tempSensorManager = null; sensorManagerTemporary = null;
} }
/** /**