Move the track context menu to the main menu.

Use sharedPreferenceChangeListener to listen when
a new recording has started to update the view like the action items.

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

@@ -18,25 +18,33 @@ package com.google.android.apps.mytracks;
 import static com.google.android.apps.mytracks.Constants.CHART_TAB_TAG;
 import static com.google.android.apps.mytracks.Constants.MAP_TAB_TAG;
 import static com.google.android.apps.mytracks.Constants.STATS_TAB_TAG;
-import static com.google.android.apps.mytracks.Constants.TAG;
 
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
 import com.google.android.apps.mytracks.content.TrackDataHub;
 import com.google.android.apps.mytracks.content.Waypoint;
 import com.google.android.apps.mytracks.content.WaypointCreationRequest;
+import com.google.android.apps.mytracks.io.file.SaveActivity;
+import com.google.android.apps.mytracks.io.file.TrackWriterFactory.TrackFileFormat;
+import com.google.android.apps.mytracks.io.sendtogoogle.SendRequest;
+import com.google.android.apps.mytracks.io.sendtogoogle.UploadServiceChooserActivity;
 import com.google.android.apps.mytracks.services.ITrackRecordingService;
 import com.google.android.apps.mytracks.services.ServiceUtils;
 import com.google.android.apps.mytracks.services.TrackRecordingServiceConnection;
 import com.google.android.apps.mytracks.util.ApiAdapterFactory;
+import com.google.android.apps.mytracks.util.DialogUtils;
+import com.google.android.apps.mytracks.util.PlayTrackUtils;
 import com.google.android.maps.mytracks.R;
-import com.google.common.annotations.VisibleForTesting;
 
+import android.app.Dialog;
 import android.app.TabActivity;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.content.res.Resources;
 import android.os.Bundle;
+import android.os.Parcelable;
 import android.os.RemoteException;
 import android.speech.tts.TextToSpeech;
 import android.util.Log;
