diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/src/cgeo/geocaching/cgBase.java | 4 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/connector/gc/GCConnector.java | 2 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/network/Network.java | 24 |
3 files changed, 6 insertions, 24 deletions
diff --git a/main/src/cgeo/geocaching/cgBase.java b/main/src/cgeo/geocaching/cgBase.java index f0fd862..fd6f326 100644 --- a/main/src/cgeo/geocaching/cgBase.java +++ b/main/src/cgeo/geocaching/cgBase.java @@ -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, my, true); + final String page = Network.requestLogged(uri, addFToParams(params, my, true)); if (StringUtils.isBlank(page)) { Log.e("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); + final String page = Network.requestLogged("http://www.geocaching.com/track/details.aspx", params); if (StringUtils.isBlank(page)) { Log.e("cgeoBase.searchTrackable: No data from server"); diff --git a/main/src/cgeo/geocaching/connector/gc/GCConnector.java b/main/src/cgeo/geocaching/connector/gc/GCConnector.java index 9f174a5..06bf728 100644 --- a/main/src/cgeo/geocaching/connector/gc/GCConnector.java +++ b/main/src/cgeo/geocaching/connector/gc/GCConnector.java @@ -104,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); + final String page = Network.requestLogged("http://www.geocaching.com/seek/cache_details.aspx", params); if (StringUtils.isEmpty(page)) { final SearchResult search = new SearchResult(); diff --git a/main/src/cgeo/geocaching/network/Network.java b/main/src/cgeo/geocaching/network/Network.java index 1629def..31ddb2a 100644 --- a/main/src/cgeo/geocaching/network/Network.java +++ b/main/src/cgeo/geocaching/network/Network.java @@ -1,6 +1,5 @@ package cgeo.geocaching.network; -import cgeo.geocaching.cgBase; import cgeo.geocaching.enumerations.StatusCode; import cgeo.geocaching.files.LocalStorage; import cgeo.geocaching.utils.BaseUtils; @@ -194,21 +193,6 @@ public abstract class Network { * the URI to request * @param params * the parameters to add the the GET request - * @param my - * @param addF - * @return - */ - public static HttpResponse request(final String uri, final Parameters params, boolean my, boolean addF) { - return Network.request(uri, cgBase.addFToParams(params, my, addF)); - } - - /** - * GET HTTP request - * - * @param uri - * the URI to request - * @param params - * the parameters to add the the GET request * @param headers * the headers to add to the GET request * @return the HTTP response @@ -394,17 +378,15 @@ public abstract class Network { * @param uri * @param params * @param xContentType - * @param my - * @param addF * @return */ - public static String requestLogged(final String uri, final Parameters params, boolean my, boolean addF) { - HttpResponse response = request(uri, params, my, addF); + public static String requestLogged(final String uri, final Parameters params) { + HttpResponse response = request(uri, params); String data = getResponseData(response); if (!Login.getLoginStatus(data)) { if (Login.login() == StatusCode.NO_ERROR) { - response = request(uri, params, my, addF); + response = request(uri, params); data = getResponseData(response); } else { Log.i("Working as guest."); |