Merge pull request #399 from KYHSGeekCode/backup

🚧 backup

Author: yhs0602

app/build.gradle

@@ -91,7 +91,7 @@ dependencies {
     implementation 'com.github.chrisbanes:PhotoView:2.3.0'
     implementation group: "pl.openrnd.android", name: "multi-level-listview", version: "1.0.1"
     // https://mvnrepository.com/artifact/commons-io/commons-io
-    implementation group: 'commons-io', name: 'commons-io', version: '2.8.0'
+//    implementation group: 'commons-io', name: 'commons-io', version: '2.8.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'com.android.support.constraint:constraint-layout:2.0.4'
 

app/src/main/java/com/kyhsgeekcode/Util.kt

@@ -23,7 +23,6 @@ import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry
 import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream
 import org.apache.commons.compress.utils.IOUtils
-import org.apache.commons.io.FileUtils
 import org.boris.pecoff4j.ImageDataDirectory
 import org.boris.pecoff4j.PE
 import org.boris.pecoff4j.io.PEParser
@@ -178,7 +177,7 @@ fun saveAsZip(dest: File, vararg sources: Pair<String, String>) {
         val fromFile = File(from)
         val toFile = File(to)
         if (fromFile.isDirectory) {
-            val fileList = FileUtils.listFiles(fromFile, null, true)
+            val fileList = fromFile.listFiles() // .listOrEmpty(fromFile, null, true)
             for (file in fileList) {
                 val relName: String = getEntryName(fromFile, file)
                 val splitName = relName.split(File.separatorChar)

app/src/main/java/com/kyhsgeekcode/disassembler/ProjectOverviewFragment.kt

@@ -22,7 +22,6 @@ import com.kyhsgeekcode.filechooser.model.FileItem
 import com.kyhsgeekcode.filechooser.model.FileItemApp
 import com.kyhsgeekcode.isArchive
 import kotlinx.coroutines.*
-import org.apache.commons.io.FileUtils
 import java.io.File
 
 class ProjectOverviewFragment : Fragment() {
@@ -161,10 +160,13 @@ class ProjectOverviewFragment : Fragment() {
                 targetFile = File(targetFile.absolutePath + "_extracted_$i.so")
                 i++
             }
-            FileUtils.copyDirectory(nativeFile, targetFile)
+            // FileUtils.copyDirectory(nativeFile, targetFile)
+            copyDirectory(nativeFile, targetFile)
         }
     }
 
+
+
     // Actually, currentProject is set and automatically figured out
     fun initializeDrawer(project: ProjectModel) {
         // project.sourceFilePath

app/src/main/java/com/kyhsgeekcode/disassembler/Utils.kt

@@ -1,5 +1,7 @@
 package com.kyhsgeekcode.disassembler
 
+import java.io.File
+
 val hexArray = "0123456789ABCDEF".toCharArray()
 fun bytesToHex(bytes: ByteArray): String? {
     val hexChars = CharArray(bytes.size * 2)
@@ -13,3 +15,8 @@ fun bytesToHex(bytes: ByteArray): String? {
     }
     return String(hexChars)
 }
+
+
+fun copyDirectory(fromDir: File, toDir: File) {
+    fromDir.copyRecursively(toDir)
+}

app/src/main/java/com/kyhsgeekcode/disassembler/project/ProjectManager.kt

@@ -3,6 +3,7 @@ package com.kyhsgeekcode.disassembler.project
 import android.content.Context
 import android.util.Log
 import com.kyhsgeekcode.disassembler.Logger
+import com.kyhsgeekcode.disassembler.copyDirectory
 import com.kyhsgeekcode.disassembler.project.models.ProjectModel
 import com.kyhsgeekcode.extractZip
 import com.kyhsgeekcode.isAccessible
@@ -11,7 +12,6 @@ import com.kyhsgeekcode.toValidFileName
 import kotlinx.serialization.SerializationException
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import org.apache.commons.io.FileUtils
 import org.json.JSONException
 import splitties.init.appCtx
 import java.io.File
@@ -100,10 +100,13 @@ object ProjectManager {
         val determinedSourceFolder: File
         if (copy) {
             val copyTargetFileOrFolder = origFolder.resolve(targetFileOrFolder.name)
-            if (!targetFileOrFolder.isDirectory && targetFileOrFolder != copyTargetFileOrFolder)
-                FileUtils.copyFile(targetFileOrFolder, copyTargetFileOrFolder)
-            else if (targetFileOrFolder != copyTargetFileOrFolder)
-                FileUtils.copyDirectory(targetFileOrFolder, copyTargetFileOrFolder)
+            if (!targetFileOrFolder.isDirectory && targetFileOrFolder != copyTargetFileOrFolder) {
+                // FileUtils.copyFile(targetFileOrFolder, copyTargetFileOrFolder)
+                targetFileOrFolder.copyTo(copyTargetFileOrFolder)
+            } else if (targetFileOrFolder != copyTargetFileOrFolder) {
+//                FileUtils.copyDirectory(targetFileOrFolder, copyTargetFileOrFolder)
+                copyDirectory(targetFileOrFolder, copyTargetFileOrFolder)
+            }
             determinedSourceFolder = copyTargetFileOrFolder
         } else {
             determinedSourceFolder = targetFileOrFolder
@@ -205,7 +208,9 @@ object ProjectManager {
         val projectModel = openProject(infoFile.absolutePath)
         val projectDir = rootdir.resolve(projectModel.name.toValidFileName())
         projectDir.mkdirs()
-        FileUtils.moveDirectory(dest, projectDir)
+        dest.copyRecursively(projectDir)
+        dest.deleteRecursively()
+//        FileUtils.moveDirectory(dest, projectDir)
         return projectModel
         //        FileUtils.moveDirectory(dest.resolve("baseFolder"), projectDir.resolve("baseFolder"))
         //        FileUtils.moveDirectory(dest.resolve("sourceFilePath"), projectDir.resolve())

app/src/main/java/com/kyhsgeekcode/filechooser/model/FileItemApp.kt

@@ -3,10 +3,10 @@ package com.kyhsgeekcode.filechooser.model
 import android.graphics.drawable.Drawable
 import com.kyhsgeekcode.Publisher
 import com.kyhsgeekcode.disassembler.Logger
+import com.kyhsgeekcode.disassembler.copyDirectory
 import com.kyhsgeekcode.extract
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import org.apache.commons.io.FileUtils
 import splitties.init.appCtx
 import java.io.File
 
@@ -32,7 +32,7 @@ class FileItemApp(label: String, val realFile: File, val nativeFile: File, icon:
                         }
                         targetFolder.mkdirs()
                         withContext(Dispatchers.IO) {
-                            FileUtils.copyDirectory(nativeFile, madetargetFile)
+                            copyDirectory(nativeFile, madetargetFile)
                         }
                     } else {
                         Logger.e(TAG, "Native file $nativeFile could not be read")