@@ -58,24 +66,27 @@ import android.widget.Toast;
  */
 @SuppressWarnings("deprecation")
 public class TrackDetailActivity extends TabActivity implements OnTouchListener {
-  
+
   public static final String TRACK_ID = "track_id";
   public static final String WAYPOINT_ID = "waypoint_id";
-  
-  private MyTracksProviderUtils myTracksProviderUtils;
+
+  private static final String TAG = TrackDetailActivity.class.getSimpleName();
+  private static final int DIALOG_INSTALL_EARTH_ID = 0;
+  private static final int DIALOG_DELETE_CURRENT_ID = 1;
+
   private SharedPreferences sharedPreferences;
   private TrackDataHub trackDataHub;
   private TrackRecordingServiceConnection trackRecordingServiceConnection;
   private NavControls navControls;
-  
-  private MenuItem recordTrack;
+
   private MenuItem stopRecording;
-  
-  /**
-   * True if a new track should be created after the track recording service
-   * binds.
-   */
-  private boolean startNewTrackRequested = false;
+  private MenuItem insertMarker;
+  private MenuItem play;
+  private MenuItem share;
+  private MenuItem sendGoogle;
+  private MenuItem save;
+  private MenuItem edit;
+  private MenuItem delete;
 
   private final Runnable changeTab = new Runnable() {
     public void run() {
@@ -83,21 +94,22 @@ public class TrackDetailActivity extends TabActivity implements OnTouchListener
     }
   };
 
-  /**
-   * Callback when {@linkk TrackRecordingServiceConnection} binding changes.
+  /*
+   * Note that sharedPreferenceChangeListener cannot be an anonymous inner
+   * class. Anonymous inner class will get garbage collected.
    */
-  private final Runnable serviceBindCallback = new Runnable() {
+  private final OnSharedPreferenceChangeListener sharedPreferenceChangeListener =
+    new OnSharedPreferenceChangeListener() {
     @Override
-    public void run() {
-      synchronized (trackRecordingServiceConnection) {
-        ITrackRecordingService service = trackRecordingServiceConnection.getServiceIfBound();
-        if (startNewTrackRequested && service != null) {
-          Log.i(TAG, "Starting recording");
-          startNewTrackRequested = false;
-          startRecordingNewTrack(service);
-        } else if (startNewTrackRequested) {
-          Log.w(TAG, "Not yet starting recording");
+    public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
+      if (key == null) {
+        return;
+      }
+      if (key.equals(getString(R.string.recording_track_key))) {
+        if (isRecording()) {
+          trackRecordingServiceConnection.startAndBind();
         }
+        updateMenu();
       }
     }
   };
@@ -106,10 +118,10 @@ public class TrackDetailActivity extends TabActivity implements OnTouchListener
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
 
-    myTracksProviderUtils = MyTracksProviderUtils.Factory.get(this);
     sharedPreferences = getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
+    sharedPreferences.registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener);
     trackDataHub = ((MyTracksApplication) getApplication()).getTrackDataHub();
-    trackRecordingServiceConnection = new TrackRecordingServiceConnection(this, serviceBindCallback);
+    trackRecordingServiceConnection = new TrackRecordingServiceConnection(this, null);
 
     setVolumeControlStream(TextToSpeech.Engine.DEFAULT_STREAM);
 
@@ -119,8 +131,7 @@ public class TrackDetailActivity extends TabActivity implements OnTouchListener
     final Resources res = getResources();
     final TabHost tabHost = getTabHost();
     tabHost.addTab(tabHost.newTabSpec(MAP_TAB_TAG)
-        .setIndicator("Map", res.getDrawable(
-            android.R.drawable.ic_menu_mapmode))
+        .setIndicator("Map", res.getDrawable(android.R.drawable.ic_menu_mapmode))
         .setContent(new Intent(this, MapActivity.class)));
     tabHost.addTab(tabHost.newTabSpec(STATS_TAB_TAG)
         .setIndicator("Stats", res.getDrawable(R.drawable.ic_menu_statistics))
@@ -134,14 +145,10 @@ public class TrackDetailActivity extends TabActivity implements OnTouchListener
     tabHost.getTabWidget().setVisibility(View.GONE);
 
     RelativeLayout layout = new RelativeLayout(this);
-    LayoutParams params =
-        new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT);
+    LayoutParams params = new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT);
     layout.setLayoutParams(params);
-    navControls =
-        new NavControls(this, layout,
-            getResources().obtainTypedArray(R.array.left_icons),
-            getResources().obtainTypedArray(R.array.right_icons),
-            changeTab);
+    navControls = new NavControls(this, layout, getResources().obtainTypedArray(R.array.left_icons),
+        getResources().obtainTypedArray(R.array.right_icons), changeTab);
     navControls.show();
     tabHost.addView(layout);
     layout.setOnTouchListener(this);
@@ -152,9 +159,7 @@ public class TrackDetailActivity extends TabActivity implements OnTouchListener
     super.onStart();
     trackDataHub.start();
 
-    // Ensure that service is running and bound if we're supposed to be recording
-    if (ServiceUtils.isRecording(
-        this, trackRecordingServiceConnection.getServiceIfBound(), sharedPreferences)) {
+    if (isRecording()) {
       trackRecordingServiceConnection.startAndBind();
     }
 
@@ -164,18 +169,26 @@ public class TrackDetailActivity extends TabActivity implements OnTouchListener
       trackDataHub.loadTrack(trackId);
       return;
     }
-    
+
     long waypointId = intent.getLongExtra(WAYPOINT_ID, -1L);
     if (waypointId != -1L) {
-      Waypoint waypoint = myTracksProviderUtils.getWaypoint(waypointId);
-      trackId = waypoint.getTrackId();
-      
-      // Request that the waypoint is shown (now or when the right track is loaded).
-      showWaypoint(trackId, waypointId);
-  
-      // Load the right track, if not loaded already.
-      trackDataHub.loadTrack(trackId);
+      Waypoint waypoint = MyTracksProviderUtils.Factory.get(this).getWaypoint(waypointId);
+      if (waypoint != null) {
+        trackId = waypoint.getTrackId();
+        trackDataHub.loadTrack(trackId);
+        MapActivity mapActivity = getMapActivity();
+        if (mapActivity != null) {
+          getTabHost().setCurrentTab(0);
+          mapActivity.showWaypoint(trackId, waypointId);
+        } else {
+          Log.e(TAG, "MapActivity is null");
+        }
+        return;
+      }
     }
+
+    // No track id or waypoint id, return to the track list activity.
+    startTrackListActivity();
   }
 
   @Override
@@ -196,98 +209,166 @@ public class TrackDetailActivity extends TabActivity implements OnTouchListener
     trackRecordingServiceConnection.unbind();
   }
 
