diff --git a/server/build.gradle.kts b/server/build.gradle.kts index fa81626..6a8132a 100644 --- a/server/build.gradle.kts +++ b/server/build.gradle.kts @@ -63,7 +63,7 @@ dependencies { val coroutinesVersion = "1.3.9" implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion") - // dex2jar + // dex2jar: https://github.com/DexPatcher/dex2jar/releases/tag/v2.1-20190905-lanchon implementation(fileTree("lib/dex2jar/")) // api diff --git a/server/lib/dex2jar/ST4-4.0.8.jar b/server/lib/dex2jar/ST4-4.0.8.jar new file mode 100644 index 0000000..144828b Binary files /dev/null and b/server/lib/dex2jar/ST4-4.0.8.jar differ diff --git a/server/lib/dex2jar/antlr-3.5.2.jar b/server/lib/dex2jar/antlr-3.5.2.jar new file mode 100644 index 0000000..12b6140 Binary files /dev/null and b/server/lib/dex2jar/antlr-3.5.2.jar differ diff --git a/server/lib/dex2jar/antlr-runtime-3.5.jar b/server/lib/dex2jar/antlr-runtime-3.5.2.jar similarity index 81% rename from server/lib/dex2jar/antlr-runtime-3.5.jar rename to server/lib/dex2jar/antlr-runtime-3.5.2.jar index a8b5969..d48e3e8 100644 Binary files a/server/lib/dex2jar/antlr-runtime-3.5.jar and b/server/lib/dex2jar/antlr-runtime-3.5.2.jar differ diff --git a/server/lib/dex2jar/antlr4-4.5.jar b/server/lib/dex2jar/antlr4-4.5.jar new file mode 100644 index 0000000..a20a536 Binary files /dev/null and b/server/lib/dex2jar/antlr4-4.5.jar differ diff --git a/server/lib/dex2jar/antlr4-runtime-4.5.jar b/server/lib/dex2jar/antlr4-runtime-4.5.jar new file mode 100644 index 0000000..924fcce Binary files /dev/null and b/server/lib/dex2jar/antlr4-runtime-4.5.jar differ diff --git a/server/lib/dex2jar/asm-debug-all-4.1.jar b/server/lib/dex2jar/asm-debug-all-4.1.jar deleted file mode 100644 index 4133d82..0000000 Binary files a/server/lib/dex2jar/asm-debug-all-4.1.jar and /dev/null differ diff --git a/server/lib/dex2jar/asm-debug-all-5.0.3.jar b/server/lib/dex2jar/asm-debug-all-5.0.3.jar new file mode 100644 index 0000000..c531dea Binary files /dev/null and b/server/lib/dex2jar/asm-debug-all-5.0.3.jar differ diff --git a/server/lib/dex2jar/d2j-base-cmd-2.0.jar b/server/lib/dex2jar/d2j-base-cmd-2.0.jar deleted file mode 100644 index 60c9fff..0000000 Binary files a/server/lib/dex2jar/d2j-base-cmd-2.0.jar and /dev/null differ diff --git a/server/lib/dex2jar/d2j-base-cmd-2.1-20190905-lanchon.jar b/server/lib/dex2jar/d2j-base-cmd-2.1-20190905-lanchon.jar new file mode 100644 index 0000000..035dcee Binary files /dev/null and b/server/lib/dex2jar/d2j-base-cmd-2.1-20190905-lanchon.jar differ diff --git a/server/lib/dex2jar/d2j-jasmin-2.0.jar b/server/lib/dex2jar/d2j-jasmin-2.0.jar deleted file mode 100644 index de745bd..0000000 Binary files a/server/lib/dex2jar/d2j-jasmin-2.0.jar and /dev/null differ diff --git a/server/lib/dex2jar/d2j-jasmin-2.1-20190905-lanchon.jar b/server/lib/dex2jar/d2j-jasmin-2.1-20190905-lanchon.jar new file mode 100644 index 0000000..3209c77 Binary files /dev/null and b/server/lib/dex2jar/d2j-jasmin-2.1-20190905-lanchon.jar differ diff --git a/server/lib/dex2jar/d2j-smali-2.0.jar b/server/lib/dex2jar/d2j-smali-2.0.jar deleted file mode 100644 index c6d2647..0000000 Binary files a/server/lib/dex2jar/d2j-smali-2.0.jar and /dev/null differ diff --git a/server/lib/dex2jar/d2j-smali-2.1-20190905-lanchon.jar b/server/lib/dex2jar/d2j-smali-2.1-20190905-lanchon.jar new file mode 100644 index 0000000..ffefccd Binary files /dev/null and b/server/lib/dex2jar/d2j-smali-2.1-20190905-lanchon.jar differ diff --git a/server/lib/dex2jar/dex-ir-2.0.jar b/server/lib/dex2jar/dex-ir-2.0.jar deleted file mode 100644 index 24b02e7..0000000 Binary files a/server/lib/dex2jar/dex-ir-2.0.jar and /dev/null differ diff --git a/server/lib/dex2jar/dex-ir-2.1-20190905-lanchon.jar b/server/lib/dex2jar/dex-ir-2.1-20190905-lanchon.jar new file mode 100644 index 0000000..4803032 Binary files /dev/null and b/server/lib/dex2jar/dex-ir-2.1-20190905-lanchon.jar differ diff --git a/server/lib/dex2jar/dex-reader-2.0.jar b/server/lib/dex2jar/dex-reader-2.0.jar deleted file mode 100644 index 0a648b8..0000000 Binary files a/server/lib/dex2jar/dex-reader-2.0.jar and /dev/null differ diff --git a/server/lib/dex2jar/dex-reader-2.1-20190905-lanchon.jar b/server/lib/dex2jar/dex-reader-2.1-20190905-lanchon.jar new file mode 100644 index 0000000..ee7e519 Binary files /dev/null and b/server/lib/dex2jar/dex-reader-2.1-20190905-lanchon.jar differ diff --git a/server/lib/dex2jar/dex-reader-api-2.0.jar b/server/lib/dex2jar/dex-reader-api-2.0.jar deleted file mode 100644 index d54ab99..0000000 Binary files a/server/lib/dex2jar/dex-reader-api-2.0.jar and /dev/null differ diff --git a/server/lib/dex2jar/dex-reader-api-2.1-20190905-lanchon.jar b/server/lib/dex2jar/dex-reader-api-2.1-20190905-lanchon.jar new file mode 100644 index 0000000..df2158e Binary files /dev/null and b/server/lib/dex2jar/dex-reader-api-2.1-20190905-lanchon.jar differ diff --git a/server/lib/dex2jar/dex-tools-2.0.jar b/server/lib/dex2jar/dex-tools-2.0.jar deleted file mode 100644 index 49a5cb7..0000000 Binary files a/server/lib/dex2jar/dex-tools-2.0.jar and /dev/null differ diff --git a/server/lib/dex2jar/dex-tools-2.1-20190905-lanchon.jar b/server/lib/dex2jar/dex-tools-2.1-20190905-lanchon.jar new file mode 100644 index 0000000..e249531 Binary files /dev/null and b/server/lib/dex2jar/dex-tools-2.1-20190905-lanchon.jar differ diff --git a/server/lib/dex2jar/dex-translator-2.0.jar b/server/lib/dex2jar/dex-translator-2.0.jar deleted file mode 100644 index e322e7f..0000000 Binary files a/server/lib/dex2jar/dex-translator-2.0.jar and /dev/null differ diff --git a/server/lib/dex2jar/dex-translator-2.1-20190905-lanchon.jar b/server/lib/dex2jar/dex-translator-2.1-20190905-lanchon.jar new file mode 100644 index 0000000..dbb6ad2 Binary files /dev/null and b/server/lib/dex2jar/dex-translator-2.1-20190905-lanchon.jar differ diff --git a/server/lib/dex2jar/dex-writer-2.0.jar b/server/lib/dex2jar/dex-writer-2.0.jar deleted file mode 100644 index ce9b95a..0000000 Binary files a/server/lib/dex2jar/dex-writer-2.0.jar and /dev/null differ diff --git a/server/lib/dex2jar/dex-writer-2.1-20190905-lanchon.jar b/server/lib/dex2jar/dex-writer-2.1-20190905-lanchon.jar new file mode 100644 index 0000000..4feda14 Binary files /dev/null and b/server/lib/dex2jar/dex-writer-2.1-20190905-lanchon.jar differ diff --git a/server/lib/dex2jar/dx-1.7.jar b/server/lib/dex2jar/dx-1.7.jar deleted file mode 100644 index 481a00e..0000000 Binary files a/server/lib/dex2jar/dx-1.7.jar and /dev/null differ diff --git a/server/lib/dex2jar/dx-27.0.3.jar b/server/lib/dex2jar/dx-27.0.3.jar new file mode 100644 index 0000000..023b8da Binary files /dev/null and b/server/lib/dex2jar/dx-27.0.3.jar differ diff --git a/server/lib/dex2jar/open-source-license.txt b/server/lib/dex2jar/open-source-license.txt new file mode 100644 index 0000000..e8669c5 --- /dev/null +++ b/server/lib/dex2jar/open-source-license.txt @@ -0,0 +1,67 @@ +==== dx-*.jar +Apache 2.0 http://www.apache.org/licenses/LICENSE-2.0.html + + +==== antlr-*.jar +[The BSD License] +Copyright (c) 2003-2007, Terence Parr +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +* Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. +* Neither the name of the author nor the names of its contributors + may be used to endorse or promote products derived from this + software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + + +==== asm-*.jar + + ASM: a very small and fast Java bytecode manipulation framework + Copyright (c) 2000-2005 INRIA, France Telecom + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the copyright holders nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + THE POSSIBILITY OF SUCH DAMAGE. + diff --git a/server/lib/dex2jar/org.abego.treelayout.core-1.0.1.jar b/server/lib/dex2jar/org.abego.treelayout.core-1.0.1.jar new file mode 100644 index 0000000..2350adc Binary files /dev/null and b/server/lib/dex2jar/org.abego.treelayout.core-1.0.1.jar differ diff --git a/server/src/main/kotlin/ir/armor/tachidesk/Main.kt b/server/src/main/kotlin/ir/armor/tachidesk/Main.kt index 15a5e0c..1bfab60 100644 --- a/server/src/main/kotlin/ir/armor/tachidesk/Main.kt +++ b/server/src/main/kotlin/ir/armor/tachidesk/Main.kt @@ -227,7 +227,7 @@ class Main { // category modification app.patch("/api/v1/category/:categoryId") { ctx -> - val categoryId = ctx.pathParam("categoryId")!!.toInt() + val categoryId = ctx.pathParam("categoryId").toInt() val name = ctx.formParam("name") val isLanding = if (ctx.formParam("isLanding") != null) ctx.formParam("isLanding")?.toBoolean() else null updateCategory(categoryId, name, isLanding)