From 46d7385d256b83c2f776a7b2175e040a222cb217 Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Sat, 22 Nov 2025 18:22:00 +0100 Subject: [PATCH] Cleanup RecordingData. --- .../fragments/StatisticsRecordingFragment.java | 10 +++++++--- .../dennisguse/opentracks/services/RecordingData.java | 7 ------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java index 52d3ea93e..0005205c7 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java +++ b/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java @@ -15,6 +15,7 @@ import androidx.gridlayout.widget.GridLayout; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.concurrent.Callable; import de.dennisguse.opentracks.R; @@ -165,11 +166,14 @@ public class StatisticsRecordingFragment extends Fragment { } private void onRecordingDataChanged(RecordingData recordingData) { - String oldCategory = this.recordingData.getTrackCategory(); - String newCategory = recordingData.getTrackCategory(); + Track oldTrack = this.recordingData.track(); + String oldActivityType = oldTrack != null ? oldTrack.getActivityTypeLocalized() : ""; + Track newTrack = recordingData.track(); + String newActivityType = newTrack != null ? newTrack.getActivityTypeLocalized() : ""; + this.recordingData = recordingData; - if (!oldCategory.equals(newCategory)) { + if (!oldActivityType.equals(newActivityType)) { sharedPreferenceChangeListener.onSharedPreferenceChanged(null, getString(R.string.stats_rate_key)); } diff --git a/src/main/java/de/dennisguse/opentracks/services/RecordingData.java b/src/main/java/de/dennisguse/opentracks/services/RecordingData.java index ba9da7ce0..3fb6da9ab 100644 --- a/src/main/java/de/dennisguse/opentracks/services/RecordingData.java +++ b/src/main/java/de/dennisguse/opentracks/services/RecordingData.java @@ -18,13 +18,6 @@ public record RecordingData( public static final RecordingData NOT_RECORDING = new RecordingData(null, null, null, null); - public String getTrackCategory() { - if (track == null) { - return ""; - } - return track.getActivityTypeLocalized(); - } - public Statistics trackStatistics() { return track.getStatistics(); }