aboutsummaryrefslogtreecommitdiffstats
path: root/main/src
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2013-01-19 12:13:04 +0100
committerSamuel Tardieu <sam@rfc1149.net>2013-01-19 12:13:04 +0100
commit14796b42b2b14f799294ba955504bc0064ef5d11 (patch)
tree5f27d9e615533cb7afe257892aaa9059ddbef572 /main/src
parent97cb0325fbb353b6b0b8989678333a085652c5e5 (diff)
downloadcgeo-14796b42b2b14f799294ba955504bc0064ef5d11.zip
cgeo-14796b42b2b14f799294ba955504bc0064ef5d11.tar.gz
cgeo-14796b42b2b14f799294ba955504bc0064ef5d11.tar.bz2
fix #2412: login fail with unhelpful message on unvalidated account
Diffstat (limited to 'main/src')
-rw-r--r--main/src/cgeo/geocaching/connector/gc/Login.java5
-rw-r--r--main/src/cgeo/geocaching/enumerations/StatusCode.java1
2 files changed, 6 insertions, 0 deletions
diff --git a/main/src/cgeo/geocaching/connector/gc/Login.java b/main/src/cgeo/geocaching/connector/gc/Login.java
index c3f29cc..8bb9866 100644
--- a/main/src/cgeo/geocaching/connector/gc/Login.java
+++ b/main/src/cgeo/geocaching/connector/gc/Login.java
@@ -132,6 +132,11 @@ public abstract class Login {
return StatusCode.WRONG_LOGIN_DATA; // wrong login
}
+ if (loginData.contains("You must validate your account before you can log in.")) {
+ Log.i("Failued to log in Geocaching.com as " + login.left + " because account needs to be validated first");
+ return StatusCode.UNVALIDATED_ACCOUNT;
+ }
+
Log.i("Failed to log in Geocaching.com as " + login.left + " for some unknown reason");
if (retry) {
Login.switchToEnglish(loginData);
diff --git a/main/src/cgeo/geocaching/enumerations/StatusCode.java b/main/src/cgeo/geocaching/enumerations/StatusCode.java
index 1a1f05d..dc62225 100644
--- a/main/src/cgeo/geocaching/enumerations/StatusCode.java
+++ b/main/src/cgeo/geocaching/enumerations/StatusCode.java
@@ -16,6 +16,7 @@ public enum StatusCode {
COMMUNICATION_ERROR(R.string.err_comm),
WRONG_LOGIN_DATA(R.string.err_wrong),
UNAPPROVED_LICENSE(R.string.err_license),
+ UNVALIDATED_ACCOUNT(R.string.err_unvalidated_account),
UNPUBLISHED_CACHE(R.string.err_unpublished),
PREMIUM_ONLY(R.string.err_premium_only),
MAINTENANCE(R.string.err_maintenance),