diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2013-10-26 19:27:22 +0200 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2013-10-26 19:27:22 +0200 |
| commit | bd9535698bd9239bc6e60580c20e6c275449ff61 (patch) | |
| tree | 83b29676ab4be7c10918a1ea5f9e985409080a56 | |
| parent | e054988257da663b6c998cc2c0da84cf264bc23b (diff) | |
| download | cgeo-bd9535698bd9239bc6e60580c20e6c275449ff61.zip cgeo-bd9535698bd9239bc6e60580c20e6c275449ff61.tar.gz cgeo-bd9535698bd9239bc6e60580c20e6c275449ff61.tar.bz2 | |
fix: also recognize PQs for routes
3 files changed, 3 insertions, 3 deletions
diff --git a/main/src/cgeo/geocaching/connector/gc/GCConstants.java b/main/src/cgeo/geocaching/connector/gc/GCConstants.java index 152b8a2..c74abae 100644 --- a/main/src/cgeo/geocaching/connector/gc/GCConstants.java +++ b/main/src/cgeo/geocaching/connector/gc/GCConstants.java @@ -158,7 +158,7 @@ public final class GCConstants { public final static Pattern PATTERN_VIEWSTATEFIELDCOUNT = Pattern.compile("id=\"__VIEWSTATEFIELDCOUNT\"[^(value)]+value=\"(\\d+)\"[^>]+>", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE); public final static Pattern PATTERN_VIEWSTATES = Pattern.compile("id=\"__VIEWSTATE(\\d*)\"[^(value)]+value=\"([^\"]+)\"[^>]+>", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE); public final static Pattern PATTERN_USERTOKEN = Pattern.compile("userToken\\s*=\\s*'([^']+)'"); - public final static Pattern PATTERN_LIST_PQ = Pattern.compile(Pattern.quote("pocket_query.png") + ".*?" + Pattern.quote("(") + "(.*?)" + Pattern.quote(")") + ".*?guid=([^\"]*)\".*?>([^<]*)<"); + public final static Pattern PATTERN_LIST_PQ = Pattern.compile(Pattern.quote("(") + "(\\d+)" + Pattern.quote(")") + ".*?guid=([^\"]*)\".*?>([^<]*)<"); /** Live Map since 14.02.2012 */ public final static Pattern PATTERN_USERSESSION = Pattern.compile("UserSession\\('([^']+)'"); diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java index 869d27d..2be811a 100644 --- a/main/src/cgeo/geocaching/connector/gc/GCParser.java +++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java @@ -907,7 +907,7 @@ public abstract class GCParser { return searchByAny(cacheType, isSearchForMyCaches(userName), showCaptcha, params, recaptchaReceiver); } - public static SearchResult searchByPocket(final String pocketGuid, final CacheType cacheType, final boolean showCaptcha, RecaptchaReceiver recaptchaReceiver) { + public static SearchResult searchByPocketQuery(final String pocketGuid, final CacheType cacheType, final boolean showCaptcha, RecaptchaReceiver recaptchaReceiver) { if (StringUtils.isBlank(pocketGuid)) { Log.e("GCParser.searchByPocket: No guid name given"); return null; diff --git a/main/src/cgeo/geocaching/loaders/PocketGeocacheListLoader.java b/main/src/cgeo/geocaching/loaders/PocketGeocacheListLoader.java index 9256189..32fb020 100644 --- a/main/src/cgeo/geocaching/loaders/PocketGeocacheListLoader.java +++ b/main/src/cgeo/geocaching/loaders/PocketGeocacheListLoader.java @@ -18,7 +18,7 @@ public class PocketGeocacheListLoader extends AbstractSearchLoader { public SearchResult runSearch() { if (Settings.isGCConnectorActive()) { - return GCParser.searchByPocket(guid, Settings.getCacheType(), Settings.isShowCaptcha(), this); + return GCParser.searchByPocketQuery(guid, Settings.getCacheType(), Settings.isShowCaptcha(), this); } return new SearchResult(); |