From 2091b92a864c5839012cc0b1dd06c0aa521f1206 Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Mon, 15 Sep 2014 23:10:48 +0200 Subject: fix #4359: imperial units checkbox not always correct This has been fixed by initializing the key to its default value instead of just the checkbox. Also, better names have been used throughout the settings to reflect the fact that "units" meant "use imperial units". It was used in both ways, including the wrong way while migrating the settings. --- main/src/cgeo/geocaching/geopoint/Units.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'main/src/cgeo/geocaching/geopoint/Units.java') diff --git a/main/src/cgeo/geocaching/geopoint/Units.java b/main/src/cgeo/geocaching/geopoint/Units.java index 018216d..c657ede 100644 --- a/main/src/cgeo/geocaching/geopoint/Units.java +++ b/main/src/cgeo/geocaching/geopoint/Units.java @@ -11,7 +11,7 @@ public class Units { public static ImmutablePair scaleDistance(final double distanceKilometers) { double distance; String units; - if (Settings.isUseImperialUnits()) { + if (Settings.useImperialUnits()) { distance = distanceKilometers / IConversion.MILES_TO_KILOMETER; if (distance >= 0.1) { units = "mi"; @@ -54,7 +54,7 @@ public class Units { } public static String getSpeed(final float kilometersPerHour) { - if (Settings.isUseImperialUnits()) { + if (Settings.useImperialUnits()) { return String.format(Locale.US, "%.0f mph", kilometersPerHour / IConversion.MILES_TO_KILOMETER); } return String.format(Locale.US, "%.0f km/h", kilometersPerHour); -- cgit v1.1