From 19a958ccbb9ba569db31eb8a34526dc98e1528bb Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Fri, 28 Jan 2022 08:03:06 +0100 Subject: [PATCH] Cleanup. --- .../services/announcement/VoiceAnnouncementUtilsTest.java | 8 ++++---- .../opentracks/ui/intervals/IntervalStatisticsTest.java | 2 +- .../services/announcement/VoiceAnnouncement.java | 3 +-- .../opentracks/ui/intervals/IntervalStatistics.java | 5 +---- .../opentracks/ui/intervals/IntervalStatisticsModel.java | 7 ++----- 5 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java index 055e5892d..7b9ceb968 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java @@ -62,7 +62,7 @@ public class VoiceAnnouncementUtilsTest { IntervalStatistics.Interval lastInterval; try (TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(trackId, null)) { assertEquals(trackPointIterator.getCount(), numberOfPoints); - IntervalStatistics intervalStatistics = new IntervalStatistics(Distance.of(1000), Distance.of(0)); + IntervalStatistics intervalStatistics = new IntervalStatistics(Distance.of(1000)); lastInterval = intervalStatistics.getIntervalList().get(intervalStatistics.getIntervalList().size() - 1); } @@ -107,7 +107,7 @@ public class VoiceAnnouncementUtilsTest { IntervalStatistics.Interval lastInterval; try (TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(trackId, null)) { assertEquals(trackPointIterator.getCount(), numberOfPoints); - IntervalStatistics intervalStatistics = new IntervalStatistics(Distance.of(1000), Distance.of(0)); + IntervalStatistics intervalStatistics = new IntervalStatistics(Distance.of(1000)); lastInterval = intervalStatistics.getIntervalList().get(intervalStatistics.getIntervalList().size() - 1); } @@ -152,7 +152,7 @@ public class VoiceAnnouncementUtilsTest { IntervalStatistics.Interval lastInterval; try (TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(trackId, null)) { assertEquals(trackPointIterator.getCount(), numberOfPoints); - IntervalStatistics intervalStatistics = new IntervalStatistics(Distance.of(1000), Distance.of(0)); + IntervalStatistics intervalStatistics = new IntervalStatistics(Distance.of(1000)); lastInterval = intervalStatistics.getIntervalList().get(intervalStatistics.getIntervalList().size() - 1); } @@ -197,7 +197,7 @@ public class VoiceAnnouncementUtilsTest { IntervalStatistics.Interval lastInterval; try (TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(trackId, null)) { assertEquals(trackPointIterator.getCount(), numberOfPoints); - IntervalStatistics intervalStatistics = new IntervalStatistics(Distance.of(1000), Distance.of(0)); + IntervalStatistics intervalStatistics = new IntervalStatistics(Distance.of(1000)); lastInterval = intervalStatistics.getIntervalList().get(intervalStatistics.getIntervalList().size() - 1); } diff --git a/src/androidTest/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsTest.java b/src/androidTest/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsTest.java index 0648b7292..606cfa721 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsTest.java @@ -149,7 +149,7 @@ public class IntervalStatisticsTest { } private void whenAndThen(Pair trackWithStats, int numberOfPoints, float distanceInterval) { - IntervalStatistics intervalStatistics = new IntervalStatistics(Distance.of(distanceInterval), Distance.of(0)); + IntervalStatistics intervalStatistics = new IntervalStatistics(Distance.of(distanceInterval)); Track.Id trackId = trackWithStats.first; TrackStatistics trackStatistics = trackWithStats.second; try (TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(trackId, null)) { diff --git a/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncement.java b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncement.java index 1470430ba..886f733a8 100644 --- a/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncement.java +++ b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncement.java @@ -165,11 +165,10 @@ public class VoiceAnnouncement { boolean isMetricUnits = PreferencesUtils.isMetricUnits(); boolean isReportSpeed = PreferencesUtils.isReportSpeed(track.getCategory()); - Distance minGPSDistance = PreferencesUtils.getRecordingDistanceInterval(); //TODO Do not load all trackpoints for every announcement TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(track.getId(), null); - IntervalStatistics intervalStatistics = new IntervalStatistics(Distance.one(isMetricUnits), minGPSDistance); + IntervalStatistics intervalStatistics = new IntervalStatistics(Distance.one(isMetricUnits)); intervalStatistics.addTrackPoints(trackPointIterator); IntervalStatistics.Interval lastInterval = intervalStatistics.getLastInterval(); diff --git a/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatistics.java b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatistics.java index 1b8fcfb00..da564635d 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatistics.java +++ b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatistics.java @@ -17,16 +17,13 @@ public class IntervalStatistics { private TrackStatisticsUpdater trackStatisticsUpdater = new TrackStatisticsUpdater(); private final List intervalList; private final Distance distanceInterval; - private final Distance minGPSDistance; private Interval interval, lastInterval; /** * @param distanceInterval distance of every interval. - * @param minGPSDistance the setting value for GPS distance. */ - public IntervalStatistics(Distance distanceInterval, Distance minGPSDistance) { + public IntervalStatistics(Distance distanceInterval) { this.distanceInterval = distanceInterval; - this.minGPSDistance = minGPSDistance; interval = new Interval(); lastInterval = new Interval(); diff --git a/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel.java b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel.java index 4b490a0c6..8e8868877 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel.java +++ b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel.java @@ -22,7 +22,6 @@ import de.dennisguse.opentracks.data.models.Distance; import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.data.tables.TrackPointsColumns; -import de.dennisguse.opentracks.settings.PreferencesUtils; /** * This model is used to load intervals for a track. @@ -35,7 +34,6 @@ public class IntervalStatisticsModel extends AndroidViewModel { private MutableLiveData> intervalsLiveData; private IntervalStatistics intervalStatistics; private Distance distanceInterval; - private final Distance minGPSDistance; private final ContentResolver contentResolver; private ContentObserver trackPointsTableObserver; private TrackPoint.Id lastTrackPointId; @@ -46,7 +44,6 @@ public class IntervalStatisticsModel extends AndroidViewModel { public IntervalStatisticsModel(@NonNull Application application) { super(application); - minGPSDistance = PreferencesUtils.getRecordingDistanceInterval(); contentResolver = getApplication().getContentResolver(); handlerThread = new HandlerThread(TAG); handlerThread.start(); @@ -75,7 +72,7 @@ public class IntervalStatisticsModel extends AndroidViewModel { intervalsLiveData = new MutableLiveData<>(); distanceInterval = interval.getDistance(metricUnits); - intervalStatistics = new IntervalStatistics(distanceInterval, minGPSDistance); + intervalStatistics = new IntervalStatistics(distanceInterval); loadIntervalStatistics(trackId); } @@ -114,7 +111,7 @@ public class IntervalStatisticsModel extends AndroidViewModel { lastTrackPointId = null; distanceInterval = interval.getDistance(metricUnits); - intervalStatistics = new IntervalStatistics(distanceInterval, minGPSDistance); + intervalStatistics = new IntervalStatistics(distanceInterval); loadIntervalStatistics(trackId); }