Finally fixes #3267, Detect and report time-skew that prevents okapi access

Extended the OAuth process to allow specific additional error reporting

1 files changed, 16 insertions, 0 deletions

diff --git a/main/src/cgeo/geocaching/connector/oc/OCAuthorizationActivity.java b/main/src/cgeo/geocaching/connector/oc/OCAuthorizationActivity.java
index c082bac..19f4447 100644
--- a/main/src/cgeo/geocaching/connector/oc/OCAuthorizationActivity.java
+++ b/main/src/cgeo/geocaching/connector/oc/OCAuthorizationActivity.java
@@ -2,9 +2,13 @@ package cgeo.geocaching.connector.oc;
 
 import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.R;
+import cgeo.geocaching.connector.oc.OkapiError.OkapiErrors;
 import cgeo.geocaching.network.OAuthAuthorizationActivity;
 import cgeo.geocaching.settings.Settings;
 
+import ch.boye.httpclientandroidlib.HttpResponse;
+
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.eclipse.jdt.annotation.Nullable;
 
@@ -52,4 +56,16 @@ public abstract class OCAuthorizationActivity extends OAuthAuthorizationActivity
         return res.getString(R.string.auth_dialog_completed_oc, getAuthTitle());
     }
 
+    /**
+     * Return an extended error in case of an invalid time stamp
+     */
+    @Override
+    protected String getExtendedErrorMsg(HttpResponse response) {
+        OkapiError error = OkapiClient.decodeErrorResponse(response);
+        if (error.getResult() == OkapiErrors.INVALID_TIMESTAMP) {
+            return res.getString(R.string.init_login_popup_invalid_timestamp);
+        }
+        return StringUtils.EMPTY;
+    }
+
 }