Commit 18e66664 authored by 0xd9a's avatar 0xd9a
Browse files

Disable HTML parsing in display names (fix #1291)

parent 3d83d3fa

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

+1 −1
Original line number Diff line number Diff line
@@ -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<View> viewWeakReference) {

app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java

+2 −5
Original line number Diff line number Diff line
@@ -1011,14 +1011,11 @@ public class SpannableHelper { 


    public static Spannable convertEmoji(Activity activity, String text, Account account, WeakReference<View> 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<Emoji> emojiList = account.emojis;