Ensuring the rest of the app can deal with preferences being restored from the backup

MyTracks/src/com/google/android/apps/mytracks/MyTracksMap.java

@@ -866,21 +866,27 @@ public class MyTracksMap extends MapActivity
   }
 
   @Override
-  public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
+  public void onSharedPreferenceChanged(
-      String key) {
+      final SharedPreferences sharedPreferences,
+      final String key) {
     if (key != null) {
+      uiHandler.post(new Runnable() {
+        @Override
+        public void run() {
           if (key.equals(getString(R.string.min_required_accuracy_key))) {
             minRequiredAccuracy = sharedPreferences.getInt(
                 getString(R.string.min_required_accuracy_key),
                 MyTracksSettings.DEFAULT_MIN_REQUIRED_ACCURACY);
           } else if (key.equals(getString(R.string.selected_track_key))) {
             long selectedTrackId =
-            sharedPreferences.getLong(getString(R.string.selected_track_key),
+                sharedPreferences.getLong(
+                    getString(R.string.selected_track_key),
                     -1);
             setSelectedTrack(selectedTrackId);
           } else if (key.equals(getString(R.string.recording_track_key))) {
             recordingTrackId =
-            sharedPreferences.getLong(getString(R.string.recording_track_key),
+                sharedPreferences.getLong(
+                    getString(R.string.recording_track_key),
                     -1);
             if (selectedTrack != null) {
               mapOverlay.setShowEndMarker(
@@ -889,6 +895,8 @@ public class MyTracksMap extends MapActivity
             }
           }
         }
+      });
+    }
   }
 
   @Override

MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java

@@ -216,20 +216,25 @@ public class StatsActivity extends Activity
 
   @Override
   public void onSharedPreferenceChanged(
-      SharedPreferences sharedPreferences, String key) {
+      final SharedPreferences sharedPreferences, final String key) {
     Log.d(MyTracksConstants.TAG,
         "StatsActivity: onSharedPreferences changed " + key);
     if (key != null) {
+      runOnUiThread(new Runnable() {
+        @Override
+        public void run() {
           if (key.equals(getString(R.string.selected_track_key))) {
             selectedTrackId =
-            sharedPreferences.getLong(getString(R.string.selected_track_key),
+                sharedPreferences.getLong(
+                    getString(R.string.selected_track_key),
                     -1);
             checkLiveTrack();
             restoreStats();
             updateLocation(null);
           } else if (key.equals(getString(R.string.recording_track_key))) {
             recordingTrackId =
-            sharedPreferences.getLong(getString(R.string.recording_track_key),
+                sharedPreferences.getLong(
+                    getString(R.string.recording_track_key),
                     -1);
             checkLiveTrack();
             restoreStats();
@@ -243,7 +248,8 @@ public class StatsActivity extends Activity
             restoreStats();
           } else if (key.equals(getString(R.string.report_speed_key))) {
             displaySpeed =
-            sharedPreferences.getBoolean(getString(R.string.report_speed_key),
+                sharedPreferences.getBoolean(
+                    getString(R.string.report_speed_key),
                     true);
             utils.setReportSpeed(displaySpeed);
             utils.updateUnits();
@@ -254,6 +260,8 @@ public class StatsActivity extends Activity
             restoreStats();
           }
         }
+      });
+    }
   }
 
   @Override
@@ -353,6 +361,11 @@ public class StatsActivity extends Activity
     }
 
     track = providerUtils.getTrack(selectedTrackId);
+    if (track == null || track.getStatistics() == null) {
+      utils.setAllToUnknown();
+      return;
+    }
+
     startTime = track.getStatistics().getStartTime();
     if (!selectedTrackIsRecording()) {
       utils.setTime(R.id.total_time_register,

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

@@ -36,7 +36,6 @@ import android.app.Service;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteException;
 import android.location.Location;