Move resource-ids to UserInfoStatus

3 files changed, 44 insertions, 48 deletions

diff --git a/main/src/cgeo/geocaching/connector/oc/OCApiLiveConnector.java b/main/src/cgeo/geocaching/connector/oc/OCApiLiveConnector.java
index fd0ba2b..5f30934 100644
--- a/main/src/cgeo/geocaching/connector/oc/OCApiLiveConnector.java
+++ b/main/src/cgeo/geocaching/connector/oc/OCApiLiveConnector.java
@@ -1,7 +1,6 @@
 package cgeo.geocaching.connector.oc;
 
 import cgeo.geocaching.Geocache;
-import cgeo.geocaching.R;
 import cgeo.geocaching.SearchResult;
 import cgeo.geocaching.Settings;
 import cgeo.geocaching.cgData;
@@ -10,8 +9,7 @@ import cgeo.geocaching.connector.ILoggingManager;
 import cgeo.geocaching.connector.capability.ILogin;
 import cgeo.geocaching.connector.capability.ISearchByCenter;
 import cgeo.geocaching.connector.capability.ISearchByViewPort;
-import cgeo.geocaching.connector.oc.OkapiClient.UserInfo;
-import cgeo.geocaching.connector.oc.OkapiClient.UserInfo.UserInfoStatus;
+import cgeo.geocaching.connector.oc.UserInfo.UserInfoStatus;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.geopoint.Viewport;
 import cgeo.geocaching.utils.CryptUtils;
@@ -131,18 +129,7 @@ public class OCApiLiveConnector extends OCApiConnector implements ISearchByCente
 
     @Override
     public String getLoginStatusString() {
-        switch (userInfo.getStatus()) {
-            case NOT_RETRIEVED:
-                return cgeoapplication.getInstance().getString(R.string.init_login_popup_working);
-            case SUCCESSFUL:
-                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";
-        }
+        return cgeoapplication.getInstance().getString(userInfo.getStatus().resId);
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
index c5c030f..e2cc7cd 100644
--- a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
+++ b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
@@ -14,7 +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.connector.oc.UserInfo.UserInfoStatus;
 import cgeo.geocaching.enumerations.CacheAttribute;
 import cgeo.geocaching.enumerations.CacheSize;
 import cgeo.geocaching.enumerations.CacheType;
@@ -697,36 +697,4 @@ final public class OkapiClient {
         return new UserInfo(name, finds, success ? UserInfoStatus.SUCCESSFUL : UserInfoStatus.FAILED);
     }
 
-    public static class UserInfo {
-
-        public enum UserInfoStatus {
-            NOT_RETRIEVED,
-            SUCCESSFUL,
-            FAILED,
-            NOT_SUPPORTED
-        }
-
-        private final String name;
-        private final int finds;
-        private final UserInfoStatus status;
-
-        UserInfo(String name, int finds, UserInfoStatus status) {
-            this.name = name;
-            this.finds = finds;
-            this.status = status;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public int getFinds() {
-            return finds;
-        }
-
-        public UserInfoStatus getStatus() {
-            return status;
-        }
-    }
-
 }
diff --git a/main/src/cgeo/geocaching/connector/oc/UserInfo.java b/main/src/cgeo/geocaching/connector/oc/UserInfo.java
new file mode 100644
index 0000000..0dc0440
--- /dev/null
+++ b/main/src/cgeo/geocaching/connector/oc/UserInfo.java
@@ -0,0 +1,41 @@
+package cgeo.geocaching.connector.oc;
+
+import cgeo.geocaching.R;
+
+public class UserInfo {
+
+    public enum UserInfoStatus {
+        NOT_RETRIEVED(R.string.init_login_popup_working),
+        SUCCESSFUL(R.string.init_login_popup_ok),
+        FAILED(R.string.init_login_popup_failed),
+        NOT_SUPPORTED(R.string.init_login_popup_not_authorized);
+
+        public final int resId;
+
+        UserInfoStatus(int resId) {
+            this.resId = resId;
+        }
+    }
+
+    private final String name;
+    private final int finds;
+    private final UserInfoStatus status;
+
+    UserInfo(String name, int finds, UserInfoStatus status) {
+        this.name = name;
+        this.finds = finds;
+        this.status = status;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getFinds() {
+        return finds;
+    }
+
+    public UserInfoStatus getStatus() {
+        return status;
+    }
+}