From 8b4c05ead38b33cde215e514494706b2ce949262 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Thu, 5 Apr 2012 09:26:23 -0700
Subject: [PATCH] fix comment for 7638122cd587

---
 .../apps/mytracks/TrackDetailActivity.java    | 52 ++++++++++++-------
 1 file changed, 32 insertions(+), 20 deletions(-)

diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
index 6c4909365..1ea25bcaf 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
@@ -156,26 +156,13 @@ public class TrackDetailActivity extends TabActivity implements OnTouchListener
     tabHost.addView(layout);
     layout.setOnTouchListener(this);
     
-    // Get the trackid
-    Intent intent = getIntent();
-    trackId = intent.getLongExtra(EXTRA_TRACK_ID, -1L);
-    if (trackId == -1L) {
-      startTrackListActivity();
-      finish();
-    }
-    trackDataHub.loadTrack(trackId);
-    
-    // Get the waypointId
-    long waypointId = intent.getLongExtra(EXTRA_WAYPOINT_ID, -1L);
-    if (waypointId != -1L) {
-      MapActivity mapActivity = getMapActivity();
-      if (mapActivity != null) {
-        getTabHost().setCurrentTab(0);
-        mapActivity.showWaypoint(trackId, waypointId);
-      } else {
-        Log.e(TAG, "MapActivity is null");
-      }
-    }
+    handleIntent(getIntent());
+  }
+
+  @Override
+  protected void onNewIntent(Intent intent) {
+    super.onNewIntent(intent);
+    handleIntent(intent);
   }
 
   @Override
@@ -448,6 +435,31 @@ public class TrackDetailActivity extends TabActivity implements OnTouchListener
     return false;
   }
 
+  /**
+   * Handles the data in the intent.
+   */
+  private void handleIntent(Intent intent) {
+    // Get the trackid
+    trackId = intent.getLongExtra(EXTRA_TRACK_ID, -1L);
+    if (trackId == -1L) {
+      startTrackListActivity();
+      finish();
+    }
+    trackDataHub.loadTrack(trackId);
+    
+    // Get the waypointId
+    long waypointId = intent.getLongExtra(EXTRA_WAYPOINT_ID, -1L);
+    if (waypointId != -1L) {
+      MapActivity mapActivity = getMapActivity();
+      if (mapActivity != null) {
+        getTabHost().setCurrentTab(0);
+        mapActivity.showWaypoint(trackId, waypointId);
+      } else {
+        Log.e(TAG, "MapActivity is null");
+      }
+    }
+  }
+
   /**
    * Updates the menu.
    */