Merge branch 'master' of https://github.com/loopj/android-async-http

Author: smarek

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

@@ -146,28 +146,26 @@ private void makeRequest() throws IOException {
 
         HttpResponse response = client.execute(request, context);
 
-        if (isCancelled()) {
+        if (isCancelled() || responseHandler == null) {
             return;
         }
 
-        if (responseHandler != null) {
-            // Carry out pre-processing for this response.
-            responseHandler.onPreProcessResponse(responseHandler, response);
-
-            if (isCancelled()) {
-                return;
-            }
+        // Carry out pre-processing for this response.
+        responseHandler.onPreProcessResponse(responseHandler, response);
 
-            // The response is ready, handle it.
-            responseHandler.sendResponseMessage(response);
+        if (isCancelled()) {
+            return;
+        }
 
-            if (isCancelled()) {
-                return;
-            }
+        // The response is ready, handle it.
+        responseHandler.sendResponseMessage(response);
 
-            // Carry out post-processing for this response.
-            responseHandler.onPostProcessResponse(responseHandler, response);
+        if (isCancelled()) {
+            return;
         }
+
+        // Carry out post-processing for this response.
+        responseHandler.onPostProcessResponse(responseHandler, response);
     }
 
     private void makeRequestWithRetries() throws IOException {

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

@@ -186,7 +186,11 @@ public AsyncHttpResponseHandler() {
     }
 
     /**
-     * Creates a new AsyncHttpResponseHandler
+     * Creates a new AsyncHttpResponseHandler with a user-supplied looper. If
+     * the passed looper is null, the looper attached to the current thread will
+     * be used.
+     *
+     * @param looper The looper to work with
      */
     public AsyncHttpResponseHandler(Looper looper) {
         this.looper = looper == null ? Looper.myLooper() : looper;
@@ -261,30 +265,37 @@ public void onCancel() {
         Log.d(LOG_TAG, "Request got cancelled");
     }
 
+    @Override
     final public void sendProgressMessage(int bytesWritten, int bytesTotal) {
         sendMessage(obtainMessage(PROGRESS_MESSAGE, new Object[]{bytesWritten, bytesTotal}));
     }
 
+    @Override
     final public void sendSuccessMessage(int statusCode, Header[] headers, byte[] responseBytes) {
         sendMessage(obtainMessage(SUCCESS_MESSAGE, new Object[]{statusCode, headers, responseBytes}));
     }
 
+    @Override
     final public void sendFailureMessage(int statusCode, Header[] headers, byte[] responseBody, Throwable throwable) {
         sendMessage(obtainMessage(FAILURE_MESSAGE, new Object[]{statusCode, headers, responseBody, throwable}));
     }
 
+    @Override
     final public void sendStartMessage() {
         sendMessage(obtainMessage(START_MESSAGE, null));
     }
 
+    @Override
     final public void sendFinishMessage() {
         sendMessage(obtainMessage(FINISH_MESSAGE, null));
     }
 
+    @Override
     final public void sendRetryMessage(int retryNo) {
         sendMessage(obtainMessage(RETRY_MESSAGE, new Object[]{retryNo}));
     }
 
+    @Override
     final public void sendCancelMessage() {
         sendMessage(obtainMessage(CANCEL_MESSAGE, null));
     }

library/src/main/java/com/loopj/android/http/JsonStreamerEntity.java

@@ -192,6 +192,10 @@ public void writeTo(final OutputStream out) throws IOException {
                 os.write('}');
             } else if (value instanceof JsonValueInterface) {
                 os.write(((JsonValueInterface) value).getEscapedJsonValue());
+            } else if (value instanceof org.json.JSONObject) {
+                os.write(((org.json.JSONObject) value).toString().getBytes());
+            } else if (value instanceof org.json.JSONArray) {
+                os.write(((org.json.JSONArray) value).toString().getBytes());
             } else if (value instanceof Boolean) {
                 os.write((Boolean) value ? JSON_TRUE : JSON_FALSE);
             } else if (value instanceof Long) {

library/src/main/java/com/loopj/android/http/ResponseHandlerInterface.java

@@ -154,5 +154,5 @@ public interface ResponseHandlerInterface {
      * @param instance An instance of this response object
      * @param response The response to post-process
      */
-    public void onPostProcessResponse(ResponseHandlerInterface instance, HttpResponse response);
+    void onPostProcessResponse(ResponseHandlerInterface instance, HttpResponse response);
 }

library/src/main/java/com/loopj/android/http/TextHttpResponseHandler.java

@@ -115,8 +115,9 @@ public void onFailure(int statusCode, Header[] headers, byte[] responseBytes, Th
     public static String getResponseString(byte[] stringBytes, String charset) {
         try {
             String toReturn = (stringBytes == null) ? null : new String(stringBytes, charset);
-            if (toReturn != null && toReturn.startsWith(UTF8_BOM))
+            if (toReturn != null && toReturn.startsWith(UTF8_BOM)) {
                 return toReturn.substring(1);
+            }
             return toReturn;
         } catch (UnsupportedEncodingException e) {
             Log.e(LOG_TAG, "Encoding response into string failed", e);