aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2014-01-03 17:00:46 +0100
committerSamuel Tardieu <sam@rfc1149.net>2014-01-03 17:00:48 +0100
commitcf4a35192beeda1ba46e0f67476a68a7da7a806b (patch)
tree51d31aea96469c9ca33c1669e43d9de7e5b20cfc
parentb0ee9a5e12f71fd6b606ef5101eed85ae0bf4283 (diff)
downloadcgeo-cf4a35192beeda1ba46e0f67476a68a7da7a806b.zip
cgeo-cf4a35192beeda1ba46e0f67476a68a7da7a806b.tar.gz
cgeo-cf4a35192beeda1ba46e0f67476a68a7da7a806b.tar.bz2
Do not set login name from map code
The user name, status and find count will be determined by the regular login procedure, there is no need to update it from the map code.
-rw-r--r--main/src/cgeo/geocaching/connector/gc/GCConstants.java2
-rw-r--r--main/src/cgeo/geocaching/connector/gc/GCLogin.java1
2 files changed, 1 insertions, 2 deletions
diff --git a/main/src/cgeo/geocaching/connector/gc/GCConstants.java b/main/src/cgeo/geocaching/connector/gc/GCConstants.java
index b8353ef..ade4bef 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCConstants.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCConstants.java
@@ -73,7 +73,7 @@ public final class GCConstants {
public static final Pattern PATTERN_AVATAR_IMAGE_PROFILE_PAGE = Pattern.compile("src=\"(https?://imgcdn.geocaching.com/avatar/[0-9a-f-]+\\.jpg)\"[^>]*alt=\"Avatar\"");
public static final Pattern PATTERN_LOGIN_NAME_LOGIN_PAGE = Pattern.compile("ctl00_ContentBody_lbUsername\">.*<strong>(.*)</strong>");
public static final Pattern PATTERN_CUSTOMDATE = Pattern.compile("<option selected=\"selected\" value=\"([ /Mdy-]+)\">");
- public static final Pattern PATTERN_MAP_LOGGED_IN = Pattern.compile("<a href=\"https?://www.geocaching.com/my/\" class=\"CommonUsername\" title=\"([^\"]*)\"");
+ public static final Pattern PATTERN_MAP_LOGGED_IN = Pattern.compile("<a href=\"https?://www.geocaching.com/my/\" class=\"CommonUsername\"");
/**
* Patterns for parsing trackables
diff --git a/main/src/cgeo/geocaching/connector/gc/GCLogin.java b/main/src/cgeo/geocaching/connector/gc/GCLogin.java
index 0c88cb5..8f3202e 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCLogin.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCLogin.java
@@ -188,7 +188,6 @@ public class GCLogin extends AbstractLogin {
assert page != null;
if (TextUtils.matches(page, GCConstants.PATTERN_MAP_LOGGED_IN)) {
- setActualUserName(TextUtils.getMatch(page, GCConstants.PATTERN_MAP_LOGGED_IN, true, "???"));
return true;
}