Changes to surrounding classes to accomodate new ImageHttpResponseHandler.

Author: coreform

.gitignore

@@ -6,4 +6,5 @@ build
 local.properties
 bin/
 gen/
-_layouts
+_layouts
+res/

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

@@ -32,13 +32,17 @@ class AsyncHttpRequest implements Runnable {
     private final HttpContext context;
     private final HttpUriRequest request;
     private final AsyncHttpResponseHandler responseHandler;
+    private boolean isImageResponseHandler;
     private int executionCount;
 
     public AsyncHttpRequest(AbstractHttpClient client, HttpContext context, HttpUriRequest request, AsyncHttpResponseHandler responseHandler) {
         this.client = client;
         this.context = context;
         this.request = request;
         this.responseHandler = responseHandler;
+        if(responseHandler instanceof ImageHttpResponseHandler) {
+        	this.isImageResponseHandler = true;
+        }
     }
 
     public void run() {
@@ -55,7 +59,11 @@ public void run() {
         } catch (IOException e) {
             if(responseHandler != null) {
                 responseHandler.sendFinishMessage();
-                responseHandler.sendFailureMessage(e, null);
+                if(this.isImageResponseHandler) {
+                	responseHandler.sendFailureMessage(e, (byte[]) null);
+                } else {
+                	responseHandler.sendFailureMessage(e, (String) null);
+                }
             }
         }
     }

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

@@ -138,6 +138,10 @@ protected void sendSuccessMessage(String responseBody) {
     protected void sendFailureMessage(Throwable e, String responseBody) {
         sendMessage(obtainMessage(FAILURE_MESSAGE, new Object[]{e, responseBody}));
     }
+    
+    protected void sendFailureMessage(Throwable e, byte[] responseBody) {
+        sendMessage(obtainMessage(FAILURE_MESSAGE, new Object[]{e, responseBody}));
+    }
 
     protected void sendStartMessage() {
         sendMessage(obtainMessage(START_MESSAGE, null));

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

@@ -68,7 +68,7 @@
  * });
  * </pre>
  */
-public class ImageHttpResponseHandler {
+public class ImageHttpResponseHandler extends AsyncHttpResponseHandler {
     private static final int SUCCESS_MESSAGE = 0;
     private static final int FAILURE_MESSAGE = 1;
     private static final int START_MESSAGE = 2;
@@ -144,7 +144,7 @@ public void onFailure(Throwable error, byte[] imageData) {
     //
     // Pre-processing of messages (executes in background threadpool thread)
     //
-
+    
     protected void sendSuccessMessage(byte[] responseBody) {
         sendMessage(obtainMessage(SUCCESS_MESSAGE, responseBody));
     }
@@ -246,7 +246,7 @@ void sendResponseMessage(HttpResponse response) {
             }
             responseBody = EntityUtils.toByteArray(entity);
         } catch(IOException e) {
-            sendFailureMessage(e, null);
+            sendFailureMessage(e, (byte[]) null);
         }
 
         if(status.getStatusCode() >= 300) {