From d6617f61b715e11d048c9b5937fd1955deda2be6 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Wed, 15 Oct 2025 18:10:35 +0200
Subject: [PATCH] Cleanup: use PreferenceUtils.isKey(List).

---
 .../opentracks/fragments/StatisticsRecordingFragment.java      | 2 +-
 .../services/announcement/VoiceAnnouncementManager.java        | 3 ++-
 .../de/dennisguse/opentracks/settings/PreferencesUtils.java    | 2 +-
 .../dennisguse/opentracks/ui/intervals/IntervalsFragment.java  | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java
index 5f9c6ede3..848c8a323 100644
--- a/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java
@@ -62,7 +62,7 @@ public class StatisticsRecordingFragment extends Fragment {
             updateDataOnUI();
         }
 
-        if (PreferencesUtils.isKey(R.string.stats_custom_layouts_key, key) || PreferencesUtils.isKey(R.string.stats_custom_layout_selected_layout_key, key)) {
+        if (PreferencesUtils.isKey(List.of(R.string.stats_custom_layouts_key, R.string.stats_custom_layout_selected_layout_key), key)) {
             onLayoutChanged(PreferencesUtils.getCustomLayout());
         }
     };
diff --git a/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManager.java b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManager.java
index 8cc362a5d..322a1c611 100644
--- a/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManager.java
+++ b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManager.java
@@ -26,6 +26,7 @@ import androidx.annotation.VisibleForTesting;
 import androidx.mediarouter.media.MediaRouter;
 
 import java.time.Duration;
+import java.util.List;
 
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.data.ContentProviderUtils;
@@ -219,7 +220,7 @@ public class VoiceAnnouncementManager implements SharedPreferences.OnSharedPrefe
             setFrequency(PreferencesUtils.getVoiceAnnouncementFrequency());
         }
 
-        if (PreferencesUtils.isKey(new int[]{R.string.voice_announcement_distance_key, R.string.stats_units_key}, key)) {
+        if (PreferencesUtils.isKey(List.of(R.string.voice_announcement_distance_key, R.string.stats_units_key), key)) {
             setFrequency(PreferencesUtils.getVoiceAnnouncementDistance());
         }
     }
diff --git a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
index 15b46fdc9..a9a12b6b2 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
@@ -125,7 +125,7 @@ public class PreferencesUtils {
         return key == null || key.equals(getKey(keyId));
     }
 
-    public static boolean isKey(int[] keyIds, String key) {
+    public static boolean isKey(List<Integer> keyIds, String key) {
         for (int keyId : keyIds) {
             if (isKey(keyId, key)) {
                 return true;
diff --git a/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalsFragment.java b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalsFragment.java
index 96f6aea58..446f4ac04 100644
--- a/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalsFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalsFragment.java
@@ -51,7 +51,7 @@ public class IntervalsFragment extends Fragment {
     private IntervalListViewBinding viewBinding;
 
     protected final SharedPreferences.OnSharedPreferenceChangeListener sharedPreferenceChangeListener = (sharedPreferences, key) -> {
-        if (PreferencesUtils.isKey(R.string.stats_units_key, key) || PreferencesUtils.isKey(R.string.stats_rate_key, key)) {
+        if (PreferencesUtils.isKey(List.of(R.string.stats_units_key, R.string.stats_rate_key), key)) {
             updateIntervals(PreferencesUtils.getUnitSystem(), selectedInterval);
             if (intervalsAdapter != null) {
                 intervalsAdapter.notifyDataSetChanged();