From 5cd639c8523d1330e5daa559f351aa47bd655030 Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Tue, 25 Nov 2025 18:42:02 +0100 Subject: [PATCH] Cleanup: TrackDataHub only needs in-sample. --- .../opentracks/data/TrackDataHub.java | 21 +++---------------- 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/src/main/java/de/dennisguse/opentracks/data/TrackDataHub.java b/src/main/java/de/dennisguse/opentracks/data/TrackDataHub.java index 59716488c..1c77d7f2e 100644 --- a/src/main/java/de/dennisguse/opentracks/data/TrackDataHub.java +++ b/src/main/java/de/dennisguse/opentracks/data/TrackDataHub.java @@ -358,24 +358,17 @@ public class TrackDataHub { samplingFrequency = 1 + (int) (numTotalPoints / targetNumPoints); } - //Prevents a NPE if stop() is happening while notifyTrackPointsTableUpdate() - //TODO Check if this NPE is still happening (and if so, fix it properly. Not with currentUpdater. if (trackStatisticsUpdater == null) { trackStatisticsUpdater = new TrackStatisticsUpdater(trackPoint); } else { trackStatisticsUpdater.addTrackPoint(trackPoint); } - TrackStatisticsUpdater currentUpdater = trackStatisticsUpdater; + Statistics statistics = trackStatisticsUpdater.getTrackStatistics(); // Also include the last point if the selected track is not recording. if ((localNumLoadedTrackPoints % samplingFrequency == 0) || (trackPointId == lastTrackPointId && !isSelectedTrackRecording())) { - for (Listener trackDataListener : listeners) { - trackDataListener.onSampledInTrackPoint(trackPoint, currentUpdater.getTrackStatistics()); - } - } else { - for (Listener trackDataListener : listeners) { - trackDataListener.onSampledOutTrackPoint(trackPoint, currentUpdater.getTrackStatistics()); - } + for (Listener trackDataListener : listeners) + trackDataListener.onSampledInTrackPoint(trackPoint, statistics); } localNumLoadedTrackPoints++; @@ -436,14 +429,6 @@ public class TrackDataHub { default void onSampledInTrackPoint(@NonNull TrackPoint trackPoint, @NonNull Statistics trackStatistics) { } - /** - * Called when a sampled out track point is read. - * - * @param trackPoint the trackPoint - */ - default void onSampledOutTrackPoint(@NonNull TrackPoint trackPoint, @NonNull Statistics trackStatistics) { - } - /** * Called when finish sending new track points. */