From b75fa34a50f31c430fba96e177a031223ccc84b2 Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 12 Jul 2026 10:05:37 +0200 Subject: [PATCH] Added blockquote type=cite --- app/src/main/java/eu/faircode/email/EditTextCompose.java | 3 ++- app/src/main/java/eu/faircode/email/EntityRule.java | 4 +++- app/src/main/java/eu/faircode/email/FragmentCompose.java | 4 +++- app/src/main/java/eu/faircode/email/HtmlEx.java | 2 +- app/src/main/java/eu/faircode/email/HtmlHelper.java | 7 ++++++- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/EditTextCompose.java b/app/src/main/java/eu/faircode/email/EditTextCompose.java index 52c2d55dc9..c5a62534f1 100644 --- a/app/src/main/java/eu/faircode/email/EditTextCompose.java +++ b/app/src/main/java/eu/faircode/email/EditTextCompose.java @@ -409,7 +409,8 @@ public class EditTextCompose extends FixedEditText { h = "
" + HtmlHelper.formatPlainText(t.toString(), false) + "
"; } String style = HtmlHelper.getQuoteStyle("", 0, 0); - String html = "
" + h + "
"; + String type = HtmlHelper.getQuoteType(); + String html = "
" + h + "
"; Helper.getUIExecutor().submit(new RunnableEx("pasteq") { @Override diff --git a/app/src/main/java/eu/faircode/email/EntityRule.java b/app/src/main/java/eu/faircode/email/EntityRule.java index 9b4539f99d..656c5331be 100644 --- a/app/src/main/java/eu/faircode/email/EntityRule.java +++ b/app/src/main/java/eu/faircode/email/EntityRule.java @@ -1236,7 +1236,9 @@ public class EntityRule { if (quote) { String style = e.attr("style"); style = HtmlHelper.mergeStyles(style, HtmlHelper.getQuoteStyle(e)); - e.tagName("blockquote").attr("style", style); + e.tagName("blockquote") + .attr("style", style) + .attr("type", HtmlHelper.getQuoteType()); } else e.tagName("p"); div.appendChild(e); diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index d16620f467..75b0596419 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -6388,7 +6388,9 @@ public class FragmentCompose extends FragmentBase { if (quote) { String style = e.attr("style"); style = HtmlHelper.mergeStyles(style, HtmlHelper.getQuoteStyle(e)); - e.tagName("blockquote").attr("style", style); + e.tagName("blockquote") + .attr("style", style) + .attr("type", HtmlHelper.getQuoteType()); } else e.tagName("p"); reply.appendChild(e); diff --git a/app/src/main/java/eu/faircode/email/HtmlEx.java b/app/src/main/java/eu/faircode/email/HtmlEx.java index f9bad7f6b2..a00c64a613 100644 --- a/app/src/main/java/eu/faircode/email/HtmlEx.java +++ b/app/src/main/java/eu/faircode/email/HtmlEx.java @@ -153,7 +153,7 @@ public class HtmlEx { if (span instanceof QuoteSpan) out.append("
"); + .append("\" type=\"" + HtmlHelper.getQuoteType() + "\">"); else if (span instanceof eu.faircode.email.IndentSpan) out.append("
level) sb.append("
"); + .append("\" type=\"" + HtmlHelper.getQuoteType() + "\">"); line = line.substring(1); // > @@ -2758,6 +2758,11 @@ public class HtmlHelper { return "border-" + dir + ":3px solid #ccc; padding-" + dir + ":10px;margin:0;"; } + static String getQuoteType() { + // https://github.com/mozilla-firefox/firefox/blob/aaf0207c409c5f6479cc92bc1bf407a453d63cdc/editor/libeditor/HTMLEditUtils.cpp#L804 + return "cite"; // Non standard + } + static String getIndentStyle(CharSequence quoted, int start, int end) { return "margin-top:0; margin-bottom:0;"; }