From 833c81a99ee9188063605144162f83b78b019483 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Tue, 24 Mar 2026 14:55:38 +0000 Subject: [PATCH] Guard against detached fragment in media preview error handlers. --- .../securesms/mediapreview/MediaPreviewV2Fragment.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt index b35b61b3c4..36fa4c1345 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt @@ -513,8 +513,9 @@ class MediaPreviewV2Fragment : } override fun onMediaNotAvailable() { - Toast.makeText(requireContext(), R.string.MediaPreviewActivity_media_no_longer_available, Toast.LENGTH_LONG).show() - requireActivity().finish() + val context = context ?: return + Toast.makeText(context, R.string.MediaPreviewActivity_media_no_longer_available, Toast.LENGTH_LONG).show() + activity?.finish() } override fun onMediaReady() { @@ -545,8 +546,9 @@ class MediaPreviewV2Fragment : } override fun unableToPlayMedia() { - Toast.makeText(requireContext(), R.string.MediaPreviewActivity_unable_to_play_media, Toast.LENGTH_LONG).show() - requireActivity().finish() + val context = context ?: return + Toast.makeText(context, R.string.MediaPreviewActivity_unable_to_play_media, Toast.LENGTH_LONG).show() + activity?.finish() } private fun forward(mediaItem: MediaTable.MediaRecord) {