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

Author: smarek

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

@@ -291,9 +291,8 @@ public void onFailure(int statusCode, Header[] headers, Throwable error, String
      * @param error        the underlying cause of the failure
      */
     public void onFailure(int statusCode, Header[] headers, byte[] responseBody, Throwable error) {
-        String response;
         try {
-            response = new String(responseBody, getCharset());
+            String response = responseBody == null ? null : new String(responseBody, getCharset());
             onFailure(statusCode, headers, error, response);
         } catch (UnsupportedEncodingException e) {
             Log.e(LOG_TAG, e.toString());

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

@@ -100,7 +100,8 @@ public void onSuccess(int statusCode, Header[] headers, String responseBody) {
     @Override
     public void onSuccess(int statusCode, Header[] headers, byte[] responseBody) {
         try {
-            onSuccess(statusCode, headers, new String(responseBody, getCharset()));
+        	String response = responseBody == null ? null : new String(responseBody, getCharset());
+            onSuccess(statusCode, headers, response);
         } catch (UnsupportedEncodingException e) {
             Log.v(LOG_TAG, "String encoding failed, calling onFailure(int, Header[], String, Throwable)");
             onFailure(0, headers, (String) null, e);
@@ -110,7 +111,8 @@ public void onSuccess(int statusCode, Header[] headers, byte[] responseBody) {
     @Override
     public void onFailure(int statusCode, Header[] headers, byte[] responseBody, Throwable error) {
         try {
-            onFailure(statusCode, headers, new String(responseBody, getCharset()), error);
+        	String response = responseBody == null ? null : new String(responseBody, getCharset());
+            onFailure(statusCode, headers, response, error);
         } catch (UnsupportedEncodingException e) {
             Log.v(LOG_TAG, "String encoding failed, calling onFailure(int, Header[], String, Throwable)");
             onFailure(0, headers, (String) null, e);

sample/src/main/AndroidManifest.xml sample/main/AndroidManifest.xmlsample/src/main/AndroidManifest.xml renamed to sample/main/AndroidManifest.xml

@@ -4,7 +4,7 @@
     android:versionCode="1"
     android:versionName="1.0">
 
-    <permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.INTERNET"/>
 
     <uses-sdk
         android:minSdkVersion="3"

…c/main/res/drawable-hdpi/ic_launcher.png …e/main/res/drawable-hdpi/ic_launcher.pngsample/src/main/res/drawable-hdpi/ic_launcher.png renamed to sample/main/res/drawable-hdpi/ic_launcher.png sample/src/main/res/drawable-hdpi/ic_launcher.png renamed to sample/main/res/drawable-hdpi/ic_launcher.png

@@ -4,5 +4,7 @@
     <string name="app_name">Android Async Http Sample</string>
     <string name="title_get_sample">GET Sample</string>
     <string name="title_json_sample">JSON Sample</string>
-
+    <string name="title_post_sample">POST Sample</string>
+	<string name="title_put_sample">PUT Sample</string>
+	<string name="title_delete_sample">DELETE Sample</string>
 </resources>