ReVanced/revanced-patcher
1
0
Fork 0
mirror of https://github.com/revanced/revanced-patcher.git synced 2025-05-01 05:44:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: applyPatches not returning successful patches

Browse Source
This commit is contained in:
Lucaskyy 2022-04-08 23:50:26 +02:00 committed by oSumAtrIX
parent 6c3e2d79ea
commit f806cb38c5
No known key found for this signature in database
GPG Key ID: A9B3094ACDB604B4
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/kotlin/app/revanced/patcher/Patcher.kt
View File

@ -3,6 +3,7 @@ package app.revanced.patcher
import app.revanced.patcher.cache.Cache import app.revanced.patcher.cache.Cache
import app.revanced.patcher.extensions.replace import app.revanced.patcher.extensions.replace
import app.revanced.patcher.patch.Patch import app.revanced.patcher.patch.Patch
import app.revanced.patcher.patch.PatchResult
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 lanchon.multidexlib2.BasicDexFileNamer import lanchon.multidexlib2.BasicDexFileNamer
@ -79,13 +80,16 @@ 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.
*/ */
fun applyPatches(stopOnError: Boolean = false): Map<String, Result<Nothing?>> { fun applyPatches(stopOnError: Boolean = false): Map<String, Result<PatchResult>> {
return buildMap { return buildMap {
for (patch in patches) { for (patch in patches) {
val result: Result<Nothing?> = try { val result: Result<PatchResult> = try {
val pr = patch.execute(cache) val pr = patch.execute(cache)
if (pr.isSuccess()) continue if (!pr.isSuccess()) {
Result.success(pr)
} else {
Result.failure(Exception(pr.error()?.errorMessage() ?: "Unknown error")) Result.failure(Exception(pr.error()?.errorMessage() ?: "Unknown error"))
}
} catch (e: Exception) { } catch (e: Exception) {
Result.failure(e) Result.failure(e)
} }