karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Cleanup: TrackDataHub only needs in-sample.

Browse Source
This commit is contained in:
Dennis Guse
2025-11-25 18:42:02 +01:00
parent ae9906fb18
commit 5cd639c852
1 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/data/TrackDataHub.java
+3 -18
View File
@@ -358,24 +358,17 @@ public class TrackDataHub {
samplingFrequency = 1 + (int) (numTotalPoints / targetNumPoints); 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) { if (trackStatisticsUpdater == null) {
trackStatisticsUpdater = new TrackStatisticsUpdater(trackPoint); trackStatisticsUpdater = new TrackStatisticsUpdater(trackPoint);
} else { } else {
trackStatisticsUpdater.addTrackPoint(trackPoint); trackStatisticsUpdater.addTrackPoint(trackPoint);
} }
TrackStatisticsUpdater currentUpdater = trackStatisticsUpdater; Statistics statistics = trackStatisticsUpdater.getTrackStatistics();
// Also include the last point if the selected track is not recording. // Also include the last point if the selected track is not recording.
if ((localNumLoadedTrackPoints % samplingFrequency == 0) || (trackPointId == lastTrackPointId && !isSelectedTrackRecording())) { if ((localNumLoadedTrackPoints % samplingFrequency == 0) || (trackPointId == lastTrackPointId && !isSelectedTrackRecording())) {
for (Listener trackDataListener : listeners) { for (Listener trackDataListener : listeners)
trackDataListener.onSampledInTrackPoint(trackPoint, currentUpdater.getTrackStatistics()); trackDataListener.onSampledInTrackPoint(trackPoint, statistics);
}
} else {
for (Listener trackDataListener : listeners) {
trackDataListener.onSampledOutTrackPoint(trackPoint, currentUpdater.getTrackStatistics());
}
} }
localNumLoadedTrackPoints++; localNumLoadedTrackPoints++;
@@ -436,14 +429,6 @@ public class TrackDataHub {
default void onSampledInTrackPoint(@NonNull TrackPoint trackPoint, @NonNull Statistics trackStatistics) { 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. * Called when finish sending new track points.
*/ */