From 79403f320fd86ced7f248956f13fed7499525d96 Mon Sep 17 00:00:00 2001
From: Nico Mexis <nico.mexis@kabelmail.de>
Date: Fri, 27 Aug 2021 01:16:52 +0200
Subject: [PATCH] Update dex2jar

This provides a better solution to #348
---
 pom.xml                                                       | 2 +-
 .../club/bytecodeviewer/compilers/impl/SmaliAssembler.java    | 4 ++--
 .../bytecodeviewer/decompilers/impl/SmaliDisassembler.java    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 248f644c..63de179a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -237,7 +237,7 @@
         <dependency>
             <groupId>com.github.ThexXTURBOXx</groupId>
             <artifactId>dex2jar</artifactId>
-            <version>v23</version>
+            <version>v24</version>
         </dependency>
         <dependency>
             <groupId>com.github.weisj</groupId>
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/compilers/impl/SmaliAssembler.java b/src/main/java/the/bytecode/club/bytecodeviewer/compilers/impl/SmaliAssembler.java
index 9a3d4539..3dd063f1 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/compilers/impl/SmaliAssembler.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/compilers/impl/SmaliAssembler.java
@@ -62,8 +62,8 @@ public class SmaliAssembler extends InternalCompiler
         }
 
         try {
-            com.googlecode.d2j.smali.SmaliCmd.main(new String[]{tempSmaliFolder.getAbsolutePath(),
-                    "-o", tempDex.getAbsolutePath()});
+            com.googlecode.d2j.smali.SmaliCmd.main(tempSmaliFolder.getAbsolutePath(),
+                    "-o", tempDex.getAbsolutePath());
         } catch (Exception e) {
             e.printStackTrace();
             //BytecodeViewer.handleException(e);
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/SmaliDisassembler.java b/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/SmaliDisassembler.java
index 486f65e8..5bff6113 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/SmaliDisassembler.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/SmaliDisassembler.java
@@ -73,8 +73,8 @@ public class SmaliDisassembler extends InternalDecompiler
         Dex2Jar.saveAsDex(tempClass, tempDex, true);
 
         try {
-            com.googlecode.d2j.smali.BaksmaliCmd.main(new String[]{tempDex.getAbsolutePath(),
-                    "-o", tempDexOut.getAbsolutePath()});
+            com.googlecode.d2j.smali.BaksmaliCmd.main(tempDex.getAbsolutePath(),
+                    "-o", tempDexOut.getAbsolutePath());
         } catch (Exception e) {
             StringWriter sw = new StringWriter();
             e.printStackTrace(new PrintWriter(sw));