When updating a track based on google drive changes, revert

if the google drive file is invalid.

MyTracksLib/src/com/google/android/apps/mytracks/content/MyTracksProviderUtils.java

@@ -40,13 +40,6 @@ public interface MyTracksProviderUtils {
    */
   public static final String AUTHORITY = "com.google.android.maps.mytracks";
 
-  /**
-   * Clears a track. Removes waypoints and trackpoints. Only keeps the track id.
-   * 
-   * @param trackId the track id
-   */
-  public void clearTrack(long trackId);
-
   /**
    * Creates a {@link Track} from a cursor.
    * 

MyTracksLib/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java

@@ -50,14 +50,6 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
     this.contentResolver = contentResolver;
   }
 
-  @Override
-  public void clearTrack(long trackId) {
-    deleteTrackPointsAndWaypoints(trackId);
-    Track track = new Track();
-    track.setId(trackId);
-    updateTrack(track);
-  }
-
   @Override
   public Track createTrack(Cursor cursor) {
     int idIndex = cursor.getColumnIndexOrThrow(TracksColumns._ID);
@@ -184,21 +176,6 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
 
   @Override
   public void deleteTrack(long trackId) {
-    deleteTrackPointsAndWaypoints(trackId);
-
-    // Delete track last since it triggers a database vaccum call
-    contentResolver.delete(TracksColumns.CONTENT_URI, TracksColumns._ID + "=?",
-        new String[] { Long.toString(trackId) });
-  }
-
-  /**
-   * Deletes track points and waypoints of a track. Assumes
-   * {@link TracksColumns#STARTID}, {@link TracksColumns#STOPID}, and
-   * {@link TracksColumns#NUMPOINTS} will be updated by the caller.
-   * 
-   * @param trackId the track id
-   */
-  private void deleteTrackPointsAndWaypoints(long trackId) {
     Track track = getTrack(trackId);
     if (track != null) {
       String where = TrackPointsColumns._ID + ">=? AND " + TrackPointsColumns._ID + "<=?";
@@ -208,6 +185,10 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
     }
     contentResolver.delete(WaypointsColumns.CONTENT_URI, WaypointsColumns.TRACKID + "=?",
         new String[] { Long.toString(trackId) });
+
+    // Delete track last since it triggers a database vaccum call
+    contentResolver.delete(TracksColumns.CONTENT_URI, TracksColumns._ID + "=?",
+        new String[] { Long.toString(trackId) });
   }
 
   @Override