fix: invalid code flow when adding patches

FiorenMas · May 27, 2022 · 206f202 · 206f202
1 parent 04e0027
commit 206f202
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,5 +1,6 @@
 name: Release
 on:
+  workflow_dispatch:
   push:
     branches:
       - main

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -24,7 +24,7 @@ repositories {
 
 dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.21")
-    implementation("app.revanced:revanced-patcher:1.0.0-dev.16")
+    implementation("app.revanced:revanced-patcher:1.0.0-dev.17")
     implementation("app.revanced:revanced-patches:1.0.0-dev.11")
 
     implementation("info.picocli:picocli:4.6.3")
@@ -68,4 +68,4 @@ publishing {
             from(components["java"])
         }
     }
-}
+}
diff --git a/src/main/kotlin/app/revanced/cli/MainCommand.kt b/src/main/kotlin/app/revanced/cli/MainCommand.kt
@@ -58,9 +58,9 @@ internal object MainCommand : Runnable {
                 for (it in JarPatchBundle(patchBundlePath).loadPatches())
                     println(
                         "[available] ${
-                            it.javaClass.findAnnotationRecursively(
+                            it.findAnnotationRecursively(
                                 Name::class.java
-                            )?.name ?: Name::class.java.name
+                            )?.name ?: it::class.java.name
                         }"
                     )
             return

diff --git a/src/main/kotlin/app/revanced/utils/patcher/Patcher.kt b/src/main/kotlin/app/revanced/utils/patcher/Patcher.kt
@@ -24,7 +24,7 @@ fun Patcher.addPatchesFiltered(
 
             val compatibilityAnnotation = patch.javaClass.findAnnotationRecursively(Compatibility::class.java)
 
-            val patchName = patch.javaClass.findAnnotationRecursively(Name::class.java)?.name ?: Name::class.java.name
+            val patchName = patch.javaClass.findAnnotationRecursively(Name::class.java)?.name ?: patch.javaClass.name
 
             val prefix = "[skipped] $patchName"
 
@@ -47,9 +47,10 @@ fun Patcher.addPatchesFiltered(
                         return@patch
                     }
 
-                    if (!packageVersionCompatibilityFilter || compatiblePackage.versions.any { it == packageVersion }) return@patch
-                    println("$prefix: Unsupported version.")
-                    return@patch
+                    if (packageVersionCompatibilityFilter && !compatiblePackage.versions.any { it == packageVersion }) {
+                        println("$prefix: Unsupported version.")
+                        return@patch
+                    }
                 }
             }