ReVanced/revanced-patcher
1
0
Fork 0
mirror of https://github.com/revanced/revanced-patcher.git synced 2025-04-30 21:34:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: do not load annotations as patches

Browse Source
This commit is contained in:
oSumAtrIX 2023-06-27 04:07:24 +02:00
parent b615ed6aab
commit 519359a9eb
No known key found for this signature in database
GPG Key ID: A9B3094ACDB604B4
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/kotlin/app/revanced/patcher/util/patch/PatchBundle.kt
View File

@ -3,6 +3,7 @@
package app.revanced.patcher.util.patch package app.revanced.patcher.util.patch
import app.revanced.patcher.data.Context import app.revanced.patcher.data.Context
import app.revanced.patcher.extensions.AnnotationExtensions.findAnnotationRecursively
import app.revanced.patcher.extensions.PatchExtensions.patchName import app.revanced.patcher.extensions.PatchExtensions.patchName
import app.revanced.patcher.patch.Patch import app.revanced.patcher.patch.Patch
import org.jf.dexlib2.DexFileFactory import org.jf.dexlib2.DexFileFactory
@ -19,7 +20,13 @@ sealed class PatchBundle(path: String) : File(path) {
internal fun loadPatches(classLoader: ClassLoader, classNames: Iterator<String>) = buildList { internal fun loadPatches(classLoader: ClassLoader, classNames: Iterator<String>) = buildList {
classNames.forEach { className -> classNames.forEach { className ->
val clazz = classLoader.loadClass(className) val clazz = classLoader.loadClass(className)
if (!clazz.isAnnotationPresent(app.revanced.patcher.patch.annotations.Patch::class.java)) return@forEach
// Annotations can not Patch.
if (clazz.isAnnotation) return@forEach
clazz.findAnnotationRecursively(app.revanced.patcher.patch.annotations.Patch::class)
?: return@forEach
@Suppress("UNCHECKED_CAST") this.add(clazz as Class<out Patch<Context>>) @Suppress("UNCHECKED_CAST") this.add(clazz as Class<out Patch<Context>>)
} }
}.sortedBy { it.patchName } }.sortedBy { it.patchName }
@ -43,11 +50,9 @@ sealed class PatchBundle(path: String) : File(path) {
), ),
JarFile(this) JarFile(this)
.stream() .stream()
.filter {it.name.endsWith(".class") && !it.name.contains("$")} .filter { it.name.endsWith(".class") && !it.name.contains("$") }
.map({it -> it.realName.replace('/', '.').replace(".class", "")}).iterator() .map { it.realName.replace('/', '.').replace(".class", "") }.iterator()
) )
} }
/** /**
@ -63,8 +68,9 @@ sealed class PatchBundle(path: String) : File(path) {
* Patches will be loaded to the provided [dexClassLoader]. * Patches will be loaded to the provided [dexClassLoader].
*/ */
fun loadPatches() = loadPatches(dexClassLoader, fun loadPatches() = loadPatches(dexClassLoader,
DexFileFactory.loadDexFile(path, null).classes.asSequence().map({ classDef -> DexFileFactory.loadDexFile(path, null).classes.asSequence().map { classDef ->
classDef.type.substring(1, classDef.length - 1).replace('/', '.') classDef.type.substring(1, classDef.length - 1).replace('/', '.')
}).iterator()) }.iterator()
)
} }
} }