diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2013-12-17 11:55:23 +0100 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2013-12-17 11:55:23 +0100 |
| commit | 64e4e15b5e59b1597337d47261bf5fb5744afcf3 (patch) | |
| tree | c1ff5164f6bd06291bf848e64223fca71370b27e | |
| parent | e6f7585487ef3bc8d2e8e8157d7c962842448004 (diff) | |
| download | cgeo-64e4e15b5e59b1597337d47261bf5fb5744afcf3.zip cgeo-64e4e15b5e59b1597337d47261bf5fb5744afcf3.tar.gz cgeo-64e4e15b5e59b1597337d47261bf5fb5744afcf3.tar.bz2 | |
refactoring: move password handling into the password preference
| -rw-r--r-- | main/src/cgeo/geocaching/settings/EditPasswordPreference.java | 11 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/settings/SettingsActivity.java | 8 |
2 files changed, 12 insertions, 7 deletions
diff --git a/main/src/cgeo/geocaching/settings/EditPasswordPreference.java b/main/src/cgeo/geocaching/settings/EditPasswordPreference.java index 20d0250..b127f52 100644 --- a/main/src/cgeo/geocaching/settings/EditPasswordPreference.java +++ b/main/src/cgeo/geocaching/settings/EditPasswordPreference.java @@ -1,5 +1,7 @@ package cgeo.geocaching.settings; +import org.apache.commons.lang3.StringUtils; + import android.content.Context; import android.preference.EditTextPreference; import android.util.AttributeSet; @@ -25,4 +27,13 @@ public class EditPasswordPreference extends EditTextPreference { super(context, attrs, defStyle); } + @Override + public void setSummary(CharSequence summary) { + if (StringUtils.isBlank(summary)) { + super.setSummary(StringUtils.EMPTY); + } else { + super.setSummary(StringUtils.repeat("\u2022 ", 10)); + } + } + } diff --git a/main/src/cgeo/geocaching/settings/SettingsActivity.java b/main/src/cgeo/geocaching/settings/SettingsActivity.java index ca8b938..6b4a71b 100644 --- a/main/src/cgeo/geocaching/settings/SettingsActivity.java +++ b/main/src/cgeo/geocaching/settings/SettingsActivity.java @@ -469,13 +469,7 @@ public class SettingsActivity extends PreferenceActivity { public boolean onPreferenceChange(final Preference preference, final Object value) { String stringValue = value.toString(); - if (preference instanceof EditPasswordPreference) { - if (StringUtils.isBlank((String) value)) { - preference.setSummary(StringUtils.EMPTY); - } else { - preference.setSummary(StringUtils.repeat("\u2022 ", 10)); - } - } else if (isPreference(preference, R.string.pref_mapsource)) { + if (isPreference(preference, R.string.pref_mapsource)) { // reset the cached map source MapSource mapSource; try { |