aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--main/src/cgeo/geocaching/StaticMapsProvider.java15
-rw-r--r--main/src/cgeo/geocaching/VisitCacheActivity.java2
-rw-r--r--main/src/cgeo/geocaching/cgBase.java8
-rw-r--r--main/src/cgeo/geocaching/cgeocaches.java2
-rw-r--r--main/src/cgeo/geocaching/cgeoinit.java2
-rw-r--r--main/src/cgeo/geocaching/cgeotouch.java2
-rw-r--r--main/src/cgeo/geocaching/connector/gc/GCBase.java2
-rw-r--r--main/src/cgeo/geocaching/connector/gc/GCConnector.java3
-rw-r--r--main/src/cgeo/geocaching/gcvote/GCVote.java4
-rw-r--r--main/src/cgeo/geocaching/network/HtmlImage.java2
-rw-r--r--main/src/cgeo/geocaching/network/Login.java12
-rw-r--r--main/src/cgeo/geocaching/network/Network.java34
-rw-r--r--main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java2
-rw-r--r--main/src/cgeo/geocaching/ui/DirectionImage.java2
-rw-r--r--main/src/cgeo/geocaching/utils/LogTemplateProvider.java2
15 files changed, 52 insertions, 42 deletions
diff --git a/main/src/cgeo/geocaching/StaticMapsProvider.java b/main/src/cgeo/geocaching/StaticMapsProvider.java
index 17601af..e19944b 100644
--- a/main/src/cgeo/geocaching/StaticMapsProvider.java
+++ b/main/src/cgeo/geocaching/StaticMapsProvider.java
@@ -4,6 +4,7 @@ import cgeo.geocaching.concurrent.BlockingThreadPool;
import cgeo.geocaching.files.LocalStorage;
import cgeo.geocaching.geopoint.GeopointFormatter.Format;
import cgeo.geocaching.network.Network;
+import cgeo.geocaching.network.Parameters;
import cgeo.geocaching.utils.Log;
import org.apache.commons.collections.CollectionUtils;
@@ -38,12 +39,18 @@ public class StaticMapsProvider {
}
private static void downloadMap(cgCache cache, int zoom, String mapType, String markerUrl, String prefix, int level, String latlonMap, int edge, String waypoints) {
- final String mapUrl = "http://maps.google.com/maps/api/staticmap?center=" + latlonMap;
- final String url = mapUrl + "&zoom=" + zoom + "&size=" + edge + "x" + edge + "&maptype=" + mapType + "&markers=icon%3A" + markerUrl + "%7C" + latlonMap + waypoints + "&sensor=false";
- final File file = getMapFile(cache.getGeocode(), prefix, level, true);
- final HttpResponse httpResponse = Network.request(url, null, false);
+ final String mapUrl = "http://maps.google.com/maps/api/staticmap";
+ final Parameters params = new Parameters(
+ "center", latlonMap,
+ "zoom", String.valueOf(zoom),
+ "size", edge + "x" + edge,
+ "maptype", mapType,
+ "markers", "icon:" + markerUrl + '|' + latlonMap + waypoints,
+ "sensor", "false");
+ final HttpResponse httpResponse = Network.request(mapUrl, params);
if (httpResponse != null) {
+ final File file = getMapFile(cache.getGeocode(), prefix, level, true);
if (LocalStorage.saveEntityToFile(httpResponse, file)) {
// Delete image if it has no contents
final long fileSize = file.length();
diff --git a/main/src/cgeo/geocaching/VisitCacheActivity.java b/main/src/cgeo/geocaching/VisitCacheActivity.java
index a471483..667f7d4 100644
--- a/main/src/cgeo/geocaching/VisitCacheActivity.java
+++ b/main/src/cgeo/geocaching/VisitCacheActivity.java
@@ -656,7 +656,7 @@ public class VisitCacheActivity extends AbstractActivity implements DateDialog.D
return;
}
- final String page = Network.getResponseData(Network.request("http://www.geocaching.com/seek/log.aspx", params, false, false, false));
+ final String page = Network.getResponseData(Network.request("http://www.geocaching.com/seek/log.aspx", params));
viewstates = Login.getViewstates(page);
trackables = cgBase.parseTrackableLog(page);
diff --git a/main/src/cgeo/geocaching/cgBase.java b/main/src/cgeo/geocaching/cgBase.java
index a1bb980..aea0c59 100644
--- a/main/src/cgeo/geocaching/cgBase.java
+++ b/main/src/cgeo/geocaching/cgBase.java
@@ -143,7 +143,7 @@ public class cgBase {
if (recaptchaJsParam != null) {
final Parameters params = new Parameters("k", recaptchaJsParam.trim());
- final String recaptchaJs = Network.getResponseData(Network.request("http://www.google.com/recaptcha/api/challenge", params, true));
+ final String recaptchaJs = Network.getResponseData(Network.request("http://www.google.com/recaptcha/api/challenge", params));
if (StringUtils.isNotBlank(recaptchaJs)) {
recaptchaChallenge = BaseUtils.getMatch(recaptchaJs, GCConstants.PATTERN_SEARCH_RECAPTCHACHALLENGE, true, 1, null, true);
@@ -853,7 +853,7 @@ public class cgBase {
// "sp", Boolean.toString(personal), // personal logs
"sf", Boolean.toString(friends));
- final HttpResponse response = Network.request("http://www.geocaching.com/seek/geocache.logbook", params, false, false, false);
+ final HttpResponse response = Network.request("http://www.geocaching.com/seek/geocache.logbook", params);
if (response == null) {
Log.e(Settings.tag, "cgBase.loadLogsFromDetails: cannot log logs, response is null");
return null;
@@ -1359,7 +1359,7 @@ public class cgBase {
final String uri = "http://www.geocaching.com/seek/nearest.aspx";
final String fullUri = uri + "?" + addFToParams(params, false, true);
- String page = Network.requestLogged(uri, params, false, my, true);
+ String page = Network.requestLogged(uri, params, my, true);
if (StringUtils.isBlank(page)) {
Log.e(Settings.tag, "cgeoBase.searchByAny: No data from server");
@@ -1439,7 +1439,7 @@ public class cgBase {
params.put("id", id);
}
- String page = Network.requestLogged("http://www.geocaching.com/track/details.aspx", params, false, false, false);
+ String page = Network.requestLogged("http://www.geocaching.com/track/details.aspx", params, false, false);
if (StringUtils.isBlank(page)) {
Log.e(Settings.tag, "cgeoBase.searchTrackable: No data from server");
diff --git a/main/src/cgeo/geocaching/cgeocaches.java b/main/src/cgeo/geocaching/cgeocaches.java
index 7d165b3..9285063 100644
--- a/main/src/cgeo/geocaching/cgeocaches.java
+++ b/main/src/cgeo/geocaching/cgeocaches.java
@@ -1848,7 +1848,7 @@ public class cgeocaches extends AbstractListActivity {
deviceCode = "";
}
final Parameters params = new Parameters("code", deviceCode);
- HttpResponse responseFromWeb = Network.request("http://send2.cgeo.org/read.html", params, true);
+ HttpResponse responseFromWeb = Network.request("http://send2.cgeo.org/read.html", params);
if (responseFromWeb != null && responseFromWeb.getStatusLine().getStatusCode() == 200) {
final String response = Network.getResponseData(responseFromWeb);
diff --git a/main/src/cgeo/geocaching/cgeoinit.java b/main/src/cgeo/geocaching/cgeoinit.java
index cb5808f..12cd073 100644
--- a/main/src/cgeo/geocaching/cgeoinit.java
+++ b/main/src/cgeo/geocaching/cgeoinit.java
@@ -863,7 +863,7 @@ public class cgeoinit extends AbstractActivity {
final String cod = StringUtils.defaultString(deviceCode);
final Parameters params = new Parameters("name", nam, "code", cod);
- HttpResponse response = Network.request("http://send2.cgeo.org/auth.html", params, true);
+ HttpResponse response = Network.request("http://send2.cgeo.org/auth.html", params);
if (response != null && response.getStatusLine().getStatusCode() == 200)
{
diff --git a/main/src/cgeo/geocaching/cgeotouch.java b/main/src/cgeo/geocaching/cgeotouch.java
index 09857a2..39d5e50 100644
--- a/main/src/cgeo/geocaching/cgeotouch.java
+++ b/main/src/cgeo/geocaching/cgeotouch.java
@@ -392,7 +392,7 @@ public class cgeotouch extends AbstractActivity implements DateDialog.DateDialog
return;
}
- final String page = Network.getResponseData(Network.request("http://www.geocaching.com/track/log.aspx", params, false, false, false));
+ final String page = Network.getResponseData(Network.request("http://www.geocaching.com/track/log.aspx", params));
viewstates = Login.getViewstates(page);
diff --git a/main/src/cgeo/geocaching/connector/gc/GCBase.java b/main/src/cgeo/geocaching/connector/gc/GCBase.java
index 2f79fab..471aef9 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCBase.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCBase.java
@@ -362,7 +362,7 @@ public class GCBase {
/** Get user session & session token from the Live Map. Needed for following requests */
public static String[] getTokens() {
- final HttpResponse response = Network.request(GCConstants.URL_LIVE_MAP, null, false);
+ final HttpResponse response = Network.request(GCConstants.URL_LIVE_MAP);
final String data = Network.getResponseData(response);
String userSession = BaseUtils.getMatch(data, GCConstants.PATTERN_USERSESSION, "");
String sessionToken = BaseUtils.getMatch(data, GCConstants.PATTERN_SESSIONTOKEN, "");
diff --git a/main/src/cgeo/geocaching/connector/gc/GCConnector.java b/main/src/cgeo/geocaching/connector/gc/GCConnector.java
index d955418..07875bc 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCConnector.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCConnector.java
@@ -17,7 +17,6 @@ import cgeo.geocaching.utils.Log;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
-
import java.util.Set;
import java.util.regex.Pattern;
@@ -105,7 +104,7 @@ public class GCConnector extends AbstractConnector {
cgBase.sendLoadProgressDetail(handler, R.string.cache_dialog_loading_details_status_loadpage);
- final String page = Network.requestLogged("http://www.geocaching.com/seek/cache_details.aspx", params, false, false, false);
+ final String page = Network.requestLogged("http://www.geocaching.com/seek/cache_details.aspx", params, false, false);
if (StringUtils.isEmpty(page)) {
final SearchResult search = new SearchResult();
diff --git a/main/src/cgeo/geocaching/gcvote/GCVote.java b/main/src/cgeo/geocaching/gcvote/GCVote.java
index eb0320f..f699aa0 100644
--- a/main/src/cgeo/geocaching/gcvote/GCVote.java
+++ b/main/src/cgeo/geocaching/gcvote/GCVote.java
@@ -95,7 +95,7 @@ public final class GCVote {
params.put("waypoints", StringUtils.join(geocodes.toArray(), ','));
}
params.put("version", "cgeo");
- final String page = Network.getResponseData(Network.request("http://gcvote.com/getVotes.php", params, false, false, false));
+ final String page = Network.getResponseData(Network.request("http://gcvote.com/getVotes.php", params));
if (page == null) {
return null;
}
@@ -219,7 +219,7 @@ public final class GCVote {
"voteUser", String.format("%.1f", vote).replace(',', '.'),
"version", "cgeo");
- final String result = Network.getResponseData(Network.request("http://gcvote.com/setVote.php", params, false, false, false));
+ final String result = Network.getResponseData(Network.request("http://gcvote.com/setVote.php", params));
return result.trim().equalsIgnoreCase("ok");
}
diff --git a/main/src/cgeo/geocaching/network/HtmlImage.java b/main/src/cgeo/geocaching/network/HtmlImage.java
index 6cb4b86..9bbbed5 100644
--- a/main/src/cgeo/geocaching/network/HtmlImage.java
+++ b/main/src/cgeo/geocaching/network/HtmlImage.java
@@ -81,7 +81,7 @@ public class HtmlImage implements Html.ImageGetter {
if (absoluteURL != null) {
try {
final File file = LocalStorage.getStorageFile(geocode, url, true, true);
- final HttpResponse httpResponse = Network.request(absoluteURL, null, false, file);
+ final HttpResponse httpResponse = Network.request(absoluteURL, null, file);
if (httpResponse != null) {
final int statusCode = httpResponse.getStatusLine().getStatusCode();
if (statusCode == 200) {
diff --git a/main/src/cgeo/geocaching/network/Login.java b/main/src/cgeo/geocaching/network/Login.java
index fe78978..b6cef0d 100644
--- a/main/src/cgeo/geocaching/network/Login.java
+++ b/main/src/cgeo/geocaching/network/Login.java
@@ -69,7 +69,7 @@ public abstract class Login {
if (cgBase.res != null) {
Login.setActualStatus(cgBase.res.getString(R.string.init_login_popup_working));
}
- HttpResponse loginResponse = Network.request("https://www.geocaching.com/login/default.aspx", null, false, false, false);
+ HttpResponse loginResponse = Network.request("https://www.geocaching.com/login/default.aspx");
String loginData = Network.getResponseData(loginResponse);
if (loginResponse != null && loginResponse.getStatusLine().getStatusCode() == 503 && BaseUtils.matches(loginData, GCConstants.PATTERN_MAINTENANCE)) {
return StatusCode.MAINTENANCE;
@@ -131,7 +131,7 @@ public abstract class Login {
}
public static StatusCode logout() {
- HttpResponse logoutResponse = Network.request("https://www.geocaching.com/login/default.aspx?RESET=Y&redir=http%3a%2f%2fwww.geocaching.com%2fdefault.aspx%3f", null, false, false, false);
+ HttpResponse logoutResponse = Network.request("https://www.geocaching.com/login/default.aspx?RESET=Y&redir=http%3a%2f%2fwww.geocaching.com%2fdefault.aspx%3f");
String logoutData = Network.getResponseData(logoutResponse);
if (logoutResponse != null && logoutResponse.getStatusLine().getStatusCode() == 503 && BaseUtils.matches(logoutData, GCConstants.PATTERN_MAINTENANCE)) {
return StatusCode.MAINTENANCE;
@@ -218,9 +218,9 @@ public abstract class Login {
if (previousPage != null && previousPage.indexOf(ENGLISH) >= 0) {
Log.i(Settings.tag, "Geocaching.com language already set to English");
// get find count
- getLoginStatus(Network.getResponseData(Network.request("http://www.geocaching.com/email/", null, false)));
+ getLoginStatus(Network.getResponseData(Network.request("http://www.geocaching.com/email/")));
} else {
- final String page = Network.getResponseData(Network.request("http://www.geocaching.com/default.aspx", null, false));
+ final String page = Network.getResponseData(Network.request("http://www.geocaching.com/default.aspx"));
getLoginStatus(page);
if (page == null) {
Log.e(Settings.tag, "Failed to read viewstates to set geocaching.com language");
@@ -238,7 +238,7 @@ public abstract class Login {
public static BitmapDrawable downloadAvatarAndGetMemberStatus(final Context context) {
try {
- final String profile = BaseUtils.replaceWhitespace(Network.getResponseData(Network.request("http://www.geocaching.com/my/", null, false)));
+ final String profile = BaseUtils.replaceWhitespace(Network.getResponseData(Network.request("http://www.geocaching.com/my/")));
Settings.setMemberStatus(BaseUtils.getMatch(profile, GCConstants.PATTERN_MEMBER_STATUS, true, null));
@@ -262,7 +262,7 @@ public abstract class Login {
*/
public static void detectGcCustomDate() {
- final String result = Network.getResponseData(Network.request("http://www.geocaching.com/account/ManagePreferences.aspx", null, false, false, false));
+ final String result = Network.getResponseData(Network.request("http://www.geocaching.com/account/ManagePreferences.aspx"));
if (null == result) {
Log.w(Settings.tag, "cgeoBase.detectGcCustomDate: result is null");
diff --git a/main/src/cgeo/geocaching/network/Network.java b/main/src/cgeo/geocaching/network/Network.java
index 502db33..bd3c254 100644
--- a/main/src/cgeo/geocaching/network/Network.java
+++ b/main/src/cgeo/geocaching/network/Network.java
@@ -193,13 +193,12 @@ public abstract class Network {
*
* @param uri
* @param params
- * @param xContentType
* @param my
* @param addF
* @return
*/
- public static HttpResponse request(final String uri, final Parameters params, boolean xContentType, boolean my, boolean addF) {
- return Network.request(uri, cgBase.addFToParams(params, my, addF), xContentType);
+ public static HttpResponse request(final String uri, final Parameters params, boolean my, boolean addF) {
+ return Network.request(uri, cgBase.addFToParams(params, my, addF));
}
/**
@@ -207,21 +206,16 @@ public abstract class Network {
*
* @param uri
* @param params
- * @param xContentType
* @param cacheFile
* the name of the file storing the cached resource, or null not to use one
* @return
*/
- public static HttpResponse request(final String uri, final Parameters params, final boolean xContentType, final File cacheFile) {
+ public static HttpResponse request(final String uri, final Parameters params, final File cacheFile) {
final String fullUri = params == null ? uri : Uri.parse(uri).buildUpon().encodedQuery(params.toString()).build().toString();
final HttpRequestBase request = new HttpGet(fullUri);
request.setHeader("X-Requested-With", "XMLHttpRequest");
- if (xContentType) {
- request.setHeader("Content-Type", "application/x-www-form-urlencoded");
- }
-
if (cacheFile != null && cacheFile.exists()) {
final String etag = LocalStorage.getSavedHeader(cacheFile, "etag");
if (etag != null) {
@@ -242,11 +236,21 @@ public abstract class Network {
*
* @param uri
* @param params
- * @param xContentType
* @return
*/
- public static HttpResponse request(final String uri, final Parameters params, final boolean xContentType) {
- return request(uri, params, xContentType, null);
+ public static HttpResponse request(final String uri, final Parameters params) {
+ return request(uri, params, null);
+ }
+
+ /**
+ * GET HTTP request
+ *
+ * @param uri
+ * the URI to request
+ * @return the HTTP response
+ */
+ public static HttpResponse request(final String uri) {
+ return request(uri, null, null);
}
public static HttpResponse request(final HttpRequestBase request) {
@@ -369,13 +373,13 @@ public abstract class Network {
* @param addF
* @return
*/
- public static String requestLogged(final String uri, final Parameters params, boolean xContentType, boolean my, boolean addF) {
- HttpResponse response = request(uri, params, xContentType, my, addF);
+ public static String requestLogged(final String uri, final Parameters params, boolean my, boolean addF) {
+ HttpResponse response = request(uri, params, my, addF);
String data = getResponseData(response);
if (!Login.getLoginStatus(data)) {
if (Login.login() == StatusCode.NO_ERROR) {
- response = request(uri, params, xContentType, my, addF);
+ response = request(uri, params, my, addF);
data = getResponseData(response);
} else {
Log.i(Settings.tag, "Working as guest.");
diff --git a/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java b/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java
index c9710e9..0bbb0e0 100644
--- a/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java
+++ b/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java
@@ -141,7 +141,7 @@ public class TwitterAuthorizationActivity extends AbstractActivity {
try {
final Parameters params = new Parameters();
OAuth.signOAuth(host, pathRequest, method, true, params, null, null);
- final String line = Network.getResponseData(Network.request("https://" + host + pathRequest, params, false));
+ final String line = Network.getResponseData(Network.request("https://" + host + pathRequest, params));
if (StringUtils.isNotBlank(line)) {
diff --git a/main/src/cgeo/geocaching/ui/DirectionImage.java b/main/src/cgeo/geocaching/ui/DirectionImage.java
index aa01b97..92ed64d 100644
--- a/main/src/cgeo/geocaching/ui/DirectionImage.java
+++ b/main/src/cgeo/geocaching/ui/DirectionImage.java
@@ -17,7 +17,7 @@ public class DirectionImage {
}
final HttpResponse httpResponse =
- Network.request("http://www.geocaching.com/ImgGen/seek/CacheDir.ashx", new Parameters("k", code), false);
+ Network.request("http://www.geocaching.com/ImgGen/seek/CacheDir.ashx", new Parameters("k", code));
if (httpResponse != null) {
LocalStorage.saveEntityToFile(httpResponse, getDirectionFile(geocode, true));
}
diff --git a/main/src/cgeo/geocaching/utils/LogTemplateProvider.java b/main/src/cgeo/geocaching/utils/LogTemplateProvider.java
index 9a5e422..1f2a7a8 100644
--- a/main/src/cgeo/geocaching/utils/LogTemplateProvider.java
+++ b/main/src/cgeo/geocaching/utils/LogTemplateProvider.java
@@ -89,7 +89,7 @@ public class LogTemplateProvider {
if (offline) {
return "";
}
- final String page = Network.getResponseData(Network.request("http://www.geocaching.com/email/", null, false, false, false));
+ final String page = Network.getResponseData(Network.request("http://www.geocaching.com/email/"));
current = parseFindCount(page);
}
generated by cgit v1.1 at 2025-11-10 18:56:54 +0000