From 03f2feb3355af11f118c36c2c797c46751ec5a8f Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Mon, 19 May 2025 14:29:47 -0400
Subject: [PATCH] Fix megaphone missing asset crash.

---
 .../securesms/megaphone/MegaphoneComponent.kt | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/MegaphoneComponent.kt b/app/src/main/java/org/thoughtcrime/securesms/megaphone/MegaphoneComponent.kt
index 2bdf1fc083..02ebc32cb6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/MegaphoneComponent.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/MegaphoneComponent.kt
@@ -297,16 +297,22 @@ private fun MegaphoneImage(
 
     LaunchedEffect(megaphone.imageRequestBuilder) {
       drawable = withContext(Dispatchers.IO) {
-        megaphone.imageRequestBuilder?.submit(size, size)?.get()
+        try {
+          megaphone.imageRequestBuilder?.submit(size, size)?.get()
+        } catch (_: Exception) {
+          null
+        }
       }
     }
 
-    Image(
-      painter = painter,
-      contentDescription = null,
-      contentScale = ContentScale.Inside,
-      modifier = sharedModifier
-    )
+    if (drawable != null) {
+      Image(
+        painter = painter,
+        contentDescription = null,
+        contentScale = ContentScale.Inside,
+        modifier = sharedModifier
+      )
+    }
   } else if (megaphone.lottieRes != 0) {
     val lottieComposition by rememberLottieComposition(spec = LottieCompositionSpec.RawRes(megaphone.lottieRes))