karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Cleanup: use PreferenceUtils.isKey(List).

Browse Source
This commit is contained in:
Dennis Guse
2025-10-15 18:10:35 +02:00
parent b5180f235f
commit d6617f61b7
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java
+1 -1
View File
@@ -62,7 +62,7 @@ public class StatisticsRecordingFragment extends Fragment {
updateDataOnUI(); 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()); onLayoutChanged(PreferencesUtils.getCustomLayout());
} }
}; };
src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManager.java
+2 -1
View File
@@ -26,6 +26,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.mediarouter.media.MediaRouter; import androidx.mediarouter.media.MediaRouter;
import java.time.Duration; import java.time.Duration;
import java.util.List;
import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.R;
import de.dennisguse.opentracks.data.ContentProviderUtils; import de.dennisguse.opentracks.data.ContentProviderUtils;
@@ -219,7 +220,7 @@ public class VoiceAnnouncementManager implements SharedPreferences.OnSharedPrefe
setFrequency(PreferencesUtils.getVoiceAnnouncementFrequency()); 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()); setFrequency(PreferencesUtils.getVoiceAnnouncementDistance());
} }
} }
src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
+1 -1
View File
@@ -125,7 +125,7 @@ public class PreferencesUtils {
return key == null || key.equals(getKey(keyId)); 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) { for (int keyId : keyIds) {
if (isKey(keyId, key)) { if (isKey(keyId, key)) {
return true; return true;
src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalsFragment.java
+1 -1
View File
@@ -51,7 +51,7 @@ public class IntervalsFragment extends Fragment {
private IntervalListViewBinding viewBinding; private IntervalListViewBinding viewBinding;
protected final SharedPreferences.OnSharedPreferenceChangeListener sharedPreferenceChangeListener = (sharedPreferences, key) -> { 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); updateIntervals(PreferencesUtils.getUnitSystem(), selectedInterval);
if (intervalsAdapter != null) { if (intervalsAdapter != null) {
intervalsAdapter.notifyDataSetChanged(); intervalsAdapter.notifyDataSetChanged();