Changed JsonHttpResponseHandler.java to derive from TextHttpResponseHandler.java

Author: sweetlilmre

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

@@ -41,8 +41,21 @@
  * Additionally, you can override the other event methods from the
  * parent class.
  */
-public class JsonHttpResponseHandler extends AsyncHttpResponseHandler {
+public class JsonHttpResponseHandler extends TextHttpResponseHandler {
     private static final String LOG_TAG = "JsonHttpResponseHandler";
+
+    /**
+     * Creates a new TextHttpResponseHandler
+     */
+
+    public JsonHttpResponseHandler() {
+        super(DEFAULT_CHARSET);
+    }
+
+    public JsonHttpResponseHandler(String encoding) {
+        super(encoding);
+    }
+
     //
     // Callbacks to be overridden, typically anonymously
     //
@@ -143,7 +156,7 @@ public void onFailure(int statusCode, Header[] headers, Throwable e, JSONArray e
     }
 
     @Override
-    public void onSuccess(final int statusCode, final Header[] headers, final byte[] responseBody) {
+    public void onSuccess(final int statusCode, final Header[] headers, final String responseBody) {
         if (statusCode != HttpStatus.SC_NO_CONTENT) {
             new Thread(new Runnable() {
                 @Override
@@ -181,7 +194,7 @@ public void run() {
     }
 
     @Override
-    public void onFailure(final int statusCode, final Header[] headers, final byte[] responseBody, final Throwable e) {
+    public void onFailure(final int statusCode, final Header[] headers, final String responseBody, final Throwable e) {
         if (responseBody != null) {
             new Thread(new Runnable() {
                 @Override
@@ -220,22 +233,17 @@ public void run() {
         }
     }
 
-    protected Object parseResponse(byte[] responseBody) throws JSONException {
+    protected Object parseResponse(String responseBody) throws JSONException {
         if (null == responseBody)
             return null;
         Object result = null;
-        try {
-            //trim the string to prevent start with blank, and test if the string is valid JSON, because the parser don't do this :(. If Json is not valid this will return null
-            String jsonString = new String(responseBody, "UTF-8").trim();
-            if (jsonString.startsWith("{") || jsonString.startsWith("[")) {
-                result = new JSONTokener(jsonString).nextValue();
-            }
-            if (result == null) {
-                result = jsonString;
-            }
-        } catch (UnsupportedEncodingException ex) {
-            Log.v(LOG_TAG, "JSON parsing failed, calling onFailure(Throwable, JSONObject)");
-            onFailure(ex, (JSONObject) null);
+        //trim the string to prevent start with blank, and test if the string is valid JSON, because the parser don't do this :(. If Json is not valid this will return null
+        String jsonString = responseBody.trim();
+        if (jsonString.startsWith("{") || jsonString.startsWith("[")) {
+            result = new JSONTokener(jsonString).nextValue();
+        }
+        if (result == null) {
+            result = jsonString;
         }
         return result;
     }

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

@@ -1,5 +1,7 @@
 package com.loopj.android.http;
 
+import android.util.Log;
+
 import org.apache.http.Header;
 
 import java.io.UnsupportedEncodingException;
@@ -40,6 +42,7 @@
  * </pre>
  */
 public class TextHttpResponseHandler extends AsyncHttpResponseHandler {
+    private static final String LOG_TAG = "TextHttpResponseHandler";
 
     /**
      * Creates a new TextHttpResponseHandler
@@ -99,6 +102,7 @@ public void onSuccess(int statusCode, Header[] headers, byte[] responseBody) {
         try {
             onSuccess(statusCode, headers, new String(responseBody, getCharset()));
         } catch (UnsupportedEncodingException e) {
+            Log.v(LOG_TAG, "String encoding failed, calling onFailure(int, Header[], String, Throwable)");
             onFailure(0, headers, (String) null, e);
         }
     }
@@ -108,6 +112,7 @@ public void onFailure(int statusCode, Header[] headers, byte[] responseBody, Thr
         try {
             onFailure(statusCode, headers, new String(responseBody, getCharset()), error);
         } catch (UnsupportedEncodingException e) {
+            Log.v(LOG_TAG, "String encoding failed, calling onFailure(int, Header[], String, Throwable)");
             onFailure(0, headers, (String) null, e);
         }
     }