provide Location to MarkerEditActivity via Intent

OpenTracksApp · Jul 19, 2024 · 766bc23 · 766bc23
1 parent 9bff3eb
commit 766bc23
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 18 deletions.
diff --git a/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java b/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java
@@ -33,6 +33,7 @@
 import de.dennisguse.opentracks.data.TrackDataHub;
 import de.dennisguse.opentracks.data.models.ActivityType;
 import de.dennisguse.opentracks.data.models.Track;
+import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.databinding.TrackRecordingBinding;
 import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
 import de.dennisguse.opentracks.fragments.StatisticsRecordingFragment;
@@ -269,9 +270,14 @@ public boolean onOptionsItemSelected(MenuItem item) {
         }
 
         if (item.getItemId() == R.id.track_detail_insert_marker) {
+            TrackPoint trackPoint = trackRecordingServiceConnection.getTrackRecordingService().getLastStoredTrackPointWithLocation();
+            if (trackPoint == null) {
+                return true;
+            }
             Intent intent = IntentUtils
                     .newIntent(this, MarkerEditActivity.class)
-                    .putExtra(MarkerEditActivity.EXTRA_TRACK_ID, trackId);
+                    .putExtra(MarkerEditActivity.EXTRA_TRACK_ID, trackId)
+                    .putExtra(MarkerEditActivity.EXTRA_LOCATION, trackPoint.getLocation());
             startActivity(intent);
             return true;
         }

diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java
@@ -139,28 +139,21 @@ Pair<Track, Pair<TrackPoint, SensorDataSet>> getDataForUI() {
     }
 
     public Marker.Id insertMarker(String name, String category, String description, String photoUrl, Track.Id trackId, TrackPoint trackPoint) {
-        Track.Id markerTrackId = trackId != null ? trackId : this.trackId;
         if (name == null) {
-            Integer nextMarkerNumber = contentProviderUtils.getNextMarkerNumber(markerTrackId);
+            Integer nextMarkerNumber = contentProviderUtils.getNextMarkerNumber(trackId);
             if (nextMarkerNumber == null) {
                 nextMarkerNumber = 1;
             }
             name = context.getString(R.string.marker_name_format, nextMarkerNumber + 1);
         }
 
-        TrackPoint markerTrackPoint = trackPoint != null ? trackPoint : lastStoredTrackPointWithLocation;
-        if (markerTrackPoint == null) {
-            Log.i(TAG, "Could not create a marker as trackPoint is unknown.");
-            return null;
-        }
-
         category = category != null ? category : "";
         description = description != null ? description : "";
         String icon = context.getString(R.string.marker_icon_url);
         photoUrl = photoUrl != null ? photoUrl : "";
 
         // Insert marker
-        Marker marker = new Marker(name, description, category, icon, markerTrackId, getTrackStatistics(), markerTrackPoint, photoUrl);
+        Marker marker = new Marker(name, description, category, icon, trackId, getTrackStatistics(), trackPoint, photoUrl);
         Uri uri = contentProviderUtils.insertMarker(marker);
         return new Marker.Id(ContentUris.parseId(uri));
     }
@@ -249,10 +242,7 @@ synchronized boolean onNewTrackPoint(@NonNull TrackPoint trackPoint) {
     }
 
     TrackStatistics getTrackStatistics() {
-        if (trackStatisticsUpdater == null) {
-            return null;
-        }
-        return trackStatisticsUpdater.getTrackStatistics();
+        return trackStatisticsUpdater == null ? null : trackStatisticsUpdater.getTrackStatistics();
     }
 
     private void insertTrackPoint(@NonNull TrackPoint trackPoint, boolean storeLastTrackPointIfUseful) {
@@ -313,6 +303,10 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
         }
     }
 
+    public TrackPoint getLastStoredTrackPointWithLocation() {
+        return lastStoredTrackPointWithLocation;
+    }
+
     public interface IdleObserver {
         void onIdle();
     }

diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
@@ -57,6 +57,10 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
     public static final RecordingData NOT_RECORDING = new RecordingData(null, null, null);
     public static final GpsStatusValue STATUS_GPS_DEFAULT = GpsStatusValue.GPS_NONE;
 
+    public TrackPoint getLastStoredTrackPointWithLocation() {
+        return trackRecordingManager.getLastStoredTrackPointWithLocation();
+    }
+
     public class Binder extends android.os.Binder {
 
         private Binder() {
@@ -270,7 +274,7 @@ public void newGpsStatus(GpsStatusValue gpsStatusValue) {
     }
 
     public Marker.Id insertMarker(String name, String category, String description, String photoUrl, Track.Id trackId, TrackPoint trackPoint) {
-        if (!isRecording() && (trackId == null || trackPoint == null)) {
+        if (trackId == null || trackPoint == null) {
             return null;
         }
 

diff --git a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerEditActivity.java b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerEditActivity.java
@@ -186,10 +186,10 @@ protected void onCreate(Bundle savedInstanceState) {
 
     private Marker.Id createNewMarker(TrackRecordingService trackRecordingService) {
         try {
-            TrackPoint trackPoint = null;
-            if (location != null) {
-                trackPoint = new TrackPoint(location, Instant.now());
+            if (location == null) {
+                throw new IllegalStateException("Location is null");
             }
+            TrackPoint trackPoint = new TrackPoint(location, Instant.now());
             Marker.Id marker = trackRecordingService.insertMarker("", "", "", null, trackId, trackPoint);
             if (marker == null) {
                 Toast.makeText(this, R.string.marker_add_error, Toast.LENGTH_LONG).show();