diff --git a/.idea/artifacts/dex_diff_main_jar.xml b/.idea/artifacts/dex_diff_main_jar.xml index b979e03..07059b2 100644 --- a/.idea/artifacts/dex_diff_main_jar.xml +++ b/.idea/artifacts/dex_diff_main_jar.xml @@ -46,6 +46,7 @@ + \ No newline at end of file diff --git a/README.md b/README.md index 50a88c9..d4a2392 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ dex-diff before.apk after.apk [com.my.app.packageName] with-fullmode.apk without-fullmode.apk ❯ dex-diff without-fullmode.apk with-fullmode.apk com.example.flowobjectrepro -⚔️ dex-diff v0.0.7 +⚔️ dex-diff v0.1.1 🚀 Initialising... ➡️ Deleting old results (dex-diff-result)... ✅ Deleted old results diff --git a/package.json b/package.json index a98cf06..e85639d 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "index.js", "preferGlobal": "true", "repository": "https://github.com/theapache64/dex-diff", - "version": "0.0.7", + "version": "0.1.2", "jdeploy": { "jdk": "false", "javaVersion": "17", diff --git a/src/main/kotlin/com/github/theapache64/dexdiff/app/App.kt b/src/main/kotlin/com/github/theapache64/dexdiff/app/App.kt index fd6b465..f6be062 100644 --- a/src/main/kotlin/com/github/theapache64/dexdiff/app/App.kt +++ b/src/main/kotlin/com/github/theapache64/dexdiff/app/App.kt @@ -30,10 +30,9 @@ class App : Application() { * Entry point */ fun main(args: Array) { - println("⚔️ dex-diff v0.0.7") + println("⚔️ dex-diff v0.1.2") val heapSize = Runtime.getRuntime().maxMemory() / 1024 / 1024 println("🧠 Heap size: $heapSize MB") - App.args = args App().onCreate() } \ No newline at end of file diff --git a/src/main/kotlin/com/github/theapache64/dexdiff/ui/home/HomeViewModel.kt b/src/main/kotlin/com/github/theapache64/dexdiff/ui/home/HomeViewModel.kt index 4bc8f4c..270acc8 100644 --- a/src/main/kotlin/com/github/theapache64/dexdiff/ui/home/HomeViewModel.kt +++ b/src/main/kotlin/com/github/theapache64/dexdiff/ui/home/HomeViewModel.kt @@ -65,33 +65,7 @@ class HomeViewModel @Inject constructor( _status.value = "✅ Decompiling after APK finished" _status.value = "✅ Decompile finished (${System.currentTimeMillis() - startTime}ms)" - startTime = System.currentTimeMillis() - _status.value = "➡️ Comparing before and after... (this may take some time)" - val beforeFiles = beforeReport.sourceDir.walk().toList().filter { it.isFile } - val afterFiles = afterReport.sourceDir.walk().toList().filter { it.isFile } - val filesResult = createFileResult( - appPackages = appArgs.appPackages, - beforeReport = beforeReport, - afterReport = afterReport - ) - - // app files - val beforeAppFiles = filesResult.beforeAppFiles - val afterAppFiles = filesResult.afterAppFiles - val changedAppFiles = filesResult.changedAppFiles - - // library files - val beforeLibraryFiles = filesResult.beforeLibraryFiles - val afterLibraryFiles = filesResult.afterLibraryFiles - val beforeTotalLibraryFiles = beforeLibraryFiles.size - val afterTotalLibraryFiles = afterLibraryFiles.size - - // framework files - val beforeFrameworkFiles = filesResult.beforeFrameworkFiles - val afterFrameworkFiles = filesResult.afterFrameworkFiles - val beforeTotalFrameworkFiles = beforeFrameworkFiles.size - val afterTotalFrameworkFiles = afterFrameworkFiles.size val reportFile = File("dex-diff-result/${beforeMd5}_${afterMd5}_report.html") @@ -99,6 +73,33 @@ class HomeViewModel @Inject constructor( println("🙌 skipping new report file generation as cache exist") } else { + _status.value = "➡️ Comparing before and after... (this may take some time)" + + val beforeFiles = beforeReport.sourceDir.walk().toList().filter { it.isFile } + val afterFiles = afterReport.sourceDir.walk().toList().filter { it.isFile } + val filesResult = createFileResult( + appPackages = appArgs.appPackages, + beforeReport = beforeReport, + afterReport = afterReport + ) + + // app files + val beforeAppFiles = filesResult.beforeAppFiles + val afterAppFiles = filesResult.afterAppFiles + val changedAppFiles = filesResult.changedAppFiles + + // library files + val beforeLibraryFiles = filesResult.beforeLibraryFiles + val afterLibraryFiles = filesResult.afterLibraryFiles + val beforeTotalLibraryFiles = beforeLibraryFiles.size + val afterTotalLibraryFiles = afterLibraryFiles.size + + // framework files + val beforeFrameworkFiles = filesResult.beforeFrameworkFiles + val afterFrameworkFiles = filesResult.afterFrameworkFiles + val beforeTotalFrameworkFiles = beforeFrameworkFiles.size + val afterTotalFrameworkFiles = afterFrameworkFiles.size + _status.value = "✅ Comparing finished (${System.currentTimeMillis() - startTime}ms)" _status.value = "➡️ Making report..."