aboutsummaryrefslogtreecommitdiffstats
path: root/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
diff options
context:
space:
mode:
Diffstat (limited to 'main/src/cgeo/geocaching/connector/oc/OkapiClient.java')
-rw-r--r--main/src/cgeo/geocaching/connector/oc/OkapiClient.java21
1 files changed, 14 insertions, 7 deletions
diff --git a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
index f818a7c..c94cb02 100644
--- a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
+++ b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
@@ -14,6 +14,7 @@ import cgeo.geocaching.connector.LogResult;
import cgeo.geocaching.connector.gc.GCConnector;
import cgeo.geocaching.connector.oc.OCApiConnector.ApiSupport;
import cgeo.geocaching.connector.oc.OCApiConnector.OAuthLevel;
+import cgeo.geocaching.connector.oc.OkapiClient.UserInfo.UserInfoStatus;
import cgeo.geocaching.enumerations.CacheAttribute;
import cgeo.geocaching.enumerations.CacheSize;
import cgeo.geocaching.enumerations.CacheType;
@@ -664,7 +665,7 @@ final public class OkapiClient {
final JSONObject data = request(connector, OkapiService.SERVICE_USER, params);
if (data == null) {
- return new UserInfo(StringUtils.EMPTY, 0, false);
+ return new UserInfo(StringUtils.EMPTY, 0, UserInfoStatus.FAILED);
}
String name = StringUtils.EMPTY;
@@ -693,19 +694,25 @@ final public class OkapiClient {
success = false;
}
- return new UserInfo(name, finds, success);
+ return new UserInfo(name, finds, success ? UserInfoStatus.SUCCESSFUL : UserInfoStatus.FAILED);
}
public static class UserInfo {
+ public enum UserInfoStatus {
+ NOT_RETRIEVED,
+ SUCCESSFUL,
+ FAILED
+ }
+
private final String name;
private final int finds;
- private final boolean retrieveSuccessful;
+ private final UserInfoStatus status;
- UserInfo(String name, int finds, boolean retrieveSuccessful) {
+ UserInfo(String name, int finds, UserInfoStatus status) {
this.name = name;
this.finds = finds;
- this.retrieveSuccessful = retrieveSuccessful;
+ this.status = status;
}
public String getName() {
@@ -716,8 +723,8 @@ final public class OkapiClient {
return finds;
}
- public boolean isRetrieveSuccessful() {
- return retrieveSuccessful;
+ public UserInfoStatus getStatus() {
+ return status;
}
}