Skip to content

Commit 42562e9

Browse files
yhs0602yhs0602
committed
2 parents 506ce98 + 91f323e commit 42562e9

7 files changed

Lines changed: 31 additions & 18 deletions

File tree

‎app/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,28 +85,28 @@ android {
8585

8686
dependencies {
8787
implementation 'androidx.appcompat:appcompat:1.2.0'
88-
implementation 'com.google.android.gms:play-services-ads:19.7.0'
88+
implementation 'com.google.android.gms:play-services-ads:19.8.0'
8989
implementation 'com.github.codekidX:storage-chooser:2.0.4.4'
9090
implementation 'com.github.skydoves:colorpickerview:2.1.5'
9191
implementation 'com.github.chrisbanes:PhotoView:2.3.0'
9292
implementation group: "pl.openrnd.android", name: "multi-level-listview", version: "1.0.1"
9393
// https://mvnrepository.com/artifact/commons-io/commons-io
94-
implementation group: 'commons-io', name: 'commons-io', version: '2.8.0'
94+
// implementation group: 'commons-io', name: 'commons-io', version: '2.8.0'
9595
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
9696
implementation 'com.android.support.constraint:constraint-layout:2.0.4'
9797

9898
//implementation 'dotnet.msil.decompiler:+'
9999
implementation fileTree(dir: 'libs', include: ['*.jar'])
100100
implementation "androidx.core:core-ktx:1.3.2"
101-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.30"
101+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.31"
102102
implementation 'androidx.recyclerview:recyclerview:1.1.0'
103103
implementation "com.louiscad.splitties:splitties-systemservices:$splitties_version"
104104
implementation("com.louiscad.splitties:splitties-appctx:$splitties_version")
105105
implementation 'org.apache.commons:commons-compress:1.20'
106106
implementation 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava'
107107
// implementation("com.google.guava:guava:29.0-android")
108108

109-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.30"
109+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.31"
110110
implementation 'org.jsoup:jsoup:1.13.1'
111111

112112
// or "kotlin-stdlib-jdk8"

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream
2323
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry
2424
import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream
2525
import org.apache.commons.compress.utils.IOUtils
26-
import org.apache.commons.io.FileUtils
2726
import org.boris.pecoff4j.ImageDataDirectory
2827
import org.boris.pecoff4j.PE
2928
import org.boris.pecoff4j.io.PEParser
@@ -178,7 +177,7 @@ fun saveAsZip(dest: File, vararg sources: Pair<String, String>) {
178177
val fromFile = File(from)
179178
val toFile = File(to)
180179
if (fromFile.isDirectory) {
181-
val fileList = FileUtils.listFiles(fromFile, null, true)
180+
val fileList = fromFile.listFiles() // .listOrEmpty(fromFile, null, true)
182181
for (file in fileList) {
183182
val relName: String = getEntryName(fromFile, file)
184183
val splitName = relName.split(File.separatorChar)

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import com.kyhsgeekcode.filechooser.model.FileItem
2222
import com.kyhsgeekcode.filechooser.model.FileItemApp
2323
import com.kyhsgeekcode.isArchive
2424
import kotlinx.coroutines.*
25-
import org.apache.commons.io.FileUtils
2625
import java.io.File
2726

2827
class ProjectOverviewFragment : Fragment() {
@@ -161,10 +160,13 @@ class ProjectOverviewFragment : Fragment() {
161160
targetFile = File(targetFile.absolutePath + "_extracted_$i.so")
162161
i++
163162
}
164-
FileUtils.copyDirectory(nativeFile, targetFile)
163+
// FileUtils.copyDirectory(nativeFile, targetFile)
164+
copyDirectory(nativeFile, targetFile)
165165
}
166166
}
167167

168+
169+
168170
// Actually, currentProject is set and automatically figured out
169171
fun initializeDrawer(project: ProjectModel) {
170172
// project.sourceFilePath

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.kyhsgeekcode.disassembler
22

3+
import java.io.File
4+
35
val hexArray = "0123456789ABCDEF".toCharArray()
46
fun bytesToHex(bytes: ByteArray): String? {
57
val hexChars = CharArray(bytes.size * 2)
@@ -13,3 +15,8 @@ fun bytesToHex(bytes: ByteArray): String? {
1315
}
1416
return String(hexChars)
1517
}
18+
19+
20+
fun copyDirectory(fromDir: File, toDir: File) {
21+
fromDir.copyRecursively(toDir)
22+
}

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

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.kyhsgeekcode.disassembler.project
33
import android.content.Context
44
import android.util.Log
55
import com.kyhsgeekcode.disassembler.Logger
6+
import com.kyhsgeekcode.disassembler.copyDirectory
67
import com.kyhsgeekcode.disassembler.project.models.ProjectModel
78
import com.kyhsgeekcode.extractZip
89
import com.kyhsgeekcode.isAccessible
@@ -11,7 +12,6 @@ import com.kyhsgeekcode.toValidFileName
1112
import kotlinx.serialization.SerializationException
1213
import kotlinx.serialization.encodeToString
1314
import kotlinx.serialization.json.Json
14-
import org.apache.commons.io.FileUtils
1515
import org.json.JSONException
1616
import splitties.init.appCtx
1717
import java.io.File
@@ -100,10 +100,13 @@ object ProjectManager {
100100
val determinedSourceFolder: File
101101
if (copy) {
102102
val copyTargetFileOrFolder = origFolder.resolve(targetFileOrFolder.name)
103-
if (!targetFileOrFolder.isDirectory && targetFileOrFolder != copyTargetFileOrFolder)
104-
FileUtils.copyFile(targetFileOrFolder, copyTargetFileOrFolder)
105-
else if (targetFileOrFolder != copyTargetFileOrFolder)
106-
FileUtils.copyDirectory(targetFileOrFolder, copyTargetFileOrFolder)
103+
if (!targetFileOrFolder.isDirectory && targetFileOrFolder != copyTargetFileOrFolder) {
104+
// FileUtils.copyFile(targetFileOrFolder, copyTargetFileOrFolder)
105+
targetFileOrFolder.copyTo(copyTargetFileOrFolder)
106+
} else if (targetFileOrFolder != copyTargetFileOrFolder) {
107+
// FileUtils.copyDirectory(targetFileOrFolder, copyTargetFileOrFolder)
108+
copyDirectory(targetFileOrFolder, copyTargetFileOrFolder)
109+
}
107110
determinedSourceFolder = copyTargetFileOrFolder
108111
} else {
109112
determinedSourceFolder = targetFileOrFolder
@@ -205,7 +208,9 @@ object ProjectManager {
205208
val projectModel = openProject(infoFile.absolutePath)
206209
val projectDir = rootdir.resolve(projectModel.name.toValidFileName())
207210
projectDir.mkdirs()
208-
FileUtils.moveDirectory(dest, projectDir)
211+
dest.copyRecursively(projectDir)
212+
dest.deleteRecursively()
213+
// FileUtils.moveDirectory(dest, projectDir)
209214
return projectModel
210215
// FileUtils.moveDirectory(dest.resolve("baseFolder"), projectDir.resolve("baseFolder"))
211216
// FileUtils.moveDirectory(dest.resolve("sourceFilePath"), projectDir.resolve())

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ package com.kyhsgeekcode.filechooser.model
33
import android.graphics.drawable.Drawable
44
import com.kyhsgeekcode.Publisher
55
import com.kyhsgeekcode.disassembler.Logger
6+
import com.kyhsgeekcode.disassembler.copyDirectory
67
import com.kyhsgeekcode.extract
78
import kotlinx.coroutines.Dispatchers
89
import kotlinx.coroutines.withContext
9-
import org.apache.commons.io.FileUtils
1010
import splitties.init.appCtx
1111
import java.io.File
1212

@@ -32,7 +32,7 @@ class FileItemApp(label: String, val realFile: File, val nativeFile: File, icon:
3232
}
3333
targetFolder.mkdirs()
3434
withContext(Dispatchers.IO) {
35-
FileUtils.copyDirectory(nativeFile, madetargetFile)
35+
copyDirectory(nativeFile, madetargetFile)
3636
}
3737
} else {
3838
Logger.e(TAG, "Native file $nativeFile could not be read")

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ buildscript {
1010
}
1111
dependencies {
1212

13-
classpath 'com.android.tools.build:gradle:4.1.2'
13+
classpath 'com.android.tools.build:gradle:4.1.3'
1414
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1515
classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
1616
classpath "de.mannodermaus.gradle.plugins:android-junit5:1.7.0.0"
1717
classpath "org.jacoco:org.jacoco.core:0.8.6"
1818

1919
classpath "org.jlleitschuh.gradle:ktlint-gradle:10.0.0"
20-
classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:8.8.2"
20+
classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:8.8.4"
2121
}
2222
}
2323

0 commit comments

Comments
 (0)