Merge pull request android-async-http#19 from scottanderson/response-bodies

Pass error response bodies through

Author: loopj

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

@@ -55,7 +55,7 @@ public void run() {
         } catch (IOException e) {
             if(responseHandler != null) {
                 responseHandler.sendFinishMessage();
-                responseHandler.sendFailureMessage(e);
+                responseHandler.sendFailureMessage(e, null);
             }
         }
     }

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

@@ -36,7 +36,7 @@
  * {@link AsyncHttpClient}. The {@link #onSuccess(String)} method is 
  * designed to be anonymously overridden with your own response handling code.
  * <p>
- * Additionally, you can override the {@link #onFailure(Throwable)},
+ * Additionally, you can override the {@link #onFailure(Throwable, String)},
  * {@link #onStart()}, and {@link #onFinish()} methods as required.
  * <p>
  * For example:
@@ -55,7 +55,7 @@
  *     }
  * 
  *     &#064;Override
- *     public void onFailure(Throwable e) {
+ *     public void onFailure(Throwable e, String response) {
  *         // Response failed :(
  *     }
  *
@@ -112,9 +112,20 @@ public void onSuccess(String content) {}
     /**
      * Fired when a request fails to complete, override to handle in your own code
      * @param error the underlying cause of the failure
+     * @deprecated use {@link #onFailure(Throwable, String)}
      */
     public void onFailure(Throwable error) {}
 
+    /**
+     * Fired when a request fails to complete, override to handle in your own code
+     * @param error the underlying cause of the failure
+     * @param content the response body, if any
+     */
+    public void onFailure(Throwable error, String content) {
+        // By default, call the deprecated onFailure(Throwable) for compatibility
+        onFailure(error);
+    }
+
 
     //
     // Pre-processing of messages (executes in background threadpool thread)
@@ -124,8 +135,8 @@ protected void sendSuccessMessage(String responseBody) {
         sendMessage(obtainMessage(SUCCESS_MESSAGE, responseBody));
     }
 
-    protected void sendFailureMessage(Throwable e) {
-        sendMessage(obtainMessage(FAILURE_MESSAGE, e));
+    protected void sendFailureMessage(Throwable e, String responseBody) {
+        sendMessage(obtainMessage(FAILURE_MESSAGE, new Object[]{e, responseBody}));
     }
 
     protected void sendStartMessage() {
@@ -145,8 +156,8 @@ protected void handleSuccessMessage(String responseBody) {
         onSuccess(responseBody);
     }
 
-    protected void handleFailureMessage(Throwable e) {
-        onFailure(e);
+    protected void handleFailureMessage(Throwable e, String responseBody) {
+        onFailure(e, responseBody);
     }
 
 
@@ -158,7 +169,8 @@ protected void handleMessage(Message msg) {
                 handleSuccessMessage((String)msg.obj);
                 break;
             case FAILURE_MESSAGE:
-                handleFailureMessage((Throwable)msg.obj);
+                Object[] repsonse = (Object[])msg.obj;
+                handleFailureMessage((Throwable)repsonse[0], (String)repsonse[1]);
                 break;
             case START_MESSAGE:
                 onStart();
@@ -193,20 +205,22 @@ protected Message obtainMessage(int responseMessage, Object response) {
     // Interface to AsyncHttpRequest
     void sendResponseMessage(HttpResponse response) {
         StatusLine status = response.getStatusLine();
+        String responseBody = null;
+        try {
+            HttpEntity entity = null;
+            HttpEntity temp = response.getEntity();
+            if(temp != null) {
+                entity = new BufferedHttpEntity(temp);
+            }
+            responseBody = EntityUtils.toString(entity);
+        } catch(IOException e) {
+            sendFailureMessage(e, null);
+        }
+
         if(status.getStatusCode() >= 300) {
-            sendFailureMessage(new HttpResponseException(status.getStatusCode(), status.getReasonPhrase()));
+            sendFailureMessage(new HttpResponseException(status.getStatusCode(), status.getReasonPhrase()), responseBody);
         } else {
-            try {
-                HttpEntity entity = null;
-                HttpEntity temp = response.getEntity();
-                if(temp != null) {
-                    entity = new BufferedHttpEntity(temp);
-                }
-
-                sendSuccessMessage(EntityUtils.toString(entity));
-            } catch(IOException e) {
-                sendFailureMessage(e);
-            }
+            sendSuccessMessage(responseBody);
         }
     }
 }

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

@@ -71,7 +71,7 @@ protected void handleSuccessMessage(String responseBody) {
                 onSuccess((JSONArray)jsonResponse);
             }
         } catch(JSONException e) {
-            onFailure(e);
+            onFailure(e, responseBody);
         }
     }