aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--main/src/cgeo/geocaching/GCConstants.java1
-rw-r--r--main/src/cgeo/geocaching/cgBase.java168
-rw-r--r--tests/src/cgeo/geocaching/cgeoApplicationTest.java12
3 files changed, 6 insertions, 175 deletions
diff --git a/main/src/cgeo/geocaching/GCConstants.java b/main/src/cgeo/geocaching/GCConstants.java
index a1d319d..49f9e29 100644
--- a/main/src/cgeo/geocaching/GCConstants.java
+++ b/main/src/cgeo/geocaching/GCConstants.java
@@ -135,7 +135,6 @@ public final class GCConstants {
public final static Pattern PATTERN_MAINTENANCE = Pattern.compile("<span id=\"ctl00_ContentBody_LogBookPanel1_lbConfirm\"[^>]*>([^<]*<font[^>]*>)?([^<]+)(</font>[^<]*)?</span>", Pattern.CASE_INSENSITIVE);
public final static Pattern PATTERN_OK1 = Pattern.compile("<h2[^>]*>[^<]*<span id=\"ctl00_ContentBody_lbHeading\"[^>]*>[^<]*</span>[^<]*</h2>", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
public final static Pattern PATTERN_OK2 = Pattern.compile("<div id=[\"|']ctl00_ContentBody_LogBookPanel1_ViewLogPanel[\"|']>", Pattern.CASE_INSENSITIVE);
- public final static Pattern PATTERN_USERTOKEN = Pattern.compile("var userToken[^=]*=[^']*'([^']+)';", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
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_USERTOKEN2 = Pattern.compile("userToken\\s*=\\s*'([^']+)'");
diff --git a/main/src/cgeo/geocaching/cgBase.java b/main/src/cgeo/geocaching/cgBase.java
index 481251e..ed904b6 100644
--- a/main/src/cgeo/geocaching/cgBase.java
+++ b/main/src/cgeo/geocaching/cgBase.java
@@ -19,7 +19,6 @@ import cgeo.geocaching.gcvote.GCVoteRating;
import cgeo.geocaching.geopoint.DistanceParser;
import cgeo.geocaching.geopoint.Geopoint;
import cgeo.geocaching.geopoint.GeopointFormatter.Format;
-import cgeo.geocaching.geopoint.Viewport;
import cgeo.geocaching.network.HtmlImage;
import cgeo.geocaching.network.Parameters;
import cgeo.geocaching.twitter.Twitter;
@@ -41,7 +40,6 @@ import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.methods.HttpRequestBase;
import org.apache.http.cookie.Cookie;
-import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.BasicCookieStore;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.impl.cookie.BasicClientCookie;
@@ -79,7 +77,6 @@ import android.widget.LinearLayout;
import java.io.File;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.net.SocketException;
@@ -695,101 +692,6 @@ public class cgBase {
return searchResult;
}
- // TODO Valentine Remove with merge
- @Deprecated
- public static SearchResult parseMapJSON(final String uri, final String data) {
- if (StringUtils.isEmpty(data)) {
- Log.e(Settings.tag, "cgeoBase.parseMapJSON: No page given");
- return null;
- }
-
- final SearchResult searchResult = new SearchResult();
- searchResult.setUrl(uri);
-
- try {
- final JSONObject yoDawg = new JSONObject(data);
- final String json = yoDawg.getString("d");
-
- if (StringUtils.isBlank(json)) {
- Log.e(Settings.tag, "cgeoBase.parseMapJSON: No JSON inside JSON");
- return null;
- }
-
- final JSONObject dataJSON = new JSONObject(json);
- final JSONObject extra = dataJSON.getJSONObject("cs");
- if (extra != null && extra.length() > 0) {
- int count = extra.getInt("count");
- // currently unused: 'pm', true for premium members
- // check login status
- boolean li = extra.getBoolean("li");
- if (!li) {
- searchResult.error = StatusCode.NOT_LOGGED_IN;
- }
-
- if (count > 0 && extra.has("cc")) {
- final JSONArray cachesData = extra.getJSONArray("cc");
- if (cachesData != null && cachesData.length() > 0) {
- JSONObject oneCache = null;
- for (int i = 0; i < count; i++) {
- oneCache = cachesData.getJSONObject(i);
- if (oneCache == null) {
- break;
- }
-
- final cgCache cacheToAdd = new cgCache();
- cacheToAdd.setDetailed(false);
- // coords are reliable if we are logged in
- cacheToAdd.setReliableLatLon(li);
- cacheToAdd.setGeocode(oneCache.getString("gc"));
- cacheToAdd.setCoords(new Geopoint(oneCache.getDouble("lat"), oneCache.getDouble("lon")));
- cacheToAdd.setName(oneCache.getString("nn"));
- cacheToAdd.setFound(oneCache.getBoolean("f"));
- cacheToAdd.setOwn(oneCache.getBoolean("o"));
- cacheToAdd.setDisabled(!oneCache.getBoolean("ia"));
- int ctid = oneCache.getInt("ctid");
- if (ctid == 2) {
- cacheToAdd.setType(CacheType.TRADITIONAL);
- } else if (ctid == 3) {
- cacheToAdd.setType(CacheType.MULTI);
- } else if (ctid == 4) {
- cacheToAdd.setType(CacheType.VIRTUAL);
- } else if (ctid == 5) {
- cacheToAdd.setType(CacheType.LETTERBOX);
- } else if (ctid == 6) {
- cacheToAdd.setType(CacheType.EVENT);
- } else if (ctid == 8) {
- cacheToAdd.setType(CacheType.MYSTERY);
- } else if (ctid == 11) {
- cacheToAdd.setType(CacheType.WEBCAM);
- } else if (ctid == 13) {
- cacheToAdd.setType(CacheType.CITO);
- } else if (ctid == 137) {
- cacheToAdd.setType(CacheType.EARTH);
- } else if (ctid == 453) {
- cacheToAdd.setType(CacheType.MEGA_EVENT);
- } else if (ctid == 1858) {
- cacheToAdd.setType(CacheType.WHERIGO);
- } else if (ctid == 3653) {
- cacheToAdd.setType(CacheType.LOSTANDFOUND);
- } else {
- cacheToAdd.setType(CacheType.UNKNOWN);
- }
-
- searchResult.addCache(cacheToAdd);
- }
- }
- } else {
- Log.w(Settings.tag, "There are no caches in viewport. Probably the viewport is too big");
- }
- searchResult.totalCnt = searchResult.getGeocodes().size();
- }
- } catch (Exception e) {
- Log.e(Settings.tag, "cgBase.parseMapJSON", e);
- }
-
- return searchResult;
- }
-
public static SearchResult parseCache(final String page, final int listId, final CancellableHandler handler) {
final SearchResult searchResult = parseCacheFromText(page, listId, handler);
if (searchResult != null && !searchResult.getGeocodes().isEmpty()) {
@@ -1880,35 +1782,6 @@ public class cgBase {
return searchByAny(thread, cacheType, false, listId, showCaptcha, params);
}
- // TODO Valentine Remove with merge
- @Deprecated
- public static SearchResult searchByViewport(final String userToken, final Viewport viewport) {
-
- String page = null;
-
- final String params = "{\"dto\":{\"data\":{\"c\":1,\"m\":\"\",\"d\":\"" +
- viewport.getLatitudeMax() + "|" + viewport.getLatitudeMin() + "|" +
- viewport.getLongitudeMax() + "|" + viewport.getLongitudeMin() + "\"},\"ut\":\"" +
- StringUtils.defaultString(userToken) + "\"}}";
-
- final String uri = "http://www.geocaching.com/map/default.aspx/MapAction";
- page = requestJSONgc(uri, params);
-
- if (StringUtils.isBlank(page)) {
- Log.e(Settings.tag, "cgeoBase.searchByViewport: No data from server");
- return null;
- }
-
- final SearchResult searchResult = parseMapJSON(Uri.parse(uri).buildUpon().encodedQuery(params).build().toString(), page);
- if (searchResult == null || CollectionUtils.isEmpty(searchResult.getGeocodes())) {
- Log.e(Settings.tag, "cgeoBase.searchByViewport: No cache parsed for viewport " + viewport);
- return null;
- }
-
- final SearchResult search = searchResult.filterSearchResults(Settings.isExcludeDisabledCaches(), Settings.isExcludeMyCaches(), Settings.getCacheType(), StoredList.TEMPORARY_LIST_ID);
- return search;
- }
-
/** Request .png image for a tile. Ignore the image - just load it */
public static void requestMapTile(final String url, final String referer) {
final HttpGet request = new HttpGet(url);
@@ -1929,24 +1802,6 @@ public class cgBase {
return getResponseData(request(request), false);
}
- // TODO Valentine Remove with merge
- @Deprecated
- public static String requestJSONgc(final String uri, final String params) {
- final HttpPost request = new HttpPost("http://www.geocaching.com/map/default.aspx/MapAction");
- try {
- request.setEntity(new StringEntity(params, HTTP.UTF_8));
- } catch (UnsupportedEncodingException e) {
- Log.e(Settings.tag, "cgeoBase.searchByViewport", e);
- }
-
- request.addHeader("Content-Type", "application/json; charset=UTF-8");
- request.addHeader("X-Requested-With", "XMLHttpRequest");
- request.addHeader("Accept", "application/json, text/javascript, */*; q=0.01");
- request.addHeader("Referer", uri);
- String page = getResponseData(request(request));
- return page;
- }
-
public static cgTrackable searchTrackable(final String geocode, final String guid, final String id) {
if (StringUtils.isBlank(geocode) && StringUtils.isBlank(guid) && StringUtils.isBlank(id)) {
Log.w(Settings.tag, "cgeoBase.searchTrackable: No geocode nor guid nor id given");
@@ -2918,29 +2773,6 @@ public class cgBase {
return false;
}
- // TODO Valentine Remove with merge
- @Deprecated
- public static String getMapUserToken(final Handler noTokenHandler) {
- final HttpResponse response = request("http://www.geocaching.com/map/default.aspx", null, false);
- final String data = getResponseData(response);
- String usertoken = null;
-
- if (StringUtils.isNotBlank(data)) {
- final Matcher matcher = GCConstants.PATTERN_USERTOKEN.matcher(data);
- while (matcher.find()) {
- if (matcher.groupCount() > 0) {
- usertoken = matcher.group(1);
- }
- }
- }
-
- if (noTokenHandler != null && StringUtils.isBlank(usertoken)) {
- noTokenHandler.sendEmptyMessage(0);
- }
-
- return usertoken;
- }
-
public static Double getElevation(final Geopoint coords) {
try {
final String uri = "http://maps.googleapis.com/maps/api/elevation/json";
diff --git a/tests/src/cgeo/geocaching/cgeoApplicationTest.java b/tests/src/cgeo/geocaching/cgeoApplicationTest.java
index 4a4b51f..0ea282f 100644
--- a/tests/src/cgeo/geocaching/cgeoApplicationTest.java
+++ b/tests/src/cgeo/geocaching/cgeoApplicationTest.java
@@ -1,5 +1,6 @@
package cgeo.geocaching;
+import cgeo.geocaching.connector.gc.GCBase;
import cgeo.geocaching.enumerations.CacheType;
import cgeo.geocaching.enumerations.LoadFlags;
import cgeo.geocaching.enumerations.StatusCode;
@@ -14,7 +15,6 @@ import cgeo.geocaching.utils.CancellableHandler;
import org.apache.commons.lang3.tuple.ImmutablePair;
-import android.os.Handler;
import android.test.ApplicationTestCase;
import android.test.suitebuilder.annotation.MediumTest;
import android.test.suitebuilder.annotation.SmallTest;
@@ -200,9 +200,9 @@ public class cgeoApplicationTest extends ApplicationTestCase<cgeoapplication> {
if (LIVEMAPENABLED) {
GC2JVEH cache = new GC2JVEH();
- final String token = cgBase.getMapUserToken(new Handler());
+ final String tokens[] = GCBase.getTokens();
final Viewport viewport = new Viewport(cache.getCoords(), 0.003, 0.003);
- final SearchResult search = cgBase.searchByViewport(token, viewport);
+ final SearchResult search = GCBase.searchByViewport(viewport, tokens);
// GC2JVEH is a premium members only cache. It can't be "found" by non-premium members
if (Settings.isPremiumMember()) {
@@ -233,14 +233,14 @@ public class cgeoApplicationTest extends ApplicationTestCase<cgeoapplication> {
try {
- final String token = null; // without a valid token we are "logged off"
+ final String tokens[] = null; // without a valid token we are "logged off"
// non premium cache
MockedCache cache = new GC2CJPF();
deleteCacheFromDBAndLogout(cache.getGeocode());
Viewport viewport = new Viewport(cache.getCoords(), 0.003, 0.003);
- SearchResult search = cgBase.searchByViewport(token, viewport);
+ SearchResult search = GCBase.searchByViewport(viewport, tokens);
assertNotNull(search);
assertTrue(search.getGeocodes().contains(cache.getGeocode()));
@@ -255,7 +255,7 @@ public class cgeoApplicationTest extends ApplicationTestCase<cgeoapplication> {
deleteCacheFromDBAndLogout(cache.getGeocode());
viewport = new Viewport(cache.getCoords(), 0.003, 0.003);
- search = cgBase.searchByViewport(token, viewport);
+ search = GCBase.searchByViewport(viewport, tokens);
assertNotNull(search);
// It's a premium member cache only and thus not visible to guests
generated by cgit v1.1 at 2025-11-11 00:42:32 +0000