Fix return signatures with arrays

romainguy · May 17, 2024 · 23c7775 · 23c7775
1 parent df99606
commit 23c7775
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -67,7 +67,7 @@ compose.desktop {
 
             targetFormats(TargetFormat.Dmg)
 
-            packageVersion = "1.2.0"
+            packageVersion = "1.2.1"
             packageName = "Kotlin Explorer"
             description = "Kotlin Explorer"
             vendor = "Romain Guy"

diff --git a/src/jvmMain/kotlin/dev/romainguy/kotlin/explorer/Disassembly.kt b/src/jvmMain/kotlin/dev/romainguy/kotlin/explorer/Disassembly.kt
@@ -101,6 +101,8 @@ suspend fun buildAndDisassemble(
 ) = coroutineScope {
     val ui = currentCoroutineContext()
 
+    onLogs(showLogs(""))
+
     launch(Dispatchers.IO) {
         val updater = ProgressUpdater(TotalDisassemblySteps, onStatusUpdate)
         try {

diff --git a/src/jvmMain/kotlin/dev/romainguy/kotlin/explorer/dex/DexDumpParser.kt b/src/jvmMain/kotlin/dev/romainguy/kotlin/explorer/dex/DexDumpParser.kt
@@ -166,12 +166,21 @@ private fun jniTypeToJavaType(
                 .replace('/', '.')
                 .replace("java.lang.", "")
         }
-
         'S' -> "short"
         'V' -> "void"
         'Z' -> "boolean"
         else -> "<unknown>"
     } to endIndex + 1
 }
 
-private fun returnTypeFromType(type: String): String = jniTypeToJavaType(type, type.lastIndexOf(')') + 1).first
+private fun returnTypeFromType(type: String): String {
+    val index = type.lastIndexOf(')') + 1
+    when (type[index]) {
+        '[' -> {
+            return jniTypeToJavaType(type, index + 1).first + "[]"
+        }
+        else -> {
+            return jniTypeToJavaType(type, index).first
+        }
+    }
+}