From 2b08eb32879819434ff65859ad80fad7bb6262b3 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Tue, 26 Sep 2023 08:13:10 +0200
Subject: [PATCH] Cleanup: removed unnecessary getter from data class
 RecordingStatus.

---
 .../de/dennisguse/opentracks/TrackListActivity.java   |  3 +--
 .../dennisguse/opentracks/TrackRecordedActivity.java  |  2 +-
 .../de/dennisguse/opentracks/data/TrackDataHub.java   |  2 +-
 .../opentracks/services/RecordingStatus.java          | 11 ++++-------
 .../de/dennisguse/opentracks/ui/TrackListAdapter.java |  2 +-
 .../opentracks/ui/markers/MarkerListActivity.java     |  2 +-
 6 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java
index a8fdbc933..668f6dfd0 100644
--- a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java
@@ -41,7 +41,6 @@ import com.google.android.material.button.MaterialButton;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
 import java.util.Objects;
 
 import de.dennisguse.opentracks.data.ContentProviderUtils;
@@ -365,7 +364,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
     @Nullable
     @Override
     protected Track.Id getRecordingTrackId() {
-        return recordingStatus.getTrackId();
+        return recordingStatus.trackId();
     }
 
     /**
diff --git a/src/main/java/de/dennisguse/opentracks/TrackRecordedActivity.java b/src/main/java/de/dennisguse/opentracks/TrackRecordedActivity.java
index f47e6b7c8..d63cfe8ed 100644
--- a/src/main/java/de/dennisguse/opentracks/TrackRecordedActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackRecordedActivity.java
@@ -226,7 +226,7 @@ public class TrackRecordedActivity extends AbstractTrackDeleteActivity implement
     @Nullable
     @Override
     protected Track.Id getRecordingTrackId() {
-        return recordingStatus.getTrackId();
+        return recordingStatus.trackId();
     }
 
     @Override
diff --git a/src/main/java/de/dennisguse/opentracks/data/TrackDataHub.java b/src/main/java/de/dennisguse/opentracks/data/TrackDataHub.java
index 7abc8f647..3cf355102 100644
--- a/src/main/java/de/dennisguse/opentracks/data/TrackDataHub.java
+++ b/src/main/java/de/dennisguse/opentracks/data/TrackDataHub.java
@@ -201,7 +201,7 @@ public class TrackDataHub {
      * Returns true if the selected track is recording.
      */
     public boolean isSelectedTrackRecording() {
-        return selectedTrackId != null && selectedTrackId.equals(recordingStatus.getTrackId());
+        return selectedTrackId != null && selectedTrackId.equals(recordingStatus.trackId());
     }
 
     /**
diff --git a/src/main/java/de/dennisguse/opentracks/services/RecordingStatus.java b/src/main/java/de/dennisguse/opentracks/services/RecordingStatus.java
index 10b0d728a..4cde989b6 100644
--- a/src/main/java/de/dennisguse/opentracks/services/RecordingStatus.java
+++ b/src/main/java/de/dennisguse/opentracks/services/RecordingStatus.java
@@ -1,13 +1,14 @@
 package de.dennisguse.opentracks.services;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import de.dennisguse.opentracks.data.models.Track;
 
-public record RecordingStatus(Track.Id trackId) {
+public record RecordingStatus(@Nullable Track.Id trackId) {
 
-    public Track.Id getTrackId() {
-        return trackId;
+    static RecordingStatus record(@NonNull Track.Id trackId) {
+        return new RecordingStatus(trackId);
     }
 
     public boolean isRecording() {
@@ -18,10 +19,6 @@ public record RecordingStatus(Track.Id trackId) {
         return new RecordingStatus(null);
     }
 
-    static RecordingStatus record(@NonNull Track.Id trackId) {
-        return new RecordingStatus(trackId);
-    }
-
     public RecordingStatus stop() {
         return TrackRecordingService.STATUS_DEFAULT;
     }
diff --git a/src/main/java/de/dennisguse/opentracks/ui/TrackListAdapter.java b/src/main/java/de/dennisguse/opentracks/ui/TrackListAdapter.java
index e1b2b3a0c..5efa6a794 100644
--- a/src/main/java/de/dennisguse/opentracks/ui/TrackListAdapter.java
+++ b/src/main/java/de/dennisguse/opentracks/ui/TrackListAdapter.java
@@ -267,7 +267,7 @@ public class TrackListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
                 return;
             }
 
-            if (recordingStatus.isRecording() && trackId.equals(recordingStatus.getTrackId())) {
+            if (recordingStatus.isRecording() && trackId.equals(recordingStatus.trackId())) {
                 // Is recording -> open record activity.
                 Intent newIntent = IntentUtils.newIntent(context, TrackRecordingActivity.class)
                         .putExtra(TrackRecordedActivity.EXTRA_TRACK_ID, trackId);
diff --git a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerListActivity.java b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerListActivity.java
index 228818c33..b72a52f09 100644
--- a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerListActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerListActivity.java
@@ -164,7 +164,7 @@ public class MarkerListActivity extends AbstractActivity {
 
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
-        insertMarkerMenuItem.setVisible(trackId != null && trackId.equals(recordingStatus.getTrackId()));
+        insertMarkerMenuItem.setVisible(trackId != null && trackId.equals(recordingStatus.trackId()));
         return super.onPrepareOptionsMenu(menu);
     }