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

feat: Minor refactor and return proxy, if class has been proxied already

Browse source
This commit is contained in:
oSumAtrIX 2022-03-30 19:15:00 +02:00
parent ce21bd60f3
commit 4b26305bd5
No known key found for this signature in database
GPG key ID: A9B3094ACDB604B4
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -33,7 +33,7 @@ class Patcher(
// TODO: the iterator would return the proxied class matching the current index of the list // TODO: the iterator would return the proxied class matching the current index of the list
// TODO: instead of the original class // TODO: instead of the original class
for (classProxy in cache.classProxy) { for (classProxy in cache.classProxy) {
if (!classProxy.proxyused) continue if (!classProxy.proxyUsed) continue
// TODO: merge this class with cache.classes somehow in an iterator // TODO: merge this class with cache.classes somehow in an iterator
classProxy.mutatedClass classProxy.mutatedClass
} }

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

@ -8,11 +8,15 @@ class Cache(
internal val classes: Set<ClassDef>, internal val classes: Set<ClassDef>,
val resolvedMethods: MethodMap val resolvedMethods: MethodMap
) { ) {
internal val classProxy = mutableListOf<ClassProxy>() internal val classProxy = mutableSetOf<ClassProxy>()
fun findClass(predicate: (ClassDef) -> Boolean): ClassProxy? { fun findClass(predicate: (ClassDef) -> Boolean): ClassProxy? {
// if a class has been found with the given predicate, // if we already proxied the class matching the predicate,
val foundClass = classes.singleOrNull(predicate) ?: return null val proxiedClass = classProxy.singleOrNull{classProxy -> predicate(classProxy.immutableClass)}
// return that proxy
if (proxiedClass != null) return proxiedClass
// else search the original class list
val foundClass = classes.singleOrNull(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
// TODO: There might be a more elegant way to the comment above // TODO: There might be a more elegant way to the comment above
val classProxy = ClassProxy(foundClass, classes.indexOf(foundClass)) val classProxy = ClassProxy(foundClass, classes.indexOf(foundClass))

6
src/main/kotlin/app/revanced/patcher/proxy/ClassProxy.kt
View file

@ -8,12 +8,12 @@ class ClassProxy(
val immutableClass: ClassDef, val immutableClass: ClassDef,
val originalClassIndex: Int, val originalClassIndex: Int,
) { ) {
internal var proxyused = false internal var proxyUsed = false
internal lateinit var mutatedClass: MutableClass internal lateinit var mutatedClass: MutableClass
fun resolve(): MutableClass { fun resolve(): MutableClass {
if (!proxyused) { if (!proxyUsed) {
proxyused = true proxyUsed = true
mutatedClass = MutableClass(immutableClass) mutatedClass = MutableClass(immutableClass)
} }
return mutatedClass return mutatedClass