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: Search method map for existing class proxy

Browse source
This commit is contained in:
oSumAtrIX 2022-04-06 23:09:58 +02:00
parent e4157332d3
commit a1e909b163
No known key found for this signature in database
GPG key ID: A9B3094ACDB604B4
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/kotlin/app/revanced/patcher/cache/Cache.kt vendored
View file

@ -10,7 +10,8 @@ class Cache(
) { ) {
// TODO: currently we create ClassProxies at multiple places, which is why we could have merge conflicts // TODO: currently we create ClassProxies at multiple places, which is why we could have merge conflicts
// this can be solved by creating a dedicated method for creating class proxies, // this can be solved by creating a dedicated method for creating class proxies,
// if the class proxy already exists in the cached proxy list below // if the class proxy already exists in the cached proxy list below.
// The to-do in the method findClass is related
internal val classProxy = mutableSetOf<ClassProxy>() internal val classProxy = mutableSetOf<ClassProxy>()
/** /**
@ -24,10 +25,17 @@ class Cache(
* @return A proxy for the first class that matches the predicate * @return A proxy for the first class that matches the predicate
*/ */
fun findClass(predicate: (ClassDef) -> Boolean): ClassProxy? { fun findClass(predicate: (ClassDef) -> Boolean): ClassProxy? {
// TODO: find a cleaner way to store all proxied classes.
// Currently we have to search the method map as well as the class proxy list which is not elegant
// if we already proxied the class matching the predicate, // if we already proxied the class matching the predicate,
val proxiedClass = classProxy.find { predicate(it.immutableClass) } val proxiedClass = classProxy.find { predicate(it.immutableClass) }
// return that proxy // return that proxy
if (proxiedClass != null) return proxiedClass if (proxiedClass != null) return proxiedClass
// if we already have the class matching the predicate in the method map,
val result = methodMap.entries.find { predicate(it.value.definingClassProxy.immutableClass) }?.value
if (result != null) return result.definingClassProxy
// else search the original class list // else search the original class list
val (foundClass, index) = classes.findIndexed(predicate) ?: return null val (foundClass, index) = classes.findIndexed(predicate) ?: return null
// create a class proxy with the index of the class in the classes list // create a class proxy with the index of the class in the classes list