From 4bee97ffd6849d2a21194a9e6b7ea802e79346f2 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Wed, 18 Dec 2019 11:39:00 +0100
Subject: [PATCH] properly handle negative callback of handleSAFDialog

---
 .../filemanager/pro/adapters/ItemsAdapter.kt         | 12 ++++++++++++
 .../filemanager/pro/dialogs/CreateNewItemDialog.kt   |  8 ++++++++
 2 files changed, 20 insertions(+)

diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt
index fff8a462..93502aa6 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt
@@ -397,6 +397,10 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
         CompressAsDialog(activity, firstPath) {
             val destination = it
             activity.handleSAFDialog(firstPath) {
+                if (!it) {
+                    return@handleSAFDialog
+                }
+
                 activity.toast(R.string.compressing)
                 val paths = getSelectedFileDirItems().map { it.path }
                 Thread {
@@ -422,6 +426,10 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
         }
 
         activity.handleSAFDialog(firstPath) {
+            if (!it) {
+                return@handleSAFDialog
+            }
+
             val paths = getSelectedFileDirItems().asSequence().map { it.path }.filter { it.isZipFile() }.toList()
             tryDecompressingPaths(paths) {
                 if (it) {
@@ -608,6 +616,10 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
         }
 
         activity.handleSAFDialog(SAFPath) {
+            if (!it) {
+                return@handleSAFDialog
+            }
+
             val files = ArrayList<FileDirItem>(selectedKeys.size)
             val positions = ArrayList<Int>()
             selectedKeys.forEach {
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/CreateNewItemDialog.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/CreateNewItemDialog.kt
index 8046e712..2131dd0d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/CreateNewItemDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/CreateNewItemDialog.kt
@@ -51,6 +51,10 @@ class CreateNewItemDialog(val activity: SimpleActivity, val path: String, val ca
     private fun createDirectory(path: String, alertDialog: AlertDialog, callback: (Boolean) -> Unit) {
         when {
             activity.needsStupidWritePermissions(path) -> activity.handleSAFDialog(path) {
+                if (!it) {
+                    return@handleSAFDialog
+                }
+
                 val documentFile = activity.getDocumentFile(path.getParentPath())
                 if (documentFile == null) {
                     val error = String.format(activity.getString(R.string.could_not_create_folder), path)
@@ -83,6 +87,10 @@ class CreateNewItemDialog(val activity: SimpleActivity, val path: String, val ca
             when {
                 activity.needsStupidWritePermissions(path) -> {
                     activity.handleSAFDialog(path) {
+                        if (!it) {
+                            return@handleSAFDialog
+                        }
+
                         val documentFile = activity.getDocumentFile(path.getParentPath())
                         if (documentFile == null) {
                             val error = String.format(activity.getString(R.string.could_not_create_file), path)