prevent copying/moving into self

Author: Raival-e

app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/files/task/CopyTask.kt

@@ -58,6 +58,7 @@ class CopyTask(
             if (deleteSourceFiles) {
                 performSourceDeletion()
             }
+            alignApkIfNecessary()
             finalizeTask()
         } catch (e: Exception) {
             handleTaskError(e)
@@ -76,6 +77,23 @@ class CopyTask(
 
     // Private helper methods
 
+    private fun alignApkIfNecessary() {
+        val destinationHolder = parameters!!.destHolder
+
+        if (destinationHolder !is ZipFileHolder) return
+
+        if (progressMonitor.status == TaskStatus.RUNNING) {
+            if (destinationHolder.zipTree.source.extension == apkFileType) {
+                progressMonitor.apply {
+                    processName = globalClass.resources.getString(R.string.aligning_apk)
+                    progress = -1f
+                    contentName = emptyString
+                }
+                ZipAlign.alignApk(destinationHolder.zipTree.source.file)
+            }
+        }
+    }
+
     private fun createTaskMetadata(): TaskMetadata {
         val time = System.currentTimeMillis().toFormattedDate()
         return TaskMetadata(
@@ -139,15 +157,11 @@ class CopyTask(
             val destFile = destHolder.zipTree.source.file.canonicalPath
 
             if (sourceFile == destFile) {
-                val destPath = destHolder.node.path
-                val hasInvalidNesting = sourceFiles
-                    .filterIsInstance<ZipFileHolder>()
-                    .filter { !it.isFile() }
-                    .any { destPath.startsWith(it.node.path) }
-
-                if (hasInvalidNesting) {
-                    markAsFailed(globalClass.resources.getString(R.string.task_summary_invalid_dest))
-                    return false
+                runBlocking {
+                    if (firstSource.getParent()?.uniquePath == destHolder.uniquePath) {
+                        markAsFailed(globalClass.resources.getString(R.string.task_summary_invalid_dest))
+                        return@runBlocking false
+                    }
                 }
             }
         }
@@ -209,9 +223,32 @@ class CopyTask(
     }
 
     private fun preparePendingFiles(sourcePath: String) {
+        val destHolder = parameters!!.destHolder
+        var hasInvalidNesting = false
+        val isSameZipFiles = (sourceFiles.first() is ZipFileHolder && destHolder is ZipFileHolder)
+                && (sourceFiles.first() as ZipFileHolder).zipTree.source.uniquePath == destHolder.zipTree.source.uniquePath
+
         if (pendingFiles.isEmpty()) {
             sourceFiles.forEach { source ->
-                pendingFiles.addAll(listFilesWithRelativePath(sourcePath, source))
+                // Prevent moving into source subdirectories
+                if (deleteSourceFiles
+                    && source.isFolder
+                    && (((source is ZipFileHolder && destHolder is ZipFileHolder) && (isSameZipFiles))
+                            || (source is LocalFileHolder && destHolder is LocalFileHolder))
+                ) {
+                    val destPath = destHolder.uniquePath
+                    if (!hasInvalidNesting && destPath.startsWith(source.uniquePath)) {
+                        hasInvalidNesting = true
+                    } else {
+                        pendingFiles.addAll(listFilesWithRelativePath(sourcePath, source))
+                    }
+                } else {
+                    pendingFiles.addAll(listFilesWithRelativePath(sourcePath, source))
+                }
+            }
+
+            if (hasInvalidNesting) {
+                markAsFailed(globalClass.getString(R.string.some_files_are_moved_into_their_subdirectories_those_will_be_excluded))
             }
         }
     }
@@ -326,6 +363,8 @@ class CopyTask(
         progressMonitor.processName = globalClass.resources.getString(R.string.counting_files)
         preparePendingFiles(sourcePath)
 
+        if (progressMonitor.status == TaskStatus.FAILED) return
+
         progressMonitor.apply {
             totalContent = pendingFiles.size
             processName = if (deleteSourceFiles)
@@ -438,6 +477,8 @@ class CopyTask(
         progressMonitor.processName = globalClass.resources.getString(R.string.counting_files)
         preparePendingFiles(sourcePath)
 
+        if (progressMonitor.status == TaskStatus.FAILED) return
+
         progressMonitor.apply {
             totalContent = pendingFiles.size
             processName = if (deleteSourceFiles)
@@ -496,16 +537,6 @@ class CopyTask(
                         }
                     }
                 }
-                if (progressMonitor.status == TaskStatus.RUNNING) {
-                    if (destinationHolder.zipTree.source.extension == apkFileType) {
-                        progressMonitor.apply {
-                            processName = globalClass.resources.getString(R.string.aligning_apk)
-                            progress = -1f
-                            contentName = emptyString
-                        }
-                        ZipAlign.alignApk(destinationHolder.zipTree.source.file)
-                    }
-                }
             }
         } catch (e: Exception) {
             throw RuntimeException(globalClass.getString(R.string.failed_to_copy_files_to_zip), e)
@@ -541,6 +572,8 @@ class CopyTask(
         progressMonitor.processName = globalClass.resources.getString(R.string.counting_files)
         preparePendingFiles(sourcePath)
 
+        if (progressMonitor.status == TaskStatus.FAILED) return
+
         progressMonitor.apply {
             totalContent = pendingFiles.size
             processName = globalClass.resources.getString(R.string.extracting)
@@ -629,6 +662,8 @@ class CopyTask(
         progressMonitor.processName = globalClass.resources.getString(R.string.counting_files)
         preparePendingFiles(sourcePath)
 
+        if (progressMonitor.status == TaskStatus.FAILED) return
+
         progressMonitor.apply {
             totalContent = pendingFiles.size
             processName = if (deleteSourceFiles)
@@ -697,16 +732,6 @@ class CopyTask(
                             }
                         }
                     }
-                    if (progressMonitor.status == TaskStatus.RUNNING) {
-                        if (destinationHolder.zipTree.source.extension == apkFileType) {
-                            progressMonitor.apply {
-                                processName = globalClass.resources.getString(R.string.aligning_apk)
-                                progress = -1f
-                                contentName = emptyString
-                            }
-                            ZipAlign.alignApk(destinationHolder.zipTree.source.file)
-                        }
-                    }
                 }
             }
         } catch (e: Exception) {

app/src/main/res/values-fa/strings.xml

@@ -371,4 +371,5 @@
     <string name="navigate_and_manage_your_files_and_folders">ناوبری و مدیریت فایل‌ها و پوشه‌های شما</string>
     <string name="aligning_apk">در حال هم‌ترازی فایل APK</string>
     <string name="invalid_apk_file">فایل APK نامعتبر</string>
+    <string name="some_files_are_moved_into_their_subdirectories_those_will_be_excluded">برخی از فایل‌ها به زیرشاخه‌های خود منتقل می‌شوند، آنها مستثنی خواهند شد.</string>
 </resources>

app/src/main/res/values-pt-rBR/strings.xml

@@ -371,4 +371,5 @@
     <string name="navigate_and_manage_your_files_and_folders">Navegar e gerenciar seus arquivos e pastas</string>
     <string name="aligning_apk">Alinhando o arquivo APK</string>
     <string name="invalid_apk_file">Arquivo APK inválido</string>
+    <string name="some_files_are_moved_into_their_subdirectories_those_will_be_excluded">Alguns arquivos são movidos para seus subdiretórios, eles serão excluídos.</string>
 </resources>

app/src/main/res/values-ru/strings.xml

@@ -370,5 +370,6 @@
     <string name="browse_and_manage_installed_applications">Обзор и управление установленными приложениями</string>
     <string name="navigate_and_manage_your_files_and_folders">Навигация и управление файлами и папками</string>
     <string name="aligning_apk">Выравнивание файла APK</string>
-    <string name="invalid_apk_file">Недопустимый APK</string>
+    <string name="invalid_apk_file">Неверный файл APK</string>
+    <string name="some_files_are_moved_into_their_subdirectories_those_will_be_excluded">Некоторые файлы перемещены в их подкаталоги, они будут исключены.</string>
 </resources>

app/src/main/res/values-zh/strings.xml

@@ -371,4 +371,5 @@
     <string name="navigate_and_manage_your_files_and_folders">浏览和管理您的文件和文件夹</string>
     <string name="aligning_apk">对齐APK文件</string>
     <string name="invalid_apk_file">无效的APK文件</string>
+    <string name="some_files_are_moved_into_their_subdirectories_those_will_be_excluded">一些文件被移动到它们的子目录中，这些文件将被排除。</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -372,4 +372,5 @@
     <string name="navigate_and_manage_your_files_and_folders">Navigate and manage your files and folders</string>
     <string name="aligning_apk">Aligning APK file</string>
     <string name="invalid_apk_file">Invalid APK</string>
+    <string name="some_files_are_moved_into_their_subdirectories_those_will_be_excluded">Some files are moved into their subdirectories, those will be excluded.</string>
 </resources>