Gallery: Fix ArrayIndexOutOfBoundsException in MediaView

Make sure we never reach for a previously deleted index from list Signed-off-by: IacobIonut01 <paulionut2003@gmail.com>
IacobIonut01 · Aug 8, 2023 · ee61c60 · ee61c60
1 parent afb1755
commit ee61c60
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/src/main/kotlin/com/dot/gallery/feature_node/presentation/mediaview/MediaViewScreen.kt b/app/src/main/kotlin/com/dot/gallery/feature_node/presentation/mediaview/MediaViewScreen.kt
@@ -95,7 +95,7 @@ fun MediaViewScreen(
         if (state.media.isNotEmpty()) {
             val index = if (page == -1) 0 else page
             if (lastIndex.value != -1)
-                runtimeMediaId = state.media[lastIndex.value].id
+                runtimeMediaId = state.media[lastIndex.value.coerceAtMost(state.media.size - 1)].id
             currentDate.value = state.media[index].timestamp.getDate(HEADER_DATE_FORMAT)
             currentMedia.value = state.media[index]
         } else if (!isStandalone) navigateUp()
@@ -131,7 +131,7 @@ fun MediaViewScreen(
                     durationMillis = DEFAULT_LOW_VELOCITY_SWIPE_DURATION
                 )
             ),
-            key = { index -> state.media[index].toString() },
+            key = { index -> state.media[index.coerceAtMost(state.media.size - 1)].toString() },
             pageSpacing = 16.dp,
         ) { index ->
             MediaPreviewComponent(

diff --git a/...tlin/com/dot/gallery/feature_node/presentation/trashed/components/TrashedViewBottomBar.kt b/...tlin/com/dot/gallery/feature_node/presentation/trashed/components/TrashedViewBottomBar.kt
@@ -77,9 +77,9 @@ fun BoxScope.TrashedViewBottomBar(
                 title = stringResource(id = R.string.trash_restore)
             ) {
                 scope.launch {
+                    onDeleteMedia.invoke(currentIndex)
                     handler.trashMedia(result = result, arrayListOf(it), trash = false)
                 }
-                onDeleteMedia.invoke(currentIndex)
             }
             Spacer(modifier = Modifier.size(8.dp))
             // Delete Component
@@ -89,9 +89,9 @@ fun BoxScope.TrashedViewBottomBar(
                 title = stringResource(id = R.string.trash_delete)
             ) {
                 scope.launch {
+                    onDeleteMedia.invoke(currentIndex)
                     handler.deleteMedia(result = result, arrayListOf(it))
                 }
-                onDeleteMedia.invoke(currentIndex)
             }
         }
     }