From 099e13ea0cd4312fb98f8767ded1d576788b31d3 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Thu, 9 Feb 2017 21:38:07 +0100
Subject: [PATCH] check lollipop sd permissions at deleting asap

---
 .../gallery/adapters/DirectoryAdapter.kt              | 11 +++++++++++
 .../gallery/adapters/MediaAdapter.kt                  | 11 +++++++++++
 2 files changed, 22 insertions(+)

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 2d89a18e7..9927b0799 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
@@ -240,6 +240,16 @@ class DirectoryAdapter(val activity: SimpleActivity, val dirs: MutableList<Direc
         val paths = ArrayList<String>(selections.size)
         val removeDirs = ArrayList<Directory>(selections.size)
 
+        var isShowingPermDialog = false
+        activity.runOnUiThread {
+            if (activity.isShowingPermDialog(File(dirs[selections[0]].path))) {
+                isShowingPermDialog = true
+            }
+        }
+
+        if (isShowingPermDialog)
+            return
+
         selections.reverse()
         selections.forEach {
             val directory = dirs[it]
@@ -249,6 +259,7 @@ class DirectoryAdapter(val activity: SimpleActivity, val dirs: MutableList<Direc
         }
 
         dirs.removeAll(removeDirs)
+        markedItems.clear()
         listener?.deleteFiles(paths)
     }
 
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 e9d0b07d5..071b51481 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
@@ -181,6 +181,16 @@ class MediaAdapter(val activity: SimpleActivity, var media: MutableList<Medium>,
         val files = ArrayList<File>(selections.size)
         val removeMedia = ArrayList<Medium>(selections.size)
 
+        var isShowingPermDialog = false
+        activity.runOnUiThread {
+            if (activity.isShowingPermDialog(File(media[selections[0]].path))) {
+                isShowingPermDialog = true
+            }
+        }
+
+        if (isShowingPermDialog)
+            return
+
         selections.reverse()
         selections.forEach {
             val medium = media[it]
@@ -190,6 +200,7 @@ class MediaAdapter(val activity: SimpleActivity, var media: MutableList<Medium>,
         }
 
         media.removeAll(removeMedia)
+        markedItems.clear()
         listener?.deleteFiles(files)
     }