From 4b3ff4560918d7abff0e28ffb3e7d3eea561a1fe Mon Sep 17 00:00:00 2001 From: blackberrypineapple Date: Wed, 5 Jul 2023 03:00:04 -0400 Subject: [PATCH] Bugfix: crash on GPS preferences if using imperial with meters Fixes #1629 --- .../dennisguse/opentracks/settings/PreferencesUtils.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java index be7cea61e..e0303a261 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java +++ b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java @@ -454,7 +454,7 @@ public class PreferencesUtils { String displayValue = formatter.formatDistance(distance); switch (unitSystem) { - case METRIC -> { + case METRIC, IMPERIAL_METER -> { if (value == recordingDistanceIntervalDefault) { entries[i] = resources.getString(R.string.value_integer_meter_recommended, value); } else { @@ -498,7 +498,7 @@ public class PreferencesUtils { String displayValue = formatter.formatDistance(distance); switch (unitSystem) { - case METRIC -> { + case METRIC, IMPERIAL_METER -> { if (value == maxRecordingDistanceDefault) { entries[i] = resources.getString(R.string.value_integer_meter_recommended, value); } else { @@ -571,7 +571,7 @@ public class PreferencesUtils { String displayValue = formatter.formatDistance(distance); switch (unitSystem) { - case METRIC -> { + case METRIC, IMPERIAL_METER -> { if (value == recordingGPSAccuracyDefault) { entries[i] = resources.getString(R.string.value_integer_meter_recommended, value); } else if (value == recordingGPSAccuracyExcellent) { @@ -624,7 +624,7 @@ public class PreferencesUtils { 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(); if (value == idleSpeedDefault) { entries[i] = resources.getString(R.string.value_float_mile_hour_recommended, valueMPH);