From 569415f8d7d51f9c1c0efa9be7b92b2e1ef53a2f Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Mon, 26 Aug 2024 13:02:54 -0500 Subject: [PATCH] Move up markup processing So that it happens before we pull out the first quote. --- .../eu/siacs/conversations/ui/adapter/MessageAdapter.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java index 9a3a7b5bf4352b02d8d51433ed5b784e617f0df2..e398432703d150f136cb2fba7970a1875c0db347 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -637,7 +637,9 @@ public class MessageAdapter extends ArrayAdapter { int end = body.getSpanEnd(mergeSeparator); body.setSpan(new DividerSpan(true), start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); } - boolean startsWithQuote = false; + if (processMarkup) StylingHelper.format(body, viewHolder.messageBody.getCurrentTextColor()); + MyLinkify.addLinks(body, message.getConversation().getAccount(), message.getConversation().getJid()); + boolean startsWithQuote = processMarkup ? handleTextQuotes(viewHolder.messageBody, body, bubbleColor, true) : false; for (final android.text.style.QuoteSpan quote : body.getSpans(0, body.length(), android.text.style.QuoteSpan.class)) { int start = body.getSpanStart(quote); int end = body.getSpanEnd(quote); @@ -657,7 +659,6 @@ public class MessageAdapter extends ArrayAdapter { } } } - startsWithQuote = (processMarkup ? handleTextQuotes(viewHolder.messageBody, body, bubbleColor, true) : false) || startsWithQuote; if (!message.isPrivateMessage()) { if (hasMeCommand) { body.setSpan( @@ -748,8 +749,6 @@ public class MessageAdapter extends ArrayAdapter { Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); } - if (processMarkup) StylingHelper.format(body, viewHolder.messageBody.getCurrentTextColor()); - MyLinkify.addLinks(body, message.getConversation().getAccount(), message.getConversation().getJid()); if (highlightedTerm != null) { StylingHelper.highlight(viewHolder.messageBody, body, highlightedTerm); }