aboutsummaryrefslogtreecommitdiffstats
path: root/main/src/cgeo/geocaching/connector/gc/GCLogin.java
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2013-12-28 12:15:52 +0100
committerSamuel Tardieu <sam@rfc1149.net>2013-12-28 12:15:52 +0100
commit5e9d1008080b67808bc19ddec3880670a8992ee7 (patch)
tree8b49f1f5b51ebcfbba1b30a9c11b13c79b09ea25 /main/src/cgeo/geocaching/connector/gc/GCLogin.java
parent40e9c8a2c70c40b382ab127736a23e2b51dfdf4d (diff)
downloadcgeo-5e9d1008080b67808bc19ddec3880670a8992ee7.zip
cgeo-5e9d1008080b67808bc19ddec3880670a8992ee7.tar.gz
cgeo-5e9d1008080b67808bc19ddec3880670a8992ee7.tar.bz2
fix #3485: requests to gc.com although deactivated
Also, refactor code so that the login request (if needed) done when retrieving the map tokens is done directly from the connector.
Diffstat (limited to 'main/src/cgeo/geocaching/connector/gc/GCLogin.java')
-rw-r--r--main/src/cgeo/geocaching/connector/gc/GCLogin.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/main/src/cgeo/geocaching/connector/gc/GCLogin.java b/main/src/cgeo/geocaching/connector/gc/GCLogin.java
index e072c8f..7f23bf6 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCLogin.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCLogin.java
@@ -473,10 +473,9 @@ public class GCLogin extends AbstractLogin {
*
* @return first is user session, second is session token
*/
- public static @NonNull
+ public @NonNull
MapTokens getMapTokens() {
- final HttpResponse response = Network.getRequest(GCConstants.URL_LIVE_MAP);
- final String data = Network.getResponseData(response);
+ final String data = getRequestLogged(GCConstants.URL_LIVE_MAP, null);
final String userSession = TextUtils.getMatch(data, GCConstants.PATTERN_USERSESSION, "");
final String sessionToken = TextUtils.getMatch(data, GCConstants.PATTERN_SESSIONTOKEN, "");
return new MapTokens(userSession, sessionToken);