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

Unverified Commit cd08af28 authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #3600 from k9mail/fix_reply_to_unencrypted_message 

Fix bug where subject field isn't populated when replying to an unencrypted message
parents 62b6e5bd 8835b1e4

app/core/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractor.java

+2 −1
Original line number Diff line number Diff line
@@ -68,7 +68,8 @@ public class MessageViewInfoExtractor { 
            if (cryptoAnnotations != null && !cryptoAnnotations.isEmpty()) {

                Timber.e("Got crypto message cryptoContentAnnotations but no crypto root part!");

            }

            return extractSimpleMessageForView(message, message);

            MessageViewInfo messageViewInfo = extractSimpleMessageForView(message, message);

            return messageViewInfo.withSubject(message.getSubject(), false);

        }



        boolean isOpenPgpEncrypted = (MessageCryptoStructureDetector.isPartMultipartEncrypted(cryptoContentPart) &&

app/core/src/test/java/com/fsck/k9/mailstore/MessageViewInfoExtractorTest.java

+2 −0
Original line number Diff line number Diff line
@@ -379,6 +379,7 @@ public class MessageViewInfoExtractorTest extends K9RobolectricTest { 
                bodypart("text/plain", "text"),

                attachmentPart

        ));

        message.setSubject(SUBJECT);

        AttachmentViewInfo attachmentViewInfo = mock(AttachmentViewInfo.class);

        setupAttachmentInfoForPart(attachmentPart, attachmentViewInfo);
@@ -391,6 +392,7 @@ public class MessageViewInfoExtractorTest extends K9RobolectricTest { 
        assertSame(attachmentViewInfo, messageViewInfo.attachments.get(0));

        assertNull(messageViewInfo.cryptoResultAnnotation);

        assertTrue(messageViewInfo.extraAttachments.isEmpty());

        assertEquals(SUBJECT, messageViewInfo.subject);

    }



    @Test