Cleanup: removed unnecessary getter from data class RecordingStatus.

This commit is contained in:
Dennis Guse
2023-09-26 08:13:10 +02:00
parent f4cec0a8b2
commit 2b08eb3287
6 changed files with 9 additions and 13 deletions
@@ -41,7 +41,6 @@ import com.google.android.material.button.MaterialButton;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List;
import java.util.Objects; import java.util.Objects;
import de.dennisguse.opentracks.data.ContentProviderUtils; import de.dennisguse.opentracks.data.ContentProviderUtils;
@@ -365,7 +364,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
@Nullable @Nullable
@Override @Override
protected Track.Id getRecordingTrackId() { protected Track.Id getRecordingTrackId() {
return recordingStatus.getTrackId(); return recordingStatus.trackId();
} }
/** /**
@@ -226,7 +226,7 @@ public class TrackRecordedActivity extends AbstractTrackDeleteActivity implement
@Nullable @Nullable
@Override @Override
protected Track.Id getRecordingTrackId() { protected Track.Id getRecordingTrackId() {
return recordingStatus.getTrackId(); return recordingStatus.trackId();
} }
@Override @Override
@@ -201,7 +201,7 @@ public class TrackDataHub {
* Returns true if the selected track is recording. * Returns true if the selected track is recording.
*/ */
public boolean isSelectedTrackRecording() { public boolean isSelectedTrackRecording() {
return selectedTrackId != null && selectedTrackId.equals(recordingStatus.getTrackId()); return selectedTrackId != null && selectedTrackId.equals(recordingStatus.trackId());
} }
/** /**
@@ -1,13 +1,14 @@
package de.dennisguse.opentracks.services; package de.dennisguse.opentracks.services;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.data.models.Track;
public record RecordingStatus(Track.Id trackId) { public record RecordingStatus(@Nullable Track.Id trackId) {
public Track.Id getTrackId() { static RecordingStatus record(@NonNull Track.Id trackId) {
return trackId; return new RecordingStatus(trackId);
} }
public boolean isRecording() { public boolean isRecording() {
@@ -18,10 +19,6 @@ public record RecordingStatus(Track.Id trackId) {
return new RecordingStatus(null); return new RecordingStatus(null);
} }
static RecordingStatus record(@NonNull Track.Id trackId) {
return new RecordingStatus(trackId);
}
public RecordingStatus stop() { public RecordingStatus stop() {
return TrackRecordingService.STATUS_DEFAULT; return TrackRecordingService.STATUS_DEFAULT;
} }
@@ -267,7 +267,7 @@ public class TrackListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
return; return;
} }
if (recordingStatus.isRecording() && trackId.equals(recordingStatus.getTrackId())) { if (recordingStatus.isRecording() && trackId.equals(recordingStatus.trackId())) {
// Is recording -> open record activity. // Is recording -> open record activity.
Intent newIntent = IntentUtils.newIntent(context, TrackRecordingActivity.class) Intent newIntent = IntentUtils.newIntent(context, TrackRecordingActivity.class)
.putExtra(TrackRecordedActivity.EXTRA_TRACK_ID, trackId); .putExtra(TrackRecordedActivity.EXTRA_TRACK_ID, trackId);
@@ -164,7 +164,7 @@ public class MarkerListActivity extends AbstractActivity {
@Override @Override
public boolean onPrepareOptionsMenu(Menu menu) { 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); return super.onPrepareOptionsMenu(menu);
} }