Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 242057d6 authored by Steve Elliott's avatar Steve Elliott
Browse files

Strip formatting from convo senders and title

Fixes: 155919582
Test: manual
Change-Id: I942050db02b4a559fb9ffcc6c9929e49f2f7232f
parent 282498aa
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ import com.android.internal.util.ContrastColorUtil;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.Objects;
import java.util.function.Consumer;
import java.util.regex.Pattern;

@@ -795,7 +796,8 @@ public class ConversationLayout extends FrameLayout
     */
    @RemotableViewMethod
    public void setConversationTitle(CharSequence conversationTitle) {
        mConversationTitle = conversationTitle;
        // Remove formatting from the title.
        mConversationTitle = conversationTitle != null ? conversationTitle.toString() : null;
    }

    public CharSequence getConversationTitle() {
@@ -1052,6 +1054,9 @@ public class ConversationLayout extends FrameLayout
                groups.add(currentGroup);
                if (sender == null) {
                    sender = mUser;
                } else {
                    // Remove all formatting from the sender name
                    sender = sender.toBuilder().setName(Objects.toString(sender.getName())).build();
                }
                senders.add(sender);
                currentSenderKey = key;