From 80b26f2a04a9c273c2461cdfdf32aff15889b3c8 Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Sun, 17 Jan 2021 17:36:06 +0100 Subject: [PATCH] MarkerDetail accepts Marker.Id also as `long`. Fixes #567. --- .../de/dennisguse/opentracks/MarkerDetailActivity.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/dennisguse/opentracks/MarkerDetailActivity.java b/src/main/java/de/dennisguse/opentracks/MarkerDetailActivity.java index a7010461c..6d3f2f78f 100644 --- a/src/main/java/de/dennisguse/opentracks/MarkerDetailActivity.java +++ b/src/main/java/de/dennisguse/opentracks/MarkerDetailActivity.java @@ -58,7 +58,15 @@ public class MarkerDetailActivity extends AbstractActivity implements DeleteMark protected void onCreate(Bundle bundle) { super.onCreate(bundle); - Marker.Id markerId = getIntent().getParcelableExtra(EXTRA_MARKER_ID); + Object bundleMarkerId = getIntent().getExtras().get(EXTRA_MARKER_ID); + Marker.Id markerId = null; + if (bundleMarkerId instanceof Marker.Id) { + markerId = (Marker.Id) bundleMarkerId; + } + if (bundleMarkerId instanceof Long) { + //Incoming Intent via Dashboard API. + markerId = new Marker.Id((Long) bundleMarkerId); + } if (markerId == null) { Log.d(TAG, "invalid marker id"); finish();