From d30cbb31ab64e8bd19dbdca565213d97d1459073 Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 26 Nov 2019 09:47:53 +0100 Subject: [PATCH] Check for attachments in the body only --- app/src/main/java/eu/faircode/email/FragmentCompose.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index 90422d0d3f..627d849aaa 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -3083,9 +3083,12 @@ public class FragmentCompose extends FragmentBase { } } - String plain = HtmlHelper.getText(body); + Document d = JsoupEx.parse(body); + d.select("div[fairemail=signature]").remove(); + d.select("div[fairemail=reference]").remove(); + String text = d.text(); for (String keyword : keywords) - if (plain.matches("(?si).*\\b" + Pattern.quote(keyword.trim()) + "\\b.*")) { + if (text.matches("(?si).*\\b" + Pattern.quote(keyword.trim()) + "\\b.*")) { args.putBoolean("remind_attachment", true); break; }