From 271cf81c49c5c1d3b2888d67efcc0543c1319a67 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 24 Jul 2026 14:08:47 +0000
Subject: [PATCH] Register media review activity result launchers during
 fragment initialization.

---
 .../v2/review/MediaReviewFragment.kt          | 39 +++++++++----------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt
index 9f9e20d5f5..f92b2e15b7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt
@@ -124,6 +124,24 @@ class MediaReviewFragment : Fragment(R.layout.v2_media_review_fragment), Schedul
   private var scheduledSendTime: Long? = null
   private var readyToSend = true
 
+  private val multiselectLauncher = registerForActivityResult(MultiselectForwardActivity.SelectionContract()) { keys ->
+    if (keys.isNotEmpty()) {
+      Log.d(TAG, "Performing send from multi-select activity result.")
+      performSend(keys)
+    } else {
+      readyToSend = true
+    }
+  }
+
+  private val storiesLauncher = registerForActivityResult(StoriesMultiselectForwardActivity.SelectionContract()) { keys ->
+    if (keys.isNotEmpty()) {
+      Log.d(TAG, "Performing send from stories activity result.")
+      performSend(keys)
+    } else {
+      readyToSend = true
+    }
+  }
+
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     postponeEnterTransition()
 
@@ -200,27 +218,6 @@ class MediaReviewFragment : Fragment(R.layout.v2_media_review_fragment), Schedul
       sharedViewModel.sendCommand(HudCommand.SaveMedia)
     }
 
-    val multiselectContract = MultiselectForwardActivity.SelectionContract()
-    val storiesContract = StoriesMultiselectForwardActivity.SelectionContract()
-
-    val multiselectLauncher = registerForActivityResult(multiselectContract) { keys ->
-      if (keys.isNotEmpty()) {
-        Log.d(TAG, "Performing send from multi-select activity result.")
-        performSend(keys)
-      } else {
-        readyToSend = true
-      }
-    }
-
-    val storiesLauncher = registerForActivityResult(storiesContract) { keys ->
-      if (keys.isNotEmpty()) {
-        Log.d(TAG, "Performing send from stories activity result.")
-        performSend(keys)
-      } else {
-        readyToSend = true
-      }
-    }
-
     sendButton.setOnClickListener {
       if (!readyToSend) {
         Log.d(TAG, "Attachment send button not currently enabled. Ignoring click event.")