ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Perform case-insensitive matches in mimeTypeMatches to support User-Agent's which use uppercased Content-Type. (fixed formatting)

Browse Source
This commit is contained in:
Josh Guilfoyle 2008-10-26 23:18:09 -07:00
parent 8978aac197
commit 14fe30f3bf
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/email/mail/internet/MimeUtility.java
View File

@ -6,6 +6,7 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.regex.Pattern;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.james.mime4j.decoder.Base64InputStream; import org.apache.james.mime4j.decoder.Base64InputStream;
@ -189,7 +190,9 @@ public class MimeUtility {
* @return * @return
*/ */
public static boolean mimeTypeMatches(String mimeType, String matchAgainst) { public static boolean mimeTypeMatches(String mimeType, String matchAgainst) {
return mimeType.matches(matchAgainst.replaceAll("\\*", "\\.\\*")); Pattern p = Pattern.compile(matchAgainst.replaceAll("\\*", "\\.\\*"),
Pattern.CASE_INSENSITIVE);
return p.matcher(mimeType).matches();
} }
/** /**
@ -201,7 +204,7 @@ public class MimeUtility {
*/ */
public static boolean mimeTypeMatches(String mimeType, String[] matchAgainst) { public static boolean mimeTypeMatches(String mimeType, String[] matchAgainst) {
for (String matchType : matchAgainst) { for (String matchType : matchAgainst) {
if (mimeType.matches(matchType.replaceAll("\\*", "\\.\\*"))) { if (mimeTypeMatches(mimeType, matchType)) {
return true; return true;
} }
} }