ReVanced/revanced-cli
1
0
Fork 0
mirror of https://github.com/ReVanced/revanced-cli.git synced 2026-01-18 08:53:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: invalid code flow when adding patches

Browse Source
This commit is contained in:
oSumAtrIX
2022-05-27 12:25:44 +02:00
parent 04e0027c08
commit 206f2029d7
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/kotlin/app/revanced/cli/MainCommand.kt
View File

@@ -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

9
src/main/kotlin/app/revanced/utils/patcher/Patcher.kt
View File

@@ -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
}
}
}