opendev
/
gerrit
Code Issues Proposed changes

Merge "Recognize all parts marked with 'multipart/'" into stable-2.14

This commit is contained in:
Edwin Kempin 2017-07-18 14:28:06 +00:00 committed by Gerrit Code Review
parent 90761cd7a2 62f34ab35e
commit de695e1206
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/RawMailParser.java
View File

@ -156,7 +156,7 @@ public class RawMailParser {
} else if (part.getMimeType().equals("text/html")) {
htmlBuilder.append(result);
}
} else if (isMixedOrAlternative(part.getMimeType())) {
} else if (isMultipart(part.getMimeType())) {
Multipart multipart = (Multipart) part.getBody();
for (Entity e : multipart.getBodyParts()) {
handleMimePart(e, textBuilder, htmlBuilder);
@ -168,8 +168,8 @@ public class RawMailParser {
return (mimeType.equals("text/plain") || mimeType.equals("text/html"));
}
private static boolean isMixedOrAlternative(String mimeType) {
return mimeType.equals("multipart/alternative") || mimeType.equals("multipart/mixed");
private static boolean isMultipart(String mimeType) {
return mimeType.startsWith("multipart/");
}
private static boolean isAttachment(String dispositionType) {