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

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

Author: Vahur Roosimaa

build.xml

@@ -17,7 +17,6 @@
 
         <exec executable="git" outputproperty="package.versionname">
           <arg value="describe"/>
-          <arg value='--match=${package.name}-*'/>
           <arg value="--tags"/>
           <arg value="--dirty"/>
           <arg value="--always"/>
@@ -26,7 +25,19 @@
     </target>
 
     <!-- Standard jar stuff -->
-    <property name="lib.dir" value="${sdk.dir}/platforms/${target}" />
+    <property environment="env"/>
+    <condition property="android.base" value="${sdk.dir}" else="${env.ANDROID_HOME}">
+      <isset property="sdk.dir" />
+    </condition>
+    <fail message="Please set either the sdk.dir property or the ANDROID_HOME environment variable to point to your Android SDK installation.">
+      <condition>
+        <not>
+          <available file="${android.base}" type="dir"/>
+        </not>
+      </condition>
+    </fail>
+
+    <property name="lib.dir" value="${android.base}/platforms/${target}" />
     <property name="build.dir" value="./build"/>
     <property name="classes.dir"  value="${build.dir}/classes"/>
     <buildnumber file="build.num" />
@@ -43,7 +54,7 @@
             sourcepath="gen:src"
             destdir="doc"
             packagenames="${package.packagename}"
-            linkoffline="http://d.android.com/reference ${sdk.dir}/docs/reference" 
+            linkoffline="http://d.android.com/reference ${android.base}/docs/reference" 
             additionalparam="-author  -version"
             />
     </target>

examples/TwitterRestClient.java

@@ -12,7 +12,7 @@ public static void get(String url, RequestParams params, AsyncHttpResponseHandle
     }
 
     public static void post(String url, RequestParams params, AsyncHttpResponseHandler responseHandler) {
-        client.get(getAbsoluteUrl(url), params, responseHandler);
+        client.post(getAbsoluteUrl(url), params, responseHandler);
     }
 
     private static String getAbsoluteUrl(String relativeUrl) {

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

@@ -125,18 +125,21 @@ protected void handleSuccessJsonMessage(int statusCode, Object jsonResponse) {
         } else if(jsonResponse instanceof JSONArray) {
             onSuccess(statusCode, (JSONArray)jsonResponse);
         } else {
-            onFailure(new JSONException("Unexpected type " + jsonResponse.getClass().getName()));
+            onFailure(new JSONException("Unexpected type " + jsonResponse.getClass().getName()), (JSONObject)null);
         }
     }
 
     protected Object parseResponse(String responseBody) throws JSONException {
         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;
+		responseBody = responseBody.trim();
+		if(responseBody.startsWith("{") || responseBody.startsWith("[")) {
+			result = new JSONTokener(responseBody).nextValue();
+		}
+		if (result == null) {
+			result = responseBody;
+		}
+		return result;
     }
 
     @Override

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

@@ -65,7 +65,7 @@ public RetryHandler(int maxRetries) {
     }
 
     public boolean retryRequest(IOException exception, int executionCount, HttpContext context) {
-        boolean retry;
+        boolean retry = true;
 
         Boolean b = (Boolean) context.getAttribute(ExecutionContext.HTTP_REQ_SENT);
         boolean sent = (b != null && b.booleanValue());
@@ -82,16 +82,13 @@ public boolean retryRequest(IOException exception, int executionCount, HttpConte
         } else if (!sent) {
             // for most other errors, retry only if request hasn't been fully sent yet
             retry = true;
-        } else {
+        }
+
+        if(retry) {
             // resend all idempotent requests
-            HttpUriRequest currentReq = (HttpUriRequest) context.getAttribute(ExecutionContext.HTTP_REQUEST);
+            HttpUriRequest currentReq = (HttpUriRequest) context.getAttribute( ExecutionContext.HTTP_REQUEST );
             String requestType = currentReq.getMethod();
-            if(!requestType.equals("POST")) {
-                retry = true;
-            } else {
-                // otherwise do not retry
-                retry = false;
-            }
+            retry = !requestType.equals("POST");
         }
 
         if(retry) {