From 89df0a2c04058d5265b0e524ed190ceebcadb000 Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Wed, 29 Sep 2021 16:22:21 -0400 Subject: [PATCH] Fix talkback crashes on EmojiTextView. --- .../securesms/components/emoji/EmojiTextView.java | 4 ++-- .../securesms/components/emoji/SimpleEmojiTextView.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 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 1b55acbf28..e735193e7e 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 @@ -133,7 +133,7 @@ public class EmojiTextView extends AppCompatTextView { previousTransformationMethod = getTransformationMethod(); if (useSystemEmoji || candidates == null || candidates.size() == 0) { - super.setText(new SpannableStringBuilder(Optional.fromNullable(text).or("")), BufferType.NORMAL); + super.setText(new SpannableStringBuilder(Optional.fromNullable(text).or("")), BufferType.SPANNABLE); } else { CharSequence emojified = EmojiProvider.emojify(candidates, text, this); super.setText(new SpannableStringBuilder(emojified), BufferType.SPANNABLE); @@ -219,7 +219,7 @@ public class EmojiTextView extends AppCompatTextView { EmojiParser.CandidateList newCandidates = isInEditMode() ? null : EmojiProvider.getCandidates(newContent); if (useSystemEmoji || newCandidates == null || newCandidates.size() == 0) { - super.setText(newContent, BufferType.NORMAL); + super.setText(newContent, BufferType.SPANNABLE); } else { CharSequence emojified = EmojiProvider.emojify(newCandidates, newContent, this); super.setText(emojified, BufferType.SPANNABLE); 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 09593770eb..9dd7d73ef6 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 @@ -19,7 +19,7 @@ open class SimpleEmojiTextView @JvmOverloads constructor( bufferType = type val candidates = if (isInEditMode) null else EmojiProvider.getCandidates(text) if (SignalStore.settings().isPreferSystemEmoji || candidates == null || candidates.size() == 0) { - super.setText(Optional.fromNullable(text).or(""), BufferType.NORMAL) + super.setText(Optional.fromNullable(text).or(""), type) } else { val newContent = if (width == 0 || maxLines == -1) { text @@ -41,7 +41,7 @@ open class SimpleEmojiTextView @JvmOverloads constructor( override fun onSizeChanged(width: Int, height: Int, oldWidth: Int, oldHeight: Int) { super.onSizeChanged(width, height, oldWidth, oldHeight) if (width > 0 && oldWidth != width) { - setText(text, bufferType ?: BufferType.NORMAL) + setText(text, bufferType ?: BufferType.SPANNABLE) } } }