Merge pull request android-async-http#200 from krschultz/feature/content-type-regex

loopj · loopj · commit cb3dd332c7b9 · 2013-03-28T14:59:46.000-07:00
Use regular expression to match content type in BinaryResponseHandler
diff --git a/src/com/loopj/android/http/BinaryHttpResponseHandler.java b/src/com/loopj/android/http/BinaryHttpResponseHandler.java
@@ -19,6 +19,7 @@
 package com.loopj.android.http;
 
 import java.io.IOException;
+import java.util.regex.Pattern;
 
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
@@ -168,7 +169,7 @@ void sendResponseMessage(HttpResponse response) {
         Header contentTypeHeader = contentTypeHeaders[0];
         boolean foundAllowedContentType = false;
         for(String anAllowedContentType : mAllowedContentTypes) {
-            if(anAllowedContentType.equals(contentTypeHeader.getValue())) {
+            if(Pattern.matches(anAllowedContentType, contentTypeHeader.getValue())) {
                 foundAllowedContentType = true;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`package com.loopj.android.http;`
`20`	`20`
`21`	`21`	`import java.io.IOException;`
	`22`	`+import java.util.regex.Pattern;`
`22`	`23`
`23`	`24`	`import org.apache.http.Header;`
`24`	`25`	`import org.apache.http.HttpEntity;`
`@@ -168,7 +169,7 @@ void sendResponseMessage(HttpResponse response) {`
`168`	`169`	`Header contentTypeHeader = contentTypeHeaders[0];`
`169`	`170`	`boolean foundAllowedContentType = false;`
`170`	`171`	`for(String anAllowedContentType : mAllowedContentTypes) {`
`171`		`- if(anAllowedContentType.equals(contentTypeHeader.getValue())) {`
	`172`	`+ if(Pattern.matches(anAllowedContentType, contentTypeHeader.getValue())) {`
`172`	`173`	`foundAllowedContentType = true;`
`173`	`174`	`}`
`174`	`175`	`}`