mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Normalize text for encryption

This commit is contained in:
M66B 2019-12-19 13:16:18 +01:00
parent 85af5423d8
commit 0d908457b8
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/eu/faircode/email/MessageHelper.java
View File

@ -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());