From 7108d350e6fe99fb9f1d5c02db84689dcd713215 Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Fri, 14 Mar 2025 13:58:02 -0400
Subject: [PATCH] Fix spoiler rendering in story captions.

---
 .../securesms/stories/viewer/page/StoryViewerPageFragment.kt  | 4 ++--
 app/src/main/res/layout/stories_viewer_fragment_page.xml      | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt
index 3bfc48d86d..53af6bde7f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt
@@ -11,7 +11,6 @@ import android.media.AudioManager
 import android.os.Bundle
 import android.text.SpannableString
 import android.text.Spanned
-import android.text.method.LinkMovementMethod
 import android.text.method.ScrollingMovementMethod
 import android.text.style.ClickableSpan
 import android.text.style.StyleSpan
@@ -86,6 +85,7 @@ import org.thoughtcrime.securesms.util.AvatarUtil
 import org.thoughtcrime.securesms.util.BottomSheetUtil
 import org.thoughtcrime.securesms.util.DateUtils
 import org.thoughtcrime.securesms.util.Debouncer
+import org.thoughtcrime.securesms.util.LongClickMovementMethod
 import org.thoughtcrime.securesms.util.Projection
 import org.thoughtcrime.securesms.util.ServiceUtil
 import org.thoughtcrime.securesms.util.ViewUtil
@@ -924,7 +924,7 @@ class StoryViewerPageFragment :
     largeCaption.text = displayBody
     caption.visible = displayBody.isNotEmpty()
     caption.requestLayout()
-    caption.movementMethod = LinkMovementMethod.getInstance()
+    caption.movementMethod = LongClickMovementMethod.getInstance(requireContext())
     val overflow = SpannableString(getString(R.string.StoryViewerPageFragment__read_more))
     overflow.setSpan(StyleSpan(Typeface.BOLD), 0, overflow.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
     caption.setOverflowText(overflow)
diff --git a/app/src/main/res/layout/stories_viewer_fragment_page.xml b/app/src/main/res/layout/stories_viewer_fragment_page.xml
index f8bf5b3701..0ab97505a4 100644
--- a/app/src/main/res/layout/stories_viewer_fragment_page.xml
+++ b/app/src/main/res/layout/stories_viewer_fragment_page.xml
@@ -158,6 +158,7 @@
             android:gravity="bottom"
             android:textAppearance="@style/Signal.Text.BodyLarge"
             android:textColor="@color/core_white"
+            app:emoji_renderSpoilers="true"
             tools:text="Ugh." />
     </FrameLayout>