From bb8acad55ec2014bbfd3dcb0d286e43616f54500 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Fri, 6 Jul 2018 13:00:45 +0200
Subject: [PATCH] adding some null checks at deleting files/folders

---
 .../gallery/adapters/DirectoryAdapter.kt      | 20 ++++++++++---------
 .../gallery/adapters/MediaAdapter.kt          |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
index e41fec139..13025e2bc 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
@@ -380,17 +380,19 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList<Directo
 
         activity.handleSAFDialog(SAFPath) {
             selectedPositions.sortedDescending().forEach {
-                val directory = dirs[it]
-                if (directory.areFavorites() || directory.isRecycleBin()) {
-                    if (selectedPositions.size == 1) {
-                        finishActMode()
+                val directory = dirs.getOrNull(it)
+                if (directory != null) {
+                    if (directory.areFavorites() || directory.isRecycleBin()) {
+                        if (selectedPositions.size == 1) {
+                            finishActMode()
+                        } else {
+                            selectedPositions.remove(it)
+                            toggleItemSelection(false, it)
+                        }
                     } else {
-                        selectedPositions.remove(it)
-                        toggleItemSelection(false, it)
+                        folders.add(File(directory.path))
+                        removeFolders.add(directory)
                     }
-                } else {
-                    folders.add(File(directory.path))
-                    removeFolders.add(directory)
                 }
             }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
index e087907f1..9438fc4b3 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
@@ -316,7 +316,7 @@ class MediaAdapter(activity: BaseSimpleActivity, var media: MutableList<Thumbnai
         val SAFPath = (media[selectedPositions.first()] as Medium).path
         activity.handleSAFDialog(SAFPath) {
             selectedPositions.sortedDescending().forEach {
-                val thumbnailItem = media[it]
+                val thumbnailItem = media.getOrNull(it)
                 if (thumbnailItem is Medium) {
                     fileDirItems.add(FileDirItem(thumbnailItem.path, thumbnailItem.name))
                     removeMedia.add(thumbnailItem)