wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

unfold+decode header value in getContentType() and getDisposition()

Browse source
This commit is contained in:
Vincent Breitmoser 2016-05-23 15:25:45 +02:00
parent 1c8a6f05d0
commit 4d3bc41c0a
7 changed files with 16 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
k9mail-library/src/main/java/com/fsck/k9/mail/Part.java
View file

@ -18,7 +18,7 @@ public interface Part {
String getContentType();
String getDisposition() throws MessagingException;
String getDisposition();
String getContentId();

2
k9mail-library/src/main/java/com/fsck/k9/mail/internet/DecoderUtil.java
View file

@ -91,7 +91,7 @@ class DecoderUtil {
// ANDROID: Most strings will not include "=?" so a quick test can prevent unneeded
// object creation. This could also be handled via lazy creation of the StringBuilder.
if (body.indexOf("=?") == -1) {
if (!body.contains("=?")) {
return body;
}

10
k9mail-library/src/main/java/com/fsck/k9/mail/internet/MessageExtractor.java
View file

@ -440,12 +440,10 @@ public class MessageExtractor {
}
private static String getContentDisposition(Part part) {
try {
String disposition = part.getDisposition();
if (disposition != null) {
return MimeUtility.getHeaderParameter(disposition, null);
}
} catch (MessagingException e) { /* ignore */ }
String disposition = part.getDisposition();
if (disposition != null) {
return MimeUtility.getHeaderParameter(disposition, null);
}
return null;
}
}

4
k9mail-library/src/main/java/com/fsck/k9/mail/internet/MimeBodyPart.java
View file

@ -92,11 +92,11 @@ public class MimeBodyPart extends BodyPart {
@Override
public String getContentType() {
String contentType = getFirstHeader(MimeHeader.HEADER_CONTENT_TYPE);
return (contentType == null) ? "text/plain" : contentType;
return (contentType == null) ? "text/plain" : MimeUtility.unfoldAndDecode(contentType);
}
@Override
public String getDisposition() throws MessagingException {
public String getDisposition() {
return getFirstHeader(MimeHeader.HEADER_CONTENT_DISPOSITION);
}

6
k9mail-library/src/main/java/com/fsck/k9/mail/internet/MimeMessage.java
View file

@ -164,12 +164,12 @@ public class MimeMessage extends Message {
@Override
public String getContentType() {
String contentType = getFirstHeader(MimeHeader.HEADER_CONTENT_TYPE);
return (contentType == null) ? "text/plain" : contentType;
return (contentType == null) ? "text/plain" : MimeUtility.unfoldAndDecode(contentType);
}
@Override
public String getDisposition() throws MessagingException {
return getFirstHeader(MimeHeader.HEADER_CONTENT_DISPOSITION);
public String getDisposition() {
return MimeUtility.unfoldAndDecode(getFirstHeader(MimeHeader.HEADER_CONTENT_DISPOSITION));
}
@Override

2
k9mail/src/main/java/com/fsck/k9/activity/compose/AttachmentPresenter.java
View file

@ -280,7 +280,7 @@ public class AttachmentPresenter {
return ret;
}
String contentType = MimeUtility.unfoldAndDecode(part.getContentType());
String contentType = part.getContentType();
String name = MimeUtility.getHeaderParameter(contentType, "name");
if (name != null) {
if (part instanceof LocalBodyPart) {

11
k9mail/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractor.java
View file

@ -280,14 +280,11 @@ public class MessageViewInfoExtractor {
* @return The (file)name of the part if available. An empty string, otherwise.
*/
private static String getPartName(Part part) {
try {
String disposition = part.getDisposition();
if (disposition != null) {
String name = getHeaderParameter(disposition, "filename");
return (name == null) ? "" : name;
}
String disposition = part.getDisposition();
if (disposition != null) {
String name = getHeaderParameter(disposition, "filename");
return (name == null) ? "" : name;
}
catch (MessagingException e) { /* ignore */ }
return "";
}