forked from upstream-mirrors/OpenTracks
fix comment for 7638122cd587
This commit is contained in:
@@ -156,26 +156,13 @@ public class TrackDetailActivity extends TabActivity implements OnTouchListener
|
|||||||
tabHost.addView(layout);
|
tabHost.addView(layout);
|
||||||
layout.setOnTouchListener(this);
|
layout.setOnTouchListener(this);
|
||||||
|
|
||||||
// Get the trackid
|
handleIntent(getIntent());
|
||||||
Intent intent = getIntent();
|
}
|
||||||
trackId = intent.getLongExtra(EXTRA_TRACK_ID, -1L);
|
|
||||||
if (trackId == -1L) {
|
|
||||||
startTrackListActivity();
|
|
||||||
finish();
|
|
||||||
}
|
|
||||||
trackDataHub.loadTrack(trackId);
|
|
||||||
|
|
||||||
// Get the waypointId
|
@Override
|
||||||
long waypointId = intent.getLongExtra(EXTRA_WAYPOINT_ID, -1L);
|
protected void onNewIntent(Intent intent) {
|
||||||
if (waypointId != -1L) {
|
super.onNewIntent(intent);
|
||||||
MapActivity mapActivity = getMapActivity();
|
handleIntent(intent);
|
||||||
if (mapActivity != null) {
|
|
||||||
getTabHost().setCurrentTab(0);
|
|
||||||
mapActivity.showWaypoint(trackId, waypointId);
|
|
||||||
} else {
|
|
||||||
Log.e(TAG, "MapActivity is null");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -448,6 +435,31 @@ public class TrackDetailActivity extends TabActivity implements OnTouchListener
|
|||||||
return false;
|
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.
|
* Updates the menu.
|
||||||
*/
|
*/
|
||||||
|
|||||||
Reference in New Issue
Block a user