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

Merge upstream updates into local fork

Browse Source
This commit is contained in:
Karol Labus
2026-09-11 14:10:42 +02:00
parent 7c6141f98c f8279c7095
commit 53dfa915fb
73 changed files with 1220 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
+7 -1
View File
@@ -73,7 +73,6 @@ public class PreferencesUtils {
private static SharedPreferences sharedPreferences;
private static Resources resources;
private static final long LONG_UNSET = Long.MIN_VALUE;
/**
* Must be called during application startup.
@@ -560,6 +559,7 @@ public class PreferencesUtils {
String[] entries = new String[entryValues.length];
final int maxRecordingDistanceDefault = Integer.parseInt(resources.getString(R.string.max_recording_distance_default));
final int maxRecordingDistanceOff = Integer.parseInt(resources.getString(R.string.max_recording_distance_off));
UnitSystem unitSystem = getUnitSystem();
DistanceFormatter formatter = DistanceFormatter.Builder()
@@ -576,6 +576,9 @@ public class PreferencesUtils {
case METRIC, IMPERIAL_METER -> {
if (value == maxRecordingDistanceDefault) {
entries[i] = resources.getString(R.string.value_integer_meter_recommended, value);
}
if (value == maxRecordingDistanceOff) {
entries[i] = resources.getString(R.string.value_off);
} else {
entries[i] = displayValue;
}
@@ -583,6 +586,9 @@ public class PreferencesUtils {
case IMPERIAL_FEET, NAUTICAL_IMPERIAL -> {
if (value == maxRecordingDistanceDefault) {
entries[i] = resources.getString(R.string.value_integer_feet_recommended, (int) distance.toFT());
}
if (value == maxRecordingDistanceOff) {
entries[i] = resources.getString(R.string.value_off);
} else {
entries[i] = displayValue;
}