Finish media preview activity if no media present.

signalapp · Oct 31, 2022 · 34f6d52 · 34f6d52
1 parent 72aac07
commit 34f6d52
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt
@@ -163,7 +163,12 @@ class MediaPreviewV2Fragment : Fragment(R.layout.fragment_media_preview_v2), Med
     val fragmentAdapter = binding.mediaPager.adapter as MediaPreviewV2Adapter
 
     fragmentAdapter.setAutoPlayItemPosition(currentPosition)
-    fragmentAdapter.updateBackingItems(currentState.mediaRecords.mapNotNull { it.attachment })
+    val backingItems = currentState.mediaRecords.mapNotNull { it.attachment }
+    if (backingItems.isEmpty()) {
+      onMediaNotAvailable()
+      return
+    }
+    fragmentAdapter.updateBackingItems(backingItems)
 
     if (binding.mediaPager.currentItem != currentPosition) {
       binding.mediaPager.setCurrentItem(currentPosition, false)
@@ -176,6 +181,10 @@ class MediaPreviewV2Fragment : Fragment(R.layout.fragment_media_preview_v2), Med
    * {@link OnPageChangeCallback}.
    */
   private fun bindMediaReadyState(currentState: MediaPreviewV2State) {
+    if (currentState.mediaRecords.isEmpty()) {
+      onMediaNotAvailable()
+      return
+    }
     val currentPosition = currentState.position
     val currentItem: MediaDatabase.MediaRecord = currentState.mediaRecords[currentPosition]