From a1bcbe9c86afa7d7bad11983d9a9222033d07a41 Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Tue, 15 Feb 2022 11:42:17 -0500
Subject: [PATCH] Fix read more on group description in conversation view.

---
 .../securesms/components/emoji/EmojiTextView.java           | 6 +++---
 1 file changed, 3 insertions(+), 3 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 d5bbf0f180..c2604ed04a 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
@@ -13,7 +13,7 @@ import android.text.TextDirectionHeuristic;
 import android.text.TextDirectionHeuristics;
 import android.text.TextUtils;
 import android.text.method.TransformationMethod;
-import android.text.style.MetricAffectingSpan;
+import android.text.style.CharacterStyle;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.ViewGroup;
@@ -218,7 +218,7 @@ public class EmojiTextView extends AppCompatTextView {
       return false;
     }
 
-    return ((Spanned) text).nextSpanTransition(-1, text.length(), MetricAffectingSpan.class) != text.length();
+    return ((Spanned) text).nextSpanTransition(-1, text.length(), CharacterStyle.class) != text.length();
   }
 
   public int getLastLineWidth() {
@@ -302,7 +302,7 @@ public class EmojiTextView extends AppCompatTextView {
     if (getLayout() != null) {
       ellipsize.run();
     } else {
-      ViewKt.doOnNextLayout(this, view -> {
+      ViewKt.doOnPreDraw(this, view -> {
         ellipsize.run();
         return Unit.INSTANCE;
       });