From 18e666649e368753701f553ab9c14db08b53ed96 Mon Sep 17 00:00:00 2001 From: 0xd9a <0xd9a@noreply.codeberg.org> Date: Tue, 9 Sep 2025 14:11:40 +0530 Subject: [PATCH] Disable HTML parsing in display names (fix #1291) --- .../android/mastodon/client/entities/api/Account.java | 2 +- .../fedilab/android/mastodon/helper/SpannableHelper.java | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Account.java b/app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Account.java index c93d3927..c1296dc8 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Account.java +++ b/app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Account.java @@ -95,7 +95,7 @@ public class Account implements Serializable { if (display_name == null || display_name.isEmpty()) { display_name = username; } - return SpannableHelper.convert(context, display_name, null, this, null, viewWeakReference, null, true, false); + return SpannableHelper.convert(context, display_name, null, this, null, viewWeakReference, null, false, false); } public synchronized Spannable getSpanDisplayNameEmoji(Activity activity, WeakReference viewWeakReference) { diff --git a/app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java b/app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java index 172b847c..3a5a41ec 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java +++ b/app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java @@ -1011,14 +1011,11 @@ public class SpannableHelper { public static Spannable convertEmoji(Activity activity, String text, Account account, WeakReference viewWeakReference) { - SpannableString initialContent; if (text == null) { return null; } - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) - initialContent = new SpannableString(Html.fromHtml(text, Html.FROM_HTML_MODE_LEGACY)); - else - initialContent = new SpannableString(Html.fromHtml(text)); + + SpannableString initialContent = new SpannableString(text); SpannableStringBuilder content = new SpannableStringBuilder(initialContent); List emojiList = account.emojis;