diff --git a/MyTracks/res/values-ja/strings.xml b/MyTracks/res/values-ja/strings.xml
index 2a8023462..5732e571f 100644
--- a/MyTracks/res/values-ja/strings.xml
+++ b/MyTracks/res/values-ja/strings.xml
@@ -154,7 +154,6 @@ limitations under the License.
   <string name="tracklist_clear_map">マップのクリア</string>
   <!-- Import All -->
   <string name="tracklist_btn_import_all">全てインポート</string>
-  <string name="import_done">インポート終了</string>
   <!-- Format:
   $1 : Successful imports
   $2 : Attempted imports
diff --git a/MyTracks/res/values-ru/strings.xml b/MyTracks/res/values-ru/strings.xml
index 062383b40..5e3068b2f 100644
--- a/MyTracks/res/values-ru/strings.xml
+++ b/MyTracks/res/values-ru/strings.xml
@@ -157,7 +157,6 @@ limitations under the License.
   <string name="tracklist_clear_map">Очистить карту</string>
   <!-- Import All -->
   <string name="tracklist_btn_import_all">Импорт всех</string>
-  <string name="import_done">Импорт закончен</string>
   <!-- Format:
   $1 : Successful imports
   $2 : Attempted imports
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index 8d7c37b0f..694c2520d 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -45,6 +45,7 @@ limitations under the License.
   <string name="error_invalid_gpx_format">File does not have a valid GPX format.</string>
   <string name="error_generic">An error occurred. Please try again.</string>
   <string name="error_track_does_not_exist">Track does not exist.</string>
+  <string name="error_operation_cancelled">The operation was cancelled.</string>
   <string name="error_out_of_memory">This file is too big (must be less than 500 KB). Aborting.</string>
   <string name="error_unable_to_insert_marker">Unable to insert marker. No location fix available.</string>
 
@@ -157,7 +158,6 @@ limitations under the License.
   <string name="tracklist_clear_map">Clear map</string>
   <!-- Import All -->
   <string name="tracklist_btn_import_all">Import all</string>
-  <string name="import_done">Import finished, imported</string>
   <!-- Format:
   $1 : Successful imports
   $2 : Attempted imports
diff --git a/MyTracks/src/com/google/android/apps/mytracks/ChartView.java b/MyTracks/src/com/google/android/apps/mytracks/ChartView.java
index a3153d014..5e50b2fa0 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ChartView.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ChartView.java
@@ -528,7 +528,7 @@ public class ChartView extends View {
           if (nearestWaypoint != null && dmin < 100) {
             Intent intent =
                 new Intent(getContext(), WaypointDetails.class);
-            intent.putExtra("waypointid", nearestWaypoint.getId());
+            intent.putExtra(WaypointDetails.WAYPOINT_ID_EXTRA, nearestWaypoint.getId());
             getContext().startActivity(intent);
             return true;
           }
@@ -728,7 +728,7 @@ public class ChartView extends View {
       }
     }
     float density = getContext().getResources().getDisplayMetrics().density;
-    // TODO: This should be function of the number of variables displayed.
+    maxLength = Math.max(maxLength, 1);
     leftBorder = (int) (density * (4 + 8 * maxLength));
     effectiveWidth = w - leftBorder - RIGHT_BORDER;
     bottomBorder = (int) (density * BOTTOM_BORDER);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/Constants.java b/MyTracks/src/com/google/android/apps/mytracks/Constants.java
