diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2012-04-26 09:36:40 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2012-04-26 09:36:40 +0200 |
| commit | cfdca4e9d09ba1a496d682850dc893c397c895c4 (patch) | |
| tree | 435413b3d8a599b4b9773d7b51a668dcffe563d8 | |
| parent | fa4f4684eb3ecf11845a67cbc0f69ff4acffc2b5 (diff) | |
| parent | bc462301695b3766fadae920ecc5ac6c3f35828b (diff) | |
| download | cgeo-cfdca4e9d09ba1a496d682850dc893c397c895c4.zip cgeo-cfdca4e9d09ba1a496d682850dc893c397c895c4.tar.gz cgeo-cfdca4e9d09ba1a496d682850dc893c397c895c4.tar.bz2 | |
Merge branch 'release' into upstream
Conflicts:
main/res/values/strings.xml
main/src/cgeo/geocaching/connector/gc/Login.java
| -rw-r--r-- | main/src/cgeo/geocaching/connector/gc/Login.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/src/cgeo/geocaching/connector/gc/Login.java b/main/src/cgeo/geocaching/connector/gc/Login.java index dc8c968..28b2c6a 100644 --- a/main/src/cgeo/geocaching/connector/gc/Login.java +++ b/main/src/cgeo/geocaching/connector/gc/Login.java @@ -81,7 +81,7 @@ public abstract class Login { } if (Login.getLoginStatus(loginData)) { - Log.i("Already logged in Geocaching.com as " + login.left); + Log.i("Already logged in Geocaching.com as " + login.left + " (" + Settings.getMemberStatus() + ')'); Login.switchToEnglish(loginData); return StatusCode.NO_ERROR; // logged in } @@ -113,7 +113,7 @@ public abstract class Login { } if (Login.getLoginStatus(loginData)) { - Log.i("Successfully logged in Geocaching.com as " + login.left); + Log.i("Successfully logged in Geocaching.com as " + login.left + " (" + Settings.getMemberStatus() + ')'); Login.switchToEnglish(loginData); Settings.setCookieStore(Cookies.dumpCookieStore()); |
