From 22dafff7b766130947244103a8815f279453da15 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Wed, 21 Dec 2011 18:27:11 -0800
Subject: [PATCH] Fix issue 679.

---
 .../android/apps/mytracks/ImportAllTracks.java      | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/MyTracks/src/com/google/android/apps/mytracks/ImportAllTracks.java b/MyTracks/src/com/google/android/apps/mytracks/ImportAllTracks.java
index d148299cc..db329f7e7 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ImportAllTracks.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ImportAllTracks.java
@@ -116,7 +116,7 @@ public class ImportAllTracks {
       Log.i(Constants.TAG, "ImportAllTracks: Releasing wake lock.");
     }
 
-    activity.runOnUiThread(new Thread() {
+    activity.runOnUiThread(new Runnable() {
       @Override
       public void run() {
         showDoneDialog();
@@ -219,7 +219,7 @@ public class ImportAllTracks {
    * Attempts to import a GPX file. Returns true on success, issues error
    * notifications and returns false on failure.
    */
-  private boolean importFile(File gpxFile, MyTracksProviderUtils providerUtils) {
+  private boolean importFile(final File gpxFile, MyTracksProviderUtils providerUtils) {
     Log.i(Constants.TAG, "ImportAllTracks: importing: " + gpxFile.getName());
     try {
       importedTrackIds = GpxImporter.importGPXFile(new FileInputStream(gpxFile), providerUtils);
@@ -234,8 +234,13 @@ public class ImportAllTracks {
     } catch (IOException e) {
       Log.w(Constants.TAG, "Error reading file: " + gpxFile.getAbsolutePath(), e);
     }
-    Toast.makeText(activity, activity.getString(R.string.import_error, gpxFile.getName()),
-        Toast.LENGTH_LONG).show();
+    activity.runOnUiThread(new Runnable() {
+      @Override
+      public void run() {
+        Toast.makeText(activity, activity.getString(R.string.import_error, gpxFile.getName()),
+            Toast.LENGTH_LONG).show();
+      }
+    });
     return false;
   }