From 10e65035eeca8fef10a00956a9a7cc7837733730 Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Sat, 23 Sep 2023 21:33:47 +0200 Subject: [PATCH] Cleanup: use List.of(). --- .../opentracks/io/file/TrackFilenameGenerator2Test.java | 4 ++-- .../de/dennisguse/opentracks/AbstractTrackDeleteActivity.java | 4 ++-- .../opentracks/io/file/importer/KmzTrackImporter.java | 3 +-- .../opentracks/services/announcement/VoiceAnnouncement.java | 3 +-- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/TrackFilenameGenerator2Test.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/TrackFilenameGenerator2Test.java index 999d6c67f..fbc88f67f 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/io/file/TrackFilenameGenerator2Test.java +++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/TrackFilenameGenerator2Test.java @@ -5,8 +5,8 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import java.time.Instant; -import java.util.Arrays; import java.util.Collection; +import java.util.List; import java.util.UUID; import de.dennisguse.opentracks.data.models.Track; @@ -18,7 +18,7 @@ public class TrackFilenameGenerator2Test { @Parameterized.Parameters public static Collection data() { - return Arrays.asList( + return List.of( "{name}_{starime}", "{name", "name}"); diff --git a/src/main/java/de/dennisguse/opentracks/AbstractTrackDeleteActivity.java b/src/main/java/de/dennisguse/opentracks/AbstractTrackDeleteActivity.java index 2bb463335..97b8819a6 100644 --- a/src/main/java/de/dennisguse/opentracks/AbstractTrackDeleteActivity.java +++ b/src/main/java/de/dennisguse/opentracks/AbstractTrackDeleteActivity.java @@ -45,8 +45,8 @@ public abstract class AbstractTrackDeleteActivity extends AbstractActivity imple @Override public void onConfirmDeleteDone(Track.Id... trackIds) { - ArrayList trackIdList = new ArrayList<>(Arrays.asList(trackIds)) - .stream().filter(trackId -> !trackId.equals(getRecordingTrackId())).collect(Collectors.toCollection(ArrayList::new)); + ArrayList trackIdList = Arrays.stream(trackIds) + .filter(trackId -> !trackId.equals(getRecordingTrackId())).collect(Collectors.toCollection(ArrayList::new)); onDeleteConfirmed(); diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/KmzTrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/KmzTrackImporter.java index e8fda73a5..ea6f2385f 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/KmzTrackImporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/KmzTrackImporter.java @@ -28,7 +28,6 @@ import java.io.FilterInputStream; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; @@ -49,7 +48,7 @@ public class KmzTrackImporter { private static final String TAG = KmzTrackImporter.class.getSimpleName(); - private static final List KMZ_IMAGES_EXT = Arrays.asList("jpeg", "jpg", "png"); + private static final List KMZ_IMAGES_EXT = List.of("jpeg", "jpg", "png"); private final Context context; private final TrackImporter trackImporter; diff --git a/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncement.java b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncement.java index bc8594d61..e8f10e7ad 100644 --- a/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncement.java +++ b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncement.java @@ -27,7 +27,6 @@ import android.util.Log; import androidx.annotation.NonNull; -import java.util.Arrays; import java.util.List; import java.util.Locale; @@ -150,7 +149,7 @@ public class VoiceAnnouncement { } } - if (Arrays.asList(AudioManager.MODE_IN_CALL, AudioManager.MODE_IN_COMMUNICATION) + if (List.of(AudioManager.MODE_IN_CALL, AudioManager.MODE_IN_COMMUNICATION) .contains(audioManager.getMode())) { Log.i(TAG, "Announcement is not allowed at this time."); return;