Skip to content

Commit 03f2feb

Browse files
committed
Fix megaphone missing asset crash.
1 parent 3b657ea commit 03f2feb

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

app/src/main/java/org/thoughtcrime/securesms/megaphone/MegaphoneComponent.kt

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -297,16 +297,22 @@ private fun MegaphoneImage(
297297

298298
LaunchedEffect(megaphone.imageRequestBuilder) {
299299
drawable = withContext(Dispatchers.IO) {
300-
megaphone.imageRequestBuilder?.submit(size, size)?.get()
300+
try {
301+
megaphone.imageRequestBuilder?.submit(size, size)?.get()
302+
} catch (_: Exception) {
303+
null
304+
}
301305
}
302306
}
303307

304-
Image(
305-
painter = painter,
306-
contentDescription = null,
307-
contentScale = ContentScale.Inside,
308-
modifier = sharedModifier
309-
)
308+
if (drawable != null) {
309+
Image(
310+
painter = painter,
311+
contentDescription = null,
312+
contentScale = ContentScale.Inside,
313+
modifier = sharedModifier
314+
)
315+
}
310316
} else if (megaphone.lottieRes != 0) {
311317
val lottieComposition by rememberLottieComposition(spec = LottieCompositionSpec.RawRes(megaphone.lottieRes))
312318

0 commit comments

Comments
 (0)