From 1b784d65225fa38d1548755fcffd9067c663b709 Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Thu, 29 Sep 2022 17:10:52 -0400 Subject: [PATCH] Fix incorrect emoji style from being used on some devices. --- .../securesms/components/emoji/EmojiEditText.java | 1 + .../securesms/components/emoji/EmojiTextView.java | 2 ++ .../securesms/components/emoji/SimpleEmojiTextView.kt | 4 ++++ 3 files changed, 7 insertions(+) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java index 9acdf3c809..17d9f0cbc8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java @@ -40,6 +40,7 @@ public class EmojiEditText extends AppCompatEditText { if (!isInEditMode() && (forceCustom || !SignalStore.settings().isPreferSystemEmoji())) { setFilters(appendEmojiFilter(this.getFilters(), jumboEmoji)); + setEmojiCompatEnabled(false); } super.setOnFocusChangeListener((v, hasFocus) -> { 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 0402812059..03416fc659 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 @@ -97,6 +97,8 @@ public class EmojiTextView extends AppCompatTextView { } textDirection = getLayoutDirection() == LAYOUT_DIRECTION_LTR ? TextDirectionHeuristics.FIRSTSTRONG_RTL : TextDirectionHeuristics.ANYRTL_LTR; + + setEmojiCompatEnabled(SignalStore.settings().isPreferSystemEmoji() && !forceCustom); } @Override diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/SimpleEmojiTextView.kt b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/SimpleEmojiTextView.kt index 3e3656d0e0..cb27a842f5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/SimpleEmojiTextView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/SimpleEmojiTextView.kt @@ -17,6 +17,10 @@ open class SimpleEmojiTextView @JvmOverloads constructor( private var bufferType: BufferType? = null private val sizeChangeDebouncer: ThrottledDebouncer = ThrottledDebouncer(200) + init { + isEmojiCompatEnabled = SignalStore.settings().isPreferSystemEmoji + } + override fun setText(text: CharSequence?, type: BufferType?) { bufferType = type val candidates = if (isInEditMode) null else EmojiProvider.getCandidates(text)