forked from upstream-mirrors/OpenTracks
@@ -24,6 +24,12 @@ class MarkerIterator extends AutoCloseableIterator<Marker> {
|
||||
cursor = contentProviderUtils.getMarkerCursor(trackId, maxCount);
|
||||
}
|
||||
|
||||
@NonNull
|
||||
@Override
|
||||
public Marker get() {
|
||||
return contentProviderUtils.createMarker(cursor);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasNext() {
|
||||
if (cursor == null) {
|
||||
@@ -38,7 +44,7 @@ class MarkerIterator extends AutoCloseableIterator<Marker> {
|
||||
if (cursor == null || !cursor.moveToNext()) {
|
||||
throw new NoSuchElementException();
|
||||
}
|
||||
return contentProviderUtils.createMarker(cursor);
|
||||
return get();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -33,13 +33,19 @@ class TrackPointIterator extends AutoCloseableIterator<TrackPoint> {
|
||||
return !cursor.isLast() && !cursor.isAfterLast();
|
||||
}
|
||||
|
||||
@Override
|
||||
@NonNull
|
||||
public TrackPoint get() {
|
||||
return ContentProviderUtils.fillTrackPoint(cursor, indexes);
|
||||
}
|
||||
|
||||
@Override
|
||||
@NonNull
|
||||
public TrackPoint next() {
|
||||
if (cursor == null || !cursor.moveToNext()) {
|
||||
throw new NoSuchElementException();
|
||||
}
|
||||
return ContentProviderUtils.fillTrackPoint(cursor, indexes);
|
||||
return get();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user