From a411ba7f99dae739306ad15e67084da7ff300180 Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 13 Nov 2020 20:16:53 +0100 Subject: [PATCH] Experiment: Limit alternative plain content --- .../main/java/eu/faircode/email/MessageHelper.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java index c9ce78c9b4..f11d80f30b 100644 --- a/app/src/main/java/eu/faircode/email/MessageHelper.java +++ b/app/src/main/java/eu/faircode/email/MessageHelper.java @@ -570,6 +570,9 @@ public class MessageHelper { // Build html body Document document = JsoupEx.parse(message.getFile(context)); + Element ref = null; + if (BuildConfig.DEBUG) + ref = document.select("div[fairemail=reference]").first(); // When sending message if (identity != null && send) { @@ -653,7 +656,15 @@ public class MessageHelper { String htmlContent = document.html(); String htmlContentType = "text/html; charset=" + Charset.defaultCharset().name(); - String plainContent = HtmlHelper.getText(context, htmlContent); + // Limit alternative plain content + if (ref != null && + (message.plain_only == null || !message.plain_only)) { + Element first = ref.select("blockquote").first(); + if (first != null) + first.children().select("blockquote").remove(); + } + + String plainContent = HtmlHelper.getText(context, document.html()); String plainContentType = "text/plain; charset=" + Charset.defaultCharset().name(); if (format_flowed) {