external/revanced-patcher
1
0
Fork 0
mirror of https://github.com/ReVanced/revanced-patcher.git synced 2024-11-13 02:14:27 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix: always return PatchResultSuccess on patch success

Browse source
This commit is contained in:
Lucaskyy 2022-04-11 17:34:43 +02:00 committed by oSumAtrIX
parent 5b28523eea
commit 996c4acb20
No known key found for this signature in database
GPG key ID: A9B3094ACDB604B4
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,7 @@ package app.revanced.patcher
import app.revanced.patcher.cache.Cache import app.revanced.patcher.cache.Cache
import app.revanced.patcher.patch.Patch import app.revanced.patcher.patch.Patch
import app.revanced.patcher.patch.PatchResult import app.revanced.patcher.patch.PatchResultSuccess
import app.revanced.patcher.signature.resolver.SignatureResolver import app.revanced.patcher.signature.resolver.SignatureResolver
import app.revanced.patcher.signature.MethodSignature import app.revanced.patcher.signature.MethodSignature
import app.revanced.patcher.util.ListBackedSet import app.revanced.patcher.util.ListBackedSet
@ -99,15 +99,18 @@ class Patcher(
/** /**
* Apply patches loaded into the patcher. * Apply patches loaded into the patcher.
* @param stopOnError If true, the patches will stop on the first error. * @param stopOnError If true, the patches will stop on the first error.
* @return A map of results. If the patch was successfully applied,
* PatchResultSuccess will always be returned in the wrapping Result object.
* If the patch failed to apply, an Exception will always be returned in the wrapping Result object.
*/ */
fun applyPatches(stopOnError: Boolean = false, callback: (String) -> Unit = {}): Map<String, Result<PatchResult>> { fun applyPatches(stopOnError: Boolean = false, callback: (String) -> Unit = {}): Map<String, Result<PatchResultSuccess>> {
return buildMap { return buildMap {
for (patch in patches) { for (patch in patches) {
callback(patch.patchName) callback(patch.patchName)
val result: Result<PatchResult> = try { val result: Result<PatchResultSuccess> = try {
val pr = patch.execute(cache) val pr = patch.execute(cache)
if (pr.isSuccess()) { if (pr.isSuccess()) {
Result.success(pr) Result.success(pr.success()!!)
} else { } else {
Result.failure(Exception(pr.error()?.errorMessage() ?: "Unknown error")) Result.failure(Exception(pr.error()?.errorMessage() ?: "Unknown error"))
} }