From 696939112a776f10b28a2ead0aa6c524259b9e8a Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Thu, 30 Oct 2025 21:52:00 +0100 Subject: [PATCH] Cleanup: Statistics doesn't need isIdle. isIdle is only used by SegmentStatisticsUpdater. --- .../opentracks/chart/ChartPointTest.java | 6 ++-- .../data/CustomContentProviderUtilsTest.java | 1 - .../io/file/TrackFilenameGenerator2Test.java | 2 +- .../io/file/TrackFilenameGeneratorTest.java | 2 +- ...cordingServiceNotificationManagerTest.java | 1 - .../TrackRecordingServiceRecordingTest.java | 30 +++++++++---------- .../VoiceAnnouncementUtilsTest.java | 11 ------- .../share/TrackShareSummaryGeneratorTest.java | 1 - .../AggregatedStatisticsTest.java | 1 - .../opentracks/data/ContentProviderUtils.java | 2 -- .../opentracks/data/models/Statistics.java | 2 +- .../io/file/TrackFilenameGenerator.java | 2 +- .../stats/SegmentStatisticUpdater.java | 3 +- .../SettingsCustomLayoutEditAdapter.java | 1 - 14 files changed, 23 insertions(+), 42 deletions(-) diff --git a/src/androidTest/java/de/dennisguse/opentracks/chart/ChartPointTest.java b/src/androidTest/java/de/dennisguse/opentracks/chart/ChartPointTest.java index 49cf43e58..47725fcb5 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/chart/ChartPointTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/chart/ChartPointTest.java @@ -21,12 +21,12 @@ import de.dennisguse.opentracks.settings.UnitSystem; @RunWith(AndroidJUnit4.class) public class ChartPointTest { - private static final Statistics STATISTIC_NULL = new Statistics(null, null, Duration.ZERO, null, null, false, null, null, null, null, null); + private static final Statistics STATISTIC_NULL = new Statistics(null, null, Duration.ZERO, null, null, null, null, null, null, null); @Test public void create_by_time() { // given - Statistics statistics = new Statistics(null, null, Duration.ofSeconds(1000), null, null, false, null, null, null, null, null); + Statistics statistics = new Statistics(null, null, Duration.ofSeconds(1000), null, null, null, null, null, null, null); // when ChartPoint point = ChartPoint.create(statistics, TrackStubUtils.createDefaultTrackPoint(), Speed.of(0), false, UnitSystem.IMPERIAL_FEET); @@ -38,7 +38,7 @@ public class ChartPointTest { @Test public void create_by_distance() { // given - Statistics statistics = new Statistics(null, null, null, null, Distance.of(1000), false, null, null, null, null, null); + Statistics statistics = new Statistics(null, null, null, null, Distance.of(1000), null, null, null, null, null); // when ChartPoint point = ChartPoint.create(statistics, TrackStubUtils.createDefaultTrackPoint(), Speed.of(0), true, UnitSystem.METRIC); diff --git a/src/androidTest/java/de/dennisguse/opentracks/data/CustomContentProviderUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/data/CustomContentProviderUtilsTest.java index c0948bcab..ac16c0b62 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/data/CustomContentProviderUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/data/CustomContentProviderUtilsTest.java @@ -415,7 +415,6 @@ public class CustomContentProviderUtilsTest { Duration.ofMillis(1500), Duration.ofMillis(700), Distance.of(750), - false, Speed.of(60), new AltitudeExtremities(1250, 1200), new AltitudeGainLoss(50, 50), diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/TrackFilenameGenerator2Test.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/TrackFilenameGenerator2Test.java index 9c86f1471..bf53c99bb 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/io/file/TrackFilenameGenerator2Test.java +++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/TrackFilenameGenerator2Test.java @@ -37,7 +37,7 @@ public class TrackFilenameGenerator2Test { Track track = new Track(); track.setName("Best Track"); track.setUuid(UUID.fromString("f81d4fae-7dec-11d0-a765-00a0c91e6bf6")); - track.setStatistics(new Statistics(Instant.parse("2020-02-02T02:02:02Z"), null, null, null, null, false, null, null, null, null, null)); + track.setStatistics(new Statistics(Instant.parse("2020-02-02T02:02:02Z"), null, null, null, null, null, null, null, null, null)); // when subject.format(track, TrackFileFormat.GPX); diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/TrackFilenameGeneratorTest.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/TrackFilenameGeneratorTest.java index 0e014f107..84d675160 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/io/file/TrackFilenameGeneratorTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/TrackFilenameGeneratorTest.java @@ -51,7 +51,7 @@ public class TrackFilenameGeneratorTest { Track track = new Track(); track.setName("Best Track"); track.setUuid(UUID.fromString("0000fee0-0000-1000-8000-00805f9b34fb")); - track.setStatistics(new Statistics(Instant.parse("2020-02-02T02:02:02Z"), null, null, null, null, false, null, null, null, null, null)); + track.setStatistics(new Statistics(Instant.parse("2020-02-02T02:02:02Z"), null, null, null, null, null, null, null, null, null)); // when String filename = subject.format(track, TrackFileFormat.GPX); diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceNotificationManagerTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceNotificationManagerTest.java index 8c01dfe80..c17bf9cf1 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceNotificationManagerTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceNotificationManagerTest.java @@ -59,7 +59,6 @@ public class TrackRecordingServiceNotificationManagerTest { null, null, Distance.of(0), - false, null, null, null, diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceRecordingTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceRecordingTest.java index 21ff4fb90..c78317116 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceRecordingTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceRecordingTest.java @@ -107,7 +107,7 @@ public class TrackRecordingServiceRecordingTest { // then - assertEquals(new Statistics(Instant.parse(startTime), Instant.parse(startTime), Duration.ZERO, Duration.ZERO, Distance.of(0), false, Speed.zero(), new AltitudeExtremities(0.0, 0.0), null, null, null) + assertEquals(new Statistics(Instant.parse(startTime), Instant.parse(startTime), Duration.ZERO, Duration.ZERO, Distance.of(0), Speed.zero(), new AltitudeExtremities(0.0, 0.0), null, null, null) , contentProviderUtils.getTrack(trackId).getStatistics()); new TrackPointAssert().assertEquals(List.of( @@ -121,7 +121,7 @@ public class TrackRecordingServiceRecordingTest { service.endCurrentTrack(); // then - assertEquals(new Statistics(Instant.parse(startTime), Instant.parse(stopTime), Duration.ofSeconds(1), Duration.ofSeconds(1), Distance.of(0), false, Speed.zero(), new AltitudeExtremities(0.0, 0.0), new AltitudeGainLoss(0, 0), null, null) + assertEquals(new Statistics(Instant.parse(startTime), Instant.parse(stopTime), Duration.ofSeconds(1), Duration.ofSeconds(1), Distance.of(0), Speed.zero(), new AltitudeExtremities(0.0, 0.0), new AltitudeGainLoss(0, 0), null, null) , contentProviderUtils.getTrack(trackId).getStatistics()); new TrackPointAssert().assertEquals(List.of( @@ -193,7 +193,7 @@ public class TrackRecordingServiceRecordingTest { service.endCurrentTrack(); // then - assertEquals(new Statistics(Instant.parse(startTime), Instant.parse(pauseTime), Duration.ofSeconds(1), Duration.ofSeconds(1), Distance.of(0), false, Speed.zero(), new AltitudeExtremities(0.0, 0.0), new AltitudeGainLoss(0, 0), null, null) + assertEquals(new Statistics(Instant.parse(startTime), Instant.parse(pauseTime), Duration.ofSeconds(1), Duration.ofSeconds(1), Distance.of(0), Speed.zero(), new AltitudeExtremities(0.0, 0.0), new AltitudeGainLoss(0, 0), null, null) , contentProviderUtils.getTrack(trackId).getStatistics()); new TrackPointAssert().assertEquals(List.of( @@ -209,7 +209,7 @@ public class TrackRecordingServiceRecordingTest { service.resumeTrack(trackId); // then - assertEquals(new Statistics(Instant.parse(startTime), Instant.parse(resumeTime), Duration.ofSeconds(1), Duration.ofSeconds(1), Distance.of(0), false, Speed.zero(), new AltitudeExtremities(0.0, 0.0), new AltitudeGainLoss(0, 0), null, null) + assertEquals(new Statistics(Instant.parse(startTime), Instant.parse(resumeTime), Duration.ofSeconds(1), Duration.ofSeconds(1), Distance.of(0), Speed.zero(), new AltitudeExtremities(0.0, 0.0), new AltitudeGainLoss(0, 0), null, null) , contentProviderUtils.getTrack(trackId).getStatistics()); new TrackPointAssert().assertEquals(List.of( @@ -342,7 +342,7 @@ public class TrackRecordingServiceRecordingTest { TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps1, 45.0, 35.0, 1, 15); // then - assertEquals(new Statistics(Instant.parse(startTime), Instant.parse(gps1), Duration.ofSeconds(1), Duration.ofSeconds(1), Distance.of(0), false, Speed.of(15), new AltitudeExtremities(0.0, 0.0), new AltitudeGainLoss(0, 0), null, null) + assertEquals(new Statistics(Instant.parse(startTime), Instant.parse(gps1), Duration.ofSeconds(1), Duration.ofSeconds(1), Distance.of(0), Speed.of(15), new AltitudeExtremities(0.0, 0.0), new AltitudeGainLoss(0, 0), null, null) , contentProviderUtils.getTrack(trackId).getStatistics()); // when @@ -350,7 +350,7 @@ public class TrackRecordingServiceRecordingTest { TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps2, 45.0001, 35.0, 1, 15); // then - assertEquals(new Statistics(Instant.parse(startTime), Instant.parse(gps2), Duration.ofSeconds(4), Duration.ofSeconds(4), Distance.of(11.113178253173828), false, Speed.of(15), new AltitudeExtremities(0.0, 0.0), new AltitudeGainLoss(0, 0), null, null) + assertEquals(new Statistics(Instant.parse(startTime), Instant.parse(gps2), Duration.ofSeconds(4), Duration.ofSeconds(4), Distance.of(11.113178253173828), Speed.of(15), new AltitudeExtremities(0.0, 0.0), new AltitudeGainLoss(0, 0), null, null) , contentProviderUtils.getTrack(trackId).getStatistics()); // when @@ -358,7 +358,7 @@ public class TrackRecordingServiceRecordingTest { TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps3, 45.0002, 35.0, 1, 15); // then - assertEquals(new Statistics(Instant.parse(startTime), Instant.parse(gps3), Duration.ofSeconds(6), Duration.ofSeconds(6), Distance.of(22.226356506347656), false, Speed.of(15), new AltitudeExtremities(0.0, 0.0), new AltitudeGainLoss(0, 0), null, null) + assertEquals(new Statistics(Instant.parse(startTime), Instant.parse(gps3), Duration.ofSeconds(6), Duration.ofSeconds(6), Distance.of(22.226356506347656), Speed.of(15), new AltitudeExtremities(0.0, 0.0), new AltitudeGainLoss(0, 0), null, null) , contentProviderUtils.getTrack(trackId).getStatistics()); // when @@ -367,7 +367,7 @@ public class TrackRecordingServiceRecordingTest { service.endCurrentTrack(); // then - assertEquals(new Statistics(Instant.parse(startTime), Instant.parse(stopTime), Duration.ofSeconds(10), Duration.ofSeconds(10), Distance.of(22.226356506347656), false, Speed.of(15), new AltitudeExtremities(0.0, 0.0), new AltitudeGainLoss(0, 0), null, null) + assertEquals(new Statistics(Instant.parse(startTime), Instant.parse(stopTime), Duration.ofSeconds(10), Duration.ofSeconds(10), Distance.of(22.226356506347656), Speed.of(15), new AltitudeExtremities(0.0, 0.0), new AltitudeGainLoss(0, 0), null, null) , contentProviderUtils.getTrack(trackId).getStatistics()); new TrackPointAssert().assertEquals(List.of( @@ -420,7 +420,7 @@ public class TrackRecordingServiceRecordingTest { TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps1, 45.0, 35.0, 1, 15); // then - Statistics gps1Statistics = new Statistics(Instant.parse(startTime), Instant.parse(gps1), Duration.ofSeconds(1), Duration.ofSeconds(1), Distance.of(0), false, Speed.of(15), new AltitudeExtremities(0.0, 0.0), new AltitudeGainLoss(0, 0), null, null); + Statistics gps1Statistics = new Statistics(Instant.parse(startTime), Instant.parse(gps1), Duration.ofSeconds(1), Duration.ofSeconds(1), Distance.of(0), Speed.of(15), new AltitudeExtremities(0.0, 0.0), new AltitudeGainLoss(0, 0), null, null); assertEquals(gps1Statistics, contentProviderUtils.getTrack(trackId).getStatistics()); // when @@ -443,7 +443,7 @@ public class TrackRecordingServiceRecordingTest { service.endCurrentTrack(); // then - assertEquals(new Statistics(Instant.parse(startTime), Instant.parse(stopTime), Duration.ofSeconds(10), Duration.ofSeconds(10), Distance.of(2.222635507583618), false, Speed.of(15), new AltitudeExtremities(0.0, 0.0), new AltitudeGainLoss(0, 0), null, null) + assertEquals(new Statistics(Instant.parse(startTime), Instant.parse(stopTime), Duration.ofSeconds(10), Duration.ofSeconds(10), Distance.of(2.222635507583618), Speed.of(15), new AltitudeExtremities(0.0, 0.0), new AltitudeGainLoss(0, 0), null, null) , contentProviderUtils.getTrack(trackId).getStatistics()); new TrackPointAssert().assertEquals(List.of( @@ -548,7 +548,7 @@ public class TrackRecordingServiceRecordingTest { TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps1, 45.0, 35.0, 100, 15); // then - Statistics startStatistics = new Statistics(Instant.parse(startTime), Instant.parse(startTime), Duration.ofSeconds(0), Duration.ofSeconds(0), Distance.of(0), false, Speed.of(0), new AltitudeExtremities(0.0, 0.0), null, null, null); + Statistics startStatistics = new Statistics(Instant.parse(startTime), Instant.parse(startTime), Duration.ofSeconds(0), Duration.ofSeconds(0), Distance.of(0), Speed.of(0), new AltitudeExtremities(0.0, 0.0), null, null, null); assertEquals(startStatistics, contentProviderUtils.getTrack(trackId).getStatistics()); @@ -566,7 +566,7 @@ public class TrackRecordingServiceRecordingTest { service.endCurrentTrack(); // then - assertEquals(new Statistics(Instant.parse(startTime), Instant.parse(stopTime), Duration.ofSeconds(10), Duration.ofSeconds(10), Distance.of(0), false, Speed.of(0), new AltitudeExtremities(0.0, 0.0), new AltitudeGainLoss(0, 0), null, null) + assertEquals(new Statistics(Instant.parse(startTime), Instant.parse(stopTime), Duration.ofSeconds(10), Duration.ofSeconds(10), Distance.of(0), Speed.of(0), new AltitudeExtremities(0.0, 0.0), new AltitudeGainLoss(0, 0), null, null) , contentProviderUtils.getTrack(trackId).getStatistics()); // then @@ -593,7 +593,7 @@ public class TrackRecordingServiceRecordingTest { TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps1, 45.0, 35.0, 1, 15); // then - assertEquals(new Statistics(Instant.parse(startTime), Instant.parse(gps1), Duration.ofSeconds(1), Duration.ofSeconds(1), Distance.of(0), false, Speed.of(15), new AltitudeExtremities(0.0, 0.0), new AltitudeGainLoss(0, 0), null, null) + assertEquals(new Statistics(Instant.parse(startTime), Instant.parse(gps1), Duration.ofSeconds(1), Duration.ofSeconds(1), Distance.of(0), Speed.of(15), new AltitudeExtremities(0.0, 0.0), new AltitudeGainLoss(0, 0), null, null) , contentProviderUtils.getTrack(trackId).getStatistics()); // when @@ -601,7 +601,7 @@ public class TrackRecordingServiceRecordingTest { TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps2, 45.1, 35.0, 1, 15); // then - assertEquals(new Statistics(Instant.parse(startTime), Instant.parse(gps2), Duration.ofSeconds(4), Duration.ofSeconds(4), Distance.of(11113.275390625), false, Speed.of(2778.31884765625f), new AltitudeExtremities(0.0, 0.0), new AltitudeGainLoss(0, 0), null, null) + assertEquals(new Statistics(Instant.parse(startTime), Instant.parse(gps2), Duration.ofSeconds(4), Duration.ofSeconds(4), Distance.of(11113.275390625), Speed.of(2778.31884765625f), new AltitudeExtremities(0.0, 0.0), new AltitudeGainLoss(0, 0), null, null) , contentProviderUtils.getTrack(trackId).getStatistics()); // when @@ -610,7 +610,7 @@ public class TrackRecordingServiceRecordingTest { service.endCurrentTrack(); // then - assertEquals(new Statistics(Instant.parse(startTime), Instant.parse(stopTime), Duration.ofSeconds(10), Duration.ofSeconds(10), Distance.of(11113.275390625), false, Speed.of(1111.3275146484375), new AltitudeExtremities(0.0, 0.0), new AltitudeGainLoss(0, 0), null, null) + assertEquals(new Statistics(Instant.parse(startTime), Instant.parse(stopTime), Duration.ofSeconds(10), Duration.ofSeconds(10), Distance.of(11113.275390625), Speed.of(1111.3275146484375), new AltitudeExtremities(0.0, 0.0), new AltitudeGainLoss(0, 0), null, null) , contentProviderUtils.getTrack(trackId).getStatistics()); 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 444a69431..8717765f4 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java @@ -70,7 +70,6 @@ public class VoiceAnnouncementUtilsTest { Duration.ofHours(2).plusMinutes(5).plusSeconds(10), Duration.ofHours(1).plusMinutes(5).plusSeconds(10), Distance.of(20000), - false, Speed.of(100), null, null, @@ -96,7 +95,6 @@ public class VoiceAnnouncementUtilsTest { Duration.ofHours(2).plusMinutes(5).plusSeconds(10), Duration.ofHours(1).plusSeconds(1), Distance.of(20000), - false, Speed.of(100), null, new AltitudeGainLoss(6000, 6000), @@ -122,7 +120,6 @@ public class VoiceAnnouncementUtilsTest { Duration.ofHours(2).plusMinutes(5).plusSeconds(10), Duration.ofHours(1), Distance.of(19999), - false, Speed.of(100), null, new AltitudeGainLoss(6000, 6000), @@ -148,7 +145,6 @@ public class VoiceAnnouncementUtilsTest { Duration.ofHours(2).plusMinutes(5).plusSeconds(10), Duration.ofHours(1), Distance.of(19900), - false, Speed.of(100), null, new AltitudeGainLoss(6000, 6000), @@ -189,7 +185,6 @@ public class VoiceAnnouncementUtilsTest { Duration.ofHours(2).plusMinutes(5).plusSeconds(10), Duration.ofHours(1).plusMinutes(5).plusSeconds(10), Distance.of(20000), - false, Speed.of(100), null, new AltitudeGainLoss(6000, 6000), @@ -230,7 +225,6 @@ public class VoiceAnnouncementUtilsTest { Duration.ofHours(2).plusMinutes(5).plusSeconds(10), Duration.ofHours(1).plusMinutes(5).plusSeconds(10), Distance.of(20000), - false, Speed.of(100), null, new AltitudeGainLoss(6000, 6000), @@ -256,7 +250,6 @@ public class VoiceAnnouncementUtilsTest { Duration.ofHours(2).plusMinutes(5).plusSeconds(10), Duration.ofHours(1), Distance.ofMile(1.1), - false, null, null, null, @@ -282,7 +275,6 @@ public class VoiceAnnouncementUtilsTest { Duration.ofHours(2).plusMinutes(5).plusSeconds(10), Duration.ofHours(1), Distance.ofMile(1.1), - false, null, null, null, @@ -308,7 +300,6 @@ public class VoiceAnnouncementUtilsTest { Duration.ofHours(2).plusMinutes(5).plusSeconds(10), Duration.ofHours(1), Distance.ofKilometer(1.1), - false, null, null, null, @@ -349,7 +340,6 @@ public class VoiceAnnouncementUtilsTest { Duration.ofHours(2).plusMinutes(5).plusSeconds(10), Duration.ofHours(1).plusMinutes(5).plusSeconds(10), Distance.of(20000), - false, Speed.of(100), null, new AltitudeGainLoss(6000, 6000), @@ -461,7 +451,6 @@ public class VoiceAnnouncementUtilsTest { Duration.ofMinutes(16).plusSeconds(39), Duration.ofMinutes(16).plusSeconds(39), Distance.of(14208), - false, Speed.of(104), null, null, diff --git a/src/androidTest/java/de/dennisguse/opentracks/share/TrackShareSummaryGeneratorTest.java b/src/androidTest/java/de/dennisguse/opentracks/share/TrackShareSummaryGeneratorTest.java index fc98b5b13..04ffbe816 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/share/TrackShareSummaryGeneratorTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/share/TrackShareSummaryGeneratorTest.java @@ -69,7 +69,6 @@ public class TrackShareSummaryGeneratorTest { Duration.ofSeconds(600), Duration.ofSeconds(300), Distance.of(20000), - false, Speed.of(100), new AltitudeExtremities(-500, 550), new AltitudeGainLoss(6000, 6000), diff --git a/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsTest.java b/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsTest.java index b49fa24d2..bc037d010 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsTest.java @@ -37,7 +37,6 @@ public class AggregatedStatisticsTest { totalTime, totalTime, totalDistance, - false, Speed.of(50), new AltitudeExtremities(1250, 1250), new AltitudeGainLoss(50, 50), diff --git a/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java b/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java index 5d0fc424b..568c6b2ce 100644 --- a/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java +++ b/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java @@ -146,8 +146,6 @@ public class ContentProviderUtils { cursor.isNull(totalDistanceIndex) ? null : Distance.of(cursor.getFloat(totalDistanceIndex)), - false, - cursor.isNull(maxSpeedIndex) ? null : Speed.of(cursor.getFloat(maxSpeedIndex)), cursor.isNull(minAltitudeIndex) || cursor.isNull(maxAltitudeIndex) ? null : new AltitudeExtremities(cursor.getFloat(minAltitudeIndex), cursor.getFloat(maxAltitudeIndex)), cursor.isNull(altitudeGainIndex) || cursor.isNull(altitudeLossIndex) ? null : new AltitudeGainLoss(cursor.getFloat(altitudeGainIndex), cursor.getFloat(altitudeLossIndex)), diff --git a/src/main/java/de/dennisguse/opentracks/data/models/Statistics.java b/src/main/java/de/dennisguse/opentracks/data/models/Statistics.java index 9c6c28b70..4fd957c03 100644 --- a/src/main/java/de/dennisguse/opentracks/data/models/Statistics.java +++ b/src/main/java/de/dennisguse/opentracks/data/models/Statistics.java @@ -14,7 +14,7 @@ public record Statistics( Duration movingTime, // Based on when we believe the user is traveling Distance totalDistance, - boolean isIdle, //TODO Check if this is persisted; if not: remove + //TODO Check if this is persisted; if not: remove Speed maxSpeed, @Nullable diff --git a/src/main/java/de/dennisguse/opentracks/io/file/TrackFilenameGenerator.java b/src/main/java/de/dennisguse/opentracks/io/file/TrackFilenameGenerator.java index 06bda1c63..f9f761630 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/TrackFilenameGenerator.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/TrackFilenameGenerator.java @@ -92,7 +92,7 @@ public class TrackFilenameGenerator { Track track = new Track(); track.setName("Berlin"); track.setUuid(UUID.fromString("f81d4fae-7dec-11d0-a765-00a0c91e6bf6")); - track.setStatistics(new Statistics(Instant.MIN, null, null, null, null, false, null, null, null, null, null)); + track.setStatistics(new Statistics(Instant.MIN, null, null, null, null, null, null, null, null, null)); return format(track, TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA_AND_PICTURES); } diff --git a/src/main/java/de/dennisguse/opentracks/stats/SegmentStatisticUpdater.java b/src/main/java/de/dennisguse/opentracks/stats/SegmentStatisticUpdater.java index fa7df7193..59becef9f 100644 --- a/src/main/java/de/dennisguse/opentracks/stats/SegmentStatisticUpdater.java +++ b/src/main/java/de/dennisguse/opentracks/stats/SegmentStatisticUpdater.java @@ -81,6 +81,7 @@ public class SegmentStatisticUpdater { */ public SegmentStatisticUpdater(SegmentStatisticUpdater other) { this(other.getStatistics()); + this.isIdle = other.isIdle(); } public SegmentStatisticUpdater(Statistics statistics) { @@ -99,7 +100,6 @@ public class SegmentStatisticUpdater { } avgHeartRate = statistics.avgHeartRate(); avgPower = statistics.avgPower(); - isIdle = statistics.isIdle(); } /** @@ -208,7 +208,6 @@ public class SegmentStatisticUpdater { movingTime, totalDistance, - isIdle, getMaxSpeed(), altitudeExtremities.hasData() ? new AltitudeExtremities(altitudeExtremities.getMin(), altitudeExtremities.getMax()) : null, totalAltitudeGain_m != null && totalAltitudeLoss_m != null ? new AltitudeGainLoss(totalAltitudeGain_m, totalAltitudeLoss_m) : null, diff --git a/src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/SettingsCustomLayoutEditAdapter.java b/src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/SettingsCustomLayoutEditAdapter.java index a1a8f66ee..5f8dab3ca 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/SettingsCustomLayoutEditAdapter.java +++ b/src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/SettingsCustomLayoutEditAdapter.java @@ -46,7 +46,6 @@ public class SettingsCustomLayoutEditAdapter extends RecyclerView.Adapter