From 525f1b778129f82e3ee7bd1901d762a755d05f3a Mon Sep 17 00:00:00 2001
From: Sandor Dornbush <Sandor Dornbush@localhost>
Date: Tue, 7 Sep 2010 17:18:06 -0700
Subject: [PATCH] Fix restarting recording.

---
 .../android/apps/mytracks/services/PreferenceManager.java  | 7 +++++++
 .../apps/mytracks/services/TrackRecordingService.java      | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/PreferenceManager.java b/MyTracks/src/com/google/android/apps/mytracks/services/PreferenceManager.java
index 5128ceca0..414dbc8ed 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/PreferenceManager.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/PreferenceManager.java
@@ -35,6 +35,7 @@ public class PreferenceManager {
   private String min_recording_distance_key;
   private String min_recording_interval_key;
   private String min_required_accuracy_key;
+  private String recording_track_key;
   private String signal_sampling_frequency_key;
   private String split_frequency_key;
   
@@ -56,6 +57,8 @@ public class PreferenceManager {
       service.getString(R.string.split_frequency_key);
     signal_sampling_frequency_key =
       service.getString(R.string.signal_sampling_frequency_key);
+    recording_track_key =
+      service.getString(R.string.recording_track_key);
   }
   
   /**
@@ -125,6 +128,10 @@ public class PreferenceManager {
           sharedPreferences.getInt(announcement_frequency_key,
               -1));
     }
+    if (key == null || key.equals(recording_track_key)) {
+      service.setRecordingTrackId(
+          sharedPreferences.getInt(recording_track_key, -1));
+    }
     if (key == null || key.equals(split_frequency_key)) {
       service.getSplitManager().setSplitFrequency(
           sharedPreferences.getInt(split_frequency_key, 0));
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 026cd6b56..967599599 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
@@ -895,6 +895,10 @@ public class TrackRecordingService extends Service implements LocationListener {
     return recordingTrackId;
   }
 
+  public void setRecordingTrackId(long recordingTrackId) {
+    this.recordingTrackId = recordingTrackId;
+  }
+
   public int getAnnouncementFrequency() {
     return announcementFrequency;
   }