fenix/Simple-Gallery
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Gallery.git synced 2025-06-05 21:59:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

check lollipop sd permissions at deleting asap

Browse Source
This commit is contained in:
tibbi
2017-02-09 21:38:07 +01:00
parent 3a0dbd9d57
commit 099e13ea0c
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
View File

@ -240,6 +240,16 @@ class DirectoryAdapter(val activity: SimpleActivity, val dirs: MutableList<Direc
val paths = ArrayList<String>(selections.size) val paths = ArrayList<String>(selections.size)
val removeDirs = ArrayList<Directory>(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.reverse()
selections.forEach { selections.forEach {
val directory = dirs[it] val directory = dirs[it]
@ -249,6 +259,7 @@ class DirectoryAdapter(val activity: SimpleActivity, val dirs: MutableList<Direc
} }
dirs.removeAll(removeDirs) dirs.removeAll(removeDirs)
markedItems.clear()
listener?.deleteFiles(paths) listener?.deleteFiles(paths)
} }

11
app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
View File

@ -181,6 +181,16 @@ class MediaAdapter(val activity: SimpleActivity, var media: MutableList<Medium>,
val files = ArrayList<File>(selections.size) val files = ArrayList<File>(selections.size)
val removeMedia = ArrayList<Medium>(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.reverse()
selections.forEach { selections.forEach {
val medium = media[it] val medium = media[it]
@ -190,6 +200,7 @@ class MediaAdapter(val activity: SimpleActivity, var media: MutableList<Medium>,
} }
media.removeAll(removeMedia) media.removeAll(removeMedia)
markedItems.clear()
listener?.deleteFiles(files) listener?.deleteFiles(files)
} }