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

Commit 8b11a728 authored by Vincent Breitmoser's avatar Vincent Breitmoser
Browse files

Return actual root part of message in MessageViewInfo (fixes #3004)

parent 7c3b90b3

k9mail/src/main/java/com/fsck/k9/mailstore/MessageViewInfo.java

+2 −2
Original line number Diff line number Diff line
@@ -37,10 +37,10 @@ public class MessageViewInfo { 
        this.extraAttachments = extraAttachments;

    }



    static MessageViewInfo createWithExtractedContent(Message message, boolean isMessageIncomplete,

    static MessageViewInfo createWithExtractedContent(Message message, Part rootPart, boolean isMessageIncomplete,

            String text, List<AttachmentViewInfo> attachments, AttachmentResolver attachmentResolver) {

        return new MessageViewInfo(

                message, isMessageIncomplete, message, text, attachments, null, attachmentResolver, null,

                message, isMessageIncomplete, rootPart, text, attachments, null, attachmentResolver, null,

                Collections.<AttachmentViewInfo>emptyList());

    }

k9mail/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractor.java

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ public class MessageViewInfoExtractor { 
                !message.isSet(Flag.X_DOWNLOADED_FULL) || MessageExtractor.hasMissingParts(message);



        return MessageViewInfo.createWithExtractedContent(

                message, isMessageIncomplete, viewable.html, attachmentInfos, attachmentResolver);

                message, contentPart, isMessageIncomplete, viewable.html, attachmentInfos, attachmentResolver);

    }



    private ViewableExtractedText extractViewableAndAttachments(List<Part> parts,

k9mail/src/test/java/com/fsck/k9/mailstore/MessageViewInfoExtractorTest.java

+4 −0
Original line number Diff line number Diff line
@@ -406,6 +406,8 @@ public class MessageViewInfoExtractorTest { 


        assertEquals("<pre class=\"k9mail\">text</pre>", messageViewInfo.text);

        assertSame(annotation, messageViewInfo.cryptoResultAnnotation);

        assertSame(message, messageViewInfo.message);

        assertSame(message, messageViewInfo.rootPart);

        assertTrue(messageViewInfo.attachments.isEmpty());

        assertTrue(messageViewInfo.extraAttachments.isEmpty());

    }
@@ -427,6 +429,8 @@ public class MessageViewInfoExtractorTest { 


        assertEquals("<pre class=\"k9mail\">replacement text</pre>", messageViewInfo.text);

        assertSame(annotation, messageViewInfo.cryptoResultAnnotation);

        assertSame(message, messageViewInfo.message);

        assertSame(replacementPart, messageViewInfo.rootPart);

        assertTrue(messageViewInfo.attachments.isEmpty());

        assertTrue(messageViewInfo.extraAttachments.isEmpty());

    }