From 2c74ac8bfa7061cead62a45692db19f6bb713fc6 Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Tue, 11 Jul 2023 16:51:15 -0400
Subject: [PATCH] Fix spoilers not working in story replies.

---
 .../stories/viewer/reply/group/StoryGroupReplyItem.kt         | 4 ++--
 app/src/main/res/layout/stories_group_text_reply_item.xml     | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyItem.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyItem.kt
index b2b28e260c..96dad886ac 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyItem.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyItem.kt
@@ -4,7 +4,6 @@ import android.content.Context
 import android.text.Spannable
 import android.text.Spanned
 import android.text.TextPaint
-import android.text.method.LinkMovementMethod
 import android.text.style.ClickableSpan
 import android.view.View
 import android.view.ViewGroup
@@ -30,6 +29,7 @@ import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.util.AvatarUtil
 import org.thoughtcrime.securesms.util.DateUtils
+import org.thoughtcrime.securesms.util.LongClickMovementMethod
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
@@ -225,7 +225,7 @@ object StoryGroupReplyItem {
     override fun bind(model: TextModel) {
       super.bind(model)
 
-      body.movementMethod = LinkMovementMethod.getInstance()
+      body.movementMethod = LongClickMovementMethod.getInstance()
       body.text = model.text.message.getDisplayBody(context).apply {
         linkifyBody(model, this)
       }
diff --git a/app/src/main/res/layout/stories_group_text_reply_item.xml b/app/src/main/res/layout/stories_group_text_reply_item.xml
index d74b648dfe..2cbfda0aeb 100644
--- a/app/src/main/res/layout/stories_group_text_reply_item.xml
+++ b/app/src/main/res/layout/stories_group_text_reply_item.xml
@@ -94,6 +94,7 @@
         android:layout_marginEnd="20dp"
         android:layout_marginBottom="1dp"
         android:textAppearance="@style/Signal.Text.Body"
+        app:emoji_renderSpoilers="true"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toTopOf="@id/viewed_at_below"
         app:layout_constraintEnd_toEndOf="@+id/message_content_end_barrier"