aboutsummaryrefslogtreecommitdiffstats
path: root/main/src
diff options
context:
space:
mode:
authorrsudev <rsudev@googlemail.com>2013-06-25 11:46:49 +0200
committerrsudev <rsudev@googlemail.com>2013-06-25 11:46:49 +0200
commitcd46bb595b3f51ccbebd616aea54341fdbbcf019 (patch)
treea8e05bf2920e6f365c3c9bcd92450596f86522dd /main/src
parentcf999b7a4ff1d6e52a2aa5ff1636c269d199f124 (diff)
downloadcgeo-cd46bb595b3f51ccbebd616aea54341fdbbcf019.zip
cgeo-cd46bb595b3f51ccbebd616aea54341fdbbcf019.tar.gz
cgeo-cd46bb595b3f51ccbebd616aea54341fdbbcf019.tar.bz2
Improved message for non-authorized OKAPI connectors
Diffstat (limited to 'main/src')
-rw-r--r--main/src/cgeo/geocaching/connector/oc/OCApiLiveConnector.java4
-rw-r--r--main/src/cgeo/geocaching/connector/oc/OkapiClient.java3
2 files changed, 6 insertions, 1 deletions
diff --git a/main/src/cgeo/geocaching/connector/oc/OCApiLiveConnector.java b/main/src/cgeo/geocaching/connector/oc/OCApiLiveConnector.java
index 87a0fd9..fd0ba2b 100644
--- a/main/src/cgeo/geocaching/connector/oc/OCApiLiveConnector.java
+++ b/main/src/cgeo/geocaching/connector/oc/OCApiLiveConnector.java
@@ -113,6 +113,8 @@ public class OCApiLiveConnector extends OCApiConnector implements ISearchByCente
public boolean login(Handler handler, Context fromActivity) {
if (supportsPersonalization()) {
userInfo = OkapiClient.getUserInfo(this);
+ } else {
+ userInfo = new UserInfo(StringUtils.EMPTY, 0, UserInfoStatus.NOT_SUPPORTED);
}
return userInfo.getStatus() == UserInfoStatus.SUCCESSFUL;
}
@@ -136,6 +138,8 @@ public class OCApiLiveConnector extends OCApiConnector implements ISearchByCente
return cgeoapplication.getInstance().getString(R.string.init_login_popup_ok);
case FAILED:
return cgeoapplication.getInstance().getString(R.string.init_login_popup_failed);
+ case NOT_SUPPORTED:
+ return cgeoapplication.getInstance().getString(R.string.init_login_popup_not_authorized);
default:
return "Error";
}
diff --git a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
index c94cb02..c5c030f 100644
--- a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
+++ b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
@@ -702,7 +702,8 @@ final public class OkapiClient {
public enum UserInfoStatus {
NOT_RETRIEVED,
SUCCESSFUL,
- FAILED
+ FAILED,
+ NOT_SUPPORTED
}
private final String name;