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.

3 files changed, 5 insertions, 5 deletions

diff --git a/tests/src/cgeo/geocaching/geopoint/UnitsTest.java b/tests/src/cgeo/geocaching/geopoint/UnitsTest.java
index f208984..7f3bdab 100644
--- a/tests/src/cgeo/geocaching/geopoint/UnitsTest.java
+++ b/tests/src/cgeo/geocaching/geopoint/UnitsTest.java
@@ -14,7 +14,7 @@ public class UnitsTest extends CGeoTestCase {
         final String actual = Units.getDistanceFromKilometers(distance);
         if (!StringUtils.equals(expected, actual.replace(',', '.'))) { // make 1.2 the same as 1,2
             fail("getHumanDistance(" + distance +
-                    ") [metric: " + (!Settings.isUseImperialUnits() ? "yes" : "no") +
+                    ") [metric: " + (!Settings.useImperialUnits() ? "yes" : "no") +
                     "] fails to match " + expected + ": " + actual);
         }
     }
@@ -23,7 +23,7 @@ public class UnitsTest extends CGeoTestCase {
     @SuppressWarnings("static-method")
     public void testDistance() {
         assertThat(Units.getDistanceFromKilometers(null)).isEqualTo("?");
-        final boolean savedImperial = Settings.isUseImperialUnits();
+        final boolean savedImperial = Settings.useImperialUnits();
         try {
             TestSettings.setUseImperialUnits(false);
             assertDistance("123 km", 122.782f);
@@ -46,7 +46,7 @@ public class UnitsTest extends CGeoTestCase {
     @SuppressWarnings("static-method")
     public void testSpeed() {
         assertThat(Units.getDistanceFromKilometers(null)).isEqualTo("?");
-        final boolean savedImperial = Settings.isUseImperialUnits();
+        final boolean savedImperial = Settings.useImperialUnits();
         try {
             TestSettings.setUseImperialUnits(false);
             assertSpeed("123 km/h", 122.782f);
diff --git a/tests/src/cgeo/geocaching/settings/TestSettings.java b/tests/src/cgeo/geocaching/settings/TestSettings.java
index 279f658..b82c120 100644
--- a/tests/src/cgeo/geocaching/settings/TestSettings.java
+++ b/tests/src/cgeo/geocaching/settings/TestSettings.java
@@ -37,7 +37,7 @@ public final class TestSettings extends Settings {
     }
 
     public static void setUseImperialUnits(final boolean imperial) {
-        putBoolean(R.string.pref_units, imperial);
+        putBoolean(R.string.pref_units_imperial, imperial);
     }
 
     public static void setCacheTwitterMessage(final String template) {
diff --git a/tests/src/cgeo/geocaching/speech/TextFactoryTest.java b/tests/src/cgeo/geocaching/speech/TextFactoryTest.java
index c53aec9..1f309ba 100644
--- a/tests/src/cgeo/geocaching/speech/TextFactoryTest.java
+++ b/tests/src/cgeo/geocaching/speech/TextFactoryTest.java
@@ -35,7 +35,7 @@ public class TextFactoryTest extends AndroidTestCase {
         final Configuration config = resources.getConfiguration();
         defaultLocale1 = config.locale;
         defaultLocale2 = Locale.getDefault();
-        defaultMetric = !Settings.isUseImperialUnits();
+        defaultMetric = !Settings.useImperialUnits();
     }
 
     @Override