From f4fe1d8d970d77b300453fe8d2c5af5e1e2e318c Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Thu, 17 Dec 2020 20:06:47 +0100
Subject: [PATCH] Marker.Id must now always be valid (if present).

---
 .../de/dennisguse/opentracks/content/data/Marker.java    | 7 -------
 .../content/provider/ContentProviderUtils.java           | 9 +++------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/content/data/Marker.java b/src/main/java/de/dennisguse/opentracks/content/data/Marker.java
index 909245336..d65f2dc35 100644
--- a/src/main/java/de/dennisguse/opentracks/content/data/Marker.java
+++ b/src/main/java/de/dennisguse/opentracks/content/data/Marker.java
@@ -27,8 +27,6 @@ import androidx.annotation.VisibleForTesting;
 
 import java.util.Objects;
 
-import de.dennisguse.opentracks.util.PreferencesUtils;
-
 /**
  * @author Leif Hendrik Wilden
  * @author Rodrigo Damazio
@@ -180,11 +178,6 @@ public final class Marker {
             return id;
         }
 
-        @Deprecated //TODO Use a Id of null instead
-        public boolean isValid() {
-            return id != PreferencesUtils.RECORDING_TRACK_ID_DEFAULT;
-        }
-
         @Override
         public boolean equals(Object o) {
             if (this == o) return true;
diff --git a/src/main/java/de/dennisguse/opentracks/content/provider/ContentProviderUtils.java b/src/main/java/de/dennisguse/opentracks/content/provider/ContentProviderUtils.java
index 8e47e05e7..a1a3580d3 100644
--- a/src/main/java/de/dennisguse/opentracks/content/provider/ContentProviderUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/content/provider/ContentProviderUtils.java
@@ -400,10 +400,7 @@ public class ContentProviderUtils {
         return -1;
     }
 
-    public Marker getMarker(Marker.Id markerId) {
-        if (!markerId.isValid()) {
-            return null;
-        }
+    public Marker getMarker(@NonNull Marker.Id markerId) {
         try (Cursor cursor = getMarkerCursor(null, MarkerColumns._ID + "=?", new String[]{Long.toString(markerId.getId())}, MarkerColumns._ID, 1)) {
             if (cursor != null && cursor.moveToFirst()) {
                 return createMarker(cursor);
@@ -426,7 +423,7 @@ public class ContentProviderUtils {
 
         String selection;
         String[] selectionArgs;
-        if (minMarkerId != null && minMarkerId.isValid()) {
+        if (minMarkerId != null) {
             selection = MarkerColumns.TRACKID + "=? AND " + MarkerColumns._ID + ">=?";
             selectionArgs = new String[]{Long.toString(trackId.getId()), Long.toString(minMarkerId.getId())};
         } else {
@@ -506,7 +503,7 @@ public class ContentProviderUtils {
     ContentValues createContentValues(@NonNull Marker marker) {
         ContentValues values = new ContentValues();
 
-        if (marker.getId() != null && marker.getId().isValid()) {
+        if (marker.getId() != null) {
             values.put(MarkerColumns._ID, marker.getId().getId());
         }
         values.put(MarkerColumns.NAME, marker.getName());