From b689ea62a60253c20e423309d5a84c2eaf0a00b8 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Wed, 22 Feb 2023 13:12:28 -0500 Subject: [PATCH] Fix using system emoji in condensed message mode. --- .../securesms/components/emoji/EmojiTextView.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java index 45c4002e5f..d5fb7630ea 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java @@ -329,9 +329,13 @@ public class EmojiTextView extends AppCompatTextView { .append(Optional.ofNullable(overflowText).orElse("")); EmojiParser.CandidateList newCandidates = isInEditMode() ? null : EmojiProvider.getCandidates(newContent); - CharSequence emojified = EmojiProvider.emojify(newCandidates, newContent, this, isJumbomoji || forceJumboEmoji); - super.setText(emojified, BufferType.SPANNABLE); + if (useSystemEmoji || newCandidates == null || newCandidates.size() == 0) { + super.setText(newContent, BufferType.SPANNABLE); + } else { + CharSequence emojified = EmojiProvider.emojify(newCandidates, newContent, this, isJumbomoji || forceJumboEmoji); + super.setText(emojified, BufferType.SPANNABLE); + } } else if (maxLength > 0) { ellipsizeAnyTextForMaxLength(); }