aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorBananeweizen <Bananeweizen@gmx.de>2013-07-30 10:05:32 +0200
committerBananeweizen <Bananeweizen@gmx.de>2013-07-30 10:05:32 +0200
commit4cb784c46dc6f099d5e24eadce600550c6e3a4cc (patch)
tree0c783d14507d66184566600f7b1cd4a5f4ae394c /main
parent964377aab5c292813e532331339d5c136c17099b (diff)
downloadcgeo-4cb784c46dc6f099d5e24eadce600550c6e3a4cc.zip
cgeo-4cb784c46dc6f099d5e24eadce600550c6e3a4cc.tar.gz
cgeo-4cb784c46dc6f099d5e24eadce600550c6e3a4cc.tar.bz2
fix #3080: remove unwanted summary change for OC.de activation
Diffstat (limited to 'main')
-rw-r--r--main/src/cgeo/geocaching/settings/SettingsActivity.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/main/src/cgeo/geocaching/settings/SettingsActivity.java b/main/src/cgeo/geocaching/settings/SettingsActivity.java
index 7ec15dd..fa84157 100644
--- a/main/src/cgeo/geocaching/settings/SettingsActivity.java
+++ b/main/src/cgeo/geocaching/settings/SettingsActivity.java
@@ -506,22 +506,22 @@ public class SettingsActivity extends PreferenceActivity {
text = preference.getContext().getString(R.string.init_backup_last_no);
}
preference.setSummary(text);
+ }
+ else if (isPreference(preference, R.string.pref_connectorOCActive) || isPreference(preference, R.string.pref_connectorGCActive)) {
+ // reset log-in status if connector activation was changed
+ cgeoapplication.getInstance().checkLogin = true;
} else {
// For all other preferences, set the summary to the value's
// simple string representation.
preference.setSummary(stringValue);
}
- // reset log-in if gc user or password is changed
if (isPreference(preference, R.string.pref_username) || isPreference(preference, R.string.pref_password)) {
+ // reset log-in if gc user or password is changed
if (Login.isActualLoginStatus()) {
Login.logout();
}
cgeoapplication.getInstance().checkLogin = true;
}
- // reset log-in status if connector activation was changed
- if (isPreference(preference, R.string.pref_connectorOCActive) || isPreference(preference, R.string.pref_connectorGCActive)) {
- cgeoapplication.getInstance().checkLogin = true;
- }
return true;
}
};