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

ReVanced · Sep 18, 2024 · 69f2f20 · 69f2f20
1 parent 525beda
commit 69f2f20
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/main/kotlin/app/revanced/patcher/Fingerprint.kt b/src/main/kotlin/app/revanced/patcher/Fingerprint.kt
@@ -128,7 +128,7 @@ class Fingerprint internal constructor(
  fun match(
  context: BytecodePatchContext,
  method: Method,
- ) = match(context, method, context.classByType(method.definingClass)!!.immutableClass)
+ ) = match(context, method, context.classBy { method.definingClass == it.type }!!.immutableClass)
 
  /**
  * Match using a [Method].

diff --git a/src/main/kotlin/app/revanced/patcher/patch/BytecodePatchContext.kt b/src/main/kotlin/app/revanced/patcher/patch/BytecodePatchContext.kt
@@ -104,6 +104,7 @@ class BytecodePatchContext internal constructor(private val config: PatcherConfi
  * @param type The type of the class.
  * @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 }
 
  /**

diff --git a/src/main/kotlin/app/revanced/patcher/util/ClassMerger.kt b/src/main/kotlin/app/revanced/patcher/util/ClassMerger.kt
@@ -179,7 +179,9 @@ internal object ClassMerger {
  callback: MutableClass.() -> Unit,
  ) {
  callback(targetClass)
- this.classByType(targetClass.superclass ?: return)?.mutableClass?.let {
+
+ targetClass.superclass ?: return
+ this.classBy { targetClass.superclass == it.type }?.mutableClass?.let {
  traverseClassHierarchy(it, callback)
  }
  }