diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2014-09-01 12:40:51 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2014-09-01 12:40:51 +0200 |
| commit | cb014bb5694b03edc1b1f545f499d50b84e703c2 (patch) | |
| tree | 08f1d76ea63a8f927a2ec3067097c0ab84735650 | |
| parent | 3b7ff336e3b55eae2bab3c0e9589b8711cfd7c5e (diff) | |
| parent | a5357f5e5820e7db674398146e9a8717608f2cc2 (diff) | |
| download | cgeo-cb014bb5694b03edc1b1f545f499d50b84e703c2.zip cgeo-cb014bb5694b03edc1b1f545f499d50b84e703c2.tar.gz cgeo-cb014bb5694b03edc1b1f545f499d50b84e703c2.tar.bz2 | |
Merge branch 'release' into upstream
| -rw-r--r-- | main/src/cgeo/geocaching/settings/Settings.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/main/src/cgeo/geocaching/settings/Settings.java b/main/src/cgeo/geocaching/settings/Settings.java index 590dbee..d45ded2 100644 --- a/main/src/cgeo/geocaching/settings/Settings.java +++ b/main/src/cgeo/geocaching/settings/Settings.java @@ -77,6 +77,8 @@ public class Settings { Min, Sec; + static int DEFAULT_INT_VALUE = Min.ordinal(); + public static CoordInputFormatEnum fromInt(final int id) { final CoordInputFormatEnum[] values = CoordInputFormatEnum.values(); if (id < 0 || id >= values.length) { @@ -153,7 +155,7 @@ public class Settings { e.putString(getKey(R.string.pref_password), old.getString(getKey(R.string.pref_password), null)); e.putString(getKey(R.string.pref_username), old.getString(getKey(R.string.pref_username), null)); e.putString(getKey(R.string.pref_memberstatus), old.getString(getKey(R.string.pref_memberstatus), "")); - e.putInt(getKey(R.string.pref_coordinputformat), old.getInt(getKey(R.string.pref_coordinputformat), 0)); + e.putInt(getKey(R.string.pref_coordinputformat), old.getInt(getKey(R.string.pref_coordinputformat), CoordInputFormatEnum.DEFAULT_INT_VALUE)); e.putBoolean(getKey(R.string.pref_log_offline), old.getBoolean(getKey(R.string.pref_log_offline), false)); e.putBoolean(getKey(R.string.pref_choose_list), old.getBoolean(getKey(R.string.pref_choose_list), true)); e.putBoolean(getKey(R.string.pref_loaddirectionimg), old.getBoolean(getKey(R.string.pref_loaddirectionimg), true)); @@ -485,7 +487,7 @@ public class Settings { } public static CoordInputFormatEnum getCoordInputFormat() { - return CoordInputFormatEnum.fromInt(getInt(R.string.pref_coordinputformat, CoordInputFormatEnum.Min.ordinal())); + return CoordInputFormatEnum.fromInt(getInt(R.string.pref_coordinputformat, CoordInputFormatEnum.DEFAULT_INT_VALUE)); } public static void setCoordInputFormat(final CoordInputFormatEnum format) { |