chore: merge branch dev to main (#2880)

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [2.188.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v2.188.0...v2.188.1-dev.1) (2023-08-27)
+
+
+### Bug Fixes
+
+* Revert previous release ([ed24a20](https://github.com/ReVanced/revanced-patches/commit/ed24a201a9fbe08dd6694582d0ab08ced8ad026a))
+
 # [2.188.0](https://github.com/ReVanced/revanced-patches/compare/v2.187.0...v2.188.0) (2023-08-26)
 
 

build.gradle.kts

@@ -4,15 +4,17 @@ plugins {
 
 group = "app.revanced"
 
+val githubUsername: String = project.findProperty("gpr.user") as? String ?: System.getenv("GITHUB_ACTOR")
+val githubPassword: String = project.findProperty("gpr.key") as? String ?: System.getenv("GITHUB_TOKEN")
+
 repositories {
     mavenCentral()
     mavenLocal()
-    google()
     maven {
         url = uri("https://maven.pkg.github.com/revanced/revanced-patcher")
         credentials {
-            username = project.findProperty("gpr.user") as? String ?: System.getenv("GITHUB_ACTOR")
+            username = githubUsername
-            password = project.findProperty("gpr.key") as? String ?: System.getenv("GITHUB_TOKEN")
+            password = githubPassword
         }
     }
     // Required for FlexVer-Java
@@ -25,15 +27,15 @@ repositories {
 }
 
 dependencies {
-    implementation("app.revanced:revanced-patcher:14.0.0")
+    implementation("app.revanced:revanced-patcher:11.0.4")
-    implementation("com.android.tools.smali:smali:3.0.3")
+    implementation("app.revanced:multidexlib2:2.5.3-a3836654")
-    // Required because build fails without it.
+    // Required for meta
-    // TODO: Find a way to remove this dependency.
-    implementation("com.google.guava:guava:32.1.2-jre")
-    // Used in JsonGenerator.
     implementation("com.google.code.gson:gson:2.10.1")
+    // Required for FlexVer-Java
+    implementation("com.unascribed:flexver-java:1.0.2")
+
     // A dependency to the Android library unfortunately fails the build,
-    // which is why this is required for the patch change-oauth-client-id.
+    // which is why this is required for the patch change-oauth-client-id
     compileOnly(project("dummy"))
 }
 

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 2.188.0
+version = 2.188.1-dev.1

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/kotlin/app/revanced/extensions/Extensions.kt

@@ -1,26 +1,25 @@
 package app.revanced.extensions
 
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.MethodFingerprintExtensions.name
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.patch.PatchException
+import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.iface.Method
+import org.jf.dexlib2.iface.Method
-import com.android.tools.smali.dexlib2.iface.instruction.WideLiteralInstruction
+import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
-import com.android.tools.smali.dexlib2.util.MethodUtil
+import org.jf.dexlib2.util.MethodUtil
 import org.w3c.dom.Node
 
+// TODO: populate this to all patches
 /**
- * The [PatchException] of failing to resolve a [MethodFingerprint].
+ * Convert a [MethodFingerprint] to a [PatchResultError].
  *
- * @return The [PatchException].
+ * @return A [PatchResultError] for the [MethodFingerprint].
  */
-val MethodFingerprint.exception
+internal fun MethodFingerprint.toErrorResult() = PatchResultError("Failed to resolve $name")
-    get() = PatchException("Failed to resolve $name")
 
 /**
  * Find the [MutableMethod] from a given [Method] in a [MutableClass].
@@ -28,27 +27,27 @@ val MethodFingerprint.exception
  * @param method The [Method] to find.
  * @return The [MutableMethod].
  */
-fun MutableClass.findMutableMethodOf(method: Method) = this.methods.first {
+internal fun MutableClass.findMutableMethodOf(method: Method) = this.methods.first {
     MethodUtil.methodSignaturesMatch(it, method)
 }
 
 /**
- * apply a transform to all methods of the class.
+ * apply a transform to all methods of the class
  *
- * @param transform the transformation function. original method goes in, transformed method goes out.
+ * @param transform the transformation function. original method goes in, transformed method goes out
  */
-fun MutableClass.transformMethods(transform: MutableMethod.() -> MutableMethod) {
+internal fun MutableClass.transformMethods(transform: MutableMethod.() -> MutableMethod) {
     val transformedMethods = methods.map { it.transform() }
     methods.clear()
     methods.addAll(transformedMethods)
 }
 
-fun Node.doRecursively(action: (Node) -> Unit) {
+internal fun Node.doRecursively(action: (Node) -> Unit) {
     action(this)
     for (i in 0 until this.childNodes.length) this.childNodes.item(i).doRecursively(action)
 }
 
-fun MutableMethod.injectHideViewCall(
+internal fun MutableMethod.injectHideViewCall(
     insertIndex: Int,
     viewRegister: Int,
     classDescriptor: String,
@@ -58,13 +57,7 @@ fun MutableMethod.injectHideViewCall(
     "invoke-static { v$viewRegister }, $classDescriptor->$targetMethod(Landroid/view/View;)V"
 )
 
-/**
+internal fun Method.findIndexForIdResource(resourceName: String): Int {
- * Find the index of the first constant instruction with the id of the given resource name.
- *
- * @param resourceName the name of the resource to find the id for.
- * @return the index of the first constant instruction with the id of the given resource name, or -1 if not found.
- */
-fun Method.findIndexForIdResource(resourceName: String): Int {
     fun getIdResourceId(resourceName: String) = ResourceMappingPatch.resourceMappings.single {
         it.type == "id" && it.name == resourceName
     }.id
@@ -73,8 +66,6 @@ fun Method.findIndexForIdResource(resourceName: String): Int {
 }
 
 /**
- * Find the index of the first constant instruction with the given value.
- *
  * @return the first constant instruction with the value, or -1 if not found.
  */
 fun Method.indexOfFirstConstantInstructionValue(constantValue: Long): Int {
@@ -86,23 +77,8 @@ fun Method.indexOfFirstConstantInstructionValue(constantValue: Long): Int {
 }
 
 /**
- * Check if the method contains a constant with the given value.
- *
  * @return if the method contains a constant with the given value.
  */
 fun Method.containsConstantInstructionValue(constantValue: Long): Boolean {
     return indexOfFirstConstantInstructionValue(constantValue) >= 0
 }
-
-/**
- * Traverse the class hierarchy starting from the given root class.
- *
- * @param targetClass the class to start traversing the class hierarchy from.
- * @param callback function that is called for every class in the hierarchy.
- */
-fun BytecodeContext.traverseClassHierarchy(targetClass: MutableClass, callback: MutableClass.() -> Unit) {
-    callback(targetClass)
-    this.findClass(targetClass.superclass ?: return)?.mutableClass?.let {
-        traverseClassHierarchy(it, callback)
-    }
-}

src/main/kotlin/app/revanced/meta/JsonGenerator.kt

@@ -6,6 +6,7 @@ import app.revanced.patcher.extensions.PatchExtensions.description
 import app.revanced.patcher.extensions.PatchExtensions.include
 import app.revanced.patcher.extensions.PatchExtensions.options
 import app.revanced.patcher.extensions.PatchExtensions.patchName
+import app.revanced.patcher.extensions.PatchExtensions.version
 import app.revanced.patcher.patch.PatchOption
 import com.google.gson.GsonBuilder
 import java.io.File
@@ -16,6 +17,7 @@ internal class JsonGenerator : PatchesFileGenerator {
             JsonPatch(
                 it.patchName,
                 it.description ?: "This patch has no description.",
+                it.version ?: "0.0.0",
                 !it.include,
                 it.options?.map { option ->
                     JsonPatch.Option(
@@ -46,6 +48,7 @@ internal class JsonGenerator : PatchesFileGenerator {
     private class JsonPatch(
         val name: String,
         val description: String,
+        val version: String,
         val excluded: Boolean,
         val options: Array<Option>,
         val dependencies: Array<String>,

src/main/kotlin/app/revanced/meta/PatchesFileGenerator.kt

@@ -1,22 +1,25 @@
 package app.revanced.meta
 
-import app.revanced.patcher.PatchBundleLoader
+import app.revanced.patcher.data.Context
-import app.revanced.patcher.patch.PatchClass
+import app.revanced.patcher.patch.Patch
+import app.revanced.patcher.util.patch.PatchBundle
 import java.io.File
 
-internal typealias PatchBundlePatches = List<PatchClass>
+internal typealias PatchBundlePatches = List<Class<out Patch<Context>>>
 
 internal interface PatchesFileGenerator {
     fun generate(bundle: PatchBundlePatches)
 
     private companion object {
         @JvmStatic
-        fun main(args: Array<String>) = PatchBundleLoader.Jar(
+        fun main(args: Array<String>) = PatchBundle.Jar(
-            File("build/libs/").listFiles { it -> it.name.endsWith(".jar") }!!.first()
+            File("build/libs/").listFiles()!!.first {
-        ).also { loader ->
+                it.name.startsWith("revanced-patches-") && it.name.endsWith(".jar")
-            if (loader.isEmpty()) throw IllegalStateException("No patches found")
+            }.absolutePath
+        ).loadPatches().also {
+            if (it.isEmpty()) throw IllegalStateException("No patches found")
         }.let { bundle ->
-            arrayOf(JsonGenerator()).forEach { generator -> generator.generate(bundle) }
+            arrayOf(JsonGenerator()).forEach { it.generate(bundle) }
         }
     }
 }

src/main/kotlin/app/revanced/patches/all/activity/exportall/patch/ExportAllActivitiesPatch.kt

@@ -1,8 +1,10 @@
-package app.revanced.patches.all.activity.exportall.patch
+package app.revanced.patches.all.activity.exportAll.patch
 
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.Patch
 
@@ -10,7 +12,7 @@ import app.revanced.patcher.patch.annotations.Patch
 @Name("Export all activities")
 @Description("Makes all app activities exportable.")
 class ExportAllActivitiesPatch : ResourcePatch {
-    override fun execute(context: ResourceContext) {
+    override fun execute(context: ResourceContext): PatchResult {
         context.xmlEditor["AndroidManifest.xml"].use { editor ->
             val document = editor.file
             val activities = document.getElementsByTagName("activity")
@@ -31,6 +33,8 @@ class ExportAllActivitiesPatch : ResourcePatch {
                 }
             }
         }
+
+        return PatchResultSuccess()
     }
 
     private companion object {

src/main/kotlin/app/revanced/patches/all/connectivity/wifi/spoof/patch/SpoofWifiPatch.kt

@@ -6,16 +6,16 @@ import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.annotations.RequiresIntegrations
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.util.patch.*
-import com.android.tools.smali.dexlib2.iface.ClassDef
+import org.jf.dexlib2.iface.ClassDef
-import com.android.tools.smali.dexlib2.iface.Method
+import org.jf.dexlib2.iface.Method
-import com.android.tools.smali.dexlib2.iface.instruction.Instruction
+import org.jf.dexlib2.iface.instruction.Instruction
 import java.util.*
 
 @Patch(false)
 @Name("Spoof wifi connection")
 @Description("Spoofs an existing Wi-Fi connection.")
 @RequiresIntegrations
-class SpoofWifiPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
+internal class SpoofWifiPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
 
     private companion object {
         const val INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX = "Lapp/revanced/all/connectivity/wifi/spoof/SpoofWifiPatch"

src/main/kotlin/app/revanced/patches/all/interaction/gestures/patch/PredictiveBackGesturePatch.kt

@@ -3,6 +3,8 @@ package app.revanced.patches.all.interaction.gestures.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.Patch
 
@@ -10,7 +12,7 @@ import app.revanced.patcher.patch.annotations.Patch
 @Name("Predictive back gesture")
 @Description("Enables the predictive back gesture introduced on Android 13.")
 class PredictiveBackGesturePatch : ResourcePatch {
-    override fun execute(context: ResourceContext) {
+    override fun execute(context: ResourceContext): PatchResult {
         context.xmlEditor["AndroidManifest.xml"].use { editor ->
             val document = editor.file
 
@@ -23,6 +25,8 @@ class PredictiveBackGesturePatch : ResourcePatch {
 
             }
         }
+
+        return PatchResultSuccess()
     }
 
     private companion object {

src/main/kotlin/app/revanced/patches/all/misc/debugging/patch/EnableAndroidDebuggingPatch.kt

@@ -9,9 +9,9 @@ import org.w3c.dom.Element
 
 @Patch(false)
 @Name("Enable android debugging")
-@Description("Enables Android debugging capabilities. This can slow down the app.")
+@Description("Enables Android debugging capabilities.")
 class EnableAndroidDebuggingPatch : ResourcePatch {
-    override fun execute(context: ResourceContext) {
+    override fun execute(context: ResourceContext): PatchResult {
         context.xmlEditor["AndroidManifest.xml"].use { dom ->
             val applicationNode = dom
                 .file
@@ -21,6 +21,8 @@ class EnableAndroidDebuggingPatch : ResourcePatch {
             // set application as debuggable
             applicationNode.setAttribute("android:debuggable", "true")
         }
+
+        return PatchResultSuccess()
     }
 
 }

src/main/kotlin/app/revanced/patches/all/misc/network/patch/OverrideCertificatePinningPatch.kt

@@ -1,75 +0,0 @@
-package app.revanced.patches.all.misc.network.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.all.misc.debugging.patch.EnableAndroidDebuggingPatch
-import org.w3c.dom.Element
-import java.io.File
-
-@Patch(false)
-@Name("Override certificate pinning")
-@Description("Overrides certificate pinning, allowing to inspect traffic via a proxy.")
-@DependsOn([EnableAndroidDebuggingPatch::class])
-class OverrideCertificatePinningPatch : ResourcePatch {
-    override fun execute(context: ResourceContext) {
-        val resXmlDirectory = context["res/xml"]
-
-        // Add android:networkSecurityConfig="@xml/network_security_config" and the "networkSecurityConfig" attribute if it does not exist.
-        context.xmlEditor["AndroidManifest.xml"].use { editor ->
-            val document = editor.file
-            val applicationNode = document.getElementsByTagName("application").item(0) as Element
-
-            if (!applicationNode.hasAttribute("networkSecurityConfig")) {
-                document.createAttribute("android:networkSecurityConfig")
-                    .apply { value = "@xml/network_security_config" }.let(applicationNode.attributes::setNamedItem)
-            }
-        }
-
-        // In case the file does not exist create the "network_security_config.xml" file.
-        File(resXmlDirectory, "network_security_config.xml").apply {
-            if (!exists()) {
-                createNewFile()
-                writeText(
-                    """
-                    <?xml version="1.0" encoding="utf-8"?>
-                    <network-security-config>
-                        <base-config cleartextTrafficPermitted="true">
-                            <trust-anchors>
-                                <certificates src="system" />
-                                <certificates
-                                    src="user"
-                                    overridePins="true" />
-                            </trust-anchors>
-                        </base-config>
-                        <debug-overrides>
-                            <trust-anchors>
-                                <certificates src="system" />
-                                <certificates
-                                    src="user"
-                                    overridePins="true" />
-                            </trust-anchors>
-                        </debug-overrides>
-                    </network-security-config>
-                    """
-                )
-            } else {
-                // If the file already exists.
-                readText().let { text ->
-                    if (!text.contains("<certificates src=\"user\" />")) {
-                        writeText(
-                            text.replace(
-                                "<trust-anchors>",
-                                "<trust-anchors>\n<certificates src=\"user\" overridePins=\"true\" />\n<certificates src=\"system\" />"
-                            )
-                        )
-                    }
-                }
-
-            }
-        }
-    }
-}

src/main/kotlin/app/revanced/patches/all/misc/packagename/patch/ChangePackageNamePatch.kt

@@ -9,32 +9,30 @@ import org.w3c.dom.Element
 
 @Patch(false)
 @Name("Change package name")
-@Description("Changes the package name. Appends \".revanced\" to the package name by default.")
+@Description("Changes the package name.")
 class ChangePackageNamePatch : ResourcePatch {
-    override fun execute(context: ResourceContext) {
+    override fun execute(context: ResourceContext): PatchResult {
-        val packageNameToUse = packageName ?: getDefaultPackageName(context)
+        packageName?.let { packageName ->
+            val packageNameRegex = Regex("^[a-z]\\w*(\\.[a-z]\\w*)+\$")
+            if (!packageName.matches(packageNameRegex))
+                return PatchResultError("Invalid package name")
 
-        val packageNameRegex = Regex("^[a-z]\\w*(\\.[a-z]\\w*)+\$")
+            var originalPackageName: String
-        if (!packageNameToUse.matches(packageNameRegex))
+            context.xmlEditor["AndroidManifest.xml"].use { editor ->
-            throw PatchException("Invalid package name")
+                val manifest = editor.file.getElementsByTagName("manifest").item(0) as Element
+                originalPackageName = manifest.getAttribute("package")
+            }
 
-        val originalPackageName = getOriginalPackageName(context)
+            if (!originalPackageName.matches(packageNameRegex))
+                return PatchResultError("Failed to get the original package name")
 
-        context["AndroidManifest.xml"].apply {
+            context["AndroidManifest.xml"].apply {
-            readText().replace(originalPackageName, packageNameToUse).let(::writeText)
+                readText().replace(originalPackageName, packageName).let(::writeText)
-        }
+            }
-    }
 
-    private fun getDefaultPackageName(context: ResourceContext): String {
+        } ?: return PatchResultError("No package name provided")
-        val originalPackageName = getOriginalPackageName(context)
-        return "$originalPackageName.revanced"
-    }
 
-    private fun getOriginalPackageName(context: ResourceContext): String {
+        return PatchResultSuccess()
-        context.xmlEditor["AndroidManifest.xml"].use { editor ->
-            val manifest = editor.file.getElementsByTagName("manifest").item(0) as Element
-            return manifest.getAttribute("package")
-        }
     }
 
     companion object : OptionsContainer() {
@@ -43,7 +41,7 @@ class ChangePackageNamePatch : ResourcePatch {
                 key = "packageName",
                 default = null,
                 title = "Package name",
-                description = "The name of the package to rename the app to.",
+                description = "The name of the package to rename of the app.",
             )
         )
     }

src/main/kotlin/app/revanced/patches/all/screencapture/removerestriction/bytecode/patch/RemoveCaptureRestrictionPatch.kt

@@ -7,20 +7,17 @@ import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.annotations.RequiresIntegrations
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.all.screencapture.removerestriction.resource.patch.RemoveCaptureRestrictionResourcePatch
-import app.revanced.util.patch.AbstractTransformInstructionsPatch
+import app.revanced.util.patch.*
-import app.revanced.util.patch.IMethodCall
+import org.jf.dexlib2.iface.ClassDef
-import app.revanced.util.patch.Instruction35cInfo
+import org.jf.dexlib2.iface.Method
-import app.revanced.util.patch.filterMapInstruction35c
+import org.jf.dexlib2.iface.instruction.Instruction
-import com.android.tools.smali.dexlib2.iface.ClassDef
-import com.android.tools.smali.dexlib2.iface.Method
-import com.android.tools.smali.dexlib2.iface.instruction.Instruction
 
 @Patch(false)
 @Name("Remove screen capture restriction")
 @Description("Removes the restriction of capturing audio from apps that normally wouldn't allow it.")
 @DependsOn([RemoveCaptureRestrictionResourcePatch::class])
 @RequiresIntegrations
-class RemoveCaptureRestrictionPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
+internal class RemoveCaptureRestrictionPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
     // Information about method calls we want to replace
     enum class MethodCall(
         override val definedClassName: String,

src/main/kotlin/app/revanced/patches/all/screencapture/removerestriction/resource/patch/RemoveCaptureRestrictionResourcePatch.kt

@@ -2,12 +2,14 @@ package app.revanced.patches.all.screencapture.removerestriction.resource.patch
 
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import org.w3c.dom.Element
 
 @Description("Sets allowAudioPlaybackCapture in manifest to true.")
 internal class RemoveCaptureRestrictionResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext) {
+    override fun execute(context: ResourceContext): PatchResult {
         // create an xml editor instance
         context.xmlEditor["AndroidManifest.xml"].use { dom ->
             // get the application node
@@ -19,5 +21,7 @@ internal class RemoveCaptureRestrictionResourcePatch : ResourcePatch {
             // set allowAudioPlaybackCapture attribute to true
             applicationNode.setAttribute("android:allowAudioPlaybackCapture", "true")
         }
+
+        return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/all/screenshot/removerestriction/patch/RemoveScreenshotRestrictionPatch.kt

@@ -5,19 +5,17 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.annotations.RequiresIntegrations
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.util.patch.AbstractTransformInstructionsPatch
+import app.revanced.util.patch.*
-import app.revanced.util.patch.IMethodCall
+import org.jf.dexlib2.iface.ClassDef
-import app.revanced.util.patch.Instruction35cInfo
+import org.jf.dexlib2.iface.Method
-import app.revanced.util.patch.filterMapInstruction35c
+import org.jf.dexlib2.iface.instruction.Instruction
-import com.android.tools.smali.dexlib2.iface.ClassDef
+import java.util.*
-import com.android.tools.smali.dexlib2.iface.Method
-import com.android.tools.smali.dexlib2.iface.instruction.Instruction
 
 @Patch(false)
 @Name("Remove screenshot restriction")
 @Description("Removes the restriction of taking screenshots in apps that normally wouldn't allow it.")
 @RequiresIntegrations
-class RemoveScreenshotRestrictionPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
+internal class RemoveScreenshotRestrictionPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
 
     private companion object {
         const val INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX =

src/main/kotlin/app/revanced/patches/backdrops/misc/pro/fingerprints/ProUnlockFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.backdrops.misc.pro.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.Opcode
 
 object ProUnlockFingerprint : MethodFingerprint(
     opcodes = listOf(

src/main/kotlin/app/revanced/patches/backdrops/misc/pro/patch/ProUnlockPatch.kt

@@ -1,16 +1,18 @@
 package app.revanced.patches.backdrops.misc.pro.patch
 
-import app.revanced.extensions.exception
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.backdrops.misc.pro.annotations.ProUnlockCompatibility
 import app.revanced.patches.backdrops.misc.pro.fingerprints.ProUnlockFingerprint
-import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 
 @Patch
 @Name("Pro unlock")
@@ -19,7 +21,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 class ProUnlockPatch : BytecodePatch(
     listOf(ProUnlockFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
         ProUnlockFingerprint.result?.let { result ->
             val registerIndex = result.scanResult.patternScanResult!!.endIndex - 1
 
@@ -33,6 +35,8 @@ class ProUnlockPatch : BytecodePatch(
                 )
             }
 
-        } ?: throw ProUnlockFingerprint.exception
+        } ?: return ProUnlockFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/candylinkvpn/patch/UnlockProPatch.kt

@@ -1,11 +1,13 @@
 package app.revanced.patches.candylinkvpn.patch
 
-import app.revanced.extensions.exception
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.candylinkvpn.annotations.UnlockProCompatibility
 import app.revanced.patches.candylinkvpn.fingerprints.IsPremiumPurchasedFingerprint
@@ -17,13 +19,15 @@ import app.revanced.patches.candylinkvpn.fingerprints.IsPremiumPurchasedFingerpr
 class UnlockProPatch : BytecodePatch(
     listOf(IsPremiumPurchasedFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
         IsPremiumPurchasedFingerprint.result?.mutableMethod?.addInstructions(
             0,
             """
                const/4 v0, 0x1
                return v0
             """
-        ) ?: throw IsPremiumPurchasedFingerprint.exception
+        ) ?: return IsPremiumPurchasedFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/duolingo/unlocksuper/fingerprints/IsUserSuperMethodFingerprint.kt

@@ -1,14 +0,0 @@
-package app.revanced.patches.duolingo.unlocksuper.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-object IsUserSuperMethodFingerprint : MethodFingerprint(
-    returnType = "Ljava/lang/Object",
-    parameters = listOf("Ljava/lang/Object"),
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    strings = listOf("user"),
-    opcodes = listOf(Opcode.IGET_BOOLEAN),
-)

src/main/kotlin/app/revanced/patches/duolingo/unlocksuper/fingerprints/UserSerializationMethodFingerprint.kt

@@ -1,20 +0,0 @@
-package app.revanced.patches.duolingo.unlocksuper.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-object UserSerializationMethodFingerprint : MethodFingerprint(
-    returnType = "V",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
-    strings = listOf(
-        "betaStatus",
-        "coachOutfit",
-        "globalAmbassadorStatus",
-    ),
-    opcodes = listOf(
-        Opcode.MOVE_FROM16,
-        Opcode.IPUT_BOOLEAN,
-    ),
-)

src/main/kotlin/app/revanced/patches/duolingo/unlocksuper/patch/UnlockDuolingoSuperPatch.kt

@@ -1,64 +0,0 @@
-package app.revanced.patches.duolingo.unlocksuper.patch
-
-import app.revanced.extensions.exception
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Package
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.getInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchException
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.duolingo.unlocksuper.fingerprints.IsUserSuperMethodFingerprint
-import app.revanced.patches.duolingo.unlocksuper.fingerprints.UserSerializationMethodFingerprint
-import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction22c
-import com.android.tools.smali.dexlib2.iface.reference.Reference
-
-@Patch
-@Name("Unlock Duolingo Super")
-@Description("Unlocks Duolingo Super features.")
-@Compatibility([Package("com.duolingo")])
-class UnlockDuolingoSuperPatch : BytecodePatch(
-    listOf(UserSerializationMethodFingerprint, IsUserSuperMethodFingerprint)
-) {
-
-    /* First find the reference to the isUserSuper field, then patch the instruction that assigns it to false.
-    * This strategy is used because the method that sets the isUserSuper field is difficult to fingerprint reliably.
-    */
-    override fun execute(context: BytecodeContext) {
-        // Find the reference to the isUserSuper field.
-        val isUserSuperReference = IsUserSuperMethodFingerprint
-            .result
-            ?.mutableMethod
-            ?.getInstructions()
-            ?.filterIsInstance<BuilderInstruction22c>()
-            ?.firstOrNull { it.opcode == Opcode.IGET_BOOLEAN }
-            ?.reference
-            ?: throw IsUserSuperMethodFingerprint.exception
-
-        // Patch the instruction that assigns isUserSuper to true.
-        UserSerializationMethodFingerprint
-            .result
-            ?.mutableMethod
-            ?.apply {
-                replaceInstructions(
-                    indexOfReference(isUserSuperReference) - 1,
-                    "const/4 v2, 0x1"
-                )
-            }
-            ?: throw UserSerializationMethodFingerprint.exception
-    }
-
-    private companion object {
-        private fun MutableMethod.indexOfReference(reference: Reference) = getInstructions()
-            .filterIsInstance<BuilderInstruction22c>()
-            .filter { it.opcode == Opcode.IPUT_BOOLEAN }.indexOfFirst { it.reference == reference }.let {
-                if (it == -1) throw PatchException("Could not find index of instruction with supplied reference.")
-                else it
-            }
-    }
-}

src/main/kotlin/app/revanced/patches/finanzonline/detection/bootloader/fingerprints/BootStateFingerprint.kt

@@ -1,8 +1,8 @@
 package app.revanced.patches.finanzonline.detection.bootloader.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.Opcode
 
 // Located @ at.gv.bmf.bmf2go.taxequalization.tools.utils.AttestationHelper#isBootStateOk (3.0.1)
 object BootStateFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/finanzonline/detection/bootloader/fingerprints/CreateKeyFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.finanzonline.detection.bootloader.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags
 
 // Located @ at.gv.bmf.bmf2go.taxequalization.tools.utils.AttestationHelper#createKey (3.0.1)
 object CreateKeyFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/finanzonline/detection/bootloader/patch/BootloaderDetectionPatch.kt

@@ -1,11 +1,13 @@
 package app.revanced.patches.finanzonline.detection.bootloader.patch
 
-import app.revanced.extensions.exception
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.finanzonline.detection.bootloader.fingerprints.BootStateFingerprint
 import app.revanced.patches.finanzonline.detection.bootloader.fingerprints.CreateKeyFingerprint
@@ -19,7 +21,7 @@ import app.revanced.patches.finanzonline.detection.shared.annotations.DetectionC
 class BootloaderDetectionPatch : BytecodePatch(
     listOf(CreateKeyFingerprint, BootStateFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
         arrayOf(CreateKeyFingerprint, BootStateFingerprint).forEach { fingerprint ->
             fingerprint.result?.mutableMethod?.addInstructions(
                 0,
@@ -27,7 +29,9 @@ class BootloaderDetectionPatch : BytecodePatch(
                         const/4 v0, 0x1
                         return v0
                 """
-            ) ?: throw fingerprint.exception
+            ) ?: return fingerprint.toErrorResult()
         }
+
+        return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/finanzonline/detection/root/fingerprints/RootDetectionFingerprint.kt

@@ -2,8 +2,8 @@ package app.revanced.patches.finanzonline.detection.root.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.Opcode
 
 // Located @ at.gv.bmf.bmf2go.taxequalization.tools.utils.RootDetection#isRooted (3.0.1)
 object RootDetectionFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/finanzonline/detection/root/patch/RootDetectionPatch.kt

@@ -1,11 +1,13 @@
 package app.revanced.patches.finanzonline.detection.root.patch
 
-import app.revanced.extensions.exception
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.finanzonline.detection.root.fingerprints.RootDetectionFingerprint
 import app.revanced.patches.finanzonline.detection.shared.annotations.DetectionCompatibility
@@ -17,13 +19,15 @@ import app.revanced.patches.finanzonline.detection.shared.annotations.DetectionC
 class RootDetectionPatch : BytecodePatch(
     listOf(RootDetectionFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
         RootDetectionFingerprint.result?.mutableMethod?.addInstructions(
             0,
             """
                 sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
                 return-object v0
             """
-        ) ?: throw RootDetectionFingerprint.exception
+        ) ?: return RootDetectionFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/googlerecorder/restrictions/patch/RemoveDeviceRestrictions.kt

@@ -1,6 +1,6 @@
 package app.revanced.patches.googlerecorder.restrictions.patch
 
-import app.revanced.extensions.exception
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
@@ -10,9 +10,11 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.removeInstructions
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.googlerecorder.restrictions.fingerprints.OnApplicationCreateFingerprint
-import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 
 @Patch
 @Name("Remove device restrictions")
@@ -21,7 +23,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 class RemoveDeviceRestrictions : BytecodePatch(
     listOf(OnApplicationCreateFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
         OnApplicationCreateFingerprint.result?.let {
             val featureStringIndex = it.scanResult.stringsScanResult!!.matches.first().index
 
@@ -34,6 +36,8 @@ class RemoveDeviceRestrictions : BytecodePatch(
                 // Override "isPixelDevice()" to return true.
                 addInstruction(featureStringIndex, "const/4 v$featureAvailableRegister, 0x1")
             }
-        } ?: throw OnApplicationCreateFingerprint.exception
+        } ?: return OnApplicationCreateFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/hexeditor/ad/patch/HexEditorAdsPatch.kt

@@ -5,6 +5,8 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstructions
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.hexeditor.ad.annotations.HexEditorAdsCompatibility
 import app.revanced.patches.hexeditor.ad.fingerprints.PrimaryAdsFingerprint
@@ -18,7 +20,7 @@ class HexEditorAdsPatch : BytecodePatch(
         PrimaryAdsFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
         val method = PrimaryAdsFingerprint.result!!.mutableMethod
         
         method.replaceInstructions(
@@ -28,5 +30,7 @@ class HexEditorAdsPatch : BytecodePatch(
                 return v0
             """
         )
+
+        return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/iconpackstudio/misc/pro/patch/UnlockProPatch.kt

@@ -5,6 +5,8 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.iconpackstudio.misc.pro.annotations.UnlockProCompatibility
 import app.revanced.patches.iconpackstudio.misc.pro.fingerprints.CheckProFingerprint
@@ -18,7 +20,7 @@ class UnlockProPatch : BytecodePatch(
         CheckProFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
         val method = CheckProFingerprint.result!!.mutableMethod
         method.addInstructions(
             0,
@@ -27,5 +29,7 @@ class UnlockProPatch : BytecodePatch(
                 return v0
             """
         )
+        
+        return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/idaustria/detection/root/fingerprints/RootDetectionFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.idaustria.detection.root.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags
 
 object RootDetectionFingerprint : MethodFingerprint(
     "V",

src/main/kotlin/app/revanced/patches/idaustria/detection/root/patch/RootDetectionPatch.kt

@@ -5,6 +5,8 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.idaustria.detection.root.fingerprints.RootDetectionFingerprint
 import app.revanced.patches.idaustria.detection.shared.annotations.DetectionCompatibility
@@ -16,6 +18,8 @@ import app.revanced.patches.idaustria.detection.shared.annotations.DetectionComp
 class RootDetectionPatch : BytecodePatch(
     listOf(RootDetectionFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) =
+    override fun execute(context: BytecodeContext): PatchResult {
         RootDetectionFingerprint.result!!.mutableMethod.addInstruction(0, "return-void")
+        return PatchResultSuccess()
+    }
 }

src/main/kotlin/app/revanced/patches/idaustria/detection/signature/fingerprints/SpoofSignatureFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.idaustria.detection.signature.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags
 
 object SpoofSignatureFingerprint : MethodFingerprint(
     "L",

src/main/kotlin/app/revanced/patches/idaustria/detection/signature/patch/SpoofSignaturePatch.kt

@@ -5,6 +5,8 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.idaustria.detection.shared.annotations.DetectionCompatibility
 import app.revanced.patches.idaustria.detection.signature.fingerprints.SpoofSignatureFingerprint
@@ -30,7 +32,7 @@ class SpoofSignaturePatch : BytecodePatch(
                 "bf42c121d620ddfb7914f7a95c713d9e1c1b7bdb4a03d618e40cf7e9e235c0b5687e03b7ab3,publicExponent=10001}"
     }
 
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
         SpoofSignatureFingerprint.result!!.mutableMethod.addInstructions(
             0,
             """
@@ -38,5 +40,6 @@ class SpoofSignaturePatch : BytecodePatch(
                 return-object v0 
             """
         )
+        return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/inshorts/ad/patch/InshortsAdsPatch.kt

@@ -1,11 +1,13 @@
 package app.revanced.patches.inshorts.ad.patch
 
-import app.revanced.extensions.exception
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.inshorts.ad.annotations.HideAdsCompatibility
 import app.revanced.patches.inshorts.ad.fingerprints.InshortsAdsFingerprint
@@ -17,7 +19,7 @@ import app.revanced.patches.inshorts.ad.fingerprints.InshortsAdsFingerprint
 class HideAdsPatch : BytecodePatch(
     listOf(InshortsAdsFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
         InshortsAdsFingerprint.result?.let { result ->
             result.apply {
                 mutableMethod.addInstruction(
@@ -27,6 +29,8 @@ class HideAdsPatch : BytecodePatch(
                     """
                 )
             }
-        } ?: throw InshortsAdsFingerprint.exception
+        } ?: return InshortsAdsFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ShowAdFingerprint.kt

@@ -2,8 +2,8 @@ package app.revanced.patches.instagram.patches.ads.timeline.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.Opcode
 
 object ShowAdFingerprint : MethodFingerprint(
     "Z",

src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/GenericMediaAdFingerprint.kt

@@ -1,6 +1,6 @@
 package app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads
 
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.Opcode
 
 object GenericMediaAdFingerprint : MediaAdFingerprint(
     opcodes = listOf(

src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/MediaAdFingerprint.kt

@@ -2,10 +2,10 @@ package app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.iface.ClassDef
+import org.jf.dexlib2.iface.ClassDef
-import com.android.tools.smali.dexlib2.iface.Method
+import org.jf.dexlib2.iface.Method
 
 abstract class MediaAdFingerprint(
     returnType: String? = "Z",

src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/PaidPartnershipAdFingerprint.kt

@@ -1,8 +1,8 @@
 package app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads
 
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+import org.jf.dexlib2.iface.reference.MethodReference
 
 object PaidPartnershipAdFingerprint : MediaAdFingerprint(
     "V",

src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/ShoppingAdFingerprint.kt

@@ -1,6 +1,6 @@
 package app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads
 
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.Opcode
 
 object ShoppingAdFingerprint : MediaAdFingerprint(
     opcodes = listOf(

src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/patch/HideTimelineAdsPatch.kt

@@ -1,6 +1,6 @@
 package app.revanced.patches.instagram.patches.ads.timeline.patch
 
-import app.revanced.extensions.exception
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.*
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
@@ -8,6 +8,8 @@ import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.MediaFingerprint
@@ -16,8 +18,8 @@ import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads.Gene
 import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads.MediaAdFingerprint
 import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads.PaidPartnershipAdFingerprint
 import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads.ShoppingAdFingerprint
-import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
+import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
-import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 
 @Patch
 @Name("Hide timeline ads")
@@ -30,19 +32,19 @@ class HideTimelineAdsPatch : BytecodePatch(
         PaidPartnershipAdFingerprint // Unlike the other ads this one is resolved from all classes.
     )
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
         // region Resolve required methods to check for ads.
 
-        ShowAdFingerprint.result ?: throw ShowAdFingerprint.exception
+        ShowAdFingerprint.result ?: return ShowAdFingerprint.toErrorResult()
 
-        PaidPartnershipAdFingerprint.result ?: throw PaidPartnershipAdFingerprint.exception
+        PaidPartnershipAdFingerprint.result ?: return PaidPartnershipAdFingerprint.toErrorResult()
 
         MediaFingerprint.result?.let {
             GenericMediaAdFingerprint.resolve(context, it.classDef)
             ShoppingAdFingerprint.resolve(context, it.classDef)
 
             return@let
-        } ?: throw MediaFingerprint.exception
+        } ?: return MediaFingerprint.toErrorResult()
 
         // endregion
 
@@ -97,5 +99,7 @@ class HideTimelineAdsPatch : BytecodePatch(
 
             // endregion
         }
+
+        return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/irplus/ad/fingerprints/IrplusAdsFingerprint.kt

@@ -2,7 +2,7 @@ package app.revanced.patches.irplus.ad.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags
 
 object IrplusAdsFingerprint : MethodFingerprint(
     "V",

src/main/kotlin/app/revanced/patches/irplus/ad/patch/IrplusAdsPatch.kt

@@ -5,6 +5,8 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.irplus.ad.annotations.IrplusAdsCompatibility
 import app.revanced.patches.irplus.ad.fingerprints.IrplusAdsFingerprint
@@ -17,11 +19,13 @@ import app.revanced.patches.irplus.ad.fingerprints.IrplusAdsFingerprint
 class IrplusAdsPatch : BytecodePatch(
     listOf(IrplusAdsFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
         val method = IrplusAdsFingerprint.result!!.mutableMethod
 
         // By overwriting the second parameter of the method,
         // the view which holds the advertisement is removed.
         method.addInstruction(0, "const/4 p2, 0x0")
+
+        return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/lightroom/misc/login/annotations/DisableMandatoryLoginCompatibility.kt

@@ -1,8 +0,0 @@
-package app.revanced.patches.lightroom.misc.login.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.adobe.lrmobile",)])
-@Target(AnnotationTarget.CLASS)
-internal annotation class DisableMandatoryLoginCompatibility

src/main/kotlin/app/revanced/patches/lightroom/misc/login/fingerprint/IsLoggedInFingerprint.kt

@@ -1,19 +0,0 @@
-package app.revanced.patches.lightroom.misc.login.fingerprint
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-object IsLoggedInFingerprint : MethodFingerprint(
-    returnType = "Z",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC or AccessFlags.FINAL,
-    opcodes = listOf(
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.SGET_OBJECT,
-        Opcode.IF_NE,
-        Opcode.CONST_4,
-        Opcode.GOTO
-    )
-)

src/main/kotlin/app/revanced/patches/lightroom/misc/login/patch/DisableMandatoryLoginPatch.kt

@@ -1,23 +0,0 @@
-package app.revanced.patches.lightroom.misc.login.patch
-
-import app.revanced.extensions.exception
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.lightroom.misc.login.annotations.DisableMandatoryLoginCompatibility
-import app.revanced.patches.lightroom.misc.login.fingerprint.IsLoggedInFingerprint
-
-@Patch
-@Name("Disable mandatory login")
-@DisableMandatoryLoginCompatibility
-class DisableMandatoryLoginPatch : BytecodePatch(listOf(IsLoggedInFingerprint)) {
-    override fun execute(context: BytecodeContext) {
-        IsLoggedInFingerprint.result?.mutableMethod?.apply {
-            val index = implementation!!.instructions.lastIndex - 1
-            // Set isLoggedIn = true.
-            replaceInstruction(index, "const/4 v0, 0x1")
-        } ?: throw IsLoggedInFingerprint.exception
-    }
-}

src/main/kotlin/app/revanced/patches/lightroom/misc/premium/annotations/UnlockPremiumCompatibility.kt

@@ -1,8 +0,0 @@
-package app.revanced.patches.lightroom.misc.premium.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.adobe.lrmobile")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class UnlockPremiumCompatibility

src/main/kotlin/app/revanced/patches/lightroom/misc/premium/fingerprint/HasPurchasedFingerprint.kt

@@ -1,18 +0,0 @@
-package app.revanced.patches.lightroom.misc.premium.fingerprint
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-object HasPurchasedFingerprint : MethodFingerprint(
-    returnType = "Z",
-    accessFlags = AccessFlags.PRIVATE or AccessFlags.FINAL,
-    strings = listOf("isPurchaseDoneRecently = true, access platform profile present? = "),
-    opcodes = listOf(
-        Opcode.SGET_OBJECT,
-        Opcode.CONST_4,
-        Opcode.CONST_4,
-        Opcode.CONST_4,
-    )
-)

src/main/kotlin/app/revanced/patches/lightroom/misc/premium/patch/UnlockPremiumPatch.kt

@@ -1,23 +0,0 @@
-package app.revanced.patches.lightroom.misc.premium.patch
-
-import app.revanced.extensions.exception
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.lightroom.misc.premium.annotations.UnlockPremiumCompatibility
-import app.revanced.patches.lightroom.misc.premium.fingerprint.HasPurchasedFingerprint
-
-@Patch
-@Name("Unlock premium")
-@Description("Unlocks premium features.")
-@UnlockPremiumCompatibility
-class UnlockPremiumPatch : BytecodePatch(listOf(HasPurchasedFingerprint)) {
-    override fun execute(context: BytecodeContext) {
-         // Set hasPremium = true.
-        HasPurchasedFingerprint.result?.mutableMethod?.replaceInstruction(2, "const/4 v2, 0x1")
-            ?: throw HasPurchasedFingerprint.exception
-    }
-}

src/main/kotlin/app/revanced/patches/memegenerator/detection/license/fingerprint/LicenseValidationFingerprint.kt

@@ -2,8 +2,8 @@ package app.revanced.patches.memegenerator.detection.license.fingerprint
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.Opcode
 
 object LicenseValidationFingerprint : MethodFingerprint(
     returnType = "Z",

src/main/kotlin/app/revanced/patches/memegenerator/detection/license/patch/LicenseValidationPatch.kt

@@ -1,17 +1,19 @@
 package app.revanced.patches.memegenerator.detection.license.patch
 
-import app.revanced.extensions.exception
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstructions
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patches.memegenerator.detection.license.fingerprint.LicenseValidationFingerprint
 
 @Description("Disables Firebase license validation.")
 class LicenseValidationPatch : BytecodePatch(
     listOf(LicenseValidationFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
         LicenseValidationFingerprint.result?.apply {
             mutableMethod.replaceInstructions(
                 0,
@@ -20,6 +22,8 @@ class LicenseValidationPatch : BytecodePatch(
                     return  p0
                 """
             )
-        } ?: throw LicenseValidationFingerprint.exception
+        } ?: throw LicenseValidationFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/memegenerator/detection/signature/fingerprint/VerifySignatureFingerprint.kt

@@ -3,8 +3,8 @@ package app.revanced.patches.memegenerator.detection.signature.fingerprint
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.Opcode
 
 @FuzzyPatternScanMethod(2)
 object VerifySignatureFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/memegenerator/detection/signature/patch/SignatureVerificationPatch.kt

@@ -1,17 +1,19 @@
 package app.revanced.patches.memegenerator.detection.signature.patch
 
-import app.revanced.extensions.exception
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstructions
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patches.memegenerator.detection.signature.fingerprint.VerifySignatureFingerprint
 
 @Description("Disables detection of incorrect signature.")
 class SignatureVerificationPatch : BytecodePatch(
     listOf(VerifySignatureFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
         VerifySignatureFingerprint.result?.apply {
             mutableMethod.replaceInstructions(
                 0,
@@ -20,6 +22,8 @@ class SignatureVerificationPatch : BytecodePatch(
                     return  p0
                 """
             )
-        } ?: throw VerifySignatureFingerprint.exception
+        } ?: throw VerifySignatureFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/memegenerator/misc/pro/fingerprint/IsFreeVersionFingerprint.kt

@@ -2,8 +2,8 @@ package app.revanced.patches.memegenerator.misc.pro.fingerprint
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.Opcode
 
 object IsFreeVersionFingerprint : MethodFingerprint(
     returnType = "Ljava/lang/Boolean;",

src/main/kotlin/app/revanced/patches/memegenerator/misc/pro/patch/UnlockProVersionPatch.kt

@@ -1,11 +1,13 @@
 package app.revanced.patches.memegenerator.misc.pro.patch
 
-import app.revanced.extensions.exception
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstructions
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.memegenerator.detection.license.patch.LicenseValidationPatch
@@ -26,7 +28,7 @@ class UnlockProVersionPatch : BytecodePatch(
         IsFreeVersionFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
         IsFreeVersionFingerprint.result?.apply {
             mutableMethod.replaceInstructions(0,
                 """
@@ -34,6 +36,8 @@ class UnlockProVersionPatch : BytecodePatch(
                     return-object p0
                 """
             )
-        } ?: throw IsFreeVersionFingerprint.exception
+        } ?: throw IsFreeVersionFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/messenger/ads/inbox/fingerprints/LoadInboxAdsFingerprint.kt

@@ -2,7 +2,7 @@ package app.revanced.patches.messenger.ads.inbox.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags
 
 object LoadInboxAdsFingerprint : MethodFingerprint(
     returnType = "V",

src/main/kotlin/app/revanced/patches/messenger/ads/inbox/patch/HideInboxAdsPatch.kt

@@ -1,10 +1,12 @@
 package app.revanced.patches.messenger.ads.inbox.patch
 
-import app.revanced.extensions.exception
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.*
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.messenger.ads.inbox.fingerprints.LoadInboxAdsFingerprint
 
@@ -15,10 +17,12 @@ import app.revanced.patches.messenger.ads.inbox.fingerprints.LoadInboxAdsFingerp
 class HideInboxAdsPatch : BytecodePatch(
     listOf(LoadInboxAdsFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
         LoadInboxAdsFingerprint.result?.mutableMethod?.apply {
             this.replaceInstruction(0, "return-void")
-        } ?: throw LoadInboxAdsFingerprint.exception
+        } ?: return LoadInboxAdsFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
     }
 }
 

src/main/kotlin/app/revanced/patches/messenger/inputfield/fingerprints/SendTypingIndicatorFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.messenger.inputfield.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.dexbacked.value.DexBackedStringEncodedValue
+import org.jf.dexlib2.dexbacked.value.DexBackedStringEncodedValue
 
 object SendTypingIndicatorFingerprint : MethodFingerprint(
     returnType = "V",

src/main/kotlin/app/revanced/patches/messenger/inputfield/fingerprints/SwitchMessangeInputEmojiButtonFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.messenger.inputfield.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.Opcode
 
 object SwitchMessangeInputEmojiButtonFingerprint : MethodFingerprint(
     returnType = "V",

src/main/kotlin/app/revanced/patches/messenger/inputfield/patch/DisableSwitchingEmojiToStickerInMessageInputField.kt

@@ -1,21 +1,23 @@
 package app.revanced.patches.messenger.inputfield.patch
 
-import app.revanced.extensions.exception
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.*
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.messenger.inputfield.fingerprints.SwitchMessangeInputEmojiButtonFingerprint
-import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 
 @Patch
 @Name("Disable switching emoji to sticker in message input field")
 @Description("Disables switching from emoji to sticker search mode in message input field")
 @Compatibility([Package("com.facebook.orca")])
 class DisableSwitchingEmojiToStickerInMessageInputField : BytecodePatch(listOf(SwitchMessangeInputEmojiButtonFingerprint)) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
         SwitchMessangeInputEmojiButtonFingerprint.result?.let {
             val setStringIndex = it.scanResult.patternScanResult!!.startIndex + 2
 
@@ -27,6 +29,8 @@ class DisableSwitchingEmojiToStickerInMessageInputField : BytecodePatch(listOf(S
                     "const-string v$targetRegister, \"expression\""
                 )
             }
-        } ?: throw SwitchMessangeInputEmojiButtonFingerprint.exception
+        } ?: throw SwitchMessangeInputEmojiButtonFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/messenger/inputfield/patch/DisableTypingIndicator.kt

@@ -1,6 +1,6 @@
 package app.revanced.patches.messenger.inputfield.patch
 
-import app.revanced.extensions.exception
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
@@ -8,6 +8,8 @@ import app.revanced.patcher.annotation.Package
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.messenger.inputfield.fingerprints.SendTypingIndicatorFingerprint
 
@@ -16,8 +18,10 @@ import app.revanced.patches.messenger.inputfield.fingerprints.SendTypingIndicato
 @Description("Disables the indicator while typing a message")
 @Compatibility([Package("com.facebook.orca")])
 class DisableTypingIndicator : BytecodePatch(listOf(SendTypingIndicatorFingerprint)) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
         SendTypingIndicatorFingerprint.result?.mutableMethod?.replaceInstruction(0, "return-void")
-            ?: throw SendTypingIndicatorFingerprint.exception
+            ?: throw SendTypingIndicatorFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/moneymanager/fingerprints/UnlockProFingerprint.kt

@@ -2,8 +2,8 @@ package app.revanced.patches.moneymanager.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.Opcode
 
 object UnlockProFingerprint : MethodFingerprint(
     "Z",

src/main/kotlin/app/revanced/patches/moneymanager/patch/UnlockProPatch.kt

@@ -5,6 +5,8 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.moneymanager.annotations.UnlockProCompatibility
 import app.revanced.patches.moneymanager.fingerprints.UnlockProFingerprint
@@ -16,7 +18,7 @@ import app.revanced.patches.moneymanager.fingerprints.UnlockProFingerprint
 class UnlockProPatch : BytecodePatch(
     listOf(UnlockProFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
        UnlockProFingerprint.result!!.mutableMethod.addInstructions(
             0,
             """
@@ -24,5 +26,6 @@ class UnlockProPatch : BytecodePatch(
                return v0 
             """
         )
+        return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/music/ad/video/fingerprints/ShowMusicVideoAdsConstructorFingerprint.kt

@@ -2,8 +2,8 @@ package app.revanced.patches.music.ad.video.fingerprints
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.Opcode
 
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
 object ShowMusicVideoAdsConstructorFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/music/ad/video/fingerprints/ShowMusicVideoAdsFingerprint.kt

@@ -2,8 +2,8 @@ package app.revanced.patches.music.ad.video.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.Opcode
 
 object ShowMusicVideoAdsFingerprint : MethodFingerprint(
     "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("Z"), listOf(

src/main/kotlin/app/revanced/patches/music/ad/video/patch/MusicVideoAdsPatch.kt

@@ -6,6 +6,8 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.music.ad.video.fingerprints.ShowMusicVideoAdsConstructorFingerprint
 import app.revanced.patches.music.ad.video.fingerprints.ShowMusicVideoAdsFingerprint
@@ -18,7 +20,7 @@ import app.revanced.patches.music.annotations.MusicCompatibility
 class MusicVideoAdsPatch : BytecodePatch(
     listOf(ShowMusicVideoAdsConstructorFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
         ShowMusicVideoAdsFingerprint.resolve(context, ShowMusicVideoAdsConstructorFingerprint.result!!.classDef)
 
         val result = ShowMusicVideoAdsFingerprint.result!!
@@ -29,5 +31,7 @@ class MusicVideoAdsPatch : BytecodePatch(
                 const/4 p1, 0x0
             """
         )
+
+        return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/music/audio/codecs/fingerprints/AllCodecsReferenceFingerprint.kt

@@ -3,8 +3,8 @@ package app.revanced.patches.music.audio.codecs.fingerprints
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.Opcode
 
 
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.

src/main/kotlin/app/revanced/patches/music/audio/codecs/fingerprints/CodecsLockFingerprint.kt

@@ -3,8 +3,8 @@ package app.revanced.patches.music.audio.codecs.fingerprints
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.Opcode
 
 
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.

src/main/kotlin/app/revanced/patches/music/audio/codecs/patch/CodecsUnlockPatch.kt

@@ -3,13 +3,16 @@ package app.revanced.patches.music.audio.codecs.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.data.toMethodWalker
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.toInstruction
 import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.audio.codecs.fingerprints.AllCodecsReferenceFingerprint
 import app.revanced.patches.music.audio.codecs.fingerprints.CodecsLockFingerprint
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.Opcode
 
 @Patch
 @Name("Codecs unlock")
@@ -20,7 +23,7 @@ class CodecsUnlockPatch : BytecodePatch(
         CodecsLockFingerprint, AllCodecsReferenceFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
         val codecsLockResult = CodecsLockFingerprint.result!!
 
         val implementation = codecsLockResult.mutableMethod.implementation!!
@@ -45,5 +48,7 @@ class CodecsUnlockPatch : BytecodePatch(
             instructionIndex,
             "invoke-static {}, ${allCodecsMethod.definingClass}->${allCodecsMethod.name}()Ljava/util/Set;".toInstruction()
         )
+
+        return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/fingerprints/AudioOnlyEnablerFingerprint.kt

@@ -2,14 +2,17 @@ package app.revanced.patches.music.audio.exclusiveaudio.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.Opcode
 
-object AllowExclusiveAudioPlaybackFingerprint: MethodFingerprint(
+object  AudioOnlyEnablerFingerprint: MethodFingerprint(
-    "Z",
+    "Z", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(
-    AccessFlags.PUBLIC or AccessFlags.FINAL,
+        Opcode.IGET_OBJECT,
-    listOf(),
+        Opcode.INVOKE_INTERFACE,
-    listOf(
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT_OBJECT,
         Opcode.INVOKE_VIRTUAL,
         Opcode.MOVE_RESULT_OBJECT,
         Opcode.CHECK_CAST,

src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/fingerprints/ExclusiveAudioFingerprint.kt

@@ -3,8 +3,8 @@ package app.revanced.patches.music.audio.exclusiveaudio.fingerprints
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.Opcode
 
 
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.

src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/patch/ExclusiveAudioPatch.kt

@@ -1,31 +1,29 @@
 package app.revanced.patches.music.audio.exclusiveaudio.patch
 
-import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.music.annotations.MusicCompatibility
-import app.revanced.patches.music.audio.exclusiveaudio.fingerprints.AllowExclusiveAudioPlaybackFingerprint
+import app.revanced.patches.music.audio.exclusiveaudio.fingerprints.AudioOnlyEnablerFingerprint
 
 @Patch
 @Name("Exclusive audio playback")
-@Description("Enables the option to play audio without video.")
+@Description("Enables the option to play music without video.")
 @MusicCompatibility
 class ExclusiveAudioPatch : BytecodePatch(
-    listOf(AllowExclusiveAudioPlaybackFingerprint)
+    listOf(AudioOnlyEnablerFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
-        AllowExclusiveAudioPlaybackFingerprint.result?.mutableMethod?.apply {
+        val method = AudioOnlyEnablerFingerprint.result!!.mutableMethod
-            addInstructions(
+        method.replaceInstruction(method.implementation!!.instructions.count() - 1, "const/4 v0, 0x1")
-                0,
+        method.addInstruction("return v0")
-            """
+
-                const/4 v0, 0x1
+        return PatchResultSuccess()
-                return v0
-            """
-            )
-        } ?: throw AllowExclusiveAudioPlaybackFingerprint.exception
     }
-}
+}

src/main/kotlin/app/revanced/patches/music/interaction/permanentrepeat/fingerprints/RepeatTrackFingerprint.kt

@@ -1,22 +0,0 @@
-package app.revanced.patches.music.interaction.permanentrepeat.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-object RepeatTrackFingerprint : MethodFingerprint(
-    "V",
-    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    listOf("L", "L"),
-    listOf(
-        Opcode.CHECK_CAST,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.SGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_NEZ
-    )
-)

src/main/kotlin/app/revanced/patches/music/interaction/permanentrepeat/patch/PermanentRepeatPatch.kt

@@ -1,36 +0,0 @@
-package app.revanced.patches.music.interaction.permanentrepeat.patch
-
-import app.revanced.extensions.exception
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.music.annotations.MusicCompatibility
-import app.revanced.patches.music.interaction.permanentrepeat.fingerprints.RepeatTrackFingerprint
-
-@Patch(false)
-@Name("Permanent repeat")
-@Description("Permanently remember your repeating preference even if the playlist ends or another track is played.")
-@MusicCompatibility
-class PermanentRepeatPatch : BytecodePatch(
-    listOf(RepeatTrackFingerprint)
-) {
-    override fun execute(context: BytecodeContext) {
-        RepeatTrackFingerprint.result?.let {
-            val startIndex = it.scanResult.patternScanResult!!.endIndex
-            val repeatIndex = startIndex + 3
-
-            it.mutableMethod.apply {
-                addInstructionsWithLabels(
-                    startIndex,
-                    "goto :repeat",
-                    ExternalLabel("repeat", getInstruction(repeatIndex))
-                )
-            }
-        } ?: throw RepeatTrackFingerprint.exception
-    }
-}

src/main/kotlin/app/revanced/patches/music/interaction/permanentshuffle/fingerprints/DisableShuffleFingerprint.kt

@@ -1,20 +0,0 @@
-package app.revanced.patches.music.interaction.permanentshuffle.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-object DisableShuffleFingerprint : MethodFingerprint(
-    "V",
-    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    listOf(),
-    listOf(
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.SGET_OBJECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL
-    )
-)

src/main/kotlin/app/revanced/patches/music/interaction/permanentshuffle/patch/PermanentShufflePatch.kt

@@ -1,25 +0,0 @@
-package app.revanced.patches.music.interaction.permanentshuffle.patch
-
-import app.revanced.extensions.exception
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.music.annotations.MusicCompatibility
-import app.revanced.patches.music.interaction.permanentshuffle.fingerprints.DisableShuffleFingerprint
-
-@Patch(false)
-@Name("Permanent shuffle")
-@Description("Permanently remember your shuffle preference " +
-        "even if the playlist ends or another track is played.")
-@MusicCompatibility
-class PermanentShuffleTogglePatch : BytecodePatch(
-    listOf(DisableShuffleFingerprint)
-) {
-    override fun execute(context: BytecodeContext) {
-        DisableShuffleFingerprint.result?.mutableMethod?.addInstruction(0, "return-void")
-            ?: throw DisableShuffleFingerprint.exception
-    }
-}

src/main/kotlin/app/revanced/patches/music/layout/compactheader/fingerprints/CompactHeaderConstructorFingerprint.kt

@@ -2,8 +2,8 @@ package app.revanced.patches.music.layout.compactheader.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.Opcode
 
 object CompactHeaderConstructorFingerprint : MethodFingerprint(
     "V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, listOf("L", "L", "L", "L", "L"), listOf(

src/main/kotlin/app/revanced/patches/music/layout/compactheader/patch/CompactHeaderPatch.kt

@@ -5,10 +5,12 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.layout.compactheader.fingerprints.CompactHeaderConstructorFingerprint
-import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction11x
+import org.jf.dexlib2.builder.instruction.BuilderInstruction11x
 
 @Patch(false)
 @Name("Compact header")
@@ -17,7 +19,7 @@ import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction11x
 class CompactHeaderPatch : BytecodePatch(
     listOf(CompactHeaderConstructorFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
         val result = CompactHeaderConstructorFingerprint.result!!
         val method = result.mutableMethod
 
@@ -29,5 +31,7 @@ class CompactHeaderPatch : BytecodePatch(
                 invoke-virtual {v${register}, v2}, Landroid/view/View;->setVisibility(I)V
             """
         )
+
+        return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/music/layout/minimizedplayback/fingerprints/MinimizedPlaybackManagerFingerprint.kt

@@ -2,8 +2,8 @@ package app.revanced.patches.music.layout.minimizedplayback.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.Opcode
 
 object MinimizedPlaybackManagerFingerprint : MethodFingerprint(
     "V",

src/main/kotlin/app/revanced/patches/music/layout/minimizedplayback/patch/MinimizedPlaybackPatch.kt

@@ -5,6 +5,8 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.layout.minimizedplayback.fingerprints.MinimizedPlaybackManagerFingerprint
@@ -16,12 +18,14 @@ import app.revanced.patches.music.layout.minimizedplayback.fingerprints.Minimize
 class MinimizedPlaybackPatch : BytecodePatch(
     listOf(MinimizedPlaybackManagerFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
         MinimizedPlaybackManagerFingerprint.result!!.mutableMethod.addInstruction(
             0,
             """
                 return-void
             """
         )
+
+        return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/music/layout/premium/fingerprints/HideGetPremiumFingerprint.kt

@@ -2,8 +2,8 @@ package app.revanced.patches.music.layout.premium.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.Opcode
 
 object HideGetPremiumFingerprint : MethodFingerprint(
     "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(

src/main/kotlin/app/revanced/patches/music/layout/premium/fingerprints/HideGetPremiumParentFingerprint.kt

@@ -2,8 +2,8 @@ package app.revanced.patches.music.layout.premium.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.Opcode
 
 object HideGetPremiumParentFingerprint : MethodFingerprint(
     "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(

src/main/kotlin/app/revanced/patches/music/layout/premium/patch/HideGetPremiumPatch.kt

@@ -7,6 +7,8 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.layout.premium.fingerprints.HideGetPremiumFingerprint
@@ -19,7 +21,7 @@ import app.revanced.patches.music.layout.premium.fingerprints.HideGetPremiumPare
 class HideGetPremiumPatch : BytecodePatch(
     listOf(HideGetPremiumParentFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
         val parentResult = HideGetPremiumParentFingerprint.result!!
         HideGetPremiumFingerprint.resolve(context, parentResult.classDef)
 
@@ -41,5 +43,7 @@ class HideGetPremiumPatch : BytecodePatch(
                 const/16 v0, 0x8
             """
         )
+
+        return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/fingerprints/PivotBarConstructorFingerprint.kt

@@ -3,8 +3,8 @@ package app.revanced.patches.music.layout.upgradebutton.fingerprints
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.Opcode
 
 
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.

src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/patch/RemoveUpgradeButtonPatch.kt

@@ -5,24 +5,26 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.toInstructions
 import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.layout.upgradebutton.fingerprints.PivotBarConstructorFingerprint
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction22t
+import org.jf.dexlib2.builder.instruction.BuilderInstruction22t
-import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction22c
+import org.jf.dexlib2.iface.instruction.formats.Instruction22c
-import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
+import org.jf.dexlib2.iface.instruction.formats.Instruction35c
 
 
 @Patch
-@Name("Remove upgrade button")
+@Name("Upgrade button remover")
 @Description("Removes the upgrade tab from the pivot bar.")
 @MusicCompatibility
 class RemoveUpgradeButtonPatch : BytecodePatch(
     listOf(PivotBarConstructorFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
         val result = PivotBarConstructorFingerprint.result!!
         val implementation = result.mutableMethod.implementation!!
 
@@ -34,7 +36,7 @@ class RemoveUpgradeButtonPatch : BytecodePatch(
         val instructionList = """
                 invoke-interface { v0 }, Ljava/util/List;->size()I
                 move-result v1
-                const/4 v2, 0x4
+                const/4 v2, 0x3
                 invoke-interface {v0, v2}, Ljava/util/List;->remove(I)Ljava/lang/Object;
                 iput-object v0, v$register, $pivotBarElementFieldRef
             """.toInstructions().toMutableList()
@@ -67,5 +69,6 @@ class RemoveUpgradeButtonPatch : BytecodePatch(
         implementation.addInstructions(
             endIndex, instructionList
         )
+        return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/music/misc/androidauto/fingerprints/CheckCertificateFingerprint.kt

@@ -2,7 +2,7 @@ package app.revanced.patches.music.misc.androidauto.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags
 
 object CheckCertificateFingerprint : MethodFingerprint(
     accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,

src/main/kotlin/app/revanced/patches/music/misc/androidauto/patch/BypassCertificateChecksPatch.kt

@@ -1,11 +1,13 @@
 package app.revanced.patches.music.misc.androidauto.patch
 
-import app.revanced.extensions.exception
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.misc.androidauto.fingerprints.CheckCertificateFingerprint
@@ -17,7 +19,7 @@ import app.revanced.patches.music.misc.androidauto.fingerprints.CheckCertificate
 class BypassCertificateChecksPatch : BytecodePatch(
     listOf(CheckCertificateFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
         CheckCertificateFingerprint.result?.apply {
             mutableMethod.addInstructions(
                 0, """
@@ -25,6 +27,8 @@ class BypassCertificateChecksPatch : BytecodePatch(
                 return v0
                 """
             )
-        } ?: throw CheckCertificateFingerprint.exception
+        } ?: return CheckCertificateFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/GooglePlayUtilityFingerprint.kt

@@ -2,7 +2,7 @@ package app.revanced.patches.music.misc.microg.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags
 
 object GooglePlayUtilityFingerprint : MethodFingerprint(
     "I",

src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/ServiceCheckFingerprint.kt

@@ -3,7 +3,7 @@ package app.revanced.patches.music.misc.microg.fingerprints
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags
 
 
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.

src/main/kotlin/app/revanced/patches/music/misc/microg/patch/bytecode/MicroGBytecodePatch.kt

@@ -4,6 +4,7 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.music.annotations.MusicCompatibility
@@ -36,25 +37,27 @@ class MicroGBytecodePatch : BytecodePatch(
     // - "com.google.android.gms.phenotype.PACKAGE_NAME",
     // - "com.google.android.gms.phenotype.UPDATE",
     // - "com.google.android.gms.phenotype",
-    override fun execute(context: BytecodeContext) = MicroGBytecodeHelper.patchBytecode(
+    override fun execute(context: BytecodeContext) =
-        context,
+        // apply common microG patch
-        arrayOf(
+        MicroGBytecodeHelper.patchBytecode(
-            MicroGBytecodeHelper.packageNameTransform(
+            context,
-                Constants.PACKAGE_NAME,
+            arrayOf(
-                Constants.REVANCED_PACKAGE_NAME
+                MicroGBytecodeHelper.packageNameTransform(
+                    Constants.PACKAGE_NAME,
+                    Constants.REVANCED_PACKAGE_NAME
+                )
+            ),
+            MicroGBytecodeHelper.PrimeMethodTransformationData(
+                PrimeFingerprint,
+                MUSIC_PACKAGE_NAME,
+                REVANCED_MUSIC_PACKAGE_NAME
+            ),
+            listOf(
+                ServiceCheckFingerprint,
+                GooglePlayUtilityFingerprint,
+                CastDynamiteModuleFingerprint,
+                CastDynamiteModuleV2Fingerprint,
+                CastContextFetchFingerprint
             )
-        ),
+        ).let { PatchResultSuccess() }
-        MicroGBytecodeHelper.PrimeMethodTransformationData(
-            PrimeFingerprint,
-            MUSIC_PACKAGE_NAME,
-            REVANCED_MUSIC_PACKAGE_NAME
-        ),
-        listOf(
-            ServiceCheckFingerprint,
-            GooglePlayUtilityFingerprint,
-            CastDynamiteModuleFingerprint,
-            CastDynamiteModuleV2Fingerprint,
-            CastContextFetchFingerprint
-        )
-    )
 }

src/main/kotlin/app/revanced/patches/music/misc/microg/patch/resource/MicroGResourcePatch.kt

@@ -2,6 +2,8 @@ package app.revanced.patches.music.misc.microg.patch.resource
 
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patches.music.misc.microg.shared.Constants.MUSIC_PACKAGE_NAME
 import app.revanced.patches.music.misc.microg.shared.Constants.REVANCED_MUSIC_APP_NAME
@@ -13,7 +15,7 @@ import app.revanced.util.microg.MicroGResourceHelper
 
 @Description("Resource patch to allow YouTube Music ReVanced to run without root and under a different package name.")
 class MicroGResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext) {
+    override fun execute(context: ResourceContext): PatchResult {
         // update manifest
         MicroGResourceHelper.patchManifest(
             context,
@@ -28,5 +30,6 @@ class MicroGResourcePatch : ResourcePatch {
             SPOOFED_PACKAGE_NAME,
             SPOOFED_PACKAGE_SIGNATURE
         )
+        return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/music/premium/backgroundplay/fingerprints/BackgroundPlaybackDisableFingerprint.kt

@@ -3,8 +3,8 @@ package app.revanced.patches.music.premium.backgroundplay.fingerprints
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.Opcode
 
 
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.

src/main/kotlin/app/revanced/patches/music/premium/backgroundplay/patch/BackgroundPlayPatch.kt

@@ -5,6 +5,8 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.premium.backgroundplay.fingerprints.BackgroundPlaybackDisableFingerprint
@@ -16,7 +18,7 @@ import app.revanced.patches.music.premium.backgroundplay.fingerprints.Background
 class BackgroundPlayPatch : BytecodePatch(
     listOf(BackgroundPlaybackDisableFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
         BackgroundPlaybackDisableFingerprint.result!!.mutableMethod.addInstructions(
             0,
             """
@@ -24,5 +26,7 @@ class BackgroundPlayPatch : BytecodePatch(
                 return v0
             """
         )
+
+        return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/myexpenses/misc/pro/patch/UnlockProPatch.kt

@@ -5,6 +5,8 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.myexpenses.misc.pro.annotations.UnlockProCompatibility
 import app.revanced.patches.myexpenses.misc.pro.fingerprints.IsEnabledFingerprint
@@ -18,7 +20,7 @@ class UnlockProPatch : BytecodePatch(
         IsEnabledFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
         val method = IsEnabledFingerprint.result!!.mutableMethod
         method.addInstructions(
             0,
@@ -27,5 +29,7 @@ class UnlockProPatch : BytecodePatch(
                 return v0
             """
         )
+        
+        return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/netguard/broadcasts/removerestriction/resource/patch/RemoveBroadcastsRestrictionPatch.kt

@@ -3,6 +3,8 @@ package app.revanced.patches.netguard.broadcasts.removerestriction.resource.patc
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.netguard.broadcasts.removerestriction.resource.annotations.RemoveBroadcastsRestrictionCompatibility
@@ -13,7 +15,7 @@ import org.w3c.dom.Element
 @Description("Enables starting/stopping NetGuard via broadcasts.")
 @RemoveBroadcastsRestrictionCompatibility
 class RemoveBroadcastsRestrictionPatch : ResourcePatch {
-    override fun execute(context: ResourceContext) {
+    override fun execute(context: ResourceContext): PatchResult {
         context.xmlEditor["AndroidManifest.xml"].use { dom ->
             val applicationNode = dom
                 .file
@@ -30,5 +32,7 @@ class RemoveBroadcastsRestrictionPatch : ResourcePatch {
                 }
             }
         }
+
+        return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/nfctoolsse/misc/pro/fingerprints/IsLicenseRegisteredFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.nfctoolsse.misc.pro.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags
 
 object IsLicenseRegisteredFingerprint : MethodFingerprint(
     returnType = "Z",

src/main/kotlin/app/revanced/patches/nfctoolsse/misc/pro/patch/UnlockProPatch.kt

@@ -1,11 +1,13 @@
 package app.revanced.patches.nfctoolsse.misc.pro.patch
 
-import app.revanced.extensions.exception
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.nfctoolsse.misc.pro.annotations.UnlockProCompatibility
 import app.revanced.patches.nfctoolsse.misc.pro.fingerprints.IsLicenseRegisteredFingerprint
@@ -20,7 +22,7 @@ class UnlockProPatch : BytecodePatch(
         IsLicenseRegisteredFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
         IsLicenseRegisteredFingerprint.result?.mutableMethod?.apply {
             addInstructions(
                 0,
@@ -29,7 +31,9 @@ class UnlockProPatch : BytecodePatch(
                     return v0
                 """
             )
-        } ?: throw IsLicenseRegisteredFingerprint.exception
+        } ?: return IsLicenseRegisteredFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
     }
 
 }

src/main/kotlin/app/revanced/patches/nyx/misc/pro/patch/UnlockProPatch.kt

@@ -5,6 +5,8 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.nyx.misc.pro.annotations.UnlockProCompatibility
 import app.revanced.patches.nyx.misc.pro.fingerprints.CheckProFingerprint
@@ -18,7 +20,7 @@ class UnlockProPatch : BytecodePatch(
         CheckProFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
         val method = CheckProFingerprint.result!!.mutableMethod
         method.addInstructions(
             0,
@@ -27,5 +29,7 @@ class UnlockProPatch : BytecodePatch(
                 return v0
             """
         )
+        
+        return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/photomath/detection/signature/fingerprints/CheckSignatureFingerprint.kt

@@ -2,8 +2,8 @@ package app.revanced.patches.photomath.detection.signature.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.Opcode
 
 object CheckSignatureFingerprint : MethodFingerprint(
     returnType = "V",