mirrors/Fedilab
1
0
Fork 1
mirror of https://codeberg.org/tom79/Fedilab.git synced 2025-09-15 08:20:18 +03:00
Code Issues Projects Releases Packages Wiki Activity

Disable HTML parsing in display names (fix #1291)

Browse source
This commit is contained in:
0xd9a 2025-09-09 14:11:40 +05:30
parent 3d83d3fa31
commit 18e666649e
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Account.java
View file

@ -95,7 +95,7 @@ public class Account implements Serializable {
if (display_name == null || display_name.isEmpty()) { if (display_name == null || display_name.isEmpty()) {
display_name = username; 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<View> viewWeakReference) { public synchronized Spannable getSpanDisplayNameEmoji(Activity activity, WeakReference<View> viewWeakReference) {

7
app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java
View file

@ -1011,14 +1011,11 @@ public class SpannableHelper {
public static Spannable convertEmoji(Activity activity, String text, Account account, WeakReference<View> viewWeakReference) { public static Spannable convertEmoji(Activity activity, String text, Account account, WeakReference<View> viewWeakReference) {
SpannableString initialContent;
if (text == null) { if (text == null) {
return null; return null;
} }
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
initialContent = new SpannableString(Html.fromHtml(text, Html.FROM_HTML_MODE_LEGACY)); SpannableString initialContent = new SpannableString(text);
else
initialContent = new SpannableString(Html.fromHtml(text));
SpannableStringBuilder content = new SpannableStringBuilder(initialContent); SpannableStringBuilder content = new SpannableStringBuilder(initialContent);
List<Emoji> emojiList = account.emojis; List<Emoji> emojiList = account.emojis;