From fc12c1f29e19d8bd801e5e96cea4d5805e3f2bc7 Mon Sep 17 00:00:00 2001 From: ml1050 Date: Mon, 6 Feb 2012 13:22:50 +0100 Subject: [PATCH] fix comments for da7d78b18f25 --- .../apps/mytracks/SensorStateActivity.java | 4 +-- .../services/TrackRecordingService.java | 6 ++--- .../sensors/SensorManagerFactory.java | 26 ++++++++++++------- .../sensors/SensorManagerFactoryTest.java | 6 ++--- 4 files changed, 25 insertions(+), 17 deletions(-) diff --git a/MyTracks/src/com/google/android/apps/mytracks/SensorStateActivity.java b/MyTracks/src/com/google/android/apps/mytracks/SensorStateActivity.java index ecd1fcca2..6b77f28a6 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/SensorStateActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/SensorStateActivity.java @@ -167,7 +167,7 @@ public class SensorStateActivity extends Activity { // If no temp sensor manager is present, create one, and start it. if (tempSensorManager == null) { - tempSensorManager = SensorManagerFactory.getSensorManager(this); + tempSensorManager = SensorManagerFactory.getInstance().getSensorManager(this); } // If a temp sensor manager is available, use states from temp sensor @@ -224,7 +224,7 @@ public class SensorStateActivity extends Activity { */ private void stopTempSensorManager() { if (tempSensorManager != null) { - SensorManagerFactory.releaseSensorManager(tempSensorManager); + SensorManagerFactory.getInstance().releaseSensorManager(tempSensorManager); tempSensorManager = null; } } diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java index 148d1c259..e00eef013 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java +++ b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java @@ -358,7 +358,7 @@ public class TrackRecordingService extends Service { unregisterLocationListener(); shutdownTaskExecutors(); if (sensorManager != null) { - SensorManagerFactory.releaseSensorManager(sensorManager); + SensorManagerFactory.getInstance().releaseSensorManager(sensorManager); sensorManager = null; } @@ -601,7 +601,7 @@ public class TrackRecordingService extends Service { length = 0; showNotification(); registerLocationListener(); - sensorManager = SensorManagerFactory.getSensorManager(this); + sensorManager = SensorManagerFactory.getInstance().getSensorManager(this); // Reset the number of auto-resume retries. setAutoResumeTrackRetries(0); @@ -1035,7 +1035,7 @@ public class TrackRecordingService extends Service { prefManager.setRecordingTrack(recordingTrackId = -1); if (sensorManager != null) { - SensorManagerFactory.releaseSensorManager(sensorManager); + SensorManagerFactory.getInstance().releaseSensorManager(sensorManager); sensorManager = null; } diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactory.java b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactory.java index 2bc272274..9d98410bc 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactory.java +++ b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactory.java @@ -31,15 +31,28 @@ import android.util.Log; */ public class SensorManagerFactory { + private String activeSensorType; + private SensorManager activeSensorManager; + private int refCount; + + private static SensorManagerFactory instance = new SensorManagerFactory(); + private SensorManagerFactory() { } + /** + * Get the factory instance. + */ + public static SensorManagerFactory getInstance() { + return instance; + } + /** * Get and start a new sensor manager. * @param context Context to fetch system preferences. * @return The sensor manager that corresponds to the sensor type setting. */ - public static SensorManager getSensorManager(Context context) { + public SensorManager getSensorManager(Context context) { SharedPreferences prefs = context.getSharedPreferences( Constants.SETTINGS_NAME, Context.MODE_PRIVATE); if (prefs == null) { @@ -71,7 +84,7 @@ public class SensorManagerFactory { } else if (sensor.equals(context.getString(R.string.sensor_type_value_polar))) { activeSensorManager = new PolarSensorManager(context); } else { - Log.w(Constants.TAG, "Unable to find sensor type: " + sensor); + Log.w(Constants.TAG, "Unable to find sensor type: " + sensor); return null; } activeSensorType = sensor; @@ -83,8 +96,7 @@ public class SensorManagerFactory { /** * Finish using a sensor manager. */ - - public static void releaseSensorManager(SensorManager sensorManager) { + public void releaseSensorManager(SensorManager sensorManager) { Log.i(Constants.TAG, "releaseSensorManager: " + activeSensorType + " " + refCount); if (sensorManager != activeSensorManager) { Log.e(Constants.TAG, "invalid parameter to releaseSensorManager"); @@ -95,7 +107,7 @@ public class SensorManagerFactory { reset(); } - private static void reset() { + private void reset() { activeSensorType = null; if (activeSensorManager != null) { activeSensorManager.shutdown(); @@ -103,8 +115,4 @@ public class SensorManagerFactory { activeSensorManager = null; refCount = 0; } - - private static String activeSensorType = null; - private static SensorManager activeSensorManager = null; - private static int refCount = 0; } diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactoryTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactoryTest.java index f27b66fc1..310da60cd 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactoryTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactoryTest.java @@ -26,7 +26,7 @@ public class SensorManagerFactoryTest extends AndroidTestCase { @SmallTest public void testDefaultSettings() throws Exception { - assertNull(SensorManagerFactory.getSensorManager(getContext())); + assertNull(SensorManagerFactory.getInstance().getSensorManager(getContext())); } @SmallTest @@ -49,9 +49,9 @@ public class SensorManagerFactoryTest extends AndroidTestCase { .putString(getContext().getString(R.string.sensor_type_key), getContext().getString(i)) .apply(); - SensorManager sm = SensorManagerFactory.getSensorManager(getContext()); + SensorManager sm = SensorManagerFactory.getInstance().getSensorManager(getContext()); assertNotNull(sm); assertTrue(c.isInstance(sm)); - SensorManagerFactory.releaseSensorManager(sm); + SensorManagerFactory.getInstance().releaseSensorManager(sm); } }