From 9bff3eb3cae38af0bde51811a70e51f78ad55885 Mon Sep 17 00:00:00 2001
From: Peter Storch <peter.storch@tuta.io>
Date: Tue, 16 Jul 2024 11:23:38 +0200
Subject: [PATCH] replace Objects.requireNonNullElseGet with tenary operator

---
 .../opentracks/services/TrackRecordingManager.java         | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java
index 87590bd23..1f392f93b 100644
--- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java
+++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java
@@ -14,7 +14,6 @@
 
 import java.time.Duration;
 import java.time.ZoneOffset;
-import java.util.Objects;
 
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.data.ContentProviderUtils;
@@ -140,7 +139,7 @@ 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 = Objects.requireNonNullElseGet(trackId, () -> this.trackId);
+        Track.Id markerTrackId = trackId != null ? trackId : this.trackId;
         if (name == null) {
             Integer nextMarkerNumber = contentProviderUtils.getNextMarkerNumber(markerTrackId);
             if (nextMarkerNumber == null) {
@@ -149,11 +148,11 @@ public Marker.Id insertMarker(String name, String category, String description,
             name = context.getString(R.string.marker_name_format, nextMarkerNumber + 1);
         }
 
-        if (lastStoredTrackPointWithLocation == null && trackPoint == null) {
+        TrackPoint markerTrackPoint = trackPoint != null ? trackPoint : lastStoredTrackPointWithLocation;
+        if (markerTrackPoint == null) {
             Log.i(TAG, "Could not create a marker as trackPoint is unknown.");
             return null;
         }
-        TrackPoint markerTrackPoint = Objects.requireNonNullElseGet(trackPoint, () -> lastStoredTrackPointWithLocation);
 
         category = category != null ? category : "";
         description = description != null ? description : "";