Get GC custom date on every succesful login

Part of work on #4416.

3 files changed, 3 insertions, 6 deletions

diff --git a/main/src/cgeo/geocaching/connector/gc/GCConnector.java b/main/src/cgeo/geocaching/connector/gc/GCConnector.java
index 3b7c31e..226c8bb 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCConnector.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCConnector.java
@@ -327,10 +327,6 @@ public class GCConnector extends AbstractConnector implements ISearchByGeocode,
         // login
         final StatusCode status = GCLogin.getInstance().login();
 
-        if (status == StatusCode.NO_ERROR) {
-            GCLogin.detectGcCustomDate();
-        }
-
         if (CgeoApplication.getInstance().showLoginToast && handler != null) {
             handler.sendMessage(handler.obtainMessage(0, status));
             CgeoApplication.getInstance().showLoginToast = false;
diff --git a/main/src/cgeo/geocaching/connector/gc/GCLogin.java b/main/src/cgeo/geocaching/connector/gc/GCLogin.java
index c0a0ad8..58e5c49 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCLogin.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCLogin.java
@@ -110,6 +110,7 @@ public class GCLogin extends AbstractLogin {
             if (switchToEnglish(loginData) && retry) {
                 return login(false);
             }
+            detectGcCustomDate();
             return StatusCode.NO_ERROR; // logged in
         }
 
@@ -146,6 +147,7 @@ public class GCLogin extends AbstractLogin {
             }
             Log.i("Successfully logged in Geocaching.com as " + username + " (" + Settings.getGCMemberStatus() + ')');
             Settings.setCookieStore(Cookies.dumpCookieStore());
+            detectGcCustomDate();
             return StatusCode.NO_ERROR; // logged in
         }
 
@@ -289,7 +291,7 @@ public class GCLogin extends AbstractLogin {
     /**
      * Detect user date settings on geocaching.com
      */
-    public static void detectGcCustomDate() {
+    private static void detectGcCustomDate() {
 
         final String result = Network.getResponseData(Network.getRequest("http://www.geocaching.com/account/ManagePreferences.aspx"));
 
diff --git a/main/src/cgeo/geocaching/settings/CheckGcCredentialsPreference.java b/main/src/cgeo/geocaching/settings/CheckGcCredentialsPreference.java
index 0269f3b..c4b243e 100644
--- a/main/src/cgeo/geocaching/settings/CheckGcCredentialsPreference.java
+++ b/main/src/cgeo/geocaching/settings/CheckGcCredentialsPreference.java
@@ -31,7 +31,6 @@ public class CheckGcCredentialsPreference extends AbstractCheckCredentialsPrefer
         final StatusCode loginResult = GCLogin.getInstance().login();
         switch (loginResult) {
             case NO_ERROR:
-                GCLogin.detectGcCustomDate();
                 return ImmutablePair.of(StatusCode.NO_ERROR, GCLogin.getInstance().downloadAvatarAndGetMemberStatus());
             default:
                 return ImmutablePair.of(loginResult, null);