Add the possibility to set headers to a GET request

1 files changed, 36 insertions, 10 deletions

diff --git a/main/src/cgeo/geocaching/network/Network.java b/main/src/cgeo/geocaching/network/Network.java
index bd3c254..8d06cd5 100644
--- a/main/src/cgeo/geocaching/network/Network.java
+++ b/main/src/cgeo/geocaching/network/Network.java
@@ -192,7 +192,9 @@ public abstract class Network {
      * GET HTTP request
      *
      * @param uri
+     *            the URI to request
      * @param params
+     *            the parameters to add the the GET request
      * @param my
      * @param addF
      * @return
@@ -205,41 +207,65 @@ public abstract class Network {
      * GET HTTP request
      *
      * @param uri
+     *            the URI to request
      * @param params
-     * @param cacheFile
-     *            the name of the file storing the cached resource, or null not to use one
-     * @return
+     *            the parameters to add the the GET request
+     * @param headers
+     *            the headers to add to the GET request
+     * @return the HTTP response
      */
-    public static HttpResponse request(final String uri, final Parameters params, final File cacheFile) {
+    public static HttpResponse request(final String uri, final Parameters params, final Parameters headers) {
         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 (headers != null) {
+            for (final NameValuePair header : headers) {
+                request.setHeader(header.getName(), header.getValue());
+            }
+        }
 
+        return Network.request(request);
+    }
+
+    /**
+     * GET HTTP request
+     *
+     * @param uri
+     *            the URI to request
+     * @param params
+     *            the parameters to add the the GET request
+     * @param cacheFile
+     *            the name of the file storing the cached resource, or null not to use one
+     * @return the HTTP response
+     */
+    public static HttpResponse request(final String uri, final Parameters params, final File cacheFile) {
         if (cacheFile != null && cacheFile.exists()) {
             final String etag = LocalStorage.getSavedHeader(cacheFile, "etag");
             if (etag != null) {
-                request.setHeader("If-None-Match", etag);
+                return request(uri, params, new Parameters("If-None-Match", etag));
             } else {
                 final String lastModified = LocalStorage.getSavedHeader(cacheFile, "last-modified");
                 if (lastModified != null) {
-                    request.setHeader("If-Modified-Since", lastModified);
+                    return request(uri, params, new Parameters("If-Modified-Since", lastModified));
                 }
             }
         }
 
-        return Network.request(request);
+        return request(uri, params, (Parameters) null);
     }
 
     /**
      * GET HTTP request
      *
      * @param uri
+     *            the URI to request
      * @param params
-     * @return
+     *            the parameters to add the the GET request
+     * @return the HTTP response
      */
     public static HttpResponse request(final String uri, final Parameters params) {
-        return request(uri, params, null);
+        return request(uri, params, (Parameters) null);
     }
 
     /**
@@ -250,7 +276,7 @@ public abstract class Network {
      * @return the HTTP response
      */
     public static HttpResponse request(final String uri) {
-        return request(uri, null, null);
+        return request(uri, null, (Parameters) null);
     }
 
     public static HttpResponse request(final HttpRequestBase request) {