Merge with 3af20c63ed16c56b6e5e3d854272ec1fb8074570

MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProvider.java

@@ -15,8 +15,6 @@
  */
 package com.google.android.apps.mytracks.content;
 
-import java.util.HashMap;
-
 import com.google.android.apps.mytracks.MyTracksConstants;
 
 import android.content.ContentProvider;
@@ -148,7 +146,7 @@ public class MyTracksProvider extends ContentProvider {
         Log.w(TAG, "Upgrading database from version " + oldVersion + " to "
             + newVersion + ", adding sensor column.");
         db.execSQL("ALTER TABLE " + TRACKPOINTS_TABLE 
-          + "ADD " + TrackPointsColumns.SENSOR + " BLOB);");
+          + " ADD " + TrackPointsColumns.SENSOR + " BLOB");
       }
     }
   }

MyTracks/src/com/google/android/apps/mytracks/io/GpxImporter.java

@@ -342,8 +342,14 @@ public class GpxImporter extends DefaultHandler {
 
     // create new location and set attributes
     Location loc = new Location(LocationManager.GPS_PROVIDER);
-    loc.setLatitude(Double.parseDouble(latitude));
-    loc.setLongitude(Double.parseDouble(longitude));
+    try {
+      loc.setLatitude(Double.parseDouble(latitude));
+      loc.setLongitude(Double.parseDouble(longitude));
+    } catch (NumberFormatException e) {
+      String msg = createErrorMessage(
+          "Unable to parse lat/long: " + latitude + "/" + longitude);
+      throw new SAXException(msg, e);
+    }
     return loc;
   }
 
@@ -472,9 +478,14 @@ public class GpxImporter extends DefaultHandler {
     }
   }
 
-  private void onAltitudeElementEnd() {
+  private void onAltitudeElementEnd() throws SAXException {
     if (location != null) {
-      location.setAltitude(Double.parseDouble(content));
+      try {
+        location.setAltitude(Double.parseDouble(content));
+      } catch (NumberFormatException e) {
+        String msg = createErrorMessage("Unable to parse altitude: " + content);
+        throw new SAXException(msg, e);
+      }
     }
   }