More unit tests for TracksRecordingService and fix a few bugs. Made the service less forgiving rather than silently ignoring invalid state.

MyTracks/src/com/google/android/apps/mytracks/services/PreferenceManager.java

@@ -20,6 +20,7 @@ import com.google.android.apps.mytracks.MyTracksSettings;
 import com.google.android.maps.mytracks.R;
 
 import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
 import android.util.Log;
 
 /**
@@ -40,9 +41,18 @@ public class PreferenceManager {
   private final String signalSamplingFrequencyKey;
   private final String splitFrequencyKey;
 
+  private final SharedPreferences sharedPreferences;
+
   public PreferenceManager(TrackRecordingService service) {
     this.service = service;
-
+    this.sharedPreferences =
+        service.getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0);
+    if (sharedPreferences == null) {
+      Log.w(MyTracksConstants.TAG,
+          "TrackRecordingService: Couldn't get shared preferences.");
+      throw new IllegalStateException("Couldn't get shared preferences");
+    }
+    
     announcementFrequencyKey =
         service.getString(R.string.announcement_frequency_key);
     autoResumeTrackTimeoutKey =
@@ -57,12 +67,12 @@ public class PreferenceManager {
         service.getString(R.string.min_recording_interval_key);
     minRequiredAccuracyKey =
         service.getString(R.string.min_required_accuracy_key);
-    splitFrequencyKey =
-        service.getString(R.string.split_frequency_key);
-    signalSamplingFrequencyKey =
-        service.getString(R.string.signal_sampling_frequency_key);
     recordingTrackKey =
         service.getString(R.string.recording_track_key);
+    signalSamplingFrequencyKey =
+        service.getString(R.string.signal_sampling_frequency_key);
+    splitFrequencyKey =
+        service.getString(R.string.split_frequency_key);
   }
 
   /**
@@ -72,14 +82,6 @@ public class PreferenceManager {
    * @param key the key that changed (may be null to update all preferences)
    */
   public void onSharedPreferenceChanged(String key) {
-    SharedPreferences sharedPreferences =
-        service.getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0);
-    if (sharedPreferences == null) {
-      Log.w(MyTracksConstants.TAG,
-          "TrackRecordingService: Couldn't get shared preferences.");
-      return;
-    }
-
     if (key == null || key.equals(minRecordingDistanceKey)) {
       service.setMinRecordingDistance(
           sharedPreferences.getInt(
@@ -156,4 +158,16 @@ public class PreferenceManager {
           sharedPreferences.getBoolean(metricUnitsKey, true));
     }
   }
+  
+  public void setAutoResumeTrackCurrentRetry(int retryAttempts) {
+    SharedPreferences.Editor editor = sharedPreferences.edit();
+    editor.putInt(autoResumeTrackTimeoutKey, retryAttempts);
+    editor.commit();
+  }
+
+  public void setRecordingTrack(long id) {
+    Editor editor = sharedPreferences.edit();
+    editor.putLong(recordingTrackKey, id);
+    editor.commit();
+  }
 }

MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java

@@ -67,7 +67,7 @@ public class TrackRecordingService extends Service implements LocationListener {
   private static final String STATISTICS_ICON_URL =
       "http://maps.google.com/mapfiles/ms/micons/ylw-pushpin.png";
 
-  private static final int MAX_AUTO_RESUME_TRACK_RETRY_ATTEMPTS = 3;
+  static final int MAX_AUTO_RESUME_TRACK_RETRY_ATTEMPTS = 3;
   
   private NotificationManager notificationManager;
   private LocationManager locationManager;
@@ -382,6 +382,7 @@ public class TrackRecordingService extends Service implements LocationListener {
   }
   
   private Track getRecordingTrack() {
+    Log.d(MyTracksConstants.TAG, "Recording track ID: " + recordingTrackId);
     if (recordingTrackId < 0) {
       return null;
     }
@@ -390,6 +391,9 @@ public class TrackRecordingService extends Service implements LocationListener {
   }
 
   private void restoreStats(Track track) {
+    Log.d(MyTracksConstants.TAG,
+        "Restoring stats of track with ID: " + track.getId());
+    
     TripStatistics stats = track.getStatistics();
     statsBuilder = new TripStatisticsBuilder();
     statsBuilder.resumeAt(stats.getStartTime());
@@ -739,8 +743,9 @@ public class TrackRecordingService extends Service implements LocationListener {
       // Make sure that the current track exists and is fresh enough.
       if (recordingTrack == null || !shouldResumeTrack(recordingTrack)) {
         Log.i(MyTracksConstants.TAG,
-            "TrackRecordingService: Not resuming because the previous track "
-            + "doesn't exist or is too old");
+            "TrackRecordingService: Not resuming, because the previous track ("
+            + recordingTrack + ") doesn't exist or is too old");
+        isRecording = false;
         stopSelfResult(startId);
         return;
       }
@@ -753,11 +758,7 @@ public class TrackRecordingService extends Service implements LocationListener {
       SharedPreferences sharedPreferences, int retryAttempts) {
     Log.d(MyTracksConstants.TAG,
         "Updating auto-resume retry attempts to: " + retryAttempts);
-    
-    SharedPreferences.Editor editor = sharedPreferences.edit();
-    editor.putInt(
-        getString(R.string.auto_resume_track_current_retry_key), retryAttempts);
-    editor.commit();
+    prefManager.setAutoResumeTrackCurrentRetry(retryAttempts);
   }
   
   private boolean shouldResumeTrack(Track track) {
@@ -908,6 +909,10 @@ public class TrackRecordingService extends Service implements LocationListener {
         @Override
         public void endCurrentTrack() {
           Log.d(MyTracksConstants.TAG, "TrackRecordingService.endCurrentTrack");
+          if (recordingTrackId == -1 || !isRecording) {
+            throw new IllegalStateException("No recording track in progress!");
+          }
+         
           isRecording = false;
           Track recordingTrack = providerUtils.getTrack(recordingTrackId);
           if (recordingTrack != null) {
@@ -928,6 +933,7 @@ public class TrackRecordingService extends Service implements LocationListener {
           }
           showNotification();
           recordingTrackId = -1;
+          prefManager.setRecordingTrack(recordingTrackId);
         }
 
         @Override
@@ -951,6 +957,10 @@ public class TrackRecordingService extends Service implements LocationListener {
 
   public long startNewTrack() {
     Log.d(MyTracksConstants.TAG, "TrackRecordingService.startNewTrack");
+    if (recordingTrackId != -1 || isRecording) {
+      throw new IllegalStateException("A track is already in progress!");
+    }
+    
     Track track = new Track();
     TripStatistics trackStats = track.getStatistics();
     track.setName("new");
@@ -973,10 +983,13 @@ public class TrackRecordingService extends Service implements LocationListener {
     registerLocationListener();
     splitManager.restore();
     signalManager.restore();
+
     // Reset the number of auto-resume retries.
-    SharedPreferences sharedPreferences =
-        getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0); 
-    setAutoResumeTrackRetries(sharedPreferences, 0);
+    setAutoResumeTrackRetries(
+        getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0), 0);
+    // Persist the current recording track.
+    prefManager.setRecordingTrack(recordingTrackId);
+    
     return recordingTrackId;
   }