Merge remote-tracking branch 'upstream/master' into response-headers

Conflicts:
	src/com/loopj/android/http/AsyncHttpResponseHandler.java

Author: p-m-j

AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.loopj.android.http"
-    android:versionName="1.4.1"
+    android:versionName="1.4.3"
     android:versionCode="1">
     <application
         android:name="android_async_http">

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

@@ -60,8 +60,8 @@
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
 import org.apache.http.params.BasicHttpParams;
-import org.apache.http.params.HttpParams;
 import org.apache.http.params.HttpConnectionParams;
+import org.apache.http.params.HttpParams;
 import org.apache.http.params.HttpProtocolParams;
 import org.apache.http.protocol.BasicHttpContext;
 import org.apache.http.protocol.HttpContext;
@@ -90,7 +90,7 @@
  * </pre>
  */
 public class AsyncHttpClient {
-    private static final String VERSION = "1.4.1";
+    private static final String VERSION = "1.4.3";
 
     private static final int DEFAULT_MAX_CONNECTIONS = 10;
     private static final int DEFAULT_SOCKET_TIMEOUT = 10 * 1000;
@@ -135,6 +135,7 @@ public AsyncHttpClient() {
         httpContext = new SyncBasicHttpContext(new BasicHttpContext());
         httpClient = new DefaultHttpClient(cm, httpParams);
         httpClient.addRequestInterceptor(new HttpRequestInterceptor() {
+            @Override
             public void process(HttpRequest request, HttpContext context) {
                 if (!request.containsHeader(HEADER_ACCEPT_ENCODING)) {
                     request.addHeader(HEADER_ACCEPT_ENCODING, ENCODING_GZIP);
@@ -146,6 +147,7 @@ public void process(HttpRequest request, HttpContext context) {
         });
 
         httpClient.addResponseInterceptor(new HttpResponseInterceptor() {
+            @Override
             public void process(HttpResponse response, HttpContext context) {
                 final HttpEntity entity = response.getEntity();
                 if (entity == null) {

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

@@ -48,6 +48,7 @@ public AsyncHttpRequest(AbstractHttpClient client, HttpContext context, HttpUriR
         }
     }
 
+    @Override
     public void run() {
         try {
             if(responseHandler != null){
@@ -73,14 +74,20 @@ public void run() {
 
     private void makeRequest() throws IOException {
         if(!Thread.currentThread().isInterrupted()) {
-            HttpResponse response = client.execute(request, context);
-            if(!Thread.currentThread().isInterrupted()) {
-                if(responseHandler != null) {
-                    responseHandler.sendResponseMessage(response);
-                }
-            } else{
-                //TODO: should raise InterruptedException? this block is reached whenever the request is cancelled before its response is received
-            }
+        	try {
+        		HttpResponse response = client.execute(request, context);
+        		if(!Thread.currentThread().isInterrupted()) {
+        			if(responseHandler != null) {
+        				responseHandler.sendResponseMessage(response);
+        			}
+        		} else{
+        			//TODO: should raise InterruptedException? this block is reached whenever the request is cancelled before its response is received
+        		}
+        	} catch (IOException e) {
+        		if(!Thread.currentThread().isInterrupted()) {
+        			throw e;
+        		}
+        	}
         }
     }
 

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

@@ -22,14 +22,17 @@
 import android.os.Looper;
 import android.os.Message;
 import org.apache.http.Header;
+import java.io.IOException;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.StatusLine;
 import org.apache.http.client.HttpResponseException;
 import org.apache.http.entity.BufferedHttpEntity;
 import org.apache.http.util.EntityUtils;
 
-import java.io.IOException;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
 
 /**
  * Used to intercept and handle the responses from requests made using 
@@ -81,6 +84,7 @@ public AsyncHttpResponseHandler() {
         // Set up a handler to post events back to the correct thread if possible
         if(Looper.myLooper() != null) {
             handler = new Handler(){
+                @Override
                 public void handleMessage(Message msg){
                     AsyncHttpResponseHandler.this.handleMessage(msg);
                 }
@@ -134,6 +138,7 @@ public void onSuccess(int statusCode, String content)
      * @param error the underlying cause of the failure
      * @deprecated use {@link #onFailure(Throwable, String)}
      */
+    @Deprecated
     public void onFailure(Throwable error) {}
 
     /**

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

@@ -18,7 +18,8 @@
 
 package com.loopj.android.http;
 
-import android.os.Message;
+import java.io.IOException;
+
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
@@ -27,7 +28,7 @@
 import org.apache.http.entity.BufferedHttpEntity;
 import org.apache.http.util.EntityUtils;
 
-import java.io.IOException;
+import android.os.Message;
 
 /**
  * Used to intercept and handle the responses from requests made using
@@ -102,6 +103,7 @@ public void onSuccess(int statusCode, byte[] binaryData) {
      * @param binaryData the response body, if any
      * @deprecated
      */
+    @Deprecated
     public void onFailure(Throwable error, byte[] binaryData) {
         // By default, call the deprecated onFailure(Throwable) for compatibility
         onFailure(error);
@@ -116,6 +118,7 @@ protected void sendSuccessMessage(int statusCode, byte[] responseBody) {
         sendMessage(obtainMessage(SUCCESS_MESSAGE, new Object[]{statusCode, responseBody}));
     }
 
+    @Override
     protected void sendFailureMessage(Throwable e, byte[] responseBody) {
         sendMessage(obtainMessage(FAILURE_MESSAGE, new Object[]{e, responseBody}));
     }
@@ -133,6 +136,7 @@ protected void handleFailureMessage(Throwable e, byte[] responseBody) {
     }
 
     // Methods which emulate android's Handler and Message methods
+    @Override
     protected void handleMessage(Message msg) {
         Object[] response;
         switch(msg.what) {
@@ -142,7 +146,7 @@ protected void handleMessage(Message msg) {
                 break;
             case FAILURE_MESSAGE:
                 response = (Object[])msg.obj;
-                handleFailureMessage((Throwable)response[0], (byte[])response[1]);
+                handleFailureMessage((Throwable)response[0], response[1].toString());
                 break;
             default:
                 super.handleMessage(msg);
@@ -151,6 +155,7 @@ protected void handleMessage(Message msg) {
     }
 
     // Interface to AsyncHttpRequest
+    @Override
     void sendResponseMessage(HttpResponse response) {
         StatusLine status = response.getStatusLine();
         Header[] contentTypeHeaders = response.getHeaders("Content-Type");

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

@@ -80,7 +80,7 @@ public PersistentCookieStore(Context context) {
 
     @Override
     public void addCookie(Cookie cookie) {
-        String name = cookie.getName();
+        String name = cookie.getName() + cookie.getDomain();
 
         // Save cookie into local store, or remove if expired
         if(!cookie.isExpired(new Date())) {

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

@@ -236,6 +236,14 @@ public HttpEntity getEntity() {
                 multipartEntity.addPart(entry.getKey(), entry.getValue());
             }
 
+            // Add dupe params
+            for(ConcurrentHashMap.Entry<String, ArrayList<String>> entry : urlParamsWithArray.entrySet()) {
+                ArrayList<String> values = entry.getValue();
+                for (String value : values) {
+                    multipartEntity.addPart(entry.getKey(), value);
+                }
+            }
+
             // Add file params
             int currentIndex = 0;
             int lastIndex = fileParams.entrySet().size() - 1;
@@ -252,14 +260,6 @@ public HttpEntity getEntity() {
                 currentIndex++;
             }
 
-            // Add dupe params
-            for(ConcurrentHashMap.Entry<String, ArrayList<String>> entry : urlParamsWithArray.entrySet()) {
-                ArrayList<String> values = entry.getValue();
-                for (String value : values) {
-                    multipartEntity.addPart(entry.getKey(), value);
-                }
-            }
-
             entity = multipartEntity;
         } else {
             try {
@@ -318,4 +318,4 @@ public String getFileName() {
             }
         }
     }
-}
+}

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

@@ -65,6 +65,7 @@ public RetryHandler(int maxRetries) {
         this.maxRetries = maxRetries;
     }
 
+    @Override
     public boolean retryRequest(IOException exception, int executionCount, HttpContext context) {
         boolean retry = true;
 

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

@@ -14,10 +14,11 @@ public abstract class SyncHttpClient extends AsyncHttpClient {
 	 * the result back to this method. Therefore the result object has to be a
 	 * field to be accessible
 	 */
-	private String result;
-	AsyncHttpResponseHandler responseHandler = new AsyncHttpResponseHandler() {
+	protected String result;
+	protected AsyncHttpResponseHandler responseHandler = new AsyncHttpResponseHandler() {
 
-		void sendResponseMessage(org.apache.http.HttpResponse response) {
+        @Override
+        void sendResponseMessage(org.apache.http.HttpResponse response) {
 			responseCode = response.getStatusLine().getStatusCode();
 			super.sendResponseMessage(response);
 		};
@@ -51,7 +52,8 @@ public int getResponseCode() {
 	}
 
 	// Private stuff
-	protected void sendRequest(DefaultHttpClient client,
+    @Override
+    protected void sendRequest(DefaultHttpClient client,
 			HttpContext httpContext, HttpUriRequest uriRequest,
 			String contentType, AsyncHttpResponseHandler responseHandler,
 			Context context) {