fixed moving nested folders cleanup

Signed-off-by: Jan Guegel <[email protected]>

Author: Jan Guegel

app/src/main/kotlin/org/fossify/filemanager/adapters/ItemsAdapter.kt

@@ -35,82 +35,19 @@ import net.lingala.zip4j.model.LocalFileHeader
 import net.lingala.zip4j.model.ZipParameters
 import net.lingala.zip4j.model.enums.EncryptionMethod
 import org.fossify.commons.adapters.MyRecyclerViewAdapter
-import org.fossify.commons.dialogs.ConfirmationDialog
-import org.fossify.commons.dialogs.FilePickerDialog
-import org.fossify.commons.dialogs.PropertiesDialog
-import org.fossify.commons.dialogs.RadioGroupDialog
-import org.fossify.commons.dialogs.RenameDialog
-import org.fossify.commons.dialogs.RenameItemDialog
-import org.fossify.commons.dialogs.RenameItemsDialog
-import org.fossify.commons.extensions.applyColorFilter
-import org.fossify.commons.extensions.beGone
-import org.fossify.commons.extensions.beVisible
-import org.fossify.commons.extensions.beVisibleIf
-import org.fossify.commons.extensions.convertToBitmap
-import org.fossify.commons.extensions.copyToClipboard
-import org.fossify.commons.extensions.createDirectorySync
-import org.fossify.commons.extensions.deleteFile
-import org.fossify.commons.extensions.deleteFileBg
-import org.fossify.commons.extensions.deleteFolderBg
-import org.fossify.commons.extensions.formatDate
-import org.fossify.commons.extensions.formatSize
-import org.fossify.commons.extensions.getAndroidSAFFileItems
-import org.fossify.commons.extensions.getAndroidSAFUri
-import org.fossify.commons.extensions.getColoredDrawableWithColor
-import org.fossify.commons.extensions.getDefaultCopyDestinationPath
-import org.fossify.commons.extensions.getDocumentFile
-import org.fossify.commons.extensions.getDoesFilePathExist
-import org.fossify.commons.extensions.getFileCount
-import org.fossify.commons.extensions.getFileInputStreamSync
-import org.fossify.commons.extensions.getFileOutputStreamSync
-import org.fossify.commons.extensions.getFilenameFromPath
-import org.fossify.commons.extensions.getIsPathDirectory
-import org.fossify.commons.extensions.getMimeType
-import org.fossify.commons.extensions.getParentPath
-import org.fossify.commons.extensions.getProperSize
-import org.fossify.commons.extensions.getTextSize
-import org.fossify.commons.extensions.getTimeFormat
-import org.fossify.commons.extensions.handleDeletePasswordProtection
-import org.fossify.commons.extensions.hasOTGConnected
-import org.fossify.commons.extensions.highlightTextPart
-import org.fossify.commons.extensions.isPathOnOTG
-import org.fossify.commons.extensions.isRestrictedSAFOnlyRoot
-import org.fossify.commons.extensions.relativizeWith
-import org.fossify.commons.extensions.setupViewBackground
-import org.fossify.commons.extensions.showErrorToast
-import org.fossify.commons.extensions.toFileDirItem
-import org.fossify.commons.extensions.toast
-import org.fossify.commons.helpers.CONFLICT_OVERWRITE
-import org.fossify.commons.helpers.CONFLICT_SKIP
-import org.fossify.commons.helpers.VIEW_TYPE_LIST
-import org.fossify.commons.helpers.ensureBackgroundThread
-import org.fossify.commons.helpers.getFilePlaceholderDrawables
+import org.fossify.commons.dialogs.*
+import org.fossify.commons.extensions.*
+import org.fossify.commons.helpers.*
 import org.fossify.commons.models.FileDirItem
 import org.fossify.commons.models.RadioItem
 import org.fossify.commons.views.MyRecyclerView
 import org.fossify.filemanager.R
 import org.fossify.filemanager.activities.SimpleActivity
 import org.fossify.filemanager.activities.SplashActivity
-import org.fossify.filemanager.databinding.ItemDirGridBinding
-import org.fossify.filemanager.databinding.ItemEmptyBinding
-import org.fossify.filemanager.databinding.ItemFileDirListBinding
-import org.fossify.filemanager.databinding.ItemFileGridBinding
-import org.fossify.filemanager.databinding.ItemSectionBinding
+import org.fossify.filemanager.databinding.*
 import org.fossify.filemanager.dialogs.CompressAsDialog
