diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2015-04-07 22:42:28 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2015-04-07 22:42:28 +0200 |
| commit | 166ddaeb7b72e6574a18edec0381458f1bdc2a3a (patch) | |
| tree | 0d5ed2d24d3f88b15fce9b54ae60ddcdd89554c8 | |
| parent | 5d67902a5b558bf471bb837f7b3fe963fc529a39 (diff) | |
| parent | e500a22cafe1b6ef0e6a1571ad7acaa385674436 (diff) | |
| download | cgeo-166ddaeb7b72e6574a18edec0381458f1bdc2a3a.zip cgeo-166ddaeb7b72e6574a18edec0381458f1bdc2a3a.tar.gz cgeo-166ddaeb7b72e6574a18edec0381458f1bdc2a3a.tar.bz2 | |
Merge branch 'issue-4824' into release
| -rw-r--r-- | main/src/cgeo/geocaching/AboutActivity.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/main/src/cgeo/geocaching/AboutActivity.java b/main/src/cgeo/geocaching/AboutActivity.java index 90961d5..e5a98c2 100644 --- a/main/src/cgeo/geocaching/AboutActivity.java +++ b/main/src/cgeo/geocaching/AboutActivity.java @@ -291,14 +291,18 @@ public class AboutActivity extends AbstractViewPagerActivity<AboutActivity.Page> .append("\nMap strategy: ").append(Settings.getLiveMapStrategy().toString().toLowerCase(Locale.getDefault())) .append("\nHW-acceleration: ").append(Settings.useHardwareAcceleration() ? "enabled" : "disabled") .append(" (").append(Settings.useHardwareAcceleration() != Settings.HW_ACCEL_DISABLED_BY_DEFAULT ? "default state" : "manually changed").append(")"); + final StringBuilder connectors = new StringBuilder(); + int connectorCount = 0; for (final ILogin connector : ConnectorFactory.getActiveLiveConnectors()) { - body.append('\n').append(connector.getName()).append(": ").append(connector.isLoggedIn() ? "logged in" : "not logged in") + connectorCount++; + connectors.append("\n - ").append(connector.getName()).append(": ").append(connector.isLoggedIn() ? "logged in" : "not logged in") .append(" (").append(connector.getLoginStatusString()).append(')'); if (connector.getName().equals("geocaching.com") && connector.isLoggedIn()) { - body.append(" / ").append(Settings.getGCMemberStatus()); + connectors.append(" / ").append(Settings.getGCMemberStatus()); } } - body.append("\nSystem language: ").append(Locale.getDefault()); + body.append("\nGeocaching sites enabled:").append(connectorCount > 0 ? connectors : " none") + .append("\nSystem language: ").append(Locale.getDefault()); if (Settings.isUseEnglish()) { body.append(" (cgeo forced to English)"); } |