From 027b659d1c0ecfcfa53607fffdd8fba0e98cbae6 Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Sat, 16 Apr 2022 09:44:05 +0200
Subject: [PATCH] fix notifications showing unparsed html (#2436)

---
 .../tusky/components/notifications/NotificationHelper.java | 7 ++++---
 .../com/keylesspalace/tusky/util/StatusParsingHelper.kt    | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationHelper.java b/app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationHelper.java
index 63c170822..83682ab28 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationHelper.java
+++ b/app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationHelper.java
@@ -16,6 +16,7 @@
 
 package com.keylesspalace.tusky.components.notifications;
 
+import static com.keylesspalace.tusky.util.StatusParsingHelper.parseAsMastodonHtml;
 import static com.keylesspalace.tusky.viewdata.PollViewDataKt.buildDescription;
 
 import android.app.NotificationChannel;
@@ -341,7 +342,7 @@ public class NotificationHelper {
         Status status = body.getStatus();
 
         String citedLocalAuthor = status.getAccount().getLocalUsername();
-        String citedText = status.getContent().toString();
+        String citedText = parseAsMastodonHtml(status.getContent()).toString();
         String inReplyToId = status.getId();
         Status actionableStatus = status.getActionableStatus();
         Status.Visibility replyVisibility = actionableStatus.getVisibility();
@@ -690,13 +691,13 @@ public class NotificationHelper {
                 if (!TextUtils.isEmpty(notification.getStatus().getSpoilerText())) {
                     return notification.getStatus().getSpoilerText();
                 } else {
-                    return notification.getStatus().getContent().toString();
+                    return parseAsMastodonHtml(notification.getStatus().getContent()).toString();
                 }
             case POLL:
                 if (!TextUtils.isEmpty(notification.getStatus().getSpoilerText())) {
                     return notification.getStatus().getSpoilerText();
                 } else {
-                    StringBuilder builder = new StringBuilder(notification.getStatus().getContent());
+                    StringBuilder builder = new StringBuilder(parseAsMastodonHtml(notification.getStatus().getContent()));
                     builder.append('\n');
                     Poll poll = notification.getStatus().getPoll();
                     List<PollOption> options = poll.getOptions();
diff --git a/app/src/main/java/com/keylesspalace/tusky/util/StatusParsingHelper.kt b/app/src/main/java/com/keylesspalace/tusky/util/StatusParsingHelper.kt
index fc62c78d6..2ac4782c3 100644
--- a/app/src/main/java/com/keylesspalace/tusky/util/StatusParsingHelper.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/util/StatusParsingHelper.kt
@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License along with Tusky; if not,
  * see <http://www.gnu.org/licenses>. */
 
+@file:JvmName("StatusParsingHelper")
 package com.keylesspalace.tusky.util
 
 import android.text.SpannableStringBuilder