Improve cancelling async task when exporting tracks

MyTracks/src/com/google/android/apps/mytracks/io/file/AbstractTrackExporter.java

@@ -59,21 +59,6 @@ abstract class AbstractTrackExporter implements TrackExporter {
     }
   }
 
-  @Override
-  public void stopWriteTrack() {
-    if (writeThread != null && writeThread.isAlive()) {
-      Log.i(TAG, "Attempting to stop write thread");
-      writeThread.interrupt();
-      try {
-        writeThread.join();
-        Log.i(TAG, "Write thread stopped");
-      } catch (InterruptedException e) {
-        Log.e(TAG, "Interrupted while waiting for write thread to stop", e);
-        success = false;
-      }
-    }
-  }
-
   @Override
   public boolean isSuccess() {
     return success;

MyTracks/src/com/google/android/apps/mytracks/io/file/FileTrackExporter.java

@@ -86,7 +86,7 @@ public class FileTrackExporter extends AbstractTrackExporter {
   /**
    * Writes the waypoints.
    */
-  private void writeWaypoints(Track track) {
+  private void writeWaypoints(Track track) throws InterruptedException {
     /*
      * TODO: Stream through the waypoints in chunks. I am leaving the number of
      * waypoints very high which should not be a problem because we don't try to
@@ -103,6 +103,9 @@ public class FileTrackExporter extends AbstractTrackExporter {
          * first waypoint holds the stats for the track.
          */
         while (cursor.moveToNext()) {
+          if (Thread.interrupted()) {
+            throw new InterruptedException();
+          }
           if (!hasWaypoints) {
             trackWriter.writeBeginWaypoints();
             hasWaypoints = true;
@@ -135,11 +138,12 @@ public class FileTrackExporter extends AbstractTrackExporter {
     try {
       int locationNumber = 0;
       while (iterator.hasNext()) {
-        Location location = iterator.next();
-        setLocationTime(location, offset);
         if (Thread.interrupted()) {
           throw new InterruptedException();
         }
+        Location location = iterator.next();
+
+        setLocationTime(location, offset);
         locationNumber++;
 
         boolean isLocationValid = LocationUtils.isValidLocation(location);

MyTracks/src/com/google/android/apps/mytracks/io/file/KmzTrackExporter.java

@@ -44,32 +44,26 @@ public class KmzTrackExporter extends AbstractTrackExporter {
   public static final String KML_FILE_NAME = "doc.kml";
 
   private final MyTracksProviderUtils myTracksProviderUtils;
-  private final TrackExporter trackExporter;
+  private final FileTrackExporter fileTrackExporter;
   private final Track[] tracks;
 
   /**
    * Constructor.
    * 
    * @param myTracksProviderUtils the my tracks provider utils
-   * @param trackExporter the track exporter
+   * @param fileTrackExporter the file track exporter
    * @param tracks the tracks to export
    */
-  public KmzTrackExporter(
+  public KmzTrackExporter(MyTracksProviderUtils myTracksProviderUtils,
-      MyTracksProviderUtils myTracksProviderUtils, TrackExporter trackExporter, Track[] tracks) {
+      FileTrackExporter fileTrackExporter, Track[] tracks) {
     this.myTracksProviderUtils = myTracksProviderUtils;
-    this.trackExporter = trackExporter;
+    this.fileTrackExporter = fileTrackExporter;
     this.tracks = tracks;
   }
 
   @Override
   public boolean isSuccess() {
-    return trackExporter.isSuccess() && super.isSuccess();
+    return fileTrackExporter.isSuccess() && super.isSuccess();
-  }
-
-  @Override
-  public void stopWriteTrack() {
-    trackExporter.stopWriteTrack();
-    super.stopWriteTrack();
   }
 
   @Override
@@ -83,9 +77,14 @@ public class KmzTrackExporter extends AbstractTrackExporter {
       zipOutputStream.putNextEntry(zipEntry);
 
       ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-      trackExporter.writeTrack(byteArrayOutputStream);
+      fileTrackExporter.writeTrack(byteArrayOutputStream);
-      zipOutputStream.write(byteArrayOutputStream.toByteArray());
+      if (fileTrackExporter.isSuccess()) {
-      zipOutputStream.closeEntry();
+        zipOutputStream.write(byteArrayOutputStream.toByteArray());
+        zipOutputStream.closeEntry();
+      } else {
+        zipOutputStream.closeEntry();
+        throw new IOException();
+      }
 
       // Add photos
       addImages(zipOutputStream);
@@ -96,7 +95,7 @@ public class KmzTrackExporter extends AbstractTrackExporter {
     }
   }
 
-  private void addImages(ZipOutputStream zipOutputStream) throws IOException {
+  private void addImages(ZipOutputStream zipOutputStream) throws InterruptedException, IOException {
     for (Track track : tracks) {
       Cursor cursor = null;
       try {
@@ -107,6 +106,9 @@ public class KmzTrackExporter extends AbstractTrackExporter {
            * the first waypoint holds the stats for the track.
            */
           while (cursor.moveToNext()) {
+            if (Thread.interrupted()) {
+              throw new InterruptedException();
+            }
             Waypoint waypoint = myTracksProviderUtils.createWaypoint(cursor);
             String photoUrl = waypoint.getPhotoUrl();
             if (photoUrl != null && !photoUrl.equals("")) {

MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java

@@ -121,7 +121,6 @@ public class SaveActivity extends Activity {
               public void onCancel(DialogInterface dialog) {
                 saveAsyncTask.cancel(true);
                 dialog.dismiss();
-                finish();
               }
             }, directoryDisplayName);
         return progressDialog;

MyTracks/src/com/google/android/apps/mytracks/io/file/SaveAsyncTask.java

@@ -165,8 +165,9 @@ public class SaveAsyncTask extends AsyncTask<Void, Integer, Boolean> {
 
   @Override
   protected void onCancelled() {
-    if (trackExporter != null) {
+    completed = true;
-      trackExporter.stopWriteTrack();
+    if (saveActivity != null) {
+      saveActivity.onAsyncTaskCompleted(successCount, totalCount, null);
     }
   }
 
@@ -220,12 +221,13 @@ public class SaveAsyncTask extends AsyncTask<Void, Integer, Boolean> {
 
     if (trackExporter.isSuccess()) {
       savedPath = file.getAbsolutePath();
+      return true;
     } else {
       if (!file.delete()) {
         Log.w(TAG, "Failed to delete file " + file.getAbsolutePath());
       }
+      return false;
     }
-    return trackExporter.isSuccess();
   }
 
   /**

MyTracks/src/com/google/android/apps/mytracks/io/file/TrackExporter.java

@@ -32,11 +32,6 @@ public interface TrackExporter {
    */
   void writeTrack(OutputStream outputStream);
 
-  /**
-   * Stops {@link #writeTrack(OutputStream)}.
-   */
-  void stopWriteTrack();
-
   /**
    * Returns true if {@link #writeTrack(OutputStream)} completed successfully.
    */

MyTracks/src/com/google/android/apps/mytracks/io/sync/SyncUtils.java

@@ -447,9 +447,13 @@ public class SyncUtils {
     fileTrackExporter.writeTrack(new FileOutputStream(file));
     if (fileTrackExporter.isSuccess()) {
       return file;
+    } else {
+      if (!file.delete()) {
+        Log.d(TAG, "Unable to delete file for track " + track.getName());
+      }
+      Log.d(TAG, "Unable to get file for track " + track.getName());
+      return null;
     }
-    Log.d(TAG, "Unable to get file for track " + track.getName());
-    return null;
   }
   
   /**