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

Bugfix: crash on GPS preferences if using imperial with meters

Browse Source 
Fixes #1629
This commit is contained in:
blackberrypineapple
2023-07-05 03:00:04 -04:00
committed by Dennis Guse
parent 6dd9630bae
commit 4b3ff45609
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
+4 -4
View File
@@ -454,7 +454,7 @@ public class PreferencesUtils {
String displayValue = formatter.formatDistance(distance); String displayValue = formatter.formatDistance(distance);
switch (unitSystem) { switch (unitSystem) {
case METRIC -> { case METRIC, IMPERIAL_METER -> {
if (value == recordingDistanceIntervalDefault) { if (value == recordingDistanceIntervalDefault) {
entries[i] = resources.getString(R.string.value_integer_meter_recommended, value); entries[i] = resources.getString(R.string.value_integer_meter_recommended, value);
} else { } else {
@@ -498,7 +498,7 @@ public class PreferencesUtils {
String displayValue = formatter.formatDistance(distance); String displayValue = formatter.formatDistance(distance);
switch (unitSystem) { switch (unitSystem) {
case METRIC -> { case METRIC, IMPERIAL_METER -> {
if (value == maxRecordingDistanceDefault) { if (value == maxRecordingDistanceDefault) {
entries[i] = resources.getString(R.string.value_integer_meter_recommended, value); entries[i] = resources.getString(R.string.value_integer_meter_recommended, value);
} else { } else {
@@ -571,7 +571,7 @@ public class PreferencesUtils {
String displayValue = formatter.formatDistance(distance); String displayValue = formatter.formatDistance(distance);
switch (unitSystem) { switch (unitSystem) {
case METRIC -> { case METRIC, IMPERIAL_METER -> {
if (value == recordingGPSAccuracyDefault) { if (value == recordingGPSAccuracyDefault) {
entries[i] = resources.getString(R.string.value_integer_meter_recommended, value); entries[i] = resources.getString(R.string.value_integer_meter_recommended, value);
} else if (value == recordingGPSAccuracyExcellent) { } else if (value == recordingGPSAccuracyExcellent) {
@@ -624,7 +624,7 @@ public class PreferencesUtils {
entries[i] = resources.getString(R.string.value_float_kilometer_hour, value); entries[i] = resources.getString(R.string.value_float_kilometer_hour, value);
} }
} }
case IMPERIAL_FEET -> { case IMPERIAL_FEET, IMPERIAL_METER -> {
double valueMPH = Speed.ofKMH(value).toMPH(); double valueMPH = Speed.ofKMH(value).toMPH();
if (value == idleSpeedDefault) { if (value == idleSpeedDefault) {
entries[i] = resources.getString(R.string.value_float_mile_hour_recommended, valueMPH); entries[i] = resources.getString(R.string.value_float_mile_hour_recommended, valueMPH);