fix: check if packageVersion is compatible with any from `compatibl…

…ePackages`
j-hc · Jun 12, 2022 · 32589c8 · 32589c8
1 parent 3878532
commit 32589c8
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/main/kotlin/app/revanced/utils/patcher/Patcher.kt b/src/main/kotlin/app/revanced/utils/patcher/Patcher.kt
@@ -36,14 +36,14 @@ fun Patcher.addPatchesFiltered(
             }
 
             if (compatiblePackages == null) println("$prefix: Missing compatibility annotation. Continuing.")
-            else compatiblePackages.forEach { compatiblePackage ->
-                if (compatiblePackage.name != packageName) {
-                    println("$prefix: Package name not matching ${compatiblePackage.name}.")
+            else {
+                if (!compatiblePackages.any { it.name == packageName }) {
+                    println("$prefix: Incompatible package.")
                     return@patch
                 }
 
-                if (!(debugging || compatiblePackage.versions.any { it == packageVersion })) {
-                    println("$prefix: Unsupported version.")
+                if (!(debugging || compatiblePackages.any { it.versions.isEmpty() || it.versions.any { version -> version == packageVersion }})) {
+                    println("$prefix: The package version is $packageVersion and is incompatible.")
                     return@patch
                 }
             }