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

Commit 5f7dac45 authored by cketti's avatar cketti
Browse files

Remove unwarranted usage of MimeUtility.unfoldAndDecode()

parent 942ecb5a

app/core/src/main/java/com/fsck/k9/message/extractors/AttachmentInfoExtractor.java

+3 −4
Original line number Diff line number Diff line
@@ -105,13 +105,12 @@ public class AttachmentInfoExtractor { 
    }



    @WorkerThread

    private AttachmentViewInfo extractAttachmentInfo(Part part, Uri uri, long size, boolean isContentAvailable)

            throws MessagingException {

    private AttachmentViewInfo extractAttachmentInfo(Part part, Uri uri, long size, boolean isContentAvailable) {

        boolean inlineAttachment = false;



        String mimeType = part.getMimeType();

        String contentTypeHeader = MimeUtility.unfoldAndDecode(part.getContentType());

        String contentDisposition = MimeUtility.unfoldAndDecode(part.getDisposition());

        String contentTypeHeader = part.getContentType();

        String contentDisposition = part.getDisposition();



        String name = MimeUtility.getHeaderParameter(contentDisposition, "filename");

        if (name == null) {

mail/common/src/main/java/com/fsck/k9/mail/internet/MimeBodyPart.java

+6 −2
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ import java.io.OutputStreamWriter; 


import android.support.annotation.NonNull;



import static com.fsck.k9.mail.internet.MimeUtility.isSameMimeType;





/**

 * TODO this is a close approximation of Message, need to update along with
@@ -95,12 +97,14 @@ public class MimeBodyPart extends BodyPart { 
    public String getContentType() {

        String contentType = getFirstHeader(MimeHeader.HEADER_CONTENT_TYPE);

        if (contentType != null) {

            return MimeUtility.unfoldAndDecode(contentType);

            return contentType;

        }



        Multipart parent = getParent();

        if (parent != null && "multipart/digest".equals(parent.getMimeType())) {

        if (parent != null && isSameMimeType(parent.getMimeType(), "multipart/digest")) {

            return "message/rfc822";

        }



        return "text/plain";

    }

mail/common/src/main/java/com/fsck/k9/mail/internet/MimeMessage.java

+10 −5
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import org.apache.james.mime4j.parser.MimeStreamParser; 
import org.apache.james.mime4j.stream.BodyDescriptor;

import org.apache.james.mime4j.stream.Field;

import org.apache.james.mime4j.stream.MimeConfig;

import timber.log.Timber;





/**
@@ -126,12 +127,16 @@ public class MimeMessage extends Message { 
    @Override

    public Date getSentDate() {

        if (mSentDate == null) {

            String dateHeaderBody = getFirstHeader("Date");

            if (dateHeaderBody == null) {

                return null;

            }



            try {

                DateTimeField field = (DateTimeField)DefaultFieldParser.parse("Date: "

                                      + MimeUtility.unfoldAndDecode(getFirstHeader("Date")));

                DateTimeField field = (DateTimeField) DefaultFieldParser.parse("Date: " + dateHeaderBody);

                mSentDate = field.getDate();

            } catch (Exception e) {



                Timber.d(e, "Couldn't parse Date header field");

            }

        }

        return mSentDate;
@@ -171,12 +176,12 @@ public class MimeMessage extends Message { 
    @Override

    public String getContentType() {

        String contentType = getFirstHeader(MimeHeader.HEADER_CONTENT_TYPE);

        return (contentType == null) ? "text/plain" : MimeUtility.unfoldAndDecode(contentType);

        return (contentType == null) ? "text/plain" : contentType;

    }



    @Override

    public String getDisposition() {

        return MimeUtility.unfoldAndDecode(getFirstHeader(MimeHeader.HEADER_CONTENT_DISPOSITION));

        return getFirstHeader(MimeHeader.HEADER_CONTENT_DISPOSITION);

    }



    @Override