index c3fc58acf..105687c5d 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/Constants.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/Constants.java
@@ -187,6 +187,14 @@ public abstract class Constants {
   public static final String RESUME_TRACK_EXTRA_NAME =
       "com.google.android.apps.mytracks.RESUME_TRACK";
 
+  /**
+   * The name of the extra intent property that holds the track information
+   * when sharing with friends
+   */
+  public static final String TRACK_EXTRA = 
+      "com.google.android.apps.mytracks.TRACK";
+  
+
   public static int getActionFromMenuId(int menuId) {
     switch (menuId) {
       case Constants.MENU_SEND_TO_GOOGLE:
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MapOverlay.java b/MyTracks/src/com/google/android/apps/mytracks/MapOverlay.java
index c72abc5d2..c6e8acfa3 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MapOverlay.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MapOverlay.java
@@ -461,7 +461,7 @@ public class MapOverlay extends Overlay {
     if (waypoint != null &&
         dmin < 15000000 / Math.pow(2, mapView.getZoomLevel())) {
       Intent intent = new Intent(context, WaypointDetails.class);
-      intent.putExtra("waypointid", waypoint.getId());
+      intent.putExtra(WaypointDetails.WAYPOINT_ID_EXTRA, waypoint.getId());
       context.startActivity(intent);
       return true;
     }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
index 7d0fb495d..235e4f6ff 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
@@ -16,6 +16,7 @@
 package com.google.android.apps.mytracks;
 
 import static com.google.android.apps.mytracks.Constants.TAG;
+import static com.google.android.apps.mytracks.Constants.TRACK_EXTRA;
 import static com.google.android.apps.mytracks.DialogManager.DIALOG_IMPORT_PROGRESS;
 import static com.google.android.apps.mytracks.DialogManager.DIALOG_PROGRESS;
 import static com.google.android.apps.mytracks.DialogManager.DIALOG_SEND_TO_GOOGLE;
@@ -1159,9 +1160,9 @@ public class MyTracks extends TabActivity implements OnTouchListener,
     return false;
   }
 
-  protected String getFusionTablesUrl(long sendToTrackId2) {
-    Track track = providerUtils.getTrack(sendToTrackId);
-    return SendToFusionTables.getMapVisualizationUrl(track);
+  protected String getFusionTablesUrl(long trackId) {
+    Track track = providerUtils.getTrack(trackId);
+    return track == null ? "" : SendToFusionTables.getMapVisualizationUrl(track);
   }
 
   /**
@@ -1245,7 +1246,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
    *
    * @param trackId The id of the track to be sent
    */
-  public void sendTrack(long trackId, final TrackFileFormat format) {
+  public void sendTrack(final long trackId, final TrackFileFormat format) {
     TrackWriter writer = TrackWriterFactory.newWriter(this, providerUtils, trackId, format);
 
     FileUtils fileUtils = new FileUtils();
@@ -1273,6 +1274,8 @@ public class MyTracks extends TabActivity implements OnTouchListener,
         shareIntent.setType(format.getMimeType());
         Uri u = Uri.fromFile(new File(writer.getAbsolutePath()));
         shareIntent.putExtra(Intent.EXTRA_STREAM, u);
+        Track track = providerUtils.getTrack(trackId);
+        shareIntent.putExtra(TRACK_EXTRA, track);
         startActivity(Intent.createChooser(shareIntent,
             getResources().getText(R.string.share_track).toString()));
       }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackList.java b/MyTracks/src/com/google/android/apps/mytracks/TrackList.java
index 990062836..d39fbc032 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackList.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackList.java
@@ -197,8 +197,13 @@ public class TrackList extends ListActivity
     listView = getListView();
     listView.setOnCreateContextMenuListener(contextMenuListener);
 
-    findViewById(R.id.tracklist_btn_delete_all).setOnClickListener(this);
-    findViewById(R.id.tracklist_btn_export_all).setOnClickListener(this);
+    View deleteAll = findViewById(R.id.tracklist_btn_delete_all);
+    View exportAll = findViewById(R.id.tracklist_btn_export_all);
+    boolean notRecording = !MyTracks.getInstance().isRecording();
+    deleteAll.setOnClickListener(this);
+    deleteAll.setEnabled(notRecording);
+    exportAll.setOnClickListener(this);
+    exportAll.setEnabled(notRecording);
     findViewById(R.id.tracklist_btn_import_all).setOnClickListener(this);
 
     SharedPreferences preferences =
diff --git a/MyTracks/src/com/google/android/apps/mytracks/WriteProgressController.java b/MyTracks/src/com/google/android/apps/mytracks/WriteProgressController.java
index 514f2fc02..3f0356756 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/WriteProgressController.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/WriteProgressController.java
@@ -20,6 +20,7 @@ import com.google.android.maps.mytracks.R;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
+import android.content.DialogInterface;
 
 /**
  * Given a {@link TrackWriter}, this class manages the process of writing the
@@ -66,6 +67,7 @@ class WriteProgressController {
     dialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
     dialog.setMessage(activity.getString(R.string.write_progress_message));
     dialog.setIndeterminate(true);
+    dialog.setOnCancelListener(dialogCancelListener);
 
     writer.setOnCompletionListener(writerCompleteListener);
     writer.setOnWriteListener(writerWriteListener);
@@ -87,6 +89,14 @@ class WriteProgressController {
     return dialog;
   }
 
+  private final DialogInterface.OnCancelListener dialogCancelListener =
+    new DialogInterface.OnCancelListener() {
+      @Override
+      public void onCancel(DialogInterface dialog) {
+        writer.stopWriteTrack();
+      }
+    };
+
   private final TrackWriter.OnCompletionListener writerCompleteListener =
       new TrackWriter.OnCompletionListener() {
         @Override
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackFormatWriter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackFormatWriter.java
index 11f93079c..0b7101c6f 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackFormatWriter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackFormatWriter.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2010 Google Inc.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -54,7 +54,7 @@ public interface TrackFormatWriter {
   void prepare(Track track, OutputStream out);
 
   /**
-   * @return The file extentsion (i.e. gpx, kml, ...)
+   * @return The file extension (i.e. gpx, kml, ...)
    */
   String getExtension();
 
@@ -77,7 +77,7 @@ public interface TrackFormatWriter {
    *
    * @param location the location to write
    */
-  void writeLocation(Location location);
+  void writeLocation(Location location) throws InterruptedException;
 
   /**
    * Write a way point.
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriter.java
index 411ae5061..bace24d33 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriter.java
@@ -75,6 +75,11 @@ public interface TrackWriter {
    */
   void writeTrack();
 
+  /**
+   * Stop any in-progress writes
+   */
+  void stopWriteTrack();
+
   /**
    * Returns true if the write completed successfully.
    */
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java
index 5e0adc968..d74a9c8f4 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java
@@ -57,6 +57,7 @@ class TrackWriterImpl implements TrackWriter {
   private File file = null;
   private OnCompletionListener onCompletionListener;
   private OnWriteListener onWriteListener;
+  private Thread writeThread;
 
   TrackWriterImpl(Context context, MyTracksProviderUtils providerUtils,
       Track track, TrackFormatWriter writer) {
@@ -89,28 +90,60 @@ class TrackWriterImpl implements TrackWriter {
 
   @Override
   public void writeTrackAsync() {
-    Thread t = new Thread() {
+    writeThread = new Thread() {
       @Override
       public void run() {
-        writeTrack();
+        doWriteTrack();
       }
     };
-    t.start();
+    writeThread.start();
   }
 
   @Override
   public void writeTrack() {
+    writeTrackAsync();
+    try {
+      writeThread.join();
+    } catch (InterruptedException e) {
+      Log.e(Constants.TAG, "Interrupted waiting for write to complete", e);
+    }
+  }
+
+  private void doWriteTrack() {
     // Open the input and output
     success = false;
     errorMessage = R.string.error_track_does_not_exist;
     if (track != null) {
       if (openFile()) {
-        writeDocument();
+        try {
+          writeDocument();
+        } catch (InterruptedException e) {
+          Log.i(Constants.TAG, "The track write was interrupted");
+          if (file != null) {
+            file.delete();
+          }
+          success = false;
+          errorMessage = R.string.error_operation_cancelled;
+        }
       }
     }
     finished();
   }
 
+  public void stopWriteTrack() {
+    if (writeThread != null && writeThread.isAlive()) {
+      Log.i(Constants.TAG, "Attempting to stop track write");
+      writeThread.interrupt();
+
+      try {
+        writeThread.join();
+        Log.i(Constants.TAG, "Track write stopped");
+      } catch (InterruptedException e) {
+        Log.e(Constants.TAG, "Failed to wait for writer to stop", e);
+      }
+    }
+  }
+
   @Override
   public int getErrorMessage() {
     return errorMessage;
@@ -253,7 +286,7 @@ class TrackWriterImpl implements TrackWriter {
   /**
    * Does the actual work of writing the track to the now open file.
    */
-  void writeDocument() {
+  void writeDocument() throws InterruptedException {
     Log.d(Constants.TAG, "Started writing track.");
     writer.writeHeader();
     writeWaypoints(track.getId());
@@ -265,7 +298,7 @@ class TrackWriterImpl implements TrackWriter {
     errorMessage = R.string.io_write_finished;
   }
 
-  private void writeLocations() {
+  private void writeLocations() throws InterruptedException {
     boolean wroteFirst = false;
     boolean segmentOpen = false;
     boolean isLastValid = false;
@@ -303,6 +336,9 @@ class TrackWriterImpl implements TrackWriter {
       int pointNumber = 0;
       while (it.hasNext()) {
         Location loc = it.next();
+        if (Thread.interrupted()) {
+          throw new InterruptedException();
+        }
 
         pointNumber++;
 
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 051f9949e..43e0a4be0 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
@@ -16,6 +16,8 @@
 package com.google.android.apps.mytracks.services.sensors;
 
 import com.google.android.apps.mytracks.Constants;
+import com.google.android.apps.mytracks.services.sensors.ant.AntDirectSensorManager;
+import com.google.android.apps.mytracks.services.sensors.ant.AntSRMSensorManager;
 import com.google.android.maps.mytracks.R;
 
 import android.content.Context;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/AntDirectSensorManager.java b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntDirectSensorManager.java
similarity index 96%
rename from MyTracks/src/com/google/android/apps/mytracks/services/sensors/AntDirectSensorManager.java
rename to MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntDirectSensorManager.java
index f9c2d6c4a..c8cc2c1ed 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/AntDirectSensorManager.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntDirectSensorManager.java
@@ -13,14 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.services.sensors;
+package com.google.android.apps.mytracks.services.sensors.ant;
 
 import static com.google.android.apps.mytracks.Constants.TAG;
 
 import com.google.android.apps.mytracks.Constants;
 import com.google.android.apps.mytracks.content.Sensor;
-import com.google.android.apps.mytracks.services.sensors.ant.AntChannelIdMessage;
-import com.google.android.apps.mytracks.services.sensors.ant.AntChannelResponseMessage;
 import com.google.android.maps.mytracks.R;
 
 import com.dsi.ant.AntDefine;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/AntSRMSensorManager.java b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSRMSensorManager.java
similarity index 86%
rename from MyTracks/src/com/google/android/apps/mytracks/services/sensors/AntSRMSensorManager.java
rename to MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSRMSensorManager.java
index cddc0d57e..632080697 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/AntSRMSensorManager.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSRMSensorManager.java
@@ -13,15 +13,17 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.services.sensors;
+package com.google.android.apps.mytracks.services.sensors.ant;
 
-import com.google.android.apps.mytracks.Constants;
-import com.google.android.apps.mytracks.content.Sensor;
-import com.google.android.maps.mytracks.R;
+import static com.google.android.apps.mytracks.Constants.TAG;
 
 import com.dsi.ant.AntDefine;
 import com.dsi.ant.AntMesg;
 import com.dsi.ant.exception.AntInterfaceException;
+import com.google.android.apps.mytracks.Constants;
+import com.google.android.apps.mytracks.content.Sensor;
+import com.google.android.apps.mytracks.services.sensors.SensorUtils;
+import com.google.android.maps.mytracks.R;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -84,7 +86,7 @@ public class AntSRMSensorManager extends AntSensorManager {
     byte recievedChannel = (byte) (antMessage[AntMesg.MESG_DATA_OFFSET]
                                & AntDefine.CHANNEL_NUMBER_MASK);
     if (recievedChannel != channel) {
-      Log.d(Constants.TAG, "Unexpected channel: " + recievedChannel);
+      Log.d(TAG, "Unexpected channel: " + recievedChannel);
       return;
     }
     switch (antMessage[AntMesg.MESG_ID_OFFSET]) {
@@ -98,18 +100,17 @@ public class AntSRMSensorManager extends AntSensorManager {
         handleChannelId(antMessage);
         break;
       default:
-        Log.e(Constants.TAG,
-            "Unexpected message id: " + antMessage[3]);
+        Log.e(TAG, "Unexpected message id: " + antMessage[3]);
     }
   }
 
   private void handleBroadcastData(byte[] antMessage) {
     if (deviceId == WILDCARD) {
       try {
-        Log.d(Constants.TAG, "Requesting channel id id.");
+        Log.d(TAG, "Requesting channel id id.");
         getAntReceiver().ANTRequestMessage(channel, AntMesg.MESG_CHANNEL_ID_ID);
       } catch (AntInterfaceException e) {
-        Log.e(Constants.TAG, "Failed to request channel id id", e);
+        Log.e(TAG, "Failed to request channel id id", e);
       }
     }
     setSensorState(Sensor.SensorState.CONNECTED);
@@ -121,15 +122,14 @@ public class AntSRMSensorManager extends AntSensorManager {
         parseSensorData(antMessage);
         break;
       default:
-        Log.e(Constants.TAG,
-            "Unexpected message type: " + antMessage[MESSAGE_TYPE_INDEX]);
+        Log.e(TAG, "Unexpected message type: " + antMessage[MESSAGE_TYPE_INDEX]);
     }
   }
 
   private void handleChannelId(byte[] antMessage) {
     // Store the device id.
     deviceId = antMessage[3];
-    Log.i(Constants.TAG, "Found device id: " + deviceId);
+    Log.i(TAG, "Found device id: " + deviceId);
 
     SharedPreferences prefs = context.getSharedPreferences(
         Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
@@ -142,38 +142,34 @@ public class AntSRMSensorManager extends AntSensorManager {
     if (antMessage[3] == AntMesg.MESG_EVENT_ID
         && antMessage[4] == AntDefine.EVENT_RX_SEARCH_TIMEOUT) {
       // Search timeout
-      Log.w(Constants.TAG, "Search timed out. Unassigning channel.");
+      Log.w(TAG, "Search timed out. Unassigning channel.");
       try {
         getAntReceiver().ANTUnassignChannel(channel);
       } catch (AntInterfaceException e) {
-        Log.e(Constants.TAG, "Failed to unassign ANT channel", e);
+        Log.e(TAG, "Failed to unassign ANT channel", e);
       }
       setSensorState(Sensor.SensorState.DISCONNECTED);
     } else if (antMessage[3] == AntMesg.MESG_UNASSIGN_CHANNEL_ID) {
       setSensorState(Sensor.SensorState.DISCONNECTED);
-      Log.i(Constants.TAG,
-          "Disconnected from the sensor: " + getSensorState());
+      Log.i(TAG, "Disconnected from the sensor: " + getSensorState());
     }
   }
 
   private void parseSensorData(byte[] antMessage) {
     if (antMessage.length != 11) {
-      Log.e(Constants.TAG,
-          "Unexpected ant message length: " + antMessage.length);
+      Log.e(TAG, "Unexpected ant message length: " + antMessage.length);
       return;
     }
 
     int newMessageId = antMessage[MESSAGE_ID_INDEX] & 0xFF;
     if (lastMessageId == newMessageId) {
       // Repeated message.
-      Log.i(Constants.TAG,
-          String.format("SRM ignoring repeat: 0x%X", newMessageId));
+      Log.i(TAG, String.format("SRM ignoring repeat: 0x%X", newMessageId));
       return;
     }
     if (newMessageId < lastMessageId) {
       if (!(newMessageId < 20 && lastMessageId > 200)) {
-        Log.i(Constants.TAG,
-            String.format("SRM ignoring repeat: 0x%X", newMessageId));
+        Log.i(TAG, String.format("SRM ignoring repeat: 0x%X", newMessageId));
         return;
       } // else assume the byte overflowed to 0.
     }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSensor.java b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSensor.java
new file mode 100644
index 000000000..beac735a5
--- /dev/null
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSensor.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.google.android.apps.mytracks.services.sensors.ant;
+
+/**
+ * A enum which stores static data about ANT sensors.
+ *
+ * @author Matthew Simmons
+ */
+public enum AntSensor {
+  SENSOR_HEART_RATE (Constants.ANT_DEVICE_TYPE_HRM),
+  SENSOR_CADENCE (Constants.ANT_DEVICE_TYPE_CADENCE),
+  SENSOR_SPEED (Constants.ANT_DEVICE_TYPE_SPEED),
+  SENSOR_POWER (Constants.ANT_DEVICE_TYPE_POWER);
+
+  private static class Constants {
+    public static byte ANT_DEVICE_TYPE_POWER = 11;
+    public static byte ANT_DEVICE_TYPE_HRM = 120;
+    public static byte ANT_DEVICE_TYPE_CADENCE = 122;
+    public static byte ANT_DEVICE_TYPE_SPEED = 123;
+  };
+
+  private final byte deviceType;
+
+  private AntSensor(byte deviceType) {
+    this.deviceType = deviceType;
+  }
+
+  public byte getDeviceType() {
+    return deviceType;
+  }
+}
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/AntSensorManager.java b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSensorManager.java
similarity index 89%
rename from MyTracks/src/com/google/android/apps/mytracks/services/sensors/AntSensorManager.java
rename to MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSensorManager.java
index 5e83a8a4a..fdd5066a4 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/AntSensorManager.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSensorManager.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.services.sensors;
+package com.google.android.apps.mytracks.services.sensors.ant;
 
-import com.google.android.apps.mytracks.Constants;
-import com.google.android.apps.mytracks.content.Sensor;
-import com.google.android.apps.mytracks.content.Sensor.SensorDataSet;
-import com.google.android.apps.mytracks.services.sensors.ant.AntStartupMessage;
+import static com.google.android.apps.mytracks.Constants.TAG;
 
 import com.dsi.ant.AntDefine;
 import com.dsi.ant.AntInterface;
 import com.dsi.ant.AntInterfaceIntent;
 import com.dsi.ant.AntMesg;
 import com.dsi.ant.exception.AntInterfaceException;
+import com.google.android.apps.mytracks.content.Sensor;
+import com.google.android.apps.mytracks.content.Sensor.SensorDataSet;
+import com.google.android.apps.mytracks.services.sensors.SensorManager;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -84,7 +84,7 @@ public abstract class AntSensorManager extends SensorManager {
     @Override
     public void onReceive(Context context, Intent intent) {
       String antAction = intent.getAction();
-      Log.i(Constants.TAG, "enter status onReceive" + antAction);
+      Log.i(TAG, "enter status onReceive" + antAction);
     }
   };
 
@@ -93,12 +93,12 @@ public abstract class AntSensorManager extends SensorManager {
     @Override
     public void onReceive(Context context, Intent intent) {
       String antAction = intent.getAction();
-      Log.i(Constants.TAG, "enter data onReceive" + antAction);
+      Log.i(TAG, "enter data onReceive" + antAction);
 
       if (antAction.equals(AntInterfaceIntent.ANT_RX_MESSAGE_ACTION)) {
         byte[] antMessage = intent.getByteArrayExtra(AntInterfaceIntent.ANT_MESSAGE);
         if (DEBUGGING) {
-          Log.d(Constants.TAG, "Received RX message " + messageToString(antMessage));
+          Log.d(TAG, "Received RX message " + messageToString(antMessage));
         }
 
         handleMessage(antMessage);
@@ -119,7 +119,7 @@ public abstract class AntSensorManager extends SensorManager {
 
     @Override
     public void onServiceDisconnected() {
-      Log.d(Constants.TAG, "ANT interface reports disconnection");
+      Log.d(TAG, "ANT interface reports disconnection");
     }
   };
 
@@ -129,14 +129,14 @@ public abstract class AntSensorManager extends SensorManager {
 
   @Override
   public void onDestroy() {
-    Log.i(Constants.TAG, "destroying AntSensorManager");
+    Log.i(TAG, "destroying AntSensorManager");
     context.unregisterReceiver(statusReceiver);
     context.unregisterReceiver(dataReceiver);
 
     try {
       antReceiver.releaseInterface();
     } catch (AntInterfaceException e) {
-      Log.e(Constants.TAG, "failed to release ANT interface", e);
+      Log.e(TAG, "failed to release ANT interface", e);
     }
 
     antReceiver.destroy();
@@ -177,7 +177,7 @@ public abstract class AntSensorManager extends SensorManager {
     antReceiver = AntInterface.getInstance(context, antServiceListener);
 
     if (antReceiver == null) {
-      Log.e(Constants.TAG, "Failed to get ANT Receiver");
+      Log.e(TAG, "Failed to get ANT Receiver");
       return;
     }
 
@@ -190,11 +190,11 @@ public abstract class AntSensorManager extends SensorManager {
    * to initiate any ANT commands.
    */
   private synchronized void serviceConnected() {
-    Log.d(Constants.TAG, "ANT service connected");
+    Log.d(TAG, "ANT service connected");
 
     try {
       if (!antReceiver.claimInterface()) {
-        Log.e(Constants.TAG, "failed to claim ANT interface");
+        Log.e(TAG, "failed to claim ANT interface");
         return;
       }
 
@@ -202,14 +202,14 @@ public abstract class AntSensorManager extends SensorManager {
         // Make sure not to call AntInterface.enable() again, if it has been
         // already called before
         if (antInterrupted == false) {
-          Log.i(Constants.TAG, "Powering on Radio");
+          Log.i(TAG, "Powering on Radio");
           antReceiver.enable();
         }
       } else {
-        Log.i(Constants.TAG, "Radio already enabled");
+        Log.i(TAG, "Radio already enabled");
       }
     } catch (AntInterfaceException e) {
-      Log.e(Constants.TAG, "failed to enable ANT", e);
+      Log.e(TAG, "failed to enable ANT", e);
     }
 
     try {
@@ -220,7 +220,7 @@ public abstract class AntSensorManager extends SensorManager {
       // that message.
       antReceiver.ANTResetSystem();
     } catch (AntInterfaceException e) {
-      Log.e(Constants.TAG, "failed to reset ANT (expected exception)", e);
+      Log.e(TAG, "failed to reset ANT (expected exception)", e);
     }
   }
 
@@ -232,7 +232,7 @@ public abstract class AntSensorManager extends SensorManager {
   protected void handleMessage(byte[] antMessage) {
     int len = antMessage[0];
     if (len != antMessage.length - 2 || antMessage.length <= 2) {
-      Log.e(Constants.TAG, "Invalid message: " + messageToString(antMessage));
+      Log.e(TAG, "Invalid message: " + messageToString(antMessage));
       return;
     }
 
@@ -253,7 +253,7 @@ public abstract class AntSensorManager extends SensorManager {
    */
   protected boolean handleMessage(byte messageId, byte[] messageData) {
     if (messageId == AntMesg.MESG_STARTUP_MESG_ID) {
-      Log.d(Constants.TAG, String.format(
+      Log.d(TAG, String.format(
           "Received startup message (reason %02x); initializing channel",
           new AntStartupMessage(messageData).getMessage()));
       setupAntSensorChannels();
@@ -305,13 +305,13 @@ public abstract class AntSensorManager extends SensorManager {
       return true;
 
     } catch (AntInterfaceException e) {
-      Log.e(Constants.TAG, "failed to setup ANT channel", e);
+      Log.e(TAG, "failed to setup ANT channel", e);
       return false;
     }
   }
 
   private void registerForAntIntents() {
-    Log.i(Constants.TAG, "Registering for ant intents.");
+    Log.i(TAG, "Registering for ant intents.");
     // Register for ANT intent broadcasts.
     IntentFilter statusIntentFilter = new IntentFilter();
     statusIntentFilter.addAction(AntInterfaceIntent.ANT_ENABLED_ACTION);
diff --git a/MyTracksLib/src/com/google/android/apps/mytracks/content/Track.java b/MyTracksLib/src/com/google/android/apps/mytracks/content/Track.java
index cf963fff7..f629a73a9 100644
--- a/MyTracksLib/src/com/google/android/apps/mytracks/content/Track.java
+++ b/MyTracksLib/src/com/google/android/apps/mytracks/content/Track.java
@@ -51,10 +51,6 @@ public class Track implements Parcelable {
       track.stats = source.readParcelable(classLoader);
 
       track.numberOfPoints = source.readInt();
-      for (int i = 0; i < track.numberOfPoints; ++i) {
-        Location loc = source.readParcelable(classLoader);
-        track.locations.add(loc);
-      }
 
       track.tableId = source.readString();
       return track;
@@ -103,9 +99,6 @@ public class Track implements Parcelable {
     dest.writeParcelable(stats, 0);
 
     dest.writeInt(numberOfPoints);
-    for (int i = 0; i < numberOfPoints; ++i) {
-      dest.writeParcelable(locations.get(i), 0);
-    }
     
     dest.writeString(tableId);
   }
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/MockTrackWriter.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/MockTrackWriter.java
index c5fbb18a3..813d42a52 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/MockTrackWriter.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/MockTrackWriter.java
@@ -59,6 +59,11 @@ public class MockTrackWriter implements TrackWriter {
     throw new UnsupportedOperationException("not implemented");
   }
 
+  @Override
+  public void stopWriteTrack() {
+    throw new UnsupportedOperationException("not implemented");
+  }
+
   @Override
   public boolean wasSuccess() {
     return false;
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackFormatWriterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackFormatWriterTest.java
index 8c265bc26..6af065c5d 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackFormatWriterTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackFormatWriterTest.java
@@ -5,18 +5,9 @@ import com.google.android.apps.mytracks.content.MyTracksLocation;
 import com.google.android.apps.mytracks.content.Sensor;
 import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.content.Waypoint;
-import com.google.android.apps.mytracks.io.file.TrackFormatWriter;
 
 import android.test.AndroidTestCase;
 
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -29,6 +20,14 @@ import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.FactoryConfigurationError;
 import javax.xml.parsers.ParserConfigurationException;
 
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Text;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
 /**
  * Base class for track format writer tests, which sets up a fake track and
  * gives auxiliary methods for verifying XML output.
@@ -105,9 +104,9 @@ public abstract class TrackFormatWriterTest extends AndroidTestCase {
    * track in {@link #track}.
    *
    * @param writer the writer to write to
-   * @return the written contents 
+   * @return the written contents
    */
-  protected String writeTrack(TrackFormatWriter writer) {
+  protected String writeTrack(TrackFormatWriter writer) throws Exception {
     OutputStream output = new ByteArrayOutputStream(BUFFER_SIZE);
     writer.prepare(track, output);
     writer.writeHeader();
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackWriterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackWriterTest.java
index 1f74dd500..7ec10b12a 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackWriterTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackWriterTest.java
@@ -9,10 +9,9 @@ import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils.Factory;
 import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.content.Waypoint;
-import com.google.android.apps.mytracks.io.file.TrackFormatWriter;
-import com.google.android.apps.mytracks.io.file.TrackWriterImpl;
 import com.google.android.apps.mytracks.services.TrackRecordingServiceTest.MockContext;
 import com.google.android.apps.mytracks.testing.TestingProviderUtilsFactory;
+import com.google.android.maps.mytracks.R;
 
 import android.content.Context;
 import android.location.Location;
@@ -25,6 +24,7 @@ import java.io.FileNotFoundException;
 import java.io.OutputStream;
 
 import org.easymock.EasyMock;
+import org.easymock.IAnswer;
 import org.easymock.IArgumentMatcher;
 import org.easymock.IMocksControl;
 
@@ -180,6 +180,43 @@ public class TrackWriterTest extends AndroidTestCase {
     mocksControl.verify();
   }
 
+  public void testWriteTrack_cancelled() throws Exception {
+    final ByteArrayOutputStream stream = new ByteArrayOutputStream();
+    writer = new OpenFileTrackWriter(
+        getContext(), providerUtils, track, formatWriter, stream, true);
+
+    formatWriter.prepare(track, stream);
+
+    final Location[] locs = {
+        new Location("fake0"),
+        new Location("fake1"),
+    };
+    fillLocations(locs);
+    assertEquals(locs.length, providerUtils.bulkInsertTrackPoints(locs, locs.length, TRACK_ID));
+
+    formatWriter.writeHeader();
+    formatWriter.writeBeginTrack(locEq(locs[0]));
+    formatWriter.writeOpenSegment();
+
+    formatWriter.writeLocation(locEq(locs[0]));
+    //EasyMock.expectLastCall().andThrow(new InterruptedException());
+    EasyMock.expectLastCall().andAnswer(new IAnswer<Object>() {
+      @Override
+      public Object answer() throws Throwable {
+        throw new InterruptedException();
+      }
+    });
+
+    mocksControl.replay();
+
+    writer.writeTrack();
+
+    mocksControl.verify();
+
+    assertFalse(writer.wasSuccess());
+    assertEquals(R.string.error_operation_cancelled, writer.getErrorMessage());
+  }
+
   public void testWriteTrack_openFails() {
     writer = new WriteTracksTrackWriter(getContext(), providerUtils, track,
         formatWriter, false);
@@ -229,7 +266,7 @@ public class TrackWriterTest extends AndroidTestCase {
     mocksControl.verify();
   }
 
-  public void testWriteDocument_emptyTrack() {
+  public void testWriteDocument_emptyTrack() throws Exception {
     writer = new TrackWriterImpl(getContext(), providerUtils, track, formatWriter);
 
     // Set expected mock behavior
@@ -244,7 +281,7 @@ public class TrackWriterTest extends AndroidTestCase {
     mocksControl.verify();
   }
 
-  public void testWriteDocument() {
+  public void testWriteDocument() throws Exception {
     writer = new TrackWriterImpl(getContext(), providerUtils, track, formatWriter);
 
     final Location[] locs = {
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/AntDirectSensorManagerTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/AntDirectSensorManagerTest.java
index 6cff03544..c50ecb985 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/AntDirectSensorManagerTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/AntDirectSensorManagerTest.java
@@ -18,6 +18,7 @@ package com.google.android.apps.mytracks.services.sensors;
 import com.dsi.ant.AntMesg;
 import com.google.android.apps.mytracks.Constants;
 import com.google.android.apps.mytracks.content.Sensor;
+import com.google.android.apps.mytracks.services.sensors.ant.AntDirectSensorManager;
 import com.google.android.maps.mytracks.R;
 
 import android.content.SharedPreferences;
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/AntSensorManagerTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/AntSensorManagerTest.java
index c636d6eae..0019bf0ae 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/AntSensorManagerTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/AntSensorManagerTest.java
@@ -15,6 +15,8 @@
  */
 package com.google.android.apps.mytracks.services.sensors;
 
+import com.google.android.apps.mytracks.services.sensors.ant.AntSensorManager;
+
 import android.test.AndroidTestCase;
 import android.test.MoreAsserts;
 
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 b25c9a9f2..933ba333a 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
@@ -1,6 +1,8 @@
 package com.google.android.apps.mytracks.services.sensors;
 
 import com.google.android.apps.mytracks.Constants;
+import com.google.android.apps.mytracks.services.sensors.ant.AntDirectSensorManager;
+import com.google.android.apps.mytracks.services.sensors.ant.AntSRMSensorManager;
 import com.google.android.maps.mytracks.R;
 
 import android.content.SharedPreferences;