+  @Override
+  protected Dialog onCreateDialog(int id) {
+    switch (id) {
+      case DIALOG_INSTALL_EARTH_ID:
+        return PlayTrackUtils.createInstallEarthDialog(this);
+      case DIALOG_DELETE_CURRENT_ID:
+        return DialogUtils.createConfirmationDialog(this,
+            R.string.track_detail_delete_confirm_message, new DialogInterface.OnClickListener() {
+              @Override
+              public void onClick(DialogInterface dialog, int which) {
+                long trackId = trackDataHub.getSelectedTrackId();
+                MyTracksProviderUtils.Factory.get(TrackDetailActivity.this).deleteTrack(trackId);
+                startTrackListActivity();
+              }
+            });
+      default:
+        return null;
+    }
+  }
+
   @Override
   public boolean onCreateOptionsMenu(Menu menu) {
     getMenuInflater().inflate(R.menu.track_detail, menu);
-    recordTrack = menu.findItem(R.id.menu_record_track);
+    String fileTypes[] = getResources().getStringArray(R.array.file_types);
+    menu.findItem(R.id.menu_save_gpx).setTitle(getString(R.string.menu_save_format, fileTypes[0]));
+    menu.findItem(R.id.menu_save_kml).setTitle(getString(R.string.menu_save_format, fileTypes[1]));
+    menu.findItem(R.id.menu_save_csv).setTitle(getString(R.string.menu_save_format, fileTypes[2]));
+    menu.findItem(R.id.menu_save_tcx).setTitle(getString(R.string.menu_save_format, fileTypes[3]));
+
+    menu.findItem(R.id.menu_share_gpx).setTitle(getString(R.string.menu_share_file, fileTypes[0]));
+    menu.findItem(R.id.menu_share_kml).setTitle(getString(R.string.menu_share_file, fileTypes[1]));
+    menu.findItem(R.id.menu_share_csv).setTitle(getString(R.string.menu_share_file, fileTypes[2]));
+    menu.findItem(R.id.menu_share_tcx).setTitle(getString(R.string.menu_share_file, fileTypes[3]));
+
     stopRecording = menu.findItem(R.id.menu_stop_recording);
+    insertMarker = menu.findItem(R.id.menu_insert_marker);
+    play = menu.findItem(R.id.menu_play);
+    share = menu.findItem(R.id.menu_share);
+    sendGoogle = menu.findItem(R.id.menu_send_google);
+    save = menu.findItem(R.id.menu_save);
+    edit = menu.findItem(R.id.menu_edit);
+    delete = menu.findItem(R.id.menu_delete);
+
+    updateMenu();
     return true;
   }
 
   @Override
   public boolean onPrepareOptionsMenu(Menu menu) {
-    updateMenuItems(ServiceUtils.isRecording(
-        this, trackRecordingServiceConnection.getServiceIfBound(), sharedPreferences));
-
     String currentTabTag = getTabHost().getCurrentTabTag();
     menu.findItem(R.id.menu_chart_settings).setVisible(CHART_TAB_TAG.equals(currentTabTag));
     menu.findItem(R.id.menu_my_location).setVisible(MAP_TAB_TAG.equals(currentTabTag));
-    
+
     // Set map or satellite mode
-    MapActivity mapActivity = (MapActivity) getLocalActivityManager().getActivity(MAP_TAB_TAG);
+    MapActivity mapActivity = getMapActivity();
     boolean isSatelliteMode = mapActivity != null ? mapActivity.isSatelliteView() : false;
-    menu.findItem(R.id.menu_satellite_mode)
-        .setVisible(MAP_TAB_TAG.equals(currentTabTag))
+    menu.findItem(R.id.menu_satellite_mode).setVisible(MAP_TAB_TAG.equals(currentTabTag))
         .setTitle(isSatelliteMode ? R.string.menu_map_mode : R.string.menu_satellite_mode);
 
     return super.onPrepareOptionsMenu(menu);
   }
 
