code improvement by using more functions

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

Author: Jan Guegel

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

@@ -455,74 +455,78 @@ class ItemsAdapter(
             showFAB = true,
             canAddShowHiddenButton = true,
             showFavoritesButton = true
-        ) {
-            config.lastCopyPath = it
-            if (activity.isPathOnRoot(it) || activity.isPathOnRoot(firstFile.path)) {
-                copyMoveRootItems(files, it, isCopyOperation)
+        ) { destination ->
+            config.lastCopyPath = destination
+            if (activity.isPathOnRoot(destination) || activity.isPathOnRoot(firstFile.path)) {
+                copyMoveRootItems(files, destination, isCopyOperation)
             } else {
                 activity.copyMoveFilesTo(
                     fileDirItems = files,
                     source = source,
-                    destination = it,
+                    destination = destination,
                     isCopyOperation = isCopyOperation,
                     copyPhotoVideoOnly = false,
                     copyHidden = config.shouldShowHidden()
                 ) {
                     if (!isCopyOperation) {
-                        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)
-                                        }
-                                    }
-                                }
-                            }
-
-                            sourceFoldersToCheck.forEach { folderPath ->
-                                checkAndDeleteEmptyFolder(folderPath)
-                            }
+                        cleanupAfterMove(files)
+                    } else {
+                        refreshUI()
+                    }
+                }
+            }
+        }
+    }
 
-                            activity.runOnUiThread {
-                                listener?.refreshFragment()
-                                finishActMode()
-                            }
+    private fun cleanupAfterMove(files: List<FileDirItem>) {
+        ensureBackgroundThread {
+            val foldersToCheck = HashSet<String>()
+            files.forEach { fileItem ->
+                val path = fileItem.path
+                if (activity.getDoesFilePathExist(path)) {
+                    activity.deleteFile(fileItem, true) {
+                        val parentPath = path.getParentPath()
+                        if (parentPath.isNotEmpty()) {
+                            foldersToCheck.add(parentPath)
                         }
-                    } else {
-                        listener?.refreshFragment()
-                        finishActMode()
                     }
                 }
             }
+
+            foldersToCheck.forEach { folderPath ->
+                deleteEmptyFoldersRecursively(folderPath)
+            }
+
+            refreshUI()
         }
     }
 
-    private fun checkAndDeleteEmptyFolder(folderPath: String) {
+    private fun deleteEmptyFoldersRecursively(folderPath: String) {
         if (!activity.getDoesFilePathExist(folderPath) || !activity.getIsPathDirectory(folderPath)) {
             return
         }
 
         val folder = File(folderPath)
-        val contents = folder.listFiles()
-
-        if (contents == null || contents.isEmpty()) {
+        val contents = folder.listFiles() ?: return
+        if (contents.isEmpty()) {
             val parentPath = folderPath.getParentPath()
             val folderItem = folder.toFileDirItem(activity)
 
             activity.deleteFile(folderItem, true) {
                 if (parentPath.isNotEmpty()) {
-                    checkAndDeleteEmptyFolder(parentPath)
+                    deleteEmptyFoldersRecursively(parentPath)
                 }
             }
         }
     }
 
+    private fun refreshUI() {
+        activity.runOnUiThread {
+            listener?.refreshFragment()
+            finishActMode()
+        }
+    }
+
     private fun copyMoveRootItems(
         files: ArrayList<FileDirItem>,
         destinationPath: String,