ReVanced/revanced-patcher
1
0
Fork 0
mirror of https://github.com/ReVanced/revanced-patcher.git synced 2026-01-18 17:03:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: ConcurrentModificationException while iterating through proxies and modifying it

Browse Source 
Signed-off-by: oSumAtrIX <johan.melkonyan1@web.de>
This commit is contained in:
oSumAtrIX
2022-04-19 20:07:31 +02:00
parent 748d0abad0
commit bfeeaf4435
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/kotlin/app/revanced/patcher/util/ProxyBackedClassList.kt
View File

@@ -15,18 +15,21 @@ class ProxyBackedClassList(internal val internalClasses: MutableList<ClassDef>)
} }
/** /**
* Apply all resolved classes into [internalClasses] and clear the [proxies] list. * Apply all resolved classes into [internalClasses] and clean the [proxies] list.
*/ */
fun applyProxies() { fun applyProxies() {
proxies.forEachIndexed { i, proxy -> // FIXME: check if this could cause issues when multiple patches use the same proxy
if (!proxy.proxyUsed) return@forEachIndexed proxies.removeIf { proxy ->
// if the proxy is unused, keep it in the list
if (!proxy.proxyUsed) return@removeIf false
// if it has been used, replace the internal class which it proxied
val index = internalClasses.indexOfFirst { it.type == proxy.immutableClass.type } val index = internalClasses.indexOfFirst { it.type == proxy.immutableClass.type }
internalClasses[index] = proxy.mutatedClass internalClasses[index] = proxy.mutatedClass
proxies.removeAt(i) // FIXME: check if this could cause issues when multiple patches use the same proxy // return true to remove it from the proxies list
return@removeIf true
} }
} }
override val size get() = internalClasses.size override val size get() = internalClasses.size