From 635006efae21cc8d98119e846c3f3abc11243313 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Fri, 23 Aug 2013 11:36:43 -0700
Subject: [PATCH] In KmlImporter, check that gx:multitrack is available before
 gx:track

---
 .../google/android/apps/mytracks/io/file/KmlImporter.java    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/KmlImporter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/KmlImporter.java
index a15c8800e..6a792baf9 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/KmlImporter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/KmlImporter.java
@@ -61,6 +61,7 @@ public class KmlImporter extends AbstractImporter {
 
   private static final String ATTRIBUTE_NAME = "name";
 
+  private boolean trackStarted = false;
   private String sensorName;
   private ArrayList<Location> locationList;
   private ArrayList<Integer> cadenceList;
@@ -88,8 +89,12 @@ public class KmlImporter extends AbstractImporter {
     if (tag.equals(TAG_PLACEMARK)) {
       onWaypointStart();
     } else if (tag.equals(TAG_GX_MULTI_TRACK)) {
+      trackStarted = true;
       onTrackStart();
     } else if (tag.equals(TAG_GX_TRACK)) {
+      if (!trackStarted) {
+        throw new SAXException("No " + TAG_GX_MULTI_TRACK);
+      }
       onTrackSegmentStart();
     } else if (tag.equals(TAG_GX_SIMPLE_ARRAY_DATA)) {
       onSensorDataStart(attributes);