external/revanced-patcher
1
0
Fork 0
mirror of https://github.com/ReVanced/revanced-patcher.git synced 2024-11-10 01:02:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix: Check for class type exactly instead of with contains (#310)

Browse source
This commit is contained in:
oSumAtrIX 2024-09-18 14:36:15 +02:00 committed by GitHub
parent 525beda18e
commit 69f2f20fd9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/kotlin/app/revanced/patcher/Fingerprint.kt
View file

@ -128,7 +128,7 @@ class Fingerprint internal constructor(
fun match( fun match(
context: BytecodePatchContext, context: BytecodePatchContext,
method: Method, method: Method,
) = match(context, method, context.classByType(method.definingClass)!!.immutableClass) ) = match(context, method, context.classBy { method.definingClass == it.type }!!.immutableClass)
/** /**
* Match using a [Method]. * Match using a [Method].

1
src/main/kotlin/app/revanced/patcher/patch/BytecodePatchContext.kt
View file

@ -104,6 +104,7 @@ class BytecodePatchContext internal constructor(private val config: PatcherConfi
* @param type The type of the class. * @param type The type of the class.
* @return A proxy for the first class that matches the type. * @return A proxy for the first class that matches the type.
*/ */
@Deprecated("Use classBy { type in it.type } instead.", ReplaceWith("classBy { type in it.type }"))
fun classByType(type: String) = classBy { type in it.type } fun classByType(type: String) = classBy { type in it.type }
/** /**

4
src/main/kotlin/app/revanced/patcher/util/ClassMerger.kt
View file

@ -179,7 +179,9 @@ internal object ClassMerger {
callback: MutableClass.() -> Unit, callback: MutableClass.() -> Unit,
) { ) {
callback(targetClass) callback(targetClass)
this.classByType(targetClass.superclass ?: return)?.mutableClass?.let {
targetClass.superclass ?: return
this.classBy { targetClass.superclass == it.type }?.mutableClass?.let {
traverseClassHierarchy(it, callback) traverseClassHierarchy(it, callback)
} }
} }