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

Commit 186145cd authored by Vincent Breitmoser's avatar Vincent Breitmoser Committed by GitHub
Browse files

Merge pull request #2192 from k9mail/asc-extension 

Add encrypted.asc filename to PGP/MIME emails
parents 1c1be7ff 513a29ad

k9mail/src/main/java/com/fsck/k9/message/PgpMessageBuilder.java

+3 −1
Original line number Diff line number Diff line
@@ -308,7 +308,9 @@ public class PgpMessageBuilder extends MessageBuilder { 
        MimeMultipart multipartEncrypted = createMimeMultipart();

        multipartEncrypted.setSubType("encrypted");

        multipartEncrypted.addBodyPart(new MimeBodyPart(new TextBody("Version: 1"), "application/pgp-encrypted"));

        multipartEncrypted.addBodyPart(new MimeBodyPart(encryptedBodyPart, "application/octet-stream"));

        MimeBodyPart encryptedPart = new MimeBodyPart(encryptedBodyPart, "application/octet-stream; name=\"encrypted.asc\"");

        encryptedPart.addHeader(MimeHeader.HEADER_CONTENT_DISPOSITION, "inline; filename=\"encrypted.asc\"");

        multipartEncrypted.addBodyPart(encryptedPart);

        MimeMessageHelper.setBody(currentProcessedMimeMessage, multipartEncrypted);



        String contentType = String.format(

k9mail/src/test/java/com/fsck/k9/message/PgpMessageBuilderTest.java

+1 −1
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ public class PgpMessageBuilderTest { 


        BodyPart encryptedBodyPart = multipart.getBodyPart(1);

        Assert.assertEquals("second part must be octet-stream of encrypted data",

                "application/octet-stream", encryptedBodyPart.getContentType());

                "application/octet-stream; name=\"encrypted.asc\"", encryptedBodyPart.getContentType());

        Assert.assertTrue("message body must be BinaryTempFileBody",

                encryptedBodyPart.getBody() instanceof BinaryTempFileBody);

        Assert.assertEquals(MimeUtil.ENC_7BIT, ((BinaryTempFileBody) encryptedBodyPart.getBody()).getEncoding());