From 4caa6cf6502f5dfefb923174c3b9dde983b946ad Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Sun, 7 Jul 2024 08:19:09 +0200
Subject: [PATCH 1/2] revert: using string replacement for whitespace checking

Ref: bc08c149b7169475cf125ac67d25acff9e9960f4.
---
 .../android/ui/displayitems/StatusDisplayItem.java             | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
index c4bb96ece..68d4950ef 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
@@ -280,9 +280,6 @@ public abstract class StatusDisplayItem{
 					Matcher matcher=QUOTE_MENTION_PATTERN.matcher(status.content);
 					if(matcher.find()){
 						String quoteMention=matcher.group();
-						// FIXME: This is ugly. I wanna do it all in the regex >:(
-						if(statusForContent.content.contains("RE:<br />"+quoteMention))
-							quoteMention = "RE:<br />"+quoteMention;
 						statusForContent.content=statusForContent.content.replace(quoteMention, "");
 					}
 				}

From 0c95f6db1be8bb8b327085119088aefdf3ba4d83 Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Sun, 7 Jul 2024 08:20:31 +0200
Subject: [PATCH 2/2] fix(StatusDisplayItem/Quote): allow whitespace in closing
 br tag

---
 .../joinmastodon/android/ui/displayitems/StatusDisplayItem.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
index 68d4950ef..b2aaa4639 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
@@ -86,7 +86,7 @@ public abstract class StatusDisplayItem{
 	public static final int FLAG_NO_MEDIA_PREVIEW=1 << 8;
 
 
-	private final static  Pattern QUOTE_MENTION_PATTERN=Pattern.compile("(?:<p>)?\\s?(?:RE:\\s?(<br\\/?>)?)?<a href=\"https:\\/\\/[^\"]+\"[^>]*><span class=\"invisible\">https:\\/\\/<\\/span><span class=\"ellipsis\">[^<]+<\\/span><span class=\"invisible\">[^<]+<\\/span><\\/a>(?:<\\/p>)?$");
+	private final static  Pattern QUOTE_MENTION_PATTERN=Pattern.compile("(?:<p>)?\\s?(?:RE:\\s?(<br\\s?\\/?>)?)?<a href=\"https:\\/\\/[^\"]+\"[^>]*><span class=\"invisible\">https:\\/\\/<\\/span><span class=\"ellipsis\">[^<]+<\\/span><span class=\"invisible\">[^<]+<\\/span><\\/a>(?:<\\/p>)?$");
 	private final static  Pattern QUOTE_PATTERN=Pattern.compile("[-a-zA-Z0-9@:%._\\+~#=]{1,256}\\.[a-zA-Z0-9()]{1,6}\\b([-a-zA-Z0-9()@:%_\\+.~#?&//=]*)$");
 
 	public void setAncestryInfo(