karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Marker.Id must now always be valid (if present).

Browse Source
This commit is contained in:
Dennis Guse
2020-12-17 20:06:47 +01:00
parent d1290c8f22
commit f4fe1d8d97
2 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/content/data/Marker.java
-7
View File
@@ -27,8 +27,6 @@ import androidx.annotation.VisibleForTesting;
import java.util.Objects; import java.util.Objects;
import de.dennisguse.opentracks.util.PreferencesUtils;
/** /**
* @author Leif Hendrik Wilden * @author Leif Hendrik Wilden
* @author Rodrigo Damazio * @author Rodrigo Damazio
@@ -180,11 +178,6 @@ public final class Marker {
return id; return id;
} }
@Deprecated //TODO Use a Id of null instead
public boolean isValid() {
return id != PreferencesUtils.RECORDING_TRACK_ID_DEFAULT;
}
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (this == o) return true; if (this == o) return true;
src/main/java/de/dennisguse/opentracks/content/provider/ContentProviderUtils.java
+3 -6
View File
@@ -400,10 +400,7 @@ public class ContentProviderUtils {
return -1; return -1;
} }
public Marker getMarker(Marker.Id markerId) { public Marker getMarker(@NonNull Marker.Id markerId) {
if (!markerId.isValid()) {
return null;
}
try (Cursor cursor = getMarkerCursor(null, MarkerColumns._ID + "=?", new String[]{Long.toString(markerId.getId())}, MarkerColumns._ID, 1)) { try (Cursor cursor = getMarkerCursor(null, MarkerColumns._ID + "=?", new String[]{Long.toString(markerId.getId())}, MarkerColumns._ID, 1)) {
if (cursor != null && cursor.moveToFirst()) { if (cursor != null && cursor.moveToFirst()) {
return createMarker(cursor); return createMarker(cursor);
@@ -426,7 +423,7 @@ public class ContentProviderUtils {
String selection; String selection;
String[] selectionArgs; String[] selectionArgs;
if (minMarkerId != null && minMarkerId.isValid()) { if (minMarkerId != null) {
selection = MarkerColumns.TRACKID + "=? AND " + MarkerColumns._ID + ">=?"; selection = MarkerColumns.TRACKID + "=? AND " + MarkerColumns._ID + ">=?";
selectionArgs = new String[]{Long.toString(trackId.getId()), Long.toString(minMarkerId.getId())}; selectionArgs = new String[]{Long.toString(trackId.getId()), Long.toString(minMarkerId.getId())};
} else { } else {
@@ -506,7 +503,7 @@ public class ContentProviderUtils {
ContentValues createContentValues(@NonNull Marker marker) { ContentValues createContentValues(@NonNull Marker marker) {
ContentValues values = new ContentValues(); 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._ID, marker.getId().getId());
} }
values.put(MarkerColumns.NAME, marker.getName()); values.put(MarkerColumns.NAME, marker.getName());