Merge pull request #1 from friendlyfashion/33809bf10d860eee6fa67ef00958da0eae1aef01

Recent changes at original repo working with refactored response handlers

Author: sweetlilmre

src/com/loopj/android/http/AsyncHttpClient.java

@@ -559,7 +559,7 @@ public void delete(Context context, String url, Header[] headers, AsyncHttpRespo
 
 
     // Private stuff
-    private void sendRequest(DefaultHttpClient client, HttpContext httpContext, HttpUriRequest uriRequest, String contentType, AsyncHttpResponseHandler responseHandler, Context context) {
+    protected void sendRequest(DefaultHttpClient client, HttpContext httpContext, HttpUriRequest uriRequest, String contentType, AsyncHttpResponseHandler responseHandler, Context context) {
         if(contentType != null) {
             uriRequest.addHeader("Content-Type", contentType);
         }
@@ -583,7 +583,11 @@ private void sendRequest(DefaultHttpClient client, HttpContext httpContext, Http
     public static String getUrlWithQueryString(String url, RequestParams params) {
         if(params != null) {
             String paramString = params.getParamString();
-            url += "?" + paramString;
+            if (url.indexOf("?") == -1) {
+                url += "?" + paramString;
+            } else {
+                url += "&" + paramString;
+            }
         }
 
         return url;

src/com/loopj/android/http/SyncHttpClient.java

@@ -0,0 +1,123 @@
+package com.loopj.android.http;
+
+import java.io.IOException;
+
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.protocol.HttpContext;
+
+import android.content.Context;
+import android.os.Message;
+
+public abstract class SyncHttpClient extends AsyncHttpClient {
+	private int responseCode;
+	/*
+	 * as this is a synchronous request this is just a helping mechanism to pass
+	 * the result back to this method. Therefore the result object has to be a
+	 * field to be accessible
+	 */
+	private String result;
+	AsyncHttpResponseHandler responseHandler = new TextHttpResponseHandler() {
+
+		void sendResponseMessage(org.apache.http.HttpResponse response) throws IOException {
+			responseCode = response.getStatusLine().getStatusCode();
+			super.sendResponseMessage(response);
+		};
+
+		@Override
+		protected void sendMessage(Message msg) {
+			/*
+			 * Dont use the handler and send it directly to the analysis
+			 * (because its all the same thread)
+			 */
+			handleMessage(msg);
+		}
+
+		@Override
+		public void onSuccess(String content) {
+			result = content;
+		}
+
+		@Override
+		public void onFailure(String content, Throwable error) {
+			result = onRequestFailed(error, content);
+		}
+	};
+
+	/**
+	 * @return the response code for the last request, might be usefull
+	 *         sometimes
+	 */
+	public int getResponseCode() {
+		return responseCode;
+	}
+
+	// Private stuff
+	protected void sendRequest(DefaultHttpClient client,
+			HttpContext httpContext, HttpUriRequest uriRequest,
+			String contentType, AsyncHttpResponseHandler responseHandler,
+			Context context) {
+		if (contentType != null) {
+			uriRequest.addHeader("Content-Type", contentType);
+		}
+
+		/*
+		 * will execute the request directly
+		 */
+		new AsyncHttpRequest(client, httpContext, uriRequest, responseHandler)
+				.run();
+	}
+
+	public abstract String onRequestFailed(Throwable error, String content);
+
+	public void delete(String url, RequestParams queryParams,
+			AsyncHttpResponseHandler responseHandler) {
+		// TODO what about query params??
+		delete(url, responseHandler);
+	}
+
+	public String get(String url, RequestParams params) {
+		this.get(url, params, responseHandler);
+		/*
+		 * the response handler will have set the result when this line is
+		 * reached
+		 */
+		return result;
+	}
+
+	public String get(String url) {
+		this.get(url, null, responseHandler);
+		return result;
+	}
+
+	public String put(String url, RequestParams params) {
+		this.put(url, params, responseHandler);
+		return result;
+	}
+
+	public String put(String url) {
+		this.put(url, null, responseHandler);
+		return result;
+	}
+
+	public String post(String url, RequestParams params) {
+		this.post(url, params, responseHandler);
+		return result;
+	}
+
+	public String post(String url) {
+		this.post(url, null, responseHandler);
+		return result;
+	}
+
+	public String delete(String url, RequestParams params) {
+		this.delete(url, params, responseHandler);
+		return result;
+	}
+
+	public String delete(String url) {
+		this.delete(url, null, responseHandler);
+		return result;
+	}
+
+}