From c289fd174d74b4ee409165e9d8958b80fc6cfb51 Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Thu, 1 Jul 2021 22:37:18 +0200 Subject: [PATCH] Cleanup. --- .../provider/CustomContentProviderUtilsTest.java | 4 ++-- .../io/file/importer/ExportImportTest.java | 2 +- .../io/file/importer/KMLImportTest.java | 6 +++--- .../opentracks/AbstractTrackDeleteActivity.java | 1 - .../opentracks/ShowOnMapProxyActivity.java | 2 +- .../content/provider/ContentProviderUtils.java | 15 --------------- .../content/provider/ShareContentProvider.java | 2 +- .../opentracks/fragments/IntervalsFragment.java | 1 - .../dennisguse/opentracks/util/IntentUtils.java | 2 +- .../opentracks/viewmodels/IntervalStatistics.java | 1 - 10 files changed, 9 insertions(+), 27 deletions(-) diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderUtilsTest.java index 9b23fe736..704495d3b 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderUtilsTest.java @@ -503,7 +503,7 @@ public class CustomContentProviderUtilsTest { contentProviderUtils.insertMarker(marker1); // Check insert was done. - assertEquals(contentProviderUtils.getMarkerCount(trackId), 1); + assertEquals(contentProviderUtils.getMarkers(trackId).size(), 1); // Get marker id that needs to delete. Marker.Id marker1Id = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(marker1))); @@ -530,7 +530,7 @@ public class CustomContentProviderUtilsTest { contentProviderUtils.insertMarker(marker1); // Check insert was done. - assertEquals(contentProviderUtils.getMarkerCount(trackId), 1); + assertEquals(contentProviderUtils.getMarkers(trackId).size(), 1); // Get marker id that needs to delete. Marker.Id marker1Id = new Marker.Id(ContentUris.parseId(contentProviderUtils.insertMarker(marker1))); diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java index 13a7aef0f..8235bc528 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java @@ -341,7 +341,7 @@ public class ExportImportTest { } private void assertMarkers() { - assertEquals(markers.size(), contentProviderUtils.getMarkerCount(importTrackId)); + assertEquals(markers.size(), contentProviderUtils.getMarkers(importTrackId).size()); List importedMarkers = contentProviderUtils.getMarkers(importTrackId); for (int i = 0; i < markers.size(); i++) { diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/KMLImportTest.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/KMLImportTest.java index b28f6239c..c49a6a76e 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/KMLImportTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/KMLImportTest.java @@ -76,7 +76,7 @@ public class KMLImportTest { assertEquals("", importedTrack.getIcon()); // 2. markers - assertEquals(0, contentProviderUtils.getMarkerCount(importTrackId)); + assertEquals(0, contentProviderUtils.getMarkers(importTrackId).size()); // 3. trackpoints List importedTrackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, importTrackId); @@ -125,7 +125,7 @@ public class KMLImportTest { assertEquals("", importedTrack.getIcon()); // 2. markers - assertEquals(0, contentProviderUtils.getMarkerCount(importTrackId)); + assertEquals(0, contentProviderUtils.getMarkers(importTrackId).size()); // 3. trackpoints List importedTrackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, importTrackId); @@ -165,7 +165,7 @@ public class KMLImportTest { assertEquals("UNKNOWN", importedTrack.getIcon()); // 2. markers - assertEquals(0, contentProviderUtils.getMarkerCount(importTrackId)); + assertEquals(0, contentProviderUtils.getMarkers(importTrackId).size()); // 3. trackpoints List importedTrackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, importTrackId); diff --git a/src/main/java/de/dennisguse/opentracks/AbstractTrackDeleteActivity.java b/src/main/java/de/dennisguse/opentracks/AbstractTrackDeleteActivity.java index 097a13ae4..df3b13c21 100644 --- a/src/main/java/de/dennisguse/opentracks/AbstractTrackDeleteActivity.java +++ b/src/main/java/de/dennisguse/opentracks/AbstractTrackDeleteActivity.java @@ -22,7 +22,6 @@ import androidx.annotation.Nullable; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.stream.Collectors; import de.dennisguse.opentracks.content.data.Track; diff --git a/src/main/java/de/dennisguse/opentracks/ShowOnMapProxyActivity.java b/src/main/java/de/dennisguse/opentracks/ShowOnMapProxyActivity.java index 48b5907f5..38cde113d 100644 --- a/src/main/java/de/dennisguse/opentracks/ShowOnMapProxyActivity.java +++ b/src/main/java/de/dennisguse/opentracks/ShowOnMapProxyActivity.java @@ -42,7 +42,7 @@ public abstract class ShowOnMapProxyActivity extends AppCompatActivity { * @param trackIds the track ids */ private static void showTrackfileFormat(Context context, TrackFileFormat trackFileFormat, Set trackIds) { - if (trackIds.size() == 0) { + if (trackIds.isEmpty()) { return; } 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 0b6e85578..6f294a1bc 100644 --- a/src/main/java/de/dennisguse/opentracks/content/provider/ContentProviderUtils.java +++ b/src/main/java/de/dennisguse/opentracks/content/provider/ContentProviderUtils.java @@ -416,21 +416,6 @@ public class ContentProviderUtils { return markers; } - //TODO Move to testing package - @Deprecated - public int getMarkerCount(Track.Id trackId) { - String[] projection = new String[]{"count(*) AS count"}; - String selection = MarkerColumns.TRACKID + "=?"; - String[] selectionArgs = new String[]{Long.toString(trackId.getId())}; - try (Cursor cursor = contentResolver.query(MarkerColumns.CONTENT_URI, projection, selection, selectionArgs, MarkerColumns._ID)) { - if (cursor == null) { - return 0; - } - cursor.moveToFirst(); - return cursor.getInt(0); - } - } - /** * @return the content provider URI of the inserted marker. */ diff --git a/src/main/java/de/dennisguse/opentracks/content/provider/ShareContentProvider.java b/src/main/java/de/dennisguse/opentracks/content/provider/ShareContentProvider.java index 616582c5f..5d7cf220f 100644 --- a/src/main/java/de/dennisguse/opentracks/content/provider/ShareContentProvider.java +++ b/src/main/java/de/dennisguse/opentracks/content/provider/ShareContentProvider.java @@ -77,7 +77,7 @@ public class ShareContentProvider extends CustomContentProvider { } public static Pair createURI(Set trackIds, String trackName, @NonNull TrackFileFormat trackFileFormat) { - if (trackIds.size() == 0) { + if (trackIds.isEmpty()) { throw new UnsupportedOperationException(); } diff --git a/src/main/java/de/dennisguse/opentracks/fragments/IntervalsFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/IntervalsFragment.java index 2980cec7d..ec3dd2028 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/IntervalsFragment.java +++ b/src/main/java/de/dennisguse/opentracks/fragments/IntervalsFragment.java @@ -64,7 +64,6 @@ public class IntervalsFragment extends Fragment { /** * Creates an instance of this class. * - * @param trackId * @param fromTopToBottom If true then the intervals are shown from top to bottom (the first interval on top). Otherwise the intervals are shown from bottom to top. * @return IntervalsFragment instance. */ diff --git a/src/main/java/de/dennisguse/opentracks/util/IntentUtils.java b/src/main/java/de/dennisguse/opentracks/util/IntentUtils.java index fa58d105e..10ad360d0 100644 --- a/src/main/java/de/dennisguse/opentracks/util/IntentUtils.java +++ b/src/main/java/de/dennisguse/opentracks/util/IntentUtils.java @@ -136,7 +136,7 @@ public class IntentUtils { uris.add(marker.getPhotoURI()); } - if (uris.size() == 0) { + if (uris.isEmpty()) { return null; } diff --git a/src/main/java/de/dennisguse/opentracks/viewmodels/IntervalStatistics.java b/src/main/java/de/dennisguse/opentracks/viewmodels/IntervalStatistics.java index a751876ce..b0aab9cc6 100644 --- a/src/main/java/de/dennisguse/opentracks/viewmodels/IntervalStatistics.java +++ b/src/main/java/de/dennisguse/opentracks/viewmodels/IntervalStatistics.java @@ -37,7 +37,6 @@ public class IntervalStatistics { /** * Complete intervals with the tracks points from the iterator. * - * @param trackPointIterator * @return the last track point's id used to compute the intervals. */ public TrackPoint.Id addTrackPoints(TrackPointIterator trackPointIterator) {