mirror of
https://github.com/ReVanced/revanced-patcher.git
synced 2024-11-10 01:02:22 +01:00
fix: check dependencies for resource patches
This commit is contained in:
parent
438321330e
commit
9c07ffcc7a
1 changed files with 5 additions and 4 deletions
|
@ -207,7 +207,7 @@ class Patcher(private val options: PatcherOptions) {
|
|||
*/
|
||||
fun Class<out Patch<Data>>.isResource() {
|
||||
this.also {
|
||||
if (!ResourcePatch::class.java.isAssignableFrom(it)) return
|
||||
if (!ResourcePatch::class.java.isAssignableFrom(it)) return@also
|
||||
// set the mode to decode all resources before running the patches
|
||||
resourceDecodingMode = ResourceDecodingMode.FULL
|
||||
}.dependencies?.forEach { it.java.isResource() }
|
||||
|
@ -249,14 +249,15 @@ class Patcher(private val options: PatcherOptions) {
|
|||
}
|
||||
|
||||
// recursively apply all dependency patches
|
||||
patch.dependencies?.forEach { dependency ->
|
||||
val result = applyPatch(dependency.java, appliedPatches)
|
||||
patch.dependencies?.forEach { dependencyClass ->
|
||||
val dependency = dependencyClass.java
|
||||
|
||||
val result = applyPatch(dependency, appliedPatches)
|
||||
if (result.isSuccess()) return@forEach
|
||||
|
||||
val error = result.error()!!
|
||||
val errorMessage = error.cause ?: error.message
|
||||
return PatchResultError("'$patchName' depends on '${patch.patchName}' but the following error was raised: $errorMessage")
|
||||
return PatchResultError("'$patchName' depends on '${dependency.patchName}' but the following error was raised: $errorMessage")
|
||||
}
|
||||
|
||||
patch.deprecated?.let { (reason, replacement) ->
|
||||
|
|
Loading…
Reference in a new issue