Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d3bc41c authored May 23, 2016 by Vincent Breitmoser

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

parent 1c8a6f05

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ public interface Part {

		String getContentType();

		String getDisposition() throws MessagingException;
		String getDisposition();

		String getContentId();

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

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

+4 −6

Original line number	Diff line number	Diff line
		@@ -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 */ }
		return null;
		}
		}

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);
		}

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -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