From 0d908457b8f0cf5f1c869e9bd2f38a02abc3e23e Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 19 Dec 2019 13:16:18 +0100 Subject: [PATCH] Normalize text for encryption --- app/src/main/java/eu/faircode/email/MessageHelper.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java index 5b26e06402..4c3caf24bc 100644 --- a/app/src/main/java/eu/faircode/email/MessageHelper.java +++ b/app/src/main/java/eu/faircode/email/MessageHelper.java @@ -466,6 +466,16 @@ public class MessageHelper { String htmlContent = document.html(); String plainContent = HtmlHelper.getText(htmlContent); + if (message.encrypt != null && !EntityMessage.ENCRYPT_NONE.equals(message.encrypt)) { + // Normalize trailing spaces and new lines + Log.i("Normalizing for encryption"); + htmlContent = htmlContent.replaceAll(" +$", "") + .replace("\\r?\\n", "\\r\\n"); + + plainContent = plainContent.replaceAll(" +$", "") + .replace("\\r?\\n", "\\r\\n"); + } + BodyPart plainPart = new MimeBodyPart(); plainPart.setContent(plainContent, "text/plain; charset=" + Charset.defaultCharset().name());