aboutsummaryrefslogtreecommitdiffstats
path: root/main/src/cgeo/geocaching/geopoint/Units.java
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2014-09-15 23:10:48 +0200
committerSamuel Tardieu <sam@rfc1149.net>2014-09-15 23:10:51 +0200
commit2091b92a864c5839012cc0b1dd06c0aa521f1206 (patch)
tree03fc3d8c61336095ed80d66f6d3372822892b628 /main/src/cgeo/geocaching/geopoint/Units.java
parentf4a281397ed951223a1d5cf08ba104c6edeb61e6 (diff)
downloadcgeo-2091b92a864c5839012cc0b1dd06c0aa521f1206.zip
cgeo-2091b92a864c5839012cc0b1dd06c0aa521f1206.tar.gz
cgeo-2091b92a864c5839012cc0b1dd06c0aa521f1206.tar.bz2
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.
Diffstat (limited to 'main/src/cgeo/geocaching/geopoint/Units.java')
-rw-r--r--main/src/cgeo/geocaching/geopoint/Units.java4
1 files changed, 2 insertions, 2 deletions
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<Double, String> 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);