Handling content-types in BinaryHttpResponseHandler

Author: smarek

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

@@ -18,6 +18,8 @@
 
 package com.loopj.android.http;
 
+import android.util.Log;
+
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpRequestRetryHandler;
 import org.apache.http.client.methods.HttpUriRequest;
@@ -110,6 +112,7 @@ private void makeRequestWithRetries() throws IOException {
             }
         } catch (Exception e) {
             // catch anything else to ensure failure message is propagated
+            Log.e("AsyncHttpRequest", "Unhandled exception origin cause", e);
             cause = new IOException("Unhandled exception: " + e.getMessage());
         }
 

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

@@ -18,13 +18,16 @@
 
 package com.loopj.android.http;
 
+import android.util.Log;
+
 import org.apache.http.Header;
 import org.apache.http.HttpResponse;
 import org.apache.http.StatusLine;
 import org.apache.http.client.HttpResponseException;
 
 import java.io.IOException;
 import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
 
 /**
  * Used to intercept and handle the responses from requests made using
@@ -60,6 +63,8 @@ public class BinaryHttpResponseHandler extends AsyncHttpResponseHandler {
     /**
      * Method can be overriden to return allowed content types,
      * can be sometimes better than passing data in constructor
+     *
+     * @return array of content-types or Pattern string templates (eg. '.*' to match every response)
      */
     public String[] getAllowedContentTypes() {
         return mAllowedContentTypes;
@@ -76,7 +81,7 @@ public BinaryHttpResponseHandler() {
      * Creates a new BinaryHttpResponseHandler, and overrides the default allowed
      * content types with passed String array (hopefully) of content types.
      *
-     * @param allowedContentTypes content types array, eg. 'image/jpeg'
+     * @param allowedContentTypes content types array, eg. 'image/jpeg' or pattern '.*'
      */
     public BinaryHttpResponseHandler(String[] allowedContentTypes) {
         this();
@@ -150,8 +155,12 @@ protected void sendResponseMessage(HttpResponse response) throws IOException {
         Header contentTypeHeader = contentTypeHeaders[0];
         boolean foundAllowedContentType = false;
         for (String anAllowedContentType : getAllowedContentTypes()) {
-            if (Pattern.matches(anAllowedContentType, contentTypeHeader.getValue())) {
-                foundAllowedContentType = true;
+            try {
+                if (Pattern.matches(anAllowedContentType, contentTypeHeader.getValue())) {
+                    foundAllowedContentType = true;
+                }
+            } catch (PatternSyntaxException e) {
+                Log.e("BinaryHttpResponseHandler", "Given pattern is not valid: " + anAllowedContentType, e);
             }
         }
         if (!foundAllowedContentType) {