-import org.fossify.filemanager.extensions.config
-import org.fossify.filemanager.extensions.isPathOnRoot
-import org.fossify.filemanager.extensions.isZipFile
-import org.fossify.filemanager.extensions.setAs
-import org.fossify.filemanager.extensions.setLastModified
-import org.fossify.filemanager.extensions.sharePaths
-import org.fossify.filemanager.extensions.toggleItemVisibility
-import org.fossify.filemanager.extensions.tryOpenPathIntent
-import org.fossify.filemanager.helpers.OPEN_AS_AUDIO
-import org.fossify.filemanager.helpers.OPEN_AS_IMAGE
-import org.fossify.filemanager.helpers.OPEN_AS_OTHER
-import org.fossify.filemanager.helpers.OPEN_AS_TEXT
-import org.fossify.filemanager.helpers.OPEN_AS_VIDEO
-import org.fossify.filemanager.helpers.RootHelpers
+import org.fossify.filemanager.extensions.*
+import org.fossify.filemanager.helpers.*
 import org.fossify.filemanager.interfaces.ItemOperationsListener
 import org.fossify.filemanager.models.ListItem
 import java.io.BufferedInputStream
@@ -532,39 +469,30 @@ class ItemsAdapter(
                     copyHidden = config.shouldShowHidden()
                 ) {
                     if (!isCopyOperation) {
-                        files.forEach { sourceFileDir ->
-                            val sourcePath = sourceFileDir.path
-                            if (
-                                activity.isRestrictedSAFOnlyRoot(sourcePath)
-                                && activity.getDoesFilePathExist(sourcePath)
-                            ) {
-                                activity.deleteFile(sourceFileDir, true) {
-                                    listener?.refreshFragment()
-                                    activity.runOnUiThread {
-                                        finishActMode()
-                                    }
-                                }
-                            } else {
-                                val sourceFile = File(sourcePath)
-                                if (
-                                    activity.getDoesFilePathExist(source)
-                                    && activity.getIsPathDirectory(source)
-                                    && sourceFile.list()?.isEmpty() == true
-                                    && sourceFile.getProperSize(true) == 0L
-                                    && sourceFile.getFileCount(true) == 0
-                                ) {
-                                    val sourceFolder = sourceFile.toFileDirItem(activity)
-                                    activity.deleteFile(sourceFolder, true) {
-                                        listener?.refreshFragment()
-                                        activity.runOnUiThread {
-                                            finishActMode()
+                        ensureBackgroundThread {
+                            val sourceFoldersToCheck = HashSet<String>()
+
+                            files.forEach { sourceFileDir ->
+                                val sourcePath = sourceFileDir.path
+
+                                if (activity.getDoesFilePathExist(sourcePath)) {
+                                    activity.deleteFile(sourceFileDir, true) {
+                                        val parentPath = sourcePath.getParentPath()
+                                        if (parentPath.isNotEmpty()) {
+                                            sourceFoldersToCheck.add(parentPath)
                                         }
                                     }
-                                } else {
-                                    listener?.refreshFragment()
-                                    finishActMode()
                                 }
                             }
+
+                            sourceFoldersToCheck.forEach { folderPath ->
+                                checkAndDeleteEmptyFolder(folderPath)
+                            }
+
+                            activity.runOnUiThread {
+                                listener?.refreshFragment()
+                                finishActMode()
+                            }
                         }
                     } else {
                         listener?.refreshFragment()
@@ -575,6 +503,26 @@ class ItemsAdapter(
         }
     }
 
+    private fun checkAndDeleteEmptyFolder(folderPath: String) {
+        if (!activity.getDoesFilePathExist(folderPath) || !activity.getIsPathDirectory(folderPath)) {
+            return
+        }
+
+        val folder = File(folderPath)
+        val contents = folder.listFiles()
+
+        if (contents == null || contents.isEmpty()) {
+            val parentPath = folderPath.getParentPath()
+            val folderItem = folder.toFileDirItem(activity)
+
+            activity.deleteFile(folderItem, true) {
+                if (parentPath.isNotEmpty()) {
+                    checkAndDeleteEmptyFolder(parentPath)
+                }
+            }
+        }
+    }
+
     private fun copyMoveRootItems(
         files: ArrayList<FileDirItem>,
         destinationPath: String,