-  /**
-   * Updates menu item
-   * 
-   * @param isRecording true if recording
-   */
-  private void updateMenuItems(boolean isRecording) {
-    if (recordTrack != null) {
-      recordTrack.setVisible(!isRecording);
-    }
-    if (stopRecording != null) {
-      stopRecording.setVisible(isRecording);
-    }
-  }
-
   @Override
   public boolean onOptionsItemSelected(MenuItem item) {
     MapActivity mapActivity;
+    Intent intent;
+    long trackId = trackDataHub.getSelectedTrackId();
     switch (item.getItemId()) {
-      case R.id.menu_record_track:
-        updateMenuItems(true);
-        startRecording();
-        return true;
       case R.id.menu_stop_recording:
         updateMenuItems(false);
         stopRecording();
         return true;
+      case R.id.menu_insert_marker:
+        // TODO:
+        return true;
+      case R.id.menu_play:
+        if (PlayTrackUtils.isEarthInstalled(this)) {
+          PlayTrackUtils.playTrack(this, trackId);
+        } else {
+          showDialog(DIALOG_INSTALL_EARTH_ID);
+        }
+        return true;
+      case R.id.menu_share_map:
+        intent = new Intent(this, UploadServiceChooserActivity.class)
+            .putExtra(SendRequest.SEND_REQUEST_KEY, new SendRequest(trackId, true, false, false));
+        startActivity(intent);
+        return true;
+      case R.id.menu_share_fusion_table:
+        intent = new Intent(this, UploadServiceChooserActivity.class)
+            .putExtra(SendRequest.SEND_REQUEST_KEY, new SendRequest(trackId, false, true, false));
+        startActivity(intent);
+        return true;
+      case R.id.menu_share_gpx:
+        startSaveActivity(trackId, TrackFileFormat.GPX, true);
+        return true;
+      case R.id.menu_share_kml:
+        startSaveActivity(trackId, TrackFileFormat.KML, true);
+        return true;
+      case R.id.menu_share_csv:
+        startSaveActivity(trackId, TrackFileFormat.CSV, true);
+        return true;
+      case R.id.menu_share_tcx:
+        startSaveActivity(trackId, TrackFileFormat.TCX, true);
+        return true;
       case R.id.menu_markers:
-        Intent intent = new Intent(this, WaypointsList.class)
+        intent = new Intent(this, WaypointsList.class)
             .putExtra("trackid", trackDataHub.getSelectedTrackId());
         startActivityForResult(intent, Constants.SHOW_WAYPOINT);
         return true;
+      case R.id.menu_send_google:
+        intent = new Intent(this, UploadServiceChooserActivity.class)
+            .putExtra(SendRequest.SEND_REQUEST_KEY, new SendRequest(trackId, true, true, true));
+        startActivity(intent);
+        return true;
+      case R.id.menu_save_gpx:
+        startSaveActivity(trackId, TrackFileFormat.GPX, false);
+        return true;
+      case R.id.menu_save_kml:
+        startSaveActivity(trackId, TrackFileFormat.KML, false);
+        return true;
+      case R.id.menu_save_csv:
+        startSaveActivity(trackId, TrackFileFormat.CSV, false);
+        return true;
+      case R.id.menu_save_tcx:
+        startSaveActivity(trackId, TrackFileFormat.TCX, false);
+        return true;
+      case R.id.menu_edit:
+        startActivity(new Intent(this, TrackEditActivity.class)
+            .putExtra(TrackEditActivity.TRACK_ID, trackId));
+        return true;
+      case R.id.menu_delete:
+        showDialog(DIALOG_DELETE_CURRENT_ID);
+        return true;
+      case R.id.menu_my_location:
+        mapActivity = getMapActivity();
+        if (mapActivity != null) {
+          mapActivity.showMyLocation();
+        }
+        return true;
+      case R.id.menu_satellite_mode:
+        mapActivity = getMapActivity();
+        if (mapActivity != null) {
+          mapActivity.setSatelliteView(!mapActivity.isSatelliteView());
+        }
+        return true;
+      case R.id.menu_chart_settings:
+        ChartActivity chartActivity = getChartActivity();
+        if (chartActivity != null) {
+          chartActivity.showChartSettingsDialog();
+        }
+        return true;
       case R.id.menu_sensor_state:
         startActivity(new Intent(this, SensorStateActivity.class));
         return true;
       case R.id.menu_settings:
         startActivity(new Intent(this, SettingsActivity.class));
         return true;
-      case R.id.menu_aggregated_statistics:
-        startActivity(new Intent(this, AggregatedStatsActivity.class));
-        return true;
       case R.id.menu_help:
         startActivity(new Intent(this, WelcomeActivity.class));
         return true;
-      case R.id.menu_search:
-        onSearchRequested();
-        return true;
-      case R.id.menu_chart_settings:
-        ChartActivity chartActivity = (ChartActivity) getLocalActivityManager()
-            .getActivity(CHART_TAB_TAG);
-        if (chartActivity != null) {
-          chartActivity.showChartSettingsDialog();
-        }
-        return true;
-      case R.id.menu_my_location:
-        mapActivity = (MapActivity) getLocalActivityManager().getActivity(MAP_TAB_TAG);
-        if (mapActivity != null) {
-          mapActivity.showMyLocation();
-        }
-        return true;
-      case R.id.menu_satellite_mode:
-        mapActivity = (MapActivity) getLocalActivityManager().getActivity(MAP_TAB_TAG);
-        if (mapActivity != null) {
-          mapActivity.setSatelliteView(!mapActivity.isSatelliteView());
-        }
-        return true;
       default:
         return false;
     }
@@ -296,7 +377,7 @@ public class TrackDetailActivity extends TabActivity implements OnTouchListener
   @Override
   public void onActivityResult(int requestCode, int resultCode, final Intent results) {
     if (requestCode != Constants.SHOW_WAYPOINT) {
-      Log.d(TAG, "Warning unhandled request code: " + requestCode);
+      Log.d(TAG, "Invalid request code: " + requestCode);
       return;
     }
     if (results != null) {
@@ -314,18 +395,30 @@ public class TrackDetailActivity extends TabActivity implements OnTouchListener
   @Override
   public boolean onTrackballEvent(MotionEvent event) {
     if (event.getAction() == MotionEvent.ACTION_DOWN) {
-      if (ServiceUtils.isRecording(this, trackRecordingServiceConnection.getServiceIfBound(), sharedPreferences)) {
-        try {
-          insertWaypoint(WaypointCreationRequest.DEFAULT_STATISTICS);
-        } catch (RemoteException e) {
-          Log.e(TAG, "Cannot insert statistics marker.", e);
-        } catch (IllegalStateException e) {
-          Log.e(TAG, "Cannot insert statistics marker.", e);
+      if (isRecording()) {
+        ITrackRecordingService trackRecordingService = trackRecordingServiceConnection
+            .getServiceIfBound();
+        if (trackRecordingService == null) {
+          Log.e(TAG, "The track recording service is null");
+          return true;
         }
+        boolean success = false;
+        try {
+          long waypointId = trackRecordingService.insertWaypoint(
+              WaypointCreationRequest.DEFAULT_STATISTICS);
+          if (waypointId != -1L) {
+            success = true;
+          }
+        } catch (RemoteException e) {
+          Log.e(TAG, "Unable to insert waypoint", e);
+        }
+        Toast.makeText(this,
+            success ? R.string.marker_insert_success : R.string.marker_insert_error,
+            success ? Toast.LENGTH_SHORT : Toast.LENGTH_LONG)
+            .show();
         return true;
       }
     }
-
     return super.onTrackballEvent(event);
   }
 
@@ -337,85 +430,87 @@ public class TrackDetailActivity extends TabActivity implements OnTouchListener
     return false;
   }
 
-  private void showWaypoint(long trackId, long waypointId) {
-    MapActivity map =
-        (MapActivity) getLocalActivityManager().getActivity("tab1");
-    if (map != null) {
-      getTabHost().setCurrentTab(0);
-      map.showWaypoint(trackId, waypointId);
-    } else {
-      Log.e(TAG, "Couldnt' get map tab");
-    }
+  /**
+   * Updates the menu.
+   */
+  private void updateMenu() {
+    updateMenuItems(isRecording());
   }
 
   /**
-   * Inserts a waypoint marker.
+   * s Updates the menu items.
    *
-   * TODO: Merge with WaypointsList#insertWaypoint.
+   * @param isRecording true if recording
+   */
+  private void updateMenuItems(boolean isRecording) {
+    if (stopRecording != null) {
+      stopRecording.setVisible(isRecording);
+    }
+    if (insertMarker != null) {
+      insertMarker.setVisible(isRecording);
+    }
+    if (play != null) {
+      play.setVisible(!isRecording);
+    }
+    if (share != null) {
+      share.setVisible(!isRecording);
+    }
+    if (sendGoogle != null) {
+      sendGoogle.setVisible(!isRecording);
+    }
+    if (save != null) {
+      save.setVisible(!isRecording);
+    }
+    if (edit != null) {
+      edit.setVisible(!isRecording);
+    }
+    if (delete != null) {
+      delete.setVisible(!isRecording);
+    }
+  }
+
+  /**
+   * Starts the {@link TrackListActivity} and ends this activity.
+   */
+  private void startTrackListActivity() {
+    Intent intent = new Intent(this, TrackListActivity.class)
+        .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+    startActivity(intent);
+    finish();
+  }
+
+  /**
+   * Starts the {@link SaveActivity} to save a track.
    *
-   * @return Id of the inserted statistics marker.
-   * @throws RemoteException If the call on the service failed.
+   * @param trackId the track id
+   * @param trackFileFormat the track file format
+   * @param shareTrack true to share the track after saving
    */
-  private long insertWaypoint(WaypointCreationRequest request) throws RemoteException {
-    ITrackRecordingService trackRecordingService = trackRecordingServiceConnection.getServiceIfBound();
-    if (trackRecordingService == null) {
-      throw new IllegalStateException("The recording service is not bound.");
-    }
-    try {
-      long waypointId = trackRecordingService.insertWaypoint(request);
-      if (waypointId >= 0) {
-        Toast.makeText(this, R.string.marker_insert_success, Toast.LENGTH_LONG).show();
-      }
-      return waypointId;
-    } catch (RemoteException e) {
-      Toast.makeText(this, R.string.marker_insert_error, Toast.LENGTH_LONG).show();
-      throw e;
-    }
-  }
-
-  private void startRecordingNewTrack(
-      ITrackRecordingService trackRecordingService) {
-    try {
-      long recordingTrackId = trackRecordingService.startNewTrack();
-      // Select the recording track.
-      trackDataHub.loadTrack(recordingTrackId);
-      Toast.makeText(this, getString(R.string.track_record_success), Toast.LENGTH_SHORT).show();
-      // TODO: We catch Exception, because after eliminating the service process
-      // all exceptions it may throw are no longer wrapped in a RemoteException.
-    } catch (Exception e) {
-      Toast.makeText(this, getString(R.string.track_record_error), Toast.LENGTH_SHORT).show();
-      Log.w(TAG, "Unable to start recording.", e);
-    }
+  private void startSaveActivity(
+      long trackId, TrackFileFormat trackFileFormat, boolean shareTrack) {
+    Intent intent = new Intent(this, SaveActivity.class)
+        .putExtra(SaveActivity.EXTRA_TRACK_ID, trackId)
+        .putExtra(SaveActivity.EXTRA_TRACK_FILE_FORMAT, (Parcelable) trackFileFormat)
+        .putExtra(SaveActivity.EXTRA_SHARE_TRACK, shareTrack);
+    startActivity(intent);
   }
 
   /**
-   * Starts the track recording service (if not already running) and binds to
-   * it. Starts recording a new track.
+   * Returns true if recording.
    */
-  @VisibleForTesting
-  void startRecording() {
-    synchronized (trackRecordingServiceConnection) {
-      startNewTrackRequested = true;
-      trackRecordingServiceConnection.startAndBind();
-
-      // Binding was already requested before, it either already happened
-      // (in which case running the callback manually triggers the actual recording start)
-      // or it will happen in the future
-      // (in which case running the callback now will have no effect).
-      serviceBindCallback.run();
-    }
+  private boolean isRecording() {
+    return ServiceUtils.isRecording(
+        this, trackRecordingServiceConnection.getServiceIfBound(), sharedPreferences);
   }
 
   /**
-   * Stops the track recording service and unbinds from it. Will display a toast
-   * "Stopped recording" and pop up the Track Details activity.
+   * Stops the recording and the track recording service connection and shows
+   * {@link TrackEditActivity}.
    */
-  @VisibleForTesting
-  void stopRecording() {
-    // Save the track id as the shared preference will overwrite the recording track id.
-    long currentTrackId = sharedPreferences.getLong(getString(R.string.recording_track_key), -1L);
-
-    ITrackRecordingService trackRecordingService = trackRecordingServiceConnection.getServiceIfBound();
+  private void stopRecording() {
+    ITrackRecordingService trackRecordingService = trackRecordingServiceConnection
+        .getServiceIfBound();
     if (trackRecordingService != null) {
       try {
         trackRecordingService.endCurrentTrack();
@@ -423,14 +518,28 @@ public class TrackDetailActivity extends TabActivity implements OnTouchListener
         Log.e(TAG, "Unable to stop recording.", e);
       }
     }
-
     trackRecordingServiceConnection.stop();
 
-    if (currentTrackId > 0) {
+    long recordingTrackId = sharedPreferences.getLong(getString(R.string.recording_track_key), -1L);
+    if (recordingTrackId != -1L) {
       Intent intent = new Intent(this, TrackEditActivity.class)
           .putExtra(TrackEditActivity.SHOW_CANCEL, false)
-          .putExtra(TrackEditActivity.TRACK_ID, currentTrackId);
+          .putExtra(TrackEditActivity.TRACK_ID, recordingTrackId);
       startActivity(intent);
     }
   }
+
+  /**
+   * Gets the map activity, can be null.
+   */
+  private MapActivity getMapActivity() {
+    return (MapActivity) getLocalActivityManager().getActivity(MAP_TAB_TAG);
+  }
+
+  /**
+   * Gets the chart activity, can be null.
+   */
+  private ChartActivity getChartActivity() {
+    return (ChartActivity) getLocalActivityManager().getActivity(CHART_TAB_TAG);
+  }
 }