From ce05c60eb48f09e824149c2b5b921608fcba0238 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 10 Jul 2026 05:42:01 +0000
Subject: [PATCH] Improve rich content URI validation.

---
 .../securesms/conversation/v2/ConversationFragment.kt      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
index 6bf4934d0b..476af69e10 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
@@ -367,6 +367,7 @@ import org.thoughtcrime.securesms.util.PlayStoreUtil
 import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.SignalLocalMetrics
 import org.thoughtcrime.securesms.util.TextSecurePreferences
+import org.thoughtcrime.securesms.util.UriUtil
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.atMidnight
 import org.thoughtcrime.securesms.util.atUTC
@@ -757,7 +758,11 @@ class ConversationFragment :
         }
         val uri = clip.getItemAt(0).uri
         if (uri != null) {
-          mediaListener.onMediaSelected(uri, mimeType)
+          if (UriUtil.isValidExternalUri(requireContext(), uri)) {
+            mediaListener.onMediaSelected(uri, mimeType)
+          } else {
+            Log.w(TAG, "Ignoring received content with a non-external URI.")
+          }
         }
       }