Merge pull request android-async-http#70 from alain57/master

added an onFailure if there is a problem with the remote host or the internet connection

Author: loopj

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

@@ -20,6 +20,7 @@
 
 import java.io.IOException;
 import java.net.ConnectException;
+import java.net.UnknownHostException;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpRequestRetryHandler;
@@ -91,6 +92,11 @@ private void makeRequestWithRetries() throws ConnectException {
             try {
                 makeRequest();
                 return;
+	    } catch (UnknownHostException e) {
+	        if(responseHandler != null) {
+	            responseHandler.sendFailureMessage(e, "can't resolve host");
+		}
+		return;
             } catch (IOException e) {
                 cause = e;
                 retry = retryHandler.retryRequest(cause, ++executionCount, context);
@@ -108,4 +114,4 @@ private void makeRequestWithRetries() throws ConnectException {
         ex.initCause(cause);
         throw ex;
     }
-}
+}

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

@@ -106,24 +106,32 @@ protected void handleSuccessJsonMessage(Object jsonResponse) {
     }
 
     protected Object parseResponse(String responseBody) throws JSONException {
-        return new JSONTokener(responseBody).nextValue();
+        Object result = 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
+	responseBody = responseBody.trim();
+	if(responseBody.startsWith("{") || responseBody.startsWith("[")) {
+	    result = new JSONTokener(responseBody).nextValue();
+	}
+	return result;
     }
 
     @Override
     protected void handleFailureMessage(Throwable e, String responseBody) {
-        if (responseBody != null) try {
-            Object jsonResponse = parseResponse(responseBody);
-            if(jsonResponse instanceof JSONObject) {
-                onFailure(e, (JSONObject)jsonResponse);
-            } else if(jsonResponse instanceof JSONArray) {
-                onFailure(e, (JSONArray)jsonResponse);
+        try {
+            if (responseBody != null) {
+                Object jsonResponse = parseResponse(responseBody);
+                if(jsonResponse instanceof JSONObject) {
+                    onFailure(e, (JSONObject)jsonResponse);
+                } else if(jsonResponse instanceof JSONArray) {
+                    onFailure(e, (JSONArray)jsonResponse);
+                } else {
+                    onFailure(e, responseBody);
+                }
+            }else {
+                onFailure(e, "");
             }
-        }
-        catch(JSONException ex) {
+        }catch(JSONException ex) {
             onFailure(e, responseBody);
         }
-        else {
-            onFailure(e, "");
-        }
     }
 }