chore(release): 2.190.0-dev.2 [skip ci]

# [2.190.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v2.190.0-dev.1...v2.190.0-dev.2) (2023-08-28) ### Bug Fixes * **Infinity for Reddit - Spoof client:** Support latest version ([3d93a9d](3d93a9d851))
fix(Infinity for Reddit - Spoof client): Support latest version
2026-01-15 15:33:13 +00:00 · 2023-08-28 18:23:24 +00:00 · 2023-08-28 20:20:04 +02:00 · 2023-08-28 13:48:22 +00:00 · 2023-08-28 15:45:47 +02:00 · 2023-08-27 23:56:04 +00:00
332 changed files with 1853 additions and 2089 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,172 @@
+# [2.190.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v2.190.0-dev.1...v2.190.0-dev.2) (2023-08-28)
+
+
+### Bug Fixes
+
+* **Infinity for Reddit - Spoof client:** Support latest version ([8a5311b](https://github.com/ReVanced/revanced-patches/commit/8a5311b1e645ca2aab1e416d647cf52bf0be6e7f))
+
+# [2.190.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v2.189.0...v2.190.0-dev.1) (2023-08-28)
+
+
+### Features
+
+* **Photomath:** Support latest version ([5a2cad0](https://github.com/ReVanced/revanced-patches/commit/5a2cad077f03880ee1417c5cfd448bbdea4c07e2))
+
+# [2.189.0](https://github.com/ReVanced/revanced-patches/compare/v2.188.1...v2.189.0) (2023-08-27)
+
+
+### Features
+
+* Restore previous release ([f7352fe](https://github.com/ReVanced/revanced-patches/commit/f7352feb6e9604162b52072d74310b9e3067bc69))
+
+# [2.189.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v2.188.1...v2.189.0-dev.1) (2023-08-27)
+
+
+### Features
+
+* Restore previous release ([f7352fe](https://github.com/ReVanced/revanced-patches/commit/f7352feb6e9604162b52072d74310b9e3067bc69))
+
+## [2.188.1](https://github.com/ReVanced/revanced-patches/compare/v2.188.0...v2.188.1) (2023-08-27)
+
+
+### Bug Fixes
+
+* Revert previous release ([ed24a20](https://github.com/ReVanced/revanced-patches/commit/ed24a201a9fbe08dd6694582d0ab08ced8ad026a))
+
+## [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)
+
+
+### Bug Fixes
+
+* allow using `PreferenceScreen` outside of current module ([fe94013](https://github.com/ReVanced/revanced-patches/commit/fe94013a2235953b32fed6e0710a252698a264b3))
+* **Client spoof:** Remove exception from option ([9c69f87](https://github.com/ReVanced/revanced-patches/commit/9c69f876902496c101eac295e581c15e02bfaf29))
+* **Enable android debugging:** Update patch description ([#2869](https://github.com/ReVanced/revanced-patches/issues/2869)) ([d9f0d08](https://github.com/ReVanced/revanced-patches/commit/d9f0d08498662e7aa18edb5201a5d60f3738e4e4))
+* improve wording ([26f9b05](https://github.com/ReVanced/revanced-patches/commit/26f9b0514fda9434b2a36d2f9e5ad6a4f5bb94bd))
+* **Reddit is Fun - Spoof client:** Use a more convincing user agent ([236a18f](https://github.com/ReVanced/revanced-patches/commit/236a18f9356cede156417c0d55a876d25a98cd4d))
+* remove newline ([545388b](https://github.com/ReVanced/revanced-patches/commit/545388b3b21cabb485c4d2025756c48984548d6b))
+* **Tiktok - Show seekbar:** Bump compatibility ([#2737](https://github.com/ReVanced/revanced-patches/issues/2737)) ([08413bd](https://github.com/ReVanced/revanced-patches/commit/08413bdc97aef892f7372c585d1d792eb95e30f4))
+* **YouTube - Client spoof:** Adjust spoof signature settings description ([#2760](https://github.com/ReVanced/revanced-patches/issues/2760)) ([f71d893](https://github.com/ReVanced/revanced-patches/commit/f71d8937663fdbfc93d8e3ce1cdb47e1667554f0))
+* **YouTube Music - Remove upgrade button:** Remove the correct navigation bar item ([fd3813f](https://github.com/ReVanced/revanced-patches/commit/fd3813f66ededdae1e52bf021a3de9d818f65096))
+
+
+### Features
+
+* Add `Override certificate pinning` patch ([#2781](https://github.com/ReVanced/revanced-patches/issues/2781)) ([94ed738](https://github.com/ReVanced/revanced-patches/commit/94ed738515aa6e1a1d346b85b54805e68e36f94c))
+* **Change package name:** Append `.revanced` to package name by default ([#2750](https://github.com/ReVanced/revanced-patches/issues/2750)) ([e83e62f](https://github.com/ReVanced/revanced-patches/commit/e83e62fc2400caf1c5179d25e0ac4fbd51ddba00))
+* **Duolingo:** Add `Unlock Duolingo Super` patch ([#2862](https://github.com/ReVanced/revanced-patches/issues/2862)) ([61a7533](https://github.com/ReVanced/revanced-patches/commit/61a7533136f38d7a308e31c9f250baad00515d6a))
+* Exclude `Custom branding` patch by default ([d6de957](https://github.com/ReVanced/revanced-patches/commit/d6de957f4efce11d9a709d4c8f500b039166fc2f))
+* **Lightroom:** Add `Disable mandatory login` patch ([#2738](https://github.com/ReVanced/revanced-patches/issues/2738)) ([896a713](https://github.com/ReVanced/revanced-patches/commit/896a71308f1084d7f941c5b59610e40ea5d53009))
+* **Lightroom:** Add `Unlock premium` patch ([#2740](https://github.com/ReVanced/revanced-patches/issues/2740)) ([e18a9bc](https://github.com/ReVanced/revanced-patches/commit/e18a9bcb50705d374ccbf03cd6ab9a140a2f23ec))
+* **Nova Launcher:** Remove `Unlock prime` patch ([bbde91c](https://github.com/ReVanced/revanced-patches/commit/bbde91cf9df4b410a34147bbe5f359e39a71ad4c))
+* Publicize resource utility functions ([20aff26](https://github.com/ReVanced/revanced-patches/commit/20aff26784296517257ea19d66ffd3bdfe6b06fa))
+* **Solid Explorer:** Add `Remove file size limit` patch ([01c617d](https://github.com/ReVanced/revanced-patches/commit/01c617d94e58b30bbffb3426fcfa55b8979962bd))
+* **Strava:** Add `Subscription features` patch ([#2872](https://github.com/ReVanced/revanced-patches/issues/2872)) ([387eb29](https://github.com/ReVanced/revanced-patches/commit/387eb29e7ed45169c89a03513af64104d0082f28))
+* **Tasker:** Remove `Unlock trial` patch ([8354a87](https://github.com/ReVanced/revanced-patches/commit/8354a879cfc6028820e2bb0e01d6f607e145c0f6))
+* Use an extension property to create new exception when failing to resolve a fingerprint ([47eac14](https://github.com/ReVanced/revanced-patches/commit/47eac14f039dc466c1957470d82255bfa2c06ff0))
+* **YouTube - Debug:** Logging of layout proto buffer strings ([#2759](https://github.com/ReVanced/revanced-patches/issues/2759)) ([189f719](https://github.com/ReVanced/revanced-patches/commit/189f719720551f36c6e006c45558fe5ae46ca4f8))
+* **YouTube - External downloads:** Recommend Seal instead of PowerTube ([#2803](https://github.com/ReVanced/revanced-patches/issues/2803)) ([082e067](https://github.com/ReVanced/revanced-patches/commit/082e067338026d05046ed5f398a1261aa20d3cb3))
+* **YouTube - Hide video action buttons:** Hide individual action buttons ([#2723](https://github.com/ReVanced/revanced-patches/issues/2723)) ([220f694](https://github.com/ReVanced/revanced-patches/commit/220f694b12e7ed013753c8215d181936ab2205c3))
+* **YouTube Music - Exclusive audio playback:** Support latest version ([0861991](https://github.com/ReVanced/revanced-patches/commit/0861991cfbdfa977713f1f1f4ee8a0a5fd3f939e))
+* **YouTube Music:** Add `Permanent repeat` patch ([#2722](https://github.com/ReVanced/revanced-patches/issues/2722)) ([506d49c](https://github.com/ReVanced/revanced-patches/commit/506d49c82a68faee25aede8194e7884191c0f271))
+* **YouTube Music:** Add `Permanent Shuffle` patch ([#2730](https://github.com/ReVanced/revanced-patches/issues/2730)) ([86a271c](https://github.com/ReVanced/revanced-patches/commit/86a271cd7cc3d1d2a11ff9ebe962574368b93f4f))
+* **YouTube:** Add `Alternative thumbnails` patch ([#2834](https://github.com/ReVanced/revanced-patches/issues/2834)) ([8a4277c](https://github.com/ReVanced/revanced-patches/commit/8a4277c486d995f57cde3a56274979c4a7b42bf6))
+* **YouTube:** Add `Custom player overlay opacity` patch ([#2721](https://github.com/ReVanced/revanced-patches/issues/2721)) ([2622b00](https://github.com/ReVanced/revanced-patches/commit/2622b008ab78b15aa3c28a13b38e63041f29c9ea))
+* **YouTube:** Add `Enable tablet layout` patch ([c89b2aa](https://github.com/ReVanced/revanced-patches/commit/c89b2aa26125d302079b5cf522f3b6c9fbe1257a))
+* **YouTube:** Support version `18.29.38` ([c1b9eef](https://github.com/ReVanced/revanced-patches/commit/c1b9eefa280b980d08a571e1ce205dc71ccde3b6))
+* **YouTube:** Support version `18.32.39` ([7b503e2](https://github.com/ReVanced/revanced-patches/commit/7b503e2336dd4d330b651bf7c168d95a38e8c777))
+
+# [2.188.0-dev.28](https://github.com/ReVanced/revanced-patches/compare/v2.188.0-dev.27...v2.188.0-dev.28) (2023-08-26)
+
+
+### Features
+
+* **YouTube:** Add `Enable tablet layout` patch ([3ac68b3](https://github.com/ReVanced/revanced-patches/commit/3ac68b3c6ef0d568780855003217fc3e904d789b))
+
+# [2.188.0-dev.27](https://github.com/ReVanced/revanced-patches/compare/v2.188.0-dev.26...v2.188.0-dev.27) (2023-08-26)
+
+
+### Features
+
+* **YouTube Music - Exclusive audio playback:** Support latest version ([bfa379a](https://github.com/ReVanced/revanced-patches/commit/bfa379a398bce8d635043eb2d4f81c4ed7440101))
+
+# [2.188.0-dev.26](https://github.com/ReVanced/revanced-patches/compare/v2.188.0-dev.25...v2.188.0-dev.26) (2023-08-26)
+
+
+### Features
+
+* **YouTube:** Support version `18.32.39` ([7b503e2](https://github.com/ReVanced/revanced-patches/commit/7b503e2336dd4d330b651bf7c168d95a38e8c777))
+
+# [2.188.0-dev.25](https://github.com/ReVanced/revanced-patches/compare/v2.188.0-dev.24...v2.188.0-dev.25) (2023-08-26)
+
+
+### Features
+
+* **YouTube:** Add `Custom player overlay opacity` patch ([#2721](https://github.com/ReVanced/revanced-patches/issues/2721)) ([2622b00](https://github.com/ReVanced/revanced-patches/commit/2622b008ab78b15aa3c28a13b38e63041f29c9ea))
+
+# [2.188.0-dev.24](https://github.com/ReVanced/revanced-patches/compare/v2.188.0-dev.23...v2.188.0-dev.24) (2023-08-25)
+
+
+### Features
+
+* Exclude `Custom branding` patch by default ([d6de957](https://github.com/ReVanced/revanced-patches/commit/d6de957f4efce11d9a709d4c8f500b039166fc2f))
+
+# [2.188.0-dev.23](https://github.com/ReVanced/revanced-patches/compare/v2.188.0-dev.22...v2.188.0-dev.23) (2023-08-25)
+
+
+### Features
+
+* **Strava:** Add `Subscription features` patch ([#2872](https://github.com/ReVanced/revanced-patches/issues/2872)) ([387eb29](https://github.com/ReVanced/revanced-patches/commit/387eb29e7ed45169c89a03513af64104d0082f28))
+
+# [2.188.0-dev.22](https://github.com/ReVanced/revanced-patches/compare/v2.188.0-dev.21...v2.188.0-dev.22) (2023-08-24)
+
+
+### Features
+
+* Publicize resource utility functions ([20aff26](https://github.com/ReVanced/revanced-patches/commit/20aff26784296517257ea19d66ffd3bdfe6b06fa))
+* Use an extension property to create new exception when failing to resolve a fingerprint ([47eac14](https://github.com/ReVanced/revanced-patches/commit/47eac14f039dc466c1957470d82255bfa2c06ff0))
+
+# [2.188.0-dev.21](https://github.com/ReVanced/revanced-patches/compare/v2.188.0-dev.20...v2.188.0-dev.21) (2023-08-24)
+
+
+### Features
+
+* **Duolingo:** Add `Unlock Duolingo Super` patch ([#2862](https://github.com/ReVanced/revanced-patches/issues/2862)) ([61a7533](https://github.com/ReVanced/revanced-patches/commit/61a7533136f38d7a308e31c9f250baad00515d6a))
+
+# [2.188.0-dev.20](https://github.com/ReVanced/revanced-patches/compare/v2.188.0-dev.19...v2.188.0-dev.20) (2023-08-24)
+
+
+### Bug Fixes
+
+* **Enable android debugging:** Update patch description ([#2869](https://github.com/ReVanced/revanced-patches/issues/2869)) ([d9f0d08](https://github.com/ReVanced/revanced-patches/commit/d9f0d08498662e7aa18edb5201a5d60f3738e4e4))
+
+# [2.188.0-dev.19](https://github.com/ReVanced/revanced-patches/compare/v2.188.0-dev.18...v2.188.0-dev.19) (2023-08-24)
+
+
+### Features
+
+* **Solid Explorer:** Add `Remove file size limit` patch ([01c617d](https://github.com/ReVanced/revanced-patches/commit/01c617d94e58b30bbffb3426fcfa55b8979962bd))
+
+# [2.188.0-dev.18](https://github.com/ReVanced/revanced-patches/compare/v2.188.0-dev.17...v2.188.0-dev.18) (2023-08-23)
+
+
+### Features
+
+* **YouTube:** Support version `18.29.38` ([c1b9eef](https://github.com/ReVanced/revanced-patches/commit/c1b9eefa280b980d08a571e1ce205dc71ccde3b6))
+
+# [2.188.0-dev.17](https://github.com/ReVanced/revanced-patches/compare/v2.188.0-dev.16...v2.188.0-dev.17) (2023-08-21)
+
+
+### Features
+
+* **YouTube:** Add `Alternative thumbnails` patch ([#2834](https://github.com/ReVanced/revanced-patches/issues/2834)) ([8a4277c](https://github.com/ReVanced/revanced-patches/commit/8a4277c486d995f57cde3a56274979c4a7b42bf6))
+
 # [2.188.0-dev.16](https://github.com/ReVanced/revanced-patches/compare/v2.188.0-dev.15...v2.188.0-dev.16) (2023-08-19)


--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -25,7 +25,7 @@ repositories {
 }

 dependencies {
-    implementation("app.revanced:revanced-patcher:13.0.0")
+    implementation("app.revanced:revanced-patcher:14.2.1")
    implementation("com.android.tools.smali:smali:3.0.3")
    // Required because build fails without it.
    // TODO: Find a way to remove this dependency.
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 2.188.0-dev.16
+version = 2.190.0-dev.2
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
--- a/patches.json
+++ b/patches.json
--- a/src/main/kotlin/app/revanced/extensions/Extensions.kt
+++ b/src/main/kotlin/app/revanced/extensions/Extensions.kt
@@ -1,9 +1,10 @@
 package app.revanced.extensions

-import app.revanced.patcher.extensions.MethodFingerprintExtensions.name
+import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.extensions.MethodFingerprintExtensions.name
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.patch.PatchException
 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
@@ -13,13 +14,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.WideLiteralInstruction
 import com.android.tools.smali.dexlib2.util.MethodUtil
 import org.w3c.dom.Node

-// TODO: populate this to all patches
 /**
- * Convert a [MethodFingerprint] to a [PatchResultError].
+ * The [PatchException] of failing to resolve a [MethodFingerprint].
 *
- * @return A [PatchResultError] for the [MethodFingerprint].
+ * @return The [PatchException].
 */
-internal fun MethodFingerprint.toErrorResult() = PatchResultError("Failed to resolve $name")
+val MethodFingerprint.exception
+    get() = PatchException("Failed to resolve $name")

 /**
 * Find the [MutableMethod] from a given [Method] in a [MutableClass].
@@ -27,27 +28,27 @@ internal fun MethodFingerprint.toErrorResult() = PatchResultError("Failed to res
 * @param method The [Method] to find.
 * @return The [MutableMethod].
 */
-internal fun MutableClass.findMutableMethodOf(method: Method) = this.methods.first {
+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.
 */
-internal fun MutableClass.transformMethods(transform: MutableMethod.() -> MutableMethod) {
+fun MutableClass.transformMethods(transform: MutableMethod.() -> MutableMethod) {
    val transformedMethods = methods.map { it.transform() }
    methods.clear()
    methods.addAll(transformedMethods)
 }

-internal fun Node.doRecursively(action: (Node) -> Unit) {
+fun Node.doRecursively(action: (Node) -> Unit) {
    action(this)
    for (i in 0 until this.childNodes.length) this.childNodes.item(i).doRecursively(action)
 }

-internal fun MutableMethod.injectHideViewCall(
+fun MutableMethod.injectHideViewCall(
    insertIndex: Int,
    viewRegister: Int,
    classDescriptor: String,
@@ -57,7 +58,13 @@ internal 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
@@ -66,6 +73,8 @@ internal 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 {
@@ -77,8 +86,23 @@ 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)
+    }
+}
--- a/src/main/kotlin/app/revanced/meta/JsonGenerator.kt
+++ b/src/main/kotlin/app/revanced/meta/JsonGenerator.kt
@@ -6,7 +6,6 @@ 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
@@ -17,7 +16,6 @@ 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(
@@ -48,7 +46,6 @@ 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>,
--- a/src/main/kotlin/app/revanced/meta/PatchesFileGenerator.kt
+++ b/src/main/kotlin/app/revanced/meta/PatchesFileGenerator.kt
@@ -1,25 +1,22 @@
 package app.revanced.meta

-import app.revanced.patcher.data.Context
-import app.revanced.patcher.patch.Patch
-import app.revanced.patcher.util.patch.PatchBundle
+import app.revanced.patcher.PatchBundleLoader
+import app.revanced.patcher.patch.PatchClass
 import java.io.File

-internal typealias PatchBundlePatches = List<Class<out Patch<Context>>>
+internal typealias PatchBundlePatches = List<PatchClass>

 internal interface PatchesFileGenerator {
    fun generate(bundle: PatchBundlePatches)

    private companion object {
        @JvmStatic
-        fun main(args: Array<String>) = PatchBundle.Jar(
-            File("build/libs/").listFiles()!!.first {
-                it.name.startsWith("revanced-patches-") && it.name.endsWith(".jar")
-            }.absolutePath
-        ).loadPatches().also {
-            if (it.isEmpty()) throw IllegalStateException("No patches found")
+        fun main(args: Array<String>) = PatchBundleLoader.Jar(
+            File("build/libs/").listFiles { it -> it.name.endsWith(".jar") }!!.first()
+        ).also { loader ->
+            if (loader.isEmpty()) throw IllegalStateException("No patches found")
        }.let { bundle ->
-            arrayOf(JsonGenerator()).forEach { it.generate(bundle) }
+            arrayOf(JsonGenerator()).forEach { generator -> generator.generate(bundle) }
        }
    }
 }
--- a/src/main/kotlin/app/revanced/patches/all/activity/exportall/patch/ExportAllActivitiesPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/all/activity/exportall/patch/ExportAllActivitiesPatch.kt
@@ -1,10 +1,8 @@
-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

@@ -12,7 +10,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): PatchResult {
+    override fun execute(context: ResourceContext) {
        context.xmlEditor["AndroidManifest.xml"].use { editor ->
            val document = editor.file
            val activities = document.getElementsByTagName("activity")
@@ -33,8 +31,6 @@ class ExportAllActivitiesPatch : ResourcePatch {
                }
            }
        }
-
-        return PatchResultSuccess()
    }

    private companion object {
--- a/src/main/kotlin/app/revanced/patches/all/connectivity/wifi/spoof/patch/SpoofWifiPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/all/connectivity/wifi/spoof/patch/SpoofWifiPatch.kt
@@ -15,7 +15,7 @@ import java.util.*
@Name("Spoof wifi connection")
@Description("Spoofs an existing Wi-Fi connection.")
@RequiresIntegrations
-internal class SpoofWifiPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
+class SpoofWifiPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {

    private companion object {
        const val INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX = "Lapp/revanced/all/connectivity/wifi/spoof/SpoofWifiPatch"
--- a/src/main/kotlin/app/revanced/patches/all/interaction/gestures/patch/PredictiveBackGesturePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/all/interaction/gestures/patch/PredictiveBackGesturePatch.kt
@@ -3,8 +3,6 @@ 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

@@ -12,7 +10,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): PatchResult {
+    override fun execute(context: ResourceContext) {
        context.xmlEditor["AndroidManifest.xml"].use { editor ->
            val document = editor.file

@@ -25,8 +23,6 @@ class PredictiveBackGesturePatch : ResourcePatch {

            }
        }
-
-        return PatchResultSuccess()
    }

    private companion object {
--- a/src/main/kotlin/app/revanced/patches/all/misc/debugging/patch/EnableAndroidDebuggingPatch.kt
+++ b/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.")
+@Description("Enables Android debugging capabilities. This can slow down the app.")
 class EnableAndroidDebuggingPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
        context.xmlEditor["AndroidManifest.xml"].use { dom ->
            val applicationNode = dom
                .file
@@ -21,8 +21,6 @@ class EnableAndroidDebuggingPatch : ResourcePatch {
            // set application as debuggable
            applicationNode.setAttribute("android:debuggable", "true")
        }
-
-        return PatchResultSuccess()
    }

 }
--- a/src/main/kotlin/app/revanced/patches/all/misc/network/patch/OverrideCertificatePinningPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/all/misc/network/patch/OverrideCertificatePinningPatch.kt
@@ -2,9 +2,8 @@ package app.revanced.patches.all.misc.network.patch

 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.*
+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
@@ -16,8 +15,7 @@ import java.io.File
@Description("Overrides certificate pinning, allowing to inspect traffic via a proxy.")
@DependsOn([EnableAndroidDebuggingPatch::class])
 class OverrideCertificatePinningPatch : ResourcePatch {
-
-    override fun execute(context: ResourceContext): PatchResult {
+    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.
@@ -73,7 +71,5 @@ class OverrideCertificatePinningPatch : ResourcePatch {

            }
        }
-
-        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/all/misc/packagename/patch/ChangePackageNamePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/all/misc/packagename/patch/ChangePackageNamePatch.kt
@@ -11,20 +11,18 @@ import org.w3c.dom.Element
@Name("Change package name")
@Description("Changes the package name. Appends \".revanced\" to the package name by default.")
 class ChangePackageNamePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
        val packageNameToUse = packageName ?: getDefaultPackageName(context)

        val packageNameRegex = Regex("^[a-z]\\w*(\\.[a-z]\\w*)+\$")
        if (!packageNameToUse.matches(packageNameRegex))
-            return PatchResultError("Invalid package name")
+            throw PatchException("Invalid package name")

        val originalPackageName = getOriginalPackageName(context)

        context["AndroidManifest.xml"].apply {
            readText().replace(originalPackageName, packageNameToUse).let(::writeText)
        }
-
-        return PatchResultSuccess()
    }

    private fun getDefaultPackageName(context: ResourceContext): String {
--- a/src/main/kotlin/app/revanced/patches/all/screencapture/removerestriction/bytecode/patch/RemoveCaptureRestrictionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/all/screencapture/removerestriction/bytecode/patch/RemoveCaptureRestrictionPatch.kt
@@ -7,7 +7,10 @@ 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.*
+import app.revanced.util.patch.AbstractTransformInstructionsPatch
+import app.revanced.util.patch.IMethodCall
+import app.revanced.util.patch.Instruction35cInfo
+import app.revanced.util.patch.filterMapInstruction35c
 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
@@ -17,7 +20,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.Instruction
@Description("Removes the restriction of capturing audio from apps that normally wouldn't allow it.")
@DependsOn([RemoveCaptureRestrictionResourcePatch::class])
@RequiresIntegrations
-internal class RemoveCaptureRestrictionPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
+class RemoveCaptureRestrictionPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
    // Information about method calls we want to replace
    enum class MethodCall(
        override val definedClassName: String,
--- a/src/main/kotlin/app/revanced/patches/all/screencapture/removerestriction/resource/patch/RemoveCaptureRestrictionResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/all/screencapture/removerestriction/resource/patch/RemoveCaptureRestrictionResourcePatch.kt
@@ -2,14 +2,12 @@ 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): PatchResult {
+    override fun execute(context: ResourceContext) {
        // create an xml editor instance
        context.xmlEditor["AndroidManifest.xml"].use { dom ->
            // get the application node
@@ -21,7 +19,5 @@ internal class RemoveCaptureRestrictionResourcePatch : ResourcePatch {
            // set allowAudioPlaybackCapture attribute to true
            applicationNode.setAttribute("android:allowAudioPlaybackCapture", "true")
        }
-
-        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/all/screenshot/removerestriction/patch/RemoveScreenshotRestrictionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/all/screenshot/removerestriction/patch/RemoveScreenshotRestrictionPatch.kt
@@ -5,17 +5,19 @@ 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.*
+import app.revanced.util.patch.AbstractTransformInstructionsPatch
+import app.revanced.util.patch.IMethodCall
+import app.revanced.util.patch.Instruction35cInfo
+import app.revanced.util.patch.filterMapInstruction35c
 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
-import java.util.*

@Patch(false)
@Name("Remove screenshot restriction")
@Description("Removes the restriction of taking screenshots in apps that normally wouldn't allow it.")
@RequiresIntegrations
-internal class RemoveScreenshotRestrictionPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
+class RemoveScreenshotRestrictionPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {

    private companion object {
        const val INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX =
--- a/src/main/kotlin/app/revanced/patches/backdrops/misc/pro/patch/ProUnlockPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/backdrops/misc/pro/patch/ProUnlockPatch.kt
@@ -1,14 +1,12 @@
 package app.revanced.patches.backdrops.misc.pro.patch

-import app.revanced.extensions.toErrorResult
+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.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
@@ -21,7 +19,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 class ProUnlockPatch : BytecodePatch(
    listOf(ProUnlockFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        ProUnlockFingerprint.result?.let { result ->
            val registerIndex = result.scanResult.patternScanResult!!.endIndex - 1

@@ -35,8 +33,6 @@ class ProUnlockPatch : BytecodePatch(
                )
            }

-        } ?: return ProUnlockFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw ProUnlockFingerprint.exception
    }
 }
--- a/src/main/kotlin/app/revanced/patches/candylinkvpn/patch/UnlockProPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/candylinkvpn/patch/UnlockProPatch.kt
@@ -1,13 +1,11 @@
 package app.revanced.patches.candylinkvpn.patch

-import app.revanced.extensions.toErrorResult
+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.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
@@ -19,15 +17,13 @@ import app.revanced.patches.candylinkvpn.fingerprints.IsPremiumPurchasedFingerpr
 class UnlockProPatch : BytecodePatch(
    listOf(IsPremiumPurchasedFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        IsPremiumPurchasedFingerprint.result?.mutableMethod?.addInstructions(
            0,
            """
               const/4 v0, 0x1
               return v0
            """
-        ) ?: return IsPremiumPurchasedFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        ) ?: throw IsPremiumPurchasedFingerprint.exception
    }
 }
--- a/src/main/kotlin/app/revanced/patches/duolingo/unlocksuper/fingerprints/IsUserSuperMethodFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/duolingo/unlocksuper/fingerprints/IsUserSuperMethodFingerprint.kt
@@ -0,0 +1,14 @@
+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),
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/links/open/fingerprints/InitializeCustomTabSupportFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/links/open/fingerprints/InitializeCustomTabSupportFingerprint.kt
@@ -1,18 +1,20 @@
-package app.revanced.patches.youtube.misc.links.open.fingerprints
+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 InitializeCustomTabSupportFingerprint : MethodFingerprint(
+object UserSerializationMethodFingerprint : MethodFingerprint(
    returnType = "V",
    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
-    opcodes = listOf(
-        Opcode.CHECK_CAST,
-        Opcode.NEW_INSTANCE,
-        Opcode.INVOKE_DIRECT,
-        Opcode.CONST_STRING
+    strings = listOf(
+        "betaStatus",
+        "coachOutfit",
+        "globalAmbassadorStatus",
+    ),
+    opcodes = listOf(
+        Opcode.MOVE_FROM16,
+        Opcode.IPUT_BOOLEAN,
    ),
-    strings = listOf("android.support.customtabs.action.CustomTabsService")
 )
--- a/src/main/kotlin/app/revanced/patches/duolingo/unlocksuper/patch/UnlockDuolingoSuperPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/duolingo/unlocksuper/patch/UnlockDuolingoSuperPatch.kt
@@ -0,0 +1,64 @@
+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
+            }
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/finanzonline/detection/bootloader/patch/BootloaderDetectionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/finanzonline/detection/bootloader/patch/BootloaderDetectionPatch.kt
@@ -1,13 +1,11 @@
 package app.revanced.patches.finanzonline.detection.bootloader.patch

-import app.revanced.extensions.toErrorResult
+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.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
@@ -21,7 +19,7 @@ import app.revanced.patches.finanzonline.detection.shared.annotations.DetectionC
 class BootloaderDetectionPatch : BytecodePatch(
    listOf(CreateKeyFingerprint, BootStateFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        arrayOf(CreateKeyFingerprint, BootStateFingerprint).forEach { fingerprint ->
            fingerprint.result?.mutableMethod?.addInstructions(
                0,
@@ -29,9 +27,7 @@ class BootloaderDetectionPatch : BytecodePatch(
                        const/4 v0, 0x1
                        return v0
                """
-            ) ?: return fingerprint.toErrorResult()
+            ) ?: throw fingerprint.exception
        }
-
-        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/finanzonline/detection/root/patch/RootDetectionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/finanzonline/detection/root/patch/RootDetectionPatch.kt
@@ -1,13 +1,11 @@
 package app.revanced.patches.finanzonline.detection.root.patch

-import app.revanced.extensions.toErrorResult
+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.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
@@ -19,15 +17,13 @@ import app.revanced.patches.finanzonline.detection.shared.annotations.DetectionC
 class RootDetectionPatch : BytecodePatch(
    listOf(RootDetectionFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        RootDetectionFingerprint.result?.mutableMethod?.addInstructions(
            0,
            """
                sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
                return-object v0
            """
-        ) ?: return RootDetectionFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        ) ?: throw RootDetectionFingerprint.exception
    }
 }
--- a/src/main/kotlin/app/revanced/patches/googlerecorder/restrictions/patch/RemoveDeviceRestrictions.kt
+++ b/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.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
@@ -10,8 +10,6 @@ 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
@@ -23,7 +21,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 class RemoveDeviceRestrictions : BytecodePatch(
    listOf(OnApplicationCreateFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        OnApplicationCreateFingerprint.result?.let {
            val featureStringIndex = it.scanResult.stringsScanResult!!.matches.first().index

@@ -36,8 +34,6 @@ class RemoveDeviceRestrictions : BytecodePatch(
                // Override "isPixelDevice()" to return true.
                addInstruction(featureStringIndex, "const/4 v$featureAvailableRegister, 0x1")
            }
-        } ?: return OnApplicationCreateFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw OnApplicationCreateFingerprint.exception
    }
 }
--- a/src/main/kotlin/app/revanced/patches/hexeditor/ad/patch/HexEditorAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/hexeditor/ad/patch/HexEditorAdsPatch.kt
@@ -5,8 +5,6 @@ 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
@@ -20,7 +18,7 @@ class HexEditorAdsPatch : BytecodePatch(
        PrimaryAdsFingerprint
    )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        val method = PrimaryAdsFingerprint.result!!.mutableMethod
        
        method.replaceInstructions(
@@ -30,7 +28,5 @@ class HexEditorAdsPatch : BytecodePatch(
                return v0
            """
        )
-
-        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/iconpackstudio/misc/pro/patch/UnlockProPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/iconpackstudio/misc/pro/patch/UnlockProPatch.kt
@@ -5,8 +5,6 @@ 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
@@ -20,7 +18,7 @@ class UnlockProPatch : BytecodePatch(
        CheckProFingerprint
    )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        val method = CheckProFingerprint.result!!.mutableMethod
        method.addInstructions(
            0,
@@ -29,7 +27,5 @@ class UnlockProPatch : BytecodePatch(
                return v0
            """
        )
-        
-        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/idaustria/detection/root/patch/RootDetectionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/idaustria/detection/root/patch/RootDetectionPatch.kt
@@ -5,8 +5,6 @@ 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
@@ -18,8 +16,6 @@ import app.revanced.patches.idaustria.detection.shared.annotations.DetectionComp
 class RootDetectionPatch : BytecodePatch(
    listOf(RootDetectionFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) =
        RootDetectionFingerprint.result!!.mutableMethod.addInstruction(0, "return-void")
-        return PatchResultSuccess()
-    }
 }
--- a/src/main/kotlin/app/revanced/patches/idaustria/detection/signature/patch/SpoofSignaturePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/idaustria/detection/signature/patch/SpoofSignaturePatch.kt
@@ -5,8 +5,6 @@ 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
@@ -32,7 +30,7 @@ class SpoofSignaturePatch : BytecodePatch(
                "bf42c121d620ddfb7914f7a95c713d9e1c1b7bdb4a03d618e40cf7e9e235c0b5687e03b7ab3,publicExponent=10001}"
    }

-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        SpoofSignatureFingerprint.result!!.mutableMethod.addInstructions(
            0,
            """
@@ -40,6 +38,5 @@ class SpoofSignaturePatch : BytecodePatch(
                return-object v0 
            """
        )
-        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/inshorts/ad/patch/InshortsAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/inshorts/ad/patch/InshortsAdsPatch.kt
@@ -1,13 +1,11 @@
 package app.revanced.patches.inshorts.ad.patch

-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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
@@ -19,7 +17,7 @@ import app.revanced.patches.inshorts.ad.fingerprints.InshortsAdsFingerprint
 class HideAdsPatch : BytecodePatch(
    listOf(InshortsAdsFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        InshortsAdsFingerprint.result?.let { result ->
            result.apply {
                mutableMethod.addInstruction(
@@ -29,8 +27,6 @@ class HideAdsPatch : BytecodePatch(
                    """
                )
            }
-        } ?: return InshortsAdsFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw InshortsAdsFingerprint.exception
    }
 }
--- a/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/patch/HideTimelineAdsPatch.kt
+++ b/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.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.*
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
@@ -8,8 +8,6 @@ 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
@@ -32,19 +30,19 @@ class HideTimelineAdsPatch : BytecodePatch(
        PaidPartnershipAdFingerprint // Unlike the other ads this one is resolved from all classes.
    )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        // region Resolve required methods to check for ads.

-        ShowAdFingerprint.result ?: return ShowAdFingerprint.toErrorResult()
+        ShowAdFingerprint.result ?: throw ShowAdFingerprint.exception

-        PaidPartnershipAdFingerprint.result ?: return PaidPartnershipAdFingerprint.toErrorResult()
+        PaidPartnershipAdFingerprint.result ?: throw PaidPartnershipAdFingerprint.exception

        MediaFingerprint.result?.let {
            GenericMediaAdFingerprint.resolve(context, it.classDef)
            ShoppingAdFingerprint.resolve(context, it.classDef)

            return@let
-        } ?: return MediaFingerprint.toErrorResult()
+        } ?: throw MediaFingerprint.exception

        // endregion

@@ -99,7 +97,5 @@ class HideTimelineAdsPatch : BytecodePatch(

            // endregion
        }
-
-        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/irplus/ad/patch/IrplusAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/irplus/ad/patch/IrplusAdsPatch.kt
@@ -5,8 +5,6 @@ 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
@@ -19,13 +17,11 @@ import app.revanced.patches.irplus.ad.fingerprints.IrplusAdsFingerprint
 class IrplusAdsPatch : BytecodePatch(
    listOf(IrplusAdsFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        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()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/lightroom/misc/login/patch/DisableMandatoryLoginPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/lightroom/misc/login/patch/DisableMandatoryLoginPatch.kt
@@ -1,12 +1,10 @@
 package app.revanced.patches.lightroom.misc.login.patch

-import app.revanced.extensions.toErrorResult
+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.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 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
@@ -15,13 +13,11 @@ import app.revanced.patches.lightroom.misc.login.fingerprint.IsLoggedInFingerpri
@Name("Disable mandatory login")
@DisableMandatoryLoginCompatibility
 class DisableMandatoryLoginPatch : BytecodePatch(listOf(IsLoggedInFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    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.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw IsLoggedInFingerprint.exception
    }
 }
--- a/src/main/kotlin/app/revanced/patches/lightroom/misc/premium/patch/UnlockPremiumPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/lightroom/misc/premium/patch/UnlockPremiumPatch.kt
@@ -1,13 +1,11 @@
 package app.revanced.patches.lightroom.misc.premium.patch

-import app.revanced.extensions.toErrorResult
+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.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 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
@@ -17,11 +15,9 @@ import app.revanced.patches.lightroom.misc.premium.fingerprint.HasPurchasedFinge
@Description("Unlocks premium features.")
@UnlockPremiumCompatibility
 class UnlockPremiumPatch : BytecodePatch(listOf(HasPurchasedFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         // Set hasPremium = true.
        HasPurchasedFingerprint.result?.mutableMethod?.replaceInstruction(2, "const/4 v2, 0x1")
-            ?: throw HasPurchasedFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+            ?: throw HasPurchasedFingerprint.exception
    }
 }
--- a/src/main/kotlin/app/revanced/patches/memegenerator/detection/license/patch/LicenseValidationPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/memegenerator/detection/license/patch/LicenseValidationPatch.kt
@@ -1,19 +1,17 @@
 package app.revanced.patches.memegenerator.detection.license.patch

-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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): PatchResult {
+    override fun execute(context: BytecodeContext) {
        LicenseValidationFingerprint.result?.apply {
            mutableMethod.replaceInstructions(
                0,
@@ -22,8 +20,6 @@ class LicenseValidationPatch : BytecodePatch(
                    return  p0
                """
            )
-        } ?: throw LicenseValidationFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw LicenseValidationFingerprint.exception
    }
 }
--- a/src/main/kotlin/app/revanced/patches/memegenerator/detection/signature/patch/SignatureVerificationPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/memegenerator/detection/signature/patch/SignatureVerificationPatch.kt
@@ -1,19 +1,17 @@
 package app.revanced.patches.memegenerator.detection.signature.patch

-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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): PatchResult {
+    override fun execute(context: BytecodeContext) {
        VerifySignatureFingerprint.result?.apply {
            mutableMethod.replaceInstructions(
                0,
@@ -22,8 +20,6 @@ class SignatureVerificationPatch : BytecodePatch(
                    return  p0
                """
            )
-        } ?: throw VerifySignatureFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw VerifySignatureFingerprint.exception
    }
 }
--- a/src/main/kotlin/app/revanced/patches/memegenerator/misc/pro/patch/UnlockProVersionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/memegenerator/misc/pro/patch/UnlockProVersionPatch.kt
@@ -1,13 +1,11 @@
 package app.revanced.patches.memegenerator.misc.pro.patch

-import app.revanced.extensions.toErrorResult
+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.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
@@ -28,7 +26,7 @@ class UnlockProVersionPatch : BytecodePatch(
        IsFreeVersionFingerprint
    )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        IsFreeVersionFingerprint.result?.apply {
            mutableMethod.replaceInstructions(0,
                """
@@ -36,8 +34,6 @@ class UnlockProVersionPatch : BytecodePatch(
                    return-object p0
                """
            )
-        } ?: throw IsFreeVersionFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw IsFreeVersionFingerprint.exception
    }
 }
--- a/src/main/kotlin/app/revanced/patches/messenger/ads/inbox/patch/HideInboxAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/messenger/ads/inbox/patch/HideInboxAdsPatch.kt
@@ -1,12 +1,10 @@
 package app.revanced.patches.messenger.ads.inbox.patch

-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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

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

--- a/src/main/kotlin/app/revanced/patches/messenger/inputfield/patch/DisableSwitchingEmojiToStickerInMessageInputField.kt
+++ b/src/main/kotlin/app/revanced/patches/messenger/inputfield/patch/DisableSwitchingEmojiToStickerInMessageInputField.kt
@@ -1,13 +1,11 @@
 package app.revanced.patches.messenger.inputfield.patch

-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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
@@ -17,7 +15,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
@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): PatchResult {
+    override fun execute(context: BytecodeContext) {
        SwitchMessangeInputEmojiButtonFingerprint.result?.let {
            val setStringIndex = it.scanResult.patternScanResult!!.startIndex + 2

@@ -29,8 +27,6 @@ class DisableSwitchingEmojiToStickerInMessageInputField : BytecodePatch(listOf(S
                    "const-string v$targetRegister, \"expression\""
                )
            }
-        } ?: throw SwitchMessangeInputEmojiButtonFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw SwitchMessangeInputEmojiButtonFingerprint.exception
    }
 }
--- a/src/main/kotlin/app/revanced/patches/messenger/inputfield/patch/DisableTypingIndicator.kt
+++ b/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.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
@@ -8,8 +8,6 @@ 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

@@ -18,10 +16,8 @@ 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): PatchResult {
+    override fun execute(context: BytecodeContext) {
        SendTypingIndicatorFingerprint.result?.mutableMethod?.replaceInstruction(0, "return-void")
-            ?: throw SendTypingIndicatorFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+            ?: throw SendTypingIndicatorFingerprint.exception
    }
 }
--- a/src/main/kotlin/app/revanced/patches/moneymanager/patch/UnlockProPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/moneymanager/patch/UnlockProPatch.kt
@@ -5,8 +5,6 @@ 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
@@ -18,7 +16,7 @@ import app.revanced.patches.moneymanager.fingerprints.UnlockProFingerprint
 class UnlockProPatch : BytecodePatch(
    listOf(UnlockProFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
       UnlockProFingerprint.result!!.mutableMethod.addInstructions(
            0,
            """
@@ -26,6 +24,5 @@ class UnlockProPatch : BytecodePatch(
               return v0 
            """
        )
-        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/music/ad/video/patch/MusicVideoAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/ad/video/patch/MusicVideoAdsPatch.kt
@@ -6,8 +6,6 @@ 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
@@ -20,7 +18,7 @@ import app.revanced.patches.music.annotations.MusicCompatibility
 class MusicVideoAdsPatch : BytecodePatch(
    listOf(ShowMusicVideoAdsConstructorFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        ShowMusicVideoAdsFingerprint.resolve(context, ShowMusicVideoAdsConstructorFingerprint.result!!.classDef)

        val result = ShowMusicVideoAdsFingerprint.result!!
@@ -31,7 +29,5 @@ class MusicVideoAdsPatch : BytecodePatch(
                const/4 p1, 0x0
            """
        )
-
-        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/music/audio/codecs/patch/CodecsUnlockPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/audio/codecs/patch/CodecsUnlockPatch.kt
@@ -3,10 +3,7 @@ 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
@@ -23,7 +20,7 @@ class CodecsUnlockPatch : BytecodePatch(
        CodecsLockFingerprint, AllCodecsReferenceFingerprint
    )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        val codecsLockResult = CodecsLockFingerprint.result!!

        val implementation = codecsLockResult.mutableMethod.implementation!!
@@ -48,7 +45,5 @@ class CodecsUnlockPatch : BytecodePatch(
            instructionIndex,
            "invoke-static {}, ${allCodecsMethod.definingClass}->${allCodecsMethod.name}()Ljava/util/Set;".toInstruction()
        )
-
-        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/fingerprints/AllowExclusiveAudioPlaybackFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/fingerprints/AllowExclusiveAudioPlaybackFingerprint.kt
@@ -5,14 +5,11 @@ import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

-object  AudioOnlyEnablerFingerprint: MethodFingerprint(
-    "Z", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
+object AllowExclusiveAudioPlaybackFingerprint: MethodFingerprint(
+    "Z",
+    AccessFlags.PUBLIC or AccessFlags.FINAL,
+    listOf(),
+    listOf(
        Opcode.INVOKE_VIRTUAL,
        Opcode.MOVE_RESULT_OBJECT,
        Opcode.CHECK_CAST,
--- a/src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/patch/ExclusiveAudioPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/patch/ExclusiveAudioPatch.kt
@@ -1,29 +1,31 @@
 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.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+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.audio.exclusiveaudio.fingerprints.AudioOnlyEnablerFingerprint
+import app.revanced.patches.music.audio.exclusiveaudio.fingerprints.AllowExclusiveAudioPlaybackFingerprint

@Patch
@Name("Exclusive audio playback")
-@Description("Enables the option to play music without video.")
+@Description("Enables the option to play audio without video.")
@MusicCompatibility
 class ExclusiveAudioPatch : BytecodePatch(
-    listOf(AudioOnlyEnablerFingerprint)
+    listOf(AllowExclusiveAudioPlaybackFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        val method = AudioOnlyEnablerFingerprint.result!!.mutableMethod
-        method.replaceInstruction(method.implementation!!.instructions.count() - 1, "const/4 v0, 0x1")
-        method.addInstruction("return v0")
-
-        return PatchResultSuccess()
+    override fun execute(context: BytecodeContext) {
+        AllowExclusiveAudioPlaybackFingerprint.result?.mutableMethod?.apply {
+            addInstructions(
+                0,
+            """
+                const/4 v0, 0x1
+                return v0
+            """
+            )
+        } ?: throw AllowExclusiveAudioPlaybackFingerprint.exception
    }
-}
+}
--- a/src/main/kotlin/app/revanced/patches/music/interaction/permanentrepeat/patch/PermanentRepeatPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/interaction/permanentrepeat/patch/PermanentRepeatPatch.kt
@@ -1,14 +1,12 @@
 package app.revanced.patches.music.interaction.permanentrepeat.patch

-import app.revanced.extensions.toErrorResult
+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.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.music.annotations.MusicCompatibility
@@ -21,7 +19,7 @@ import app.revanced.patches.music.interaction.permanentrepeat.fingerprints.Repea
 class PermanentRepeatPatch : BytecodePatch(
    listOf(RepeatTrackFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        RepeatTrackFingerprint.result?.let {
            val startIndex = it.scanResult.patternScanResult!!.endIndex
            val repeatIndex = startIndex + 3
@@ -33,8 +31,6 @@ class PermanentRepeatPatch : BytecodePatch(
                    ExternalLabel("repeat", getInstruction(repeatIndex))
                )
            }
-        } ?: return RepeatTrackFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw RepeatTrackFingerprint.exception
    }
 }
--- a/src/main/kotlin/app/revanced/patches/music/interaction/permanentshuffle/patch/PermanentShufflePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/interaction/permanentshuffle/patch/PermanentShufflePatch.kt
@@ -1,13 +1,11 @@
 package app.revanced.patches.music.interaction.permanentshuffle.patch

-import app.revanced.extensions.toErrorResult
+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.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.interaction.permanentshuffle.fingerprints.DisableShuffleFingerprint
@@ -20,10 +18,8 @@ import app.revanced.patches.music.interaction.permanentshuffle.fingerprints.Disa
 class PermanentShuffleTogglePatch : BytecodePatch(
    listOf(DisableShuffleFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        DisableShuffleFingerprint.result?.mutableMethod?.addInstruction(0, "return-void")
-            ?: return DisableShuffleFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+            ?: throw DisableShuffleFingerprint.exception
    }
 }
--- a/src/main/kotlin/app/revanced/patches/music/layout/compactheader/patch/CompactHeaderPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/compactheader/patch/CompactHeaderPatch.kt
@@ -5,8 +5,6 @@ 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
@@ -19,7 +17,7 @@ import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction11x
 class CompactHeaderPatch : BytecodePatch(
    listOf(CompactHeaderConstructorFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        val result = CompactHeaderConstructorFingerprint.result!!
        val method = result.mutableMethod

@@ -31,7 +29,5 @@ class CompactHeaderPatch : BytecodePatch(
                invoke-virtual {v${register}, v2}, Landroid/view/View;->setVisibility(I)V
            """
        )
-
-        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/music/layout/minimizedplayback/patch/MinimizedPlaybackPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/minimizedplayback/patch/MinimizedPlaybackPatch.kt
@@ -5,8 +5,6 @@ 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
@@ -18,14 +16,12 @@ import app.revanced.patches.music.layout.minimizedplayback.fingerprints.Minimize
 class MinimizedPlaybackPatch : BytecodePatch(
    listOf(MinimizedPlaybackManagerFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        MinimizedPlaybackManagerFingerprint.result!!.mutableMethod.addInstruction(
            0,
            """
                return-void
            """
        )
-
-        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/music/layout/premium/patch/HideGetPremiumPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/premium/patch/HideGetPremiumPatch.kt
@@ -7,8 +7,6 @@ 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
@@ -21,7 +19,7 @@ import app.revanced.patches.music.layout.premium.fingerprints.HideGetPremiumPare
 class HideGetPremiumPatch : BytecodePatch(
    listOf(HideGetPremiumParentFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        val parentResult = HideGetPremiumParentFingerprint.result!!
        HideGetPremiumFingerprint.resolve(context, parentResult.classDef)

@@ -43,7 +41,5 @@ class HideGetPremiumPatch : BytecodePatch(
                const/16 v0, 0x8
            """
        )
-
-        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/patch/RemoveUpgradeButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/patch/RemoveUpgradeButtonPatch.kt
@@ -5,8 +5,6 @@ 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
@@ -24,7 +22,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
 class RemoveUpgradeButtonPatch : BytecodePatch(
    listOf(PivotBarConstructorFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        val result = PivotBarConstructorFingerprint.result!!
        val implementation = result.mutableMethod.implementation!!

@@ -69,6 +67,5 @@ class RemoveUpgradeButtonPatch : BytecodePatch(
        implementation.addInstructions(
            endIndex, instructionList
        )
-        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/music/misc/androidauto/patch/BypassCertificateChecksPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/androidauto/patch/BypassCertificateChecksPatch.kt
@@ -1,13 +1,11 @@
 package app.revanced.patches.music.misc.androidauto.patch

-import app.revanced.extensions.toErrorResult
+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.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
@@ -19,7 +17,7 @@ import app.revanced.patches.music.misc.androidauto.fingerprints.CheckCertificate
 class BypassCertificateChecksPatch : BytecodePatch(
    listOf(CheckCertificateFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        CheckCertificateFingerprint.result?.apply {
            mutableMethod.addInstructions(
                0, """
@@ -27,8 +25,6 @@ class BypassCertificateChecksPatch : BytecodePatch(
                return v0
                """
            )
-        } ?: return CheckCertificateFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw CheckCertificateFingerprint.exception
    }
 }
--- a/src/main/kotlin/app/revanced/patches/music/misc/microg/patch/bytecode/MicroGBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/microg/patch/bytecode/MicroGBytecodePatch.kt
@@ -4,7 +4,6 @@ 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
@@ -37,27 +36,25 @@ 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) =
-        // apply common microG patch
-        MicroGBytecodeHelper.patchBytecode(
-            context,
-            arrayOf(
-                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
+    override fun execute(context: BytecodeContext) = MicroGBytecodeHelper.patchBytecode(
+        context,
+        arrayOf(
+            MicroGBytecodeHelper.packageNameTransform(
+                Constants.PACKAGE_NAME,
+                Constants.REVANCED_PACKAGE_NAME
            )
-        ).let { PatchResultSuccess() }
+        ),
+        MicroGBytecodeHelper.PrimeMethodTransformationData(
+            PrimeFingerprint,
+            MUSIC_PACKAGE_NAME,
+            REVANCED_MUSIC_PACKAGE_NAME
+        ),
+        listOf(
+            ServiceCheckFingerprint,
+            GooglePlayUtilityFingerprint,
+            CastDynamiteModuleFingerprint,
+            CastDynamiteModuleV2Fingerprint,
+            CastContextFetchFingerprint
+        )
+    )
 }
--- a/src/main/kotlin/app/revanced/patches/music/misc/microg/patch/resource/MicroGResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/microg/patch/resource/MicroGResourcePatch.kt
@@ -2,8 +2,6 @@ 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
@@ -15,7 +13,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): PatchResult {
+    override fun execute(context: ResourceContext) {
        // update manifest
        MicroGResourceHelper.patchManifest(
            context,
@@ -30,6 +28,5 @@ class MicroGResourcePatch : ResourcePatch {
            SPOOFED_PACKAGE_NAME,
            SPOOFED_PACKAGE_SIGNATURE
        )
-        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/music/premium/backgroundplay/patch/BackgroundPlayPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/premium/backgroundplay/patch/BackgroundPlayPatch.kt
@@ -5,8 +5,6 @@ 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
@@ -18,7 +16,7 @@ import app.revanced.patches.music.premium.backgroundplay.fingerprints.Background
 class BackgroundPlayPatch : BytecodePatch(
    listOf(BackgroundPlaybackDisableFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        BackgroundPlaybackDisableFingerprint.result!!.mutableMethod.addInstructions(
            0,
            """
@@ -26,7 +24,5 @@ class BackgroundPlayPatch : BytecodePatch(
                return v0
            """
        )
-
-        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/myexpenses/misc/pro/patch/UnlockProPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/myexpenses/misc/pro/patch/UnlockProPatch.kt
@@ -5,8 +5,6 @@ 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
@@ -20,7 +18,7 @@ class UnlockProPatch : BytecodePatch(
        IsEnabledFingerprint
    )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        val method = IsEnabledFingerprint.result!!.mutableMethod
        method.addInstructions(
            0,
@@ -29,7 +27,5 @@ class UnlockProPatch : BytecodePatch(
                return v0
            """
        )
-        
-        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/netguard/broadcasts/removerestriction/resource/patch/RemoveBroadcastsRestrictionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/netguard/broadcasts/removerestriction/resource/patch/RemoveBroadcastsRestrictionPatch.kt
@@ -3,8 +3,6 @@ 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
@@ -15,7 +13,7 @@ import org.w3c.dom.Element
@Description("Enables starting/stopping NetGuard via broadcasts.")
@RemoveBroadcastsRestrictionCompatibility
 class RemoveBroadcastsRestrictionPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
        context.xmlEditor["AndroidManifest.xml"].use { dom ->
            val applicationNode = dom
                .file
@@ -32,7 +30,5 @@ class RemoveBroadcastsRestrictionPatch : ResourcePatch {
                }
            }
        }
-
-        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/nfctoolsse/misc/pro/patch/UnlockProPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/nfctoolsse/misc/pro/patch/UnlockProPatch.kt
@@ -1,13 +1,11 @@
 package app.revanced.patches.nfctoolsse.misc.pro.patch

-import app.revanced.extensions.toErrorResult
+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.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
@@ -22,7 +20,7 @@ class UnlockProPatch : BytecodePatch(
        IsLicenseRegisteredFingerprint
    )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        IsLicenseRegisteredFingerprint.result?.mutableMethod?.apply {
            addInstructions(
                0,
@@ -31,9 +29,7 @@ class UnlockProPatch : BytecodePatch(
                    return v0
                """
            )
-        } ?: return IsLicenseRegisteredFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw IsLicenseRegisteredFingerprint.exception
    }

 }
--- a/src/main/kotlin/app/revanced/patches/nyx/misc/pro/patch/UnlockProPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/nyx/misc/pro/patch/UnlockProPatch.kt
@@ -5,8 +5,6 @@ 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
@@ -20,7 +18,7 @@ class UnlockProPatch : BytecodePatch(
        CheckProFingerprint
    )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        val method = CheckProFingerprint.result!!.mutableMethod
        method.addInstructions(
            0,
@@ -29,7 +27,5 @@ class UnlockProPatch : BytecodePatch(
                return v0
            """
        )
-        
-        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/photomath/detection/deviceid/fingerprints/GetDeviceIdFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/photomath/detection/deviceid/fingerprints/GetDeviceIdFingerprint.kt
@@ -0,0 +1,9 @@
+package app.revanced.patches.photomath.detection.deviceid.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object GetDeviceIdFingerprint : MethodFingerprint(
+    returnType = "Ljava/lang/String;",
+    strings = listOf("androidId", "android_id"),
+    parameters = listOf()
+)
--- a/src/main/kotlin/app/revanced/patches/photomath/detection/deviceid/patch/SpoofDeviceIdPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/photomath/detection/deviceid/patch/SpoofDeviceIdPatch.kt
@@ -0,0 +1,32 @@
+package app.revanced.patches.photomath.detection.deviceid.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.replaceInstructions
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.photomath.detection.deviceid.fingerprints.GetDeviceIdFingerprint
+import app.revanced.patches.photomath.detection.signature.patch.SignatureDetectionPatch
+import kotlin.random.Random
+
+@Patch
+@DependsOn([SignatureDetectionPatch::class])
+@Name("Spoof device ID")
+@Description("Spoofs device ID to mitigate manual bans by developers.")
+@Compatibility([Package("com.microblink.photomath")])
+class SpoofDeviceIdPatch : BytecodePatch(
+    listOf(GetDeviceIdFingerprint)
+) {
+    override fun execute(context: BytecodeContext) = GetDeviceIdFingerprint.result?.mutableMethod?.replaceInstructions(
+        0,
+        """
+            const-string v0, "${Random.nextLong().toString(16)}"
+            return-object v0
+        """
+    ) ?: throw GetDeviceIdFingerprint.exception
+}
--- a/src/main/kotlin/app/revanced/patches/photomath/detection/signature/fingerprints/CheckSignatureFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/photomath/detection/signature/fingerprints/CheckSignatureFingerprint.kt
@@ -1,19 +1,11 @@
 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 com.android.tools.smali.dexlib2.Opcode

 object CheckSignatureFingerprint : MethodFingerprint(
-    returnType = "V",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    customFingerprint = { methodDef, _ ->
-        (methodDef.definingClass == "Lcom/microblink/photomath/main/activity/LauncherActivity;" ||
-                methodDef.definingClass == "Lcom/microblink/photomath/PhotoMath;") &&
-                methodDef.name == "onCreate"
-    },
    strings = listOf(
+        "packageInfo.signatures",
        "currentSignature"
    ),
    opcodes = listOf(
--- a/src/main/kotlin/app/revanced/patches/photomath/detection/signature/patch/SignatureDetectionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/photomath/detection/signature/patch/SignatureDetectionPatch.kt
@@ -1,13 +1,11 @@
 package app.revanced.patches.photomath.detection.signature.patch

-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 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.patches.photomath.detection.signature.fingerprints.CheckSignatureFingerprint
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction

@@ -17,15 +15,12 @@ class SignatureDetectionPatch : BytecodePatch(
        CheckSignatureFingerprint
    )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        CheckSignatureFingerprint.result?.apply {
            val signatureCheckInstruction = mutableMethod.getInstruction(scanResult.patternScanResult!!.endIndex)
            val checkRegister = (signatureCheckInstruction as OneRegisterInstruction).registerA

            mutableMethod.replaceInstruction(signatureCheckInstruction.location.index, "const/4 v$checkRegister, 0x1")
-        } ?: throw CheckSignatureFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw CheckSignatureFingerprint.exception
    }
-
 }
--- a/src/main/kotlin/app/revanced/patches/photomath/misc/bookpoint/fingerprints/IsBookpointEnabledFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/photomath/misc/bookpoint/fingerprints/IsBookpointEnabledFingerprint.kt
@@ -0,0 +1,17 @@
+package app.revanced.patches.photomath.misc.bookpoint.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+object IsBookpointEnabledFingerprint : MethodFingerprint(
+    returnType = "Z",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    parameters = listOf(),
+    strings = listOf(
+        "NoGeoData",
+        "NoCountryInGeo",
+        "RemoteConfig",
+        "GeoRCMismatch"
+    )
+)
--- a/src/main/kotlin/app/revanced/patches/photomath/misc/bookpoint/patch/EnableBookpointPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/photomath/misc/bookpoint/patch/EnableBookpointPatch.kt
@@ -0,0 +1,20 @@
+package app.revanced.patches.photomath.misc.bookpoint.patch
+
+import app.revanced.extensions.exception
+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.patches.photomath.misc.bookpoint.fingerprints.IsBookpointEnabledFingerprint
+
+@Description("Enables textbook access")
+class EnableBookpointPatch : BytecodePatch(listOf(IsBookpointEnabledFingerprint)) {
+    override fun execute(context: BytecodeContext) =
+        IsBookpointEnabledFingerprint.result?.mutableMethod?.replaceInstructions(
+            0,
+            """
+                const/4 v0, 0x1
+                return v0
+            """
+        ) ?: throw IsBookpointEnabledFingerprint.exception
+}
--- a/src/main/kotlin/app/revanced/patches/photomath/misc/unlockplus/annotations/UnlockPlusCompatibilty.kt
+++ b/src/main/kotlin/app/revanced/patches/photomath/misc/unlockplus/annotations/UnlockPlusCompatibilty.kt
@@ -1,8 +0,0 @@
-package app.revanced.patches.photomath.misc.unlockplus.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.microblink.photomath", arrayOf("8.20.0"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class UnlockPlusCompatibilty
--- a/src/main/kotlin/app/revanced/patches/photomath/misc/unlockplus/patch/UnlockPlusPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/photomath/misc/unlockplus/patch/UnlockPlusPatch.kt
@@ -1,41 +1,30 @@
 package app.revanced.patches.photomath.misc.unlockplus.patch

-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
+import app.revanced.extensions.exception
+import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Package
 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.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.photomath.detection.signature.patch.SignatureDetectionPatch
-import app.revanced.patches.photomath.misc.unlockplus.annotations.UnlockPlusCompatibilty
+import app.revanced.patches.photomath.misc.bookpoint.patch.EnableBookpointPatch
 import app.revanced.patches.photomath.misc.unlockplus.fingerprints.IsPlusUnlockedFingerprint

@Patch
@Name("Unlock plus")
-@DependsOn([SignatureDetectionPatch::class])
-@Description("Unlocks plus features.")
-@UnlockPlusCompatibilty
+@DependsOn([SignatureDetectionPatch::class, EnableBookpointPatch::class])
+@Compatibility([Package("com.microblink.photomath")])
 class UnlockPlusPatch : BytecodePatch(
-    listOf(
-        IsPlusUnlockedFingerprint
-    )
+    listOf(IsPlusUnlockedFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        IsPlusUnlockedFingerprint.result?.mutableMethod?.apply {
-            addInstructions(
-                0,
-                """
-                    const/4 v0, 0x1
-                    return v0
-                """
-            )
-        } ?: return IsPlusUnlockedFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-
+    override fun execute(context: BytecodeContext) = IsPlusUnlockedFingerprint.result?.mutableMethod?.addInstructions(
+        0,
+        """
+            const/4 v0, 0x1
+            return v0
+        """
+    ) ?: throw IsPlusUnlockedFingerprint.exception
 }
--- a/src/main/kotlin/app/revanced/patches/pixiv/ads/patch/HideAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/pixiv/ads/patch/HideAdsPatch.kt
@@ -1,12 +1,10 @@
 package app.revanced.patches.pixiv.ads.patch

-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.*
 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.pixiv.ads.fingerprints.IsNotPremiumFingerprint

@@ -15,7 +13,7 @@ import app.revanced.patches.pixiv.ads.fingerprints.IsNotPremiumFingerprint
@Description("Hides ads.")
@Compatibility([Package("jp.pxv.android")])
 class HideAdsPatch : BytecodePatch(listOf(IsNotPremiumFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        // Always return false in the "isNotPremium" method which normally returns !this.accountManager.isPremium.
        // However, this is not the method that controls the user's premium status.
        // Instead, this method is used to determine whether ads should be shown.
@@ -25,8 +23,6 @@ class HideAdsPatch : BytecodePatch(listOf(IsNotPremiumFingerprint)) {
                const/4 v0, 0x0
                return v0
            """
-        ) ?: return IsNotPremiumFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        ) ?: throw IsNotPremiumFingerprint.exception
    }
 }
--- a/src/main/kotlin/app/revanced/patches/reddit/ad/banner/patch/HideBannerPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/ad/banner/patch/HideBannerPatch.kt
@@ -3,14 +3,12 @@ package app.revanced.patches.reddit.ad.banner.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

@Name("Hide subreddit banner")
@Description("Hides banner ads from comments on subreddits.")
 class HideBannerPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
        context.xmlEditor[RESOURCE_FILE_PATH].use {
            it.file.getElementsByTagName("merge").item(0).childNodes.apply {
                val attributes = arrayOf("height", "width")
@@ -30,8 +28,6 @@ class HideBannerPatch : ResourcePatch {
                }
            }
        }
-
-        return PatchResultSuccess()
    }

    private companion object {
--- a/src/main/kotlin/app/revanced/patches/reddit/ad/comments/patch/HideCommentAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/ad/comments/patch/HideCommentAdsPatch.kt
@@ -5,8 +5,6 @@ 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.patches.reddit.ad.comments.fingerprints.HideCommentAdsFingerprint

@Name("Hide comment ads")
@@ -14,7 +12,7 @@ import app.revanced.patches.reddit.ad.comments.fingerprints.HideCommentAdsFinger
 class HideCommentAdsPatch : BytecodePatch(
    listOf(HideCommentAdsFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        val method = HideCommentAdsFingerprint.result!!.mutableMethod
        // Returns a blank object instead of the comment ad.
        method.addInstructions(
@@ -25,6 +23,5 @@ class HideCommentAdsPatch : BytecodePatch(
            return-object v0
            """
        )
-        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/reddit/ad/general/patch/HideAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/ad/general/patch/HideAdsPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
 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.patcher.patch.annotations.RequiresIntegrations
@@ -31,7 +29,7 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 class HideAdsPatch : BytecodePatch(
    listOf(AdPostFingerprint, NewAdPostFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        // region Filter promoted ads (does not work in popular or latest feed)

        AdPostFingerprint.result?.mutableMethod?.apply {
@@ -78,8 +76,6 @@ class HideAdsPatch : BytecodePatch(
        }

        // endregion
-
-        return PatchResultSuccess()
    }

    private companion object {
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/AbstractSpoofClientPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/AbstractSpoofClientPatch.kt
@@ -1,11 +1,14 @@
 package app.revanced.patches.reddit.customclients

 import android.os.Environment
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
-import app.revanced.patcher.patch.*
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.OptionsContainer
+import app.revanced.patcher.patch.PatchException
+import app.revanced.patcher.patch.PatchOption
 import java.io.File

 abstract class AbstractSpoofClientPatch(
@@ -17,13 +20,13 @@ abstract class AbstractSpoofClientPatch(
    addAll(clientIdFingerprints)
    userAgentFingerprints?.let(::addAll)
 }) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        if (options.clientId == null) {
            // Ensure device runs Android.
            try {
                Class.forName("android.os.Environment")
            } catch (e: ClassNotFoundException) {
-                return PatchResultError("No client ID provided")
+                throw PatchException("No client ID provided")
            }

            File(Environment.getExternalStorageDirectory(), "reddit_client_id_revanced.txt").also {
@@ -38,22 +41,16 @@ abstract class AbstractSpoofClientPatch(
                    The application type has to be "Installed app" and the redirect URI has to be set to "$redirectUri".
                """.trimIndent()

-                return PatchResultError(error)
+                throw PatchException(error)
            }.let { options.clientId = it.readText().trim() }
        }

        fun List<MethodFingerprint>?.executePatch(
-            patch: List<MethodFingerprintResult>.(BytecodeContext) -> PatchResult
-        ) {
-            when (val result = this?.map { it.result ?: throw it.toErrorResult() }?.patch(context)) {
-                is PatchResultError -> throw result
-            }
-        }
+            patch: List<MethodFingerprintResult>.(BytecodeContext) -> Unit
+        ) = this?.map { it.result ?: throw it.exception }?.patch(context)

        clientIdFingerprints.executePatch { patchClientId(context) }
        userAgentFingerprints.executePatch { patchUserAgent(context) }
-
-        return PatchResultSuccess()
    }

    /**
@@ -62,7 +59,7 @@ abstract class AbstractSpoofClientPatch(
     * @param context The current [BytecodeContext].
     *
     */
-    abstract fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext): PatchResult
+    abstract fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext)

    /**
     * Patch the user agent. The fingerprints are guaranteed to be in the same order as in [userAgentFingerprints].
@@ -70,8 +67,7 @@ abstract class AbstractSpoofClientPatch(
     * @param context The current [BytecodeContext].
     */
    // Not every client needs to patch the user agent.
-    open fun List<MethodFingerprintResult>.patchUserAgent(context: BytecodeContext): PatchResult =
-        PatchResultSuccess()
+    open fun List<MethodFingerprintResult>.patchUserAgent(context: BytecodeContext) {}

    companion object Options {
        open class SpoofClientOptionsContainer : OptionsContainer() {
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/baconreader/api/patch/SpoofClientPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/baconreader/api/patch/SpoofClientPatch.kt
@@ -7,8 +7,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
 import app.revanced.patches.reddit.customclients.SpoofClientAnnotation
 import app.revanced.patches.reddit.customclients.baconreader.api.fingerprints.GetAuthorizationUrlFingerprint
@@ -30,7 +28,7 @@ class SpoofClientPatch : AbstractSpoofClientPatch(
    "http://baconreader.com/auth", Options, listOf(GetAuthorizationUrlFingerprint, RequestTokenFingerprint)
 ) {

-    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext): PatchResult {
+    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext) {
        fun MethodFingerprintResult.patch(replacementString: String) {
            val clientIdIndex = scanResult.stringsScanResult!!.matches.first().index

@@ -48,8 +46,6 @@ class SpoofClientPatch : AbstractSpoofClientPatch(

        // Patch client id for access token request.
        last().patch(clientId!!)
-
-        return PatchResultSuccess()
    }

    companion object Options : AbstractSpoofClientPatch.Options.SpoofClientOptionsContainer()
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/boostforreddit/api/patch/SpoofClientPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/boostforreddit/api/patch/SpoofClientPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.annotation.Package
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
 import app.revanced.patches.reddit.customclients.SpoofClientAnnotation
 import app.revanced.patches.reddit.customclients.boostforreddit.api.fingerprints.GetClientIdFingerprint
@@ -20,7 +18,7 @@ import app.revanced.patches.reddit.customclients.boostforreddit.api.fingerprints
 class SpoofClientPatch : AbstractSpoofClientPatch(
    "http://rubenmayayo.com", Options, listOf(GetClientIdFingerprint)
 ) {
-    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext): PatchResult {
+    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext) {
        first().mutableMethod.addInstructions(
            0,
            """
@@ -28,8 +26,6 @@ class SpoofClientPatch : AbstractSpoofClientPatch(
                 return-object v0
            """
        )
-
-        return PatchResultSuccess()
    }

    companion object Options : AbstractSpoofClientPatch.Options.SpoofClientOptionsContainer()
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/infinityforreddit/api/fingerprints/AbstractClientIdFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/infinityforreddit/api/fingerprints/AbstractClientIdFingerprint.kt
@@ -1,12 +1,17 @@
 package app.revanced.patches.reddit.customclients.infinityforreddit.api.fingerprints

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import com.android.tools.smali.dexlib2.iface.ClassDef
+import com.android.tools.smali.dexlib2.iface.Method

-abstract class AbstractClientIdFingerprint(classTypeSuffix: String, methodName: String) : MethodFingerprint(
-    strings = listOf("NOe2iKrPPzwscA"),
-    customFingerprint = custom@{ methodDef, classDef ->
-        if (!classDef.type.endsWith(classTypeSuffix)) return@custom false
-
-        methodDef.name == methodName
-    }
-)
+/**
+ * Fingerprint for a method that has the client id hardcoded in it.
+ * The first string in the fingerprint is the client id.
+ *
+ * @param customFingerprint A custom fingerprint.
+ * @param additionalStrings Additional strings to add to the fingerprint.
+ */
+abstract class AbstractClientIdFingerprint(
+    customFingerprint: ((methodDef: Method, classDef: ClassDef) -> Boolean)? = null,
+    vararg additionalStrings: String
+) : MethodFingerprint(strings = listOf("NOe2iKrPPzwscA", *additionalStrings), customFingerprint = customFingerprint)
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/infinityforreddit/api/fingerprints/GetHttpBasicAuthHeaderFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/infinityforreddit/api/fingerprints/GetHttpBasicAuthHeaderFingerprint.kt
@@ -1,6 +1,3 @@
 package app.revanced.patches.reddit.customclients.infinityforreddit.api.fingerprints

-object GetHttpBasicAuthHeaderFingerprint : AbstractClientIdFingerprint(
-    "APIUtils;",
-    "getHttpBasicAuthHeader"
-)
+object GetHttpBasicAuthHeaderFingerprint : AbstractClientIdFingerprint(additionalStrings = arrayOf("Authorization"))
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/infinityforreddit/api/fingerprints/LoginActivityOnCreateFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/infinityforreddit/api/fingerprints/LoginActivityOnCreateFingerprint.kt
@@ -1,6 +1,5 @@
 package app.revanced.patches.reddit.customclients.infinityforreddit.api.fingerprints

-object LoginActivityOnCreateFingerprint : AbstractClientIdFingerprint(
-    "LoginActivity;",
-    "onCreate"
-)
+object LoginActivityOnCreateFingerprint : AbstractClientIdFingerprint(custom@{ methodDef, classDef ->
+    methodDef.name == "onCreate" && classDef.type.endsWith("LoginActivity;")
+})
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/infinityforreddit/api/patch/SpoofClientPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/infinityforreddit/api/patch/SpoofClientPatch.kt
@@ -7,8 +7,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
 import app.revanced.patches.reddit.customclients.SpoofClientAnnotation
 import app.revanced.patches.reddit.customclients.infinityforreddit.api.fingerprints.GetHttpBasicAuthHeaderFingerprint
@@ -25,8 +23,9 @@ class SpoofClientPatch : AbstractSpoofClientPatch(
    Options,
    listOf(GetHttpBasicAuthHeaderFingerprint, LoginActivityOnCreateFingerprint)
 ) {
-    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext): PatchResult {
+    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext) {
        forEach {
+            // First is index of the clientId string.
            val clientIdIndex = it.scanResult.stringsScanResult!!.matches.first().index
            it.mutableMethod.apply {
                val oAuthClientIdRegister = getInstruction<OneRegisterInstruction>(clientIdIndex).registerA
@@ -37,8 +36,6 @@ class SpoofClientPatch : AbstractSpoofClientPatch(
                )
            }
        }
-
-        return PatchResultSuccess()
    }

    companion object Options : AbstractSpoofClientPatch.Options.SpoofClientOptionsContainer()
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/joeyforreddit/ads/patch/DisableAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/joeyforreddit/ads/patch/DisableAdsPatch.kt
@@ -1,14 +1,12 @@
 package app.revanced.patches.reddit.customclients.joeyforreddit.ads.patch

-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Package
 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.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.reddit.customclients.joeyforreddit.ads.fingerprints.IsAdFreeUserFingerprint
@@ -19,15 +17,13 @@ import app.revanced.patches.reddit.customclients.joeyforreddit.detection.piracy.
@DependsOn([DisablePiracyDetectionPatch::class])
@Compatibility([Package("o.o.joey")])
 class DisableAdsPatch : BytecodePatch(listOf(IsAdFreeUserFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        IsAdFreeUserFingerprint.result?.mutableMethod?.addInstructions(
            0,
            """
                const/4 v0, 0x1
                return v0
            """
-        ) ?: return IsAdFreeUserFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        ) ?: throw IsAdFreeUserFingerprint.exception
    }
 }
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/joeyforreddit/api/patch/SpoofClientPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/joeyforreddit/api/patch/SpoofClientPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.annotation.Package
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
 import app.revanced.patches.reddit.customclients.SpoofClientAnnotation
@@ -31,7 +29,7 @@ import app.revanced.patches.reddit.customclients.joeyforreddit.detection.piracy.
 class SpoofClientPatch : AbstractSpoofClientPatch(
    "https://127.0.0.1:65023/authorize_callback", Options, listOf(GetClientIdFingerprint)
 ) {
-    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext): PatchResult {
+    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext) {
        first().mutableMethod.addInstructions(
            0,
            """
@@ -39,8 +37,6 @@ class SpoofClientPatch : AbstractSpoofClientPatch(
                return-object v0
            """
        )
-
-        return PatchResultSuccess()
    }

    companion object Options : AbstractSpoofClientPatch.Options.SpoofClientOptionsContainer()
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/joeyforreddit/detection/piracy/patch/DisablePiracyDetectionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/joeyforreddit/detection/piracy/patch/DisablePiracyDetectionPatch.kt
@@ -1,22 +1,18 @@
 package app.revanced.patches.reddit.customclients.joeyforreddit.detection.piracy.patch

-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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.patches.reddit.customclients.joeyforreddit.detection.piracy.fingerprints.PiracyDetectionFingerprint

 class DisablePiracyDetectionPatch : BytecodePatch(listOf(PiracyDetectionFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        PiracyDetectionFingerprint.result?.mutableMethod?.addInstruction(
            0,
            """
                return-void
            """
-        ) ?: return PiracyDetectionFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        ) ?: throw PiracyDetectionFingerprint.exception
    }
 }
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/redditisfun/api/patch/SpoofClientPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/redditisfun/api/patch/SpoofClientPatch.kt
@@ -9,8 +9,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult.MethodFingerprintScanResult.StringsScanResult.StringMatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
 import app.revanced.patches.reddit.customclients.SpoofClientAnnotation
 import app.revanced.patches.reddit.customclients.redditisfun.api.fingerprints.BasicAuthorizationFingerprint
@@ -29,7 +27,7 @@ class SpoofClientPatch : AbstractSpoofClientPatch(
    listOf(BuildAuthorizationStringFingerprint, BasicAuthorizationFingerprint),
    listOf(GetUserAgentFingerprint)
 ) {
-    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext): PatchResult {
+    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext) {
        /**
         * Replaces a one register instruction with a const-string instruction
         * at the index returned by [getReplacementIndex].
@@ -53,11 +51,9 @@ class SpoofClientPatch : AbstractSpoofClientPatch(

        // Path basic authorization.
        last().replaceWith("$clientId:") { last().index + 7 }
-
-        return PatchResultSuccess()
    }

-    override fun List<MethodFingerprintResult>.patchUserAgent(context: BytecodeContext): PatchResult {
+    override fun List<MethodFingerprintResult>.patchUserAgent(context: BytecodeContext) {
        // Use a random user agent.
        val randomName = (0..100000).random()
        val userAgent = "android:app.revanced.$randomName:v1.0.0 (by /u/revanced)"
@@ -69,8 +65,6 @@ class SpoofClientPatch : AbstractSpoofClientPatch(
                return-object v0
            """
        )
-
-        return PatchResultSuccess()
    }

    companion object Options : AbstractSpoofClientPatch.Options.SpoofClientOptionsContainer()
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/relayforreddit/api/patch/SpoofClientPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/relayforreddit/api/patch/SpoofClientPatch.kt
@@ -7,8 +7,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
 import app.revanced.patches.reddit.customclients.SpoofClientAnnotation
 import app.revanced.patches.reddit.customclients.relayforreddit.api.fingerprints.GetLoggedInBearerTokenFingerprint
@@ -32,7 +30,7 @@ class SpoofClientPatch : AbstractSpoofClientPatch(
        GetRefreshTokenFingerprint
    )
 ) {
-    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext): PatchResult {
+    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext) {
        forEach {
            val clientIdIndex = it.scanResult.stringsScanResult!!.matches.first().index
            it.mutableMethod.apply {
@@ -44,8 +42,6 @@ class SpoofClientPatch : AbstractSpoofClientPatch(
                )
            }
        }
-
-        return PatchResultSuccess()
    }

    companion object Options : AbstractSpoofClientPatch.Options.SpoofClientOptionsContainer()
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/slide/api/patch/SpoofClientPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/slide/api/patch/SpoofClientPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.annotation.Package
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
 import app.revanced.patches.reddit.customclients.SpoofClientAnnotation
 import app.revanced.patches.reddit.customclients.boostforreddit.api.fingerprints.GetClientIdFingerprint
@@ -20,7 +18,7 @@ import app.revanced.patches.reddit.customclients.boostforreddit.api.fingerprints
 class SpoofClientPatch : AbstractSpoofClientPatch(
    "http://www.ccrama.me", Options, listOf(GetClientIdFingerprint)
 ) {
-    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext): PatchResult {
+    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext) {
        first().mutableMethod.addInstructions(
            0,
    """
@@ -28,8 +26,6 @@ class SpoofClientPatch : AbstractSpoofClientPatch(
                     return-object v0
                """
        )
-
-        return PatchResultSuccess()
    }

    companion object Options : AbstractSpoofClientPatch.Options.SpoofClientOptionsContainer()
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/ads/patch/DisableAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/ads/patch/DisableAdsPatch.kt
@@ -1,12 +1,10 @@
 package app.revanced.patches.reddit.customclients.syncforreddit.ads.patch

-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.*
 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.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.reddit.customclients.syncforreddit.ads.fingerprints.IsAdsEnabledFingerprint
@@ -17,7 +15,7 @@ import app.revanced.patches.reddit.customclients.syncforreddit.detection.piracy.
@DependsOn([DisablePiracyDetectionPatch::class])
@Compatibility([Package("com.laurencedawson.reddit_sync")])
 class DisableAdsPatch : BytecodePatch(listOf(IsAdsEnabledFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        IsAdsEnabledFingerprint.result?.mutableMethod?.apply {
            addInstructions(
                0,
@@ -26,9 +24,7 @@ class DisableAdsPatch : BytecodePatch(listOf(IsAdsEnabledFingerprint)) {
                return v0
            """
            )
-        } ?: return IsAdsEnabledFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw IsAdsEnabledFingerprint.exception
    }

 }
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/annoyances/startup/patch/DisableSyncForLemmyBottomSheetPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/annoyances/startup/patch/DisableSyncForLemmyBottomSheetPatch.kt
@@ -7,8 +7,6 @@ import app.revanced.patcher.annotation.Package
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
 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.reddit.customclients.syncforreddit.annoyances.startup.fingerprints.MainActivityOnCreate

@@ -23,13 +21,11 @@ import app.revanced.patches.reddit.customclients.syncforreddit.annoyances.startu
    ]
 )
 class DisableSyncForLemmyBottomSheetPatch : BytecodePatch(listOf(MainActivityOnCreate)) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        MainActivityOnCreate.result?.mutableMethod?.apply {
            val showBottomSheetIndex = implementation!!.instructions.lastIndex - 1

            removeInstruction(showBottomSheetIndex)
        }
-
-        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/api/patch/SpoofClientPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/api/patch/SpoofClientPatch.kt
@@ -1,6 +1,6 @@
 package app.revanced.patches.reddit.customclients.syncforreddit.api.patch

-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Package
@@ -10,8 +10,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
 import app.revanced.patches.reddit.customclients.SpoofClientAnnotation
@@ -38,7 +36,7 @@ import java.util.*
 class SpoofClientPatch : AbstractSpoofClientPatch(
    "http://redditsync/auth", Options, listOf(GetAuthorizationStringFingerprint)
 ) {
-    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext): PatchResult {
+    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext) {
        forEach { fingerprintResult ->
            fingerprintResult.also { result ->
                GetBearerTokenFingerprint.also { it.resolve(context, result.classDef) }.result?.mutableMethod?.apply {
@@ -50,7 +48,7 @@ class SpoofClientPatch : AbstractSpoofClientPatch(
                         return-object v0
                    """
                    )
-                } ?: return GetBearerTokenFingerprint.toErrorResult()
+                } ?: throw GetBearerTokenFingerprint.exception
            }.let {
                val occurrenceIndex = it.scanResult.stringsScanResult!!.matches.first().index

@@ -71,8 +69,6 @@ class SpoofClientPatch : AbstractSpoofClientPatch(
                }
            }
        }
-
-        return PatchResultSuccess()
    }

    companion object Options : AbstractSpoofClientPatch.Options.SpoofClientOptionsContainer()
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/detection/piracy/patch/DisablePiracyDetectionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/detection/piracy/patch/DisablePiracyDetectionPatch.kt
@@ -4,13 +4,11 @@ import app.revanced.patcher.annotation.Description
 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.patches.reddit.customclients.syncforreddit.detection.piracy.fingerprints.PiracyDetectionFingerprint

@Description("Disables detection of modified versions.")
 class DisablePiracyDetectionPatch : BytecodePatch(listOf(PiracyDetectionFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        // Do not return an error if the fingerprint is not resolved.
        // This is fine because new versions of the target app do not need this patch.
        PiracyDetectionFingerprint.result?.mutableMethod?.apply {
@@ -21,7 +19,5 @@ class DisablePiracyDetectionPatch : BytecodePatch(listOf(PiracyDetectionFingerpr
                """
            )
        }
-
-        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/reddit/layout/disablescreenshotpopup/patch/DisableScreenshotPopupPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/layout/disablescreenshotpopup/patch/DisableScreenshotPopupPatch.kt
@@ -1,13 +1,11 @@
 package app.revanced.patches.reddit.layout.disablescreenshotpopup.patch

-import app.revanced.extensions.toErrorResult
+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.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.reddit.layout.disablescreenshotpopup.annotations.DisableScreenshotPopupCompatibility
 import app.revanced.patches.reddit.layout.disablescreenshotpopup.fingerprints.DisableScreenshotPopupFingerprint
@@ -19,10 +17,8 @@ import app.revanced.patches.reddit.layout.disablescreenshotpopup.fingerprints.Di
 class DisableScreenshotPopupPatch : BytecodePatch(
    listOf(DisableScreenshotPopupFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        DisableScreenshotPopupFingerprint.result?.mutableMethod?.addInstruction(0, "return-void")
-            ?: return DisableScreenshotPopupFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+            ?: throw DisableScreenshotPopupFingerprint.exception
    }
 }
--- a/src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/patch/PremiumIconPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/patch/PremiumIconPatch.kt
@@ -5,8 +5,6 @@ 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.reddit.layout.premiumicon.annotations.PremiumIconCompatibility
 import app.revanced.patches.reddit.layout.premiumicon.fingerprints.PremiumIconFingerprint
@@ -20,7 +18,7 @@ class PremiumIconPatch : BytecodePatch(
        PremiumIconFingerprint
    )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        val method = PremiumIconFingerprint.result!!.mutableMethod
        method.addInstructions(
            0,
@@ -29,6 +27,5 @@ class PremiumIconPatch : BytecodePatch(
                return v0
            """
        )
-        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/reddit/misc/tracking/url/patch/SanitizeUrlQueryPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/misc/tracking/url/patch/SanitizeUrlQueryPatch.kt
@@ -1,13 +1,11 @@
 package app.revanced.patches.reddit.misc.tracking.url.patch

-import app.revanced.extensions.toErrorResult
+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.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.reddit.misc.tracking.url.annotations.SanitizeUrlQueryCompatibility
 import app.revanced.patches.reddit.misc.tracking.url.fingerprints.ShareLinkFormatterFingerprint
@@ -19,14 +17,12 @@ import app.revanced.patches.reddit.misc.tracking.url.fingerprints.ShareLinkForma
 class SanitizeUrlQueryPatch : BytecodePatch(
    listOf(ShareLinkFormatterFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {

        ShareLinkFormatterFingerprint.result?.mutableMethod?.addInstructions(
            0,
            "return-object p0"
-        ) ?: return ShareLinkFormatterFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        ) ?: throw ShareLinkFormatterFingerprint.exception
    }

 }
--- a/src/main/kotlin/app/revanced/patches/scbeasy/detection/debugging/patch/RemoveDebuggingDetectionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/scbeasy/detection/debugging/patch/RemoveDebuggingDetectionPatch.kt
@@ -5,8 +5,6 @@ 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.scbeasy.detection.debugging.annotations.RemoveDebuggingDetectionCompatibility
 import app.revanced.patches.scbeasy.detection.debugging.fingerprints.DebuggingDetectionFingerprint
@@ -18,7 +16,7 @@ import app.revanced.patches.scbeasy.detection.debugging.fingerprints.DebuggingDe
 class RemoveDebuggingDetectionPatch : BytecodePatch(
    listOf(DebuggingDetectionFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        DebuggingDetectionFingerprint.result!!.mutableMethod.addInstructions(
            0,
            """
@@ -26,6 +24,5 @@ class RemoveDebuggingDetectionPatch : BytecodePatch(
                return v0
            """
        )
-        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/shared/fingerprints/LayoutConstructorFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/fingerprints/LayoutConstructorFingerprint.kt
@@ -0,0 +1,12 @@
+package app.revanced.patches.shared.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+object LayoutConstructorFingerprint : MethodFingerprint(
+    returnType = "V",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    parameters = emptyList(),
+    strings = listOf("1.0x")
+)
--- a/src/main/kotlin/app/revanced/patches/shared/integrations/patch/AbstractIntegrationsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/integrations/patch/AbstractIntegrationsPatch.kt
@@ -5,9 +5,7 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patches.shared.integrations.patch.AbstractIntegrationsPatch.IntegrationsFingerprint.RegisterResolver
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.ClassDef
@@ -40,7 +38,7 @@ abstract class AbstractIntegrationsPatch(
        strings,
        customFingerprint
    ) {
-        fun invoke(integrationsDescriptor: String): PatchResult {
+        fun invoke(integrationsDescriptor: String) {
            result?.mutableMethod?.let { method ->
                val contextRegister = contextRegisterResolver(method)

@@ -49,9 +47,7 @@ abstract class AbstractIntegrationsPatch(
                    "sput-object v$contextRegister, " +
                            "$integrationsDescriptor->context:Landroid/content/Context;"
                )
-            } ?: return PatchResultError("Could not find hook target fingerprint.")
-
-            return PatchResultSuccess()
+            } ?: throw PatchException("Could not find hook target fingerprint.")
        }

        interface RegisterResolver : (Method) -> Int {
@@ -59,20 +55,11 @@ abstract class AbstractIntegrationsPatch(
        }
    }

-    override fun execute(context: BytecodeContext): PatchResult {
-        if (context.findClass(integrationsDescriptor) == null) return MISSING_INTEGRATIONS
-
-        for (hook in hooks) hook.invoke(integrationsDescriptor).let {
-            if (it is PatchResultError) return it
-        }
-
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        val MISSING_INTEGRATIONS = PatchResultError(
-            "Integrations have not been merged yet. " +
-                    "This patch can not succeed without merging the integrations."
+    override fun execute(context: BytecodeContext) {
+        if (context.findClass(integrationsDescriptor) == null) throw PatchException(
+            "Integrations have not been merged yet. This patch can not succeed without merging the integrations."
        )
+
+        for (hook in hooks) hook.invoke(integrationsDescriptor)
    }
 }
--- a/src/main/kotlin/app/revanced/patches/shared/mapping/misc/patch/ResourceMappingPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/mapping/misc/patch/ResourceMappingPatch.kt
@@ -1,8 +1,6 @@
 package app.revanced.patches.shared.mapping.misc.patch

 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
 import java.util.*
@@ -19,7 +17,7 @@ class ResourceMappingPatch : ResourcePatch {
        private val threadPoolExecutor = Executors.newFixedThreadPool(THREAD_COUNT)
    }

-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
        // save the file in memory to concurrently read from
        val resourceXmlFile = context["res/values/public.xml"].readBytes()

@@ -59,8 +57,6 @@ class ResourceMappingPatch : ResourcePatch {
            .awaitTermination(Long.MAX_VALUE, TimeUnit.SECONDS)

        resourceMappings = mappings
-
-        return PatchResultSuccess()
    }
 }

--- a/src/main/kotlin/app/revanced/patches/shared/misc/fix/verticalscroll/patch/VerticalScrollPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/misc/fix/verticalscroll/patch/VerticalScrollPatch.kt
@@ -1,13 +1,11 @@
 package app.revanced.patches.shared.misc.fix.verticalscroll.patch

-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 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.patches.shared.misc.fix.verticalscroll.annotations.VerticalScrollCompatibility
 import app.revanced.patches.shared.misc.fix.verticalscroll.fingerprints.CanScrollVerticallyFingerprint
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
@@ -17,7 +15,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 class VerticalScrollPatch : BytecodePatch(
    listOf(CanScrollVerticallyFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        CanScrollVerticallyFingerprint.result?.let {
            it.mutableMethod.apply {
                val moveResultIndex = it.scanResult.patternScanResult!!.endIndex
@@ -29,8 +27,6 @@ class VerticalScrollPatch : BytecodePatch(
                    "const/4 v$moveResultRegister, 0x0"
                )
            }
-        } ?: return CanScrollVerticallyFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw CanScrollVerticallyFingerprint.exception
    }
 }
--- a/src/main/kotlin/app/revanced/patches/shared/settings/resource/patch/AbstractSettingsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/settings/resource/patch/AbstractSettingsResourcePatch.kt
@@ -1,10 +1,8 @@
 package app.revanced.patches.shared.settings.resource.patch

-import app.revanced.patcher.data.DomFileEditor
 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.util.DomFileEditor
 import app.revanced.patches.shared.settings.preference.BasePreference
 import app.revanced.patches.shared.settings.preference.BaseResource
 import app.revanced.patches.shared.settings.preference.addPreference
@@ -26,7 +24,7 @@ abstract class AbstractSettingsResourcePatch(
    private val preferenceFileName: String,
    private val sourceDirectory: String,
 ) : ResourcePatch, Closeable {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
        /*
         * used for self-restart
         * TODO: do this only, when necessary
@@ -51,8 +49,6 @@ abstract class AbstractSettingsResourcePatch(
        stringsEditor = context.xmlEditor["res/values/strings.xml"]
        arraysEditor = context.xmlEditor["res/values/arrays.xml"]
        revancedPreferencesEditor = context.xmlEditor["res/xml/$preferenceFileName.xml"]
-
-        return PatchResultSuccess()
    }

    internal companion object {
--- a/src/main/kotlin/app/revanced/patches/solidexplorer2/functionality/filesize/fingerprints/OnReadyFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/solidexplorer2/functionality/filesize/fingerprints/OnReadyFingerprint.kt
@@ -0,0 +1,15 @@
+package app.revanced.patches.solidexplorer2.functionality.filesize.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import com.android.tools.smali.dexlib2.Opcode
+
+object OnReadyFingerprint : MethodFingerprint(
+    opcodes = listOf(
+        Opcode.CONST_WIDE_32, // Constant storing the 2MB limit
+        Opcode.CMP_LONG,
+        Opcode.IF_LEZ,
+    ),
+    customFingerprint = { methodDef, _ ->
+        methodDef.definingClass == "Lpl/solidexplorer/plugins/texteditor/TextEditor;" && methodDef.name == "onReady"
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/solidexplorer2/functionality/filesize/patch/RemoveFileSizeLimitPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/solidexplorer2/functionality/filesize/patch/RemoveFileSizeLimitPatch.kt
@@ -0,0 +1,27 @@
+package app.revanced.patches.solidexplorer2.functionality.filesize.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.getInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.solidexplorer2.functionality.filesize.fingerprints.OnReadyFingerprint
+import com.android.tools.smali.dexlib2.iface.instruction.ThreeRegisterInstruction
+
+@Patch
+@Name("Remove file size limit")
+@Description("Allows opening files larger than 2 MB in the text editor.")
+@Compatibility([Package("pl.solidexplorer2")])
+class RemoveFileSizeLimitPatch : BytecodePatch(listOf(OnReadyFingerprint)) {
+    override fun execute(context: BytecodeContext) = OnReadyFingerprint.result?.let { result ->
+        val cmpIndex = result.scanResult.patternScanResult!!.startIndex + 1
+        val cmpResultRegister = result.mutableMethod.getInstruction<ThreeRegisterInstruction>(cmpIndex).registerA
+
+        result.mutableMethod.replaceInstruction(cmpIndex, "const/4 v${cmpResultRegister}, 0x0")
+    } ?: throw OnReadyFingerprint.exception
+}
--- a/src/main/kotlin/app/revanced/patches/songpal/badge/patch/BadgeTabPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/songpal/badge/patch/BadgeTabPatch.kt
@@ -1,14 +1,12 @@
 package app.revanced.patches.songpal.badge.patch

-import app.revanced.extensions.toErrorResult
+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.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.songpal.badge.annotations.BadgeCompatibility
 import app.revanced.patches.songpal.badge.fingerprints.CreateTabsFingerprint
@@ -20,7 +18,7 @@ import app.revanced.patches.songpal.badge.fingerprints.CreateTabsFingerprint
 class BadgeTabPatch : BytecodePatch(
    listOf(CreateTabsFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        CreateTabsFingerprint.result?.mutableMethod?.apply {
            removeInstructions(0, 2)

@@ -52,9 +50,7 @@ class BadgeTabPatch : BytecodePatch(
                 """
            )

-        } ?: return CreateTabsFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw CreateTabsFingerprint.exception
    }

    companion object {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
semantic-release-bot	dc6fa70d6f	chore(release): 2.190.0-dev.2 [skip ci] # [2.190.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v2.190.0-dev.1...v2.190.0-dev.2) (2023-08-28) ### Bug Fixes * Infinity for Reddit - Spoof client: Support latest version ([`3d93a9d`](`3d93a9d851`))	2023-08-28 18:23:24 +00:00
oSumAtrIX	3d93a9d851	fix(Infinity for Reddit - Spoof client): Support latest version	2023-08-28 20:20:04 +02:00
semantic-release-bot	426c4c2600	chore(release): 2.190.0-dev.1 [skip ci] # [2.190.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v2.189.0...v2.190.0-dev.1) (2023-08-28) ### Features * Photomath: Support latest version ([`8bcbd84`](`8bcbd8443d`))	2023-08-28 13:48:22 +00:00
badawoll	8bcbd8443d	feat(Photomath): Support latest version Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>	2023-08-28 15:45:47 +02:00
semantic-release-bot	1d01155b47	chore(release): 2.189.0 [skip ci] # [2.189.0](https://github.com/ReVanced/revanced-patches/compare/v2.188.1...v2.189.0) (2023-08-27) ### Features * Restore previous release ([`2adfc37`](`2adfc37a66`))	2023-08-27 23:56:04 +00:00
oSumAtrIX	bada0ea50f	chore: merge branch `dev` to `main` (#2884 )	2023-08-28 01:53:14 +02:00
semantic-release-bot	0a9e0982da	chore(release): 2.189.0-dev.1 [skip ci] # [2.189.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v2.188.1...v2.189.0-dev.1) (2023-08-27) ### Features * Restore previous release ([`2adfc37`](`2adfc37a66`))	2023-08-27 20:29:07 +00:00
oSumAtrIX	078e5d3b88	build: bump dependencies	2023-08-27 22:25:18 +02:00
oSumAtrIX	2adfc37a66	feat: Restore previous release This reverts commit `3938f2f1b3`.	2023-08-27 21:41:04 +02:00
semantic-release-bot	392021124c	chore(release): 2.188.1 [skip ci] ## [2.188.1](https://github.com/ReVanced/revanced-patches/compare/v2.188.0...v2.188.1) (2023-08-27) ### Bug Fixes * Revert previous release ([`3938f2f`](`3938f2f1b3`))	2023-08-27 02:44:10 +00:00
oSumAtrIX	d5dd8a22de	chore: merge branch `dev` to `main` (#2880 )	2023-08-27 04:40:34 +02:00
semantic-release-bot	03725b853a	chore(release): 2.188.1-dev.1 [skip ci] ## [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 ([`3938f2f`](`3938f2f1b3`))	2023-08-27 02:40:19 +00:00
oSumAtrIX	3938f2f1b3	fix: Revert previous release The previous release depends on a version of ReVanced Patcher which prevents usage of resource patches on lower Android versions. To solve this issue temporarily, until a fix is present, the previous release is reverted.	2023-08-27 04:37:21 +02:00
semantic-release-bot	ce2e46a7cb	chore(release): 2.188.0 [skip ci] # [2.188.0](https://github.com/ReVanced/revanced-patches/compare/v2.187.0...v2.188.0) (2023-08-26) ### Bug Fixes * allow using `PreferenceScreen` outside of current module ([`eb20cc4`](`eb20cc477f`)) * Client spoof: Remove exception from option ([`8f559ca`](`8f559ca170`)) * Enable android debugging: Update patch description ([#2869](https://github.com/ReVanced/revanced-patches/issues/2869)) ([`c10de2d`](`c10de2da22`)) * improve wording ([`8cd2933`](`8cd293310a`)) * Reddit is Fun - Spoof client: Use a more convincing user agent ([`1ea6f27`](`1ea6f27d7d`)) * remove newline ([`28c5410`](`28c541078b`)) * Tiktok - Show seekbar: Bump compatibility ([#2737](https://github.com/ReVanced/revanced-patches/issues/2737)) ([`70cffa4`](`70cffa4466`)) * YouTube - Client spoof: Adjust spoof signature settings description ([#2760](https://github.com/ReVanced/revanced-patches/issues/2760)) ([`d10b5cf`](`d10b5cf56e`)) * YouTube Music - Remove upgrade button: Remove the correct navigation bar item ([`395cfd2`](`395cfd2ee2`)) ### Features * Add `Override certificate pinning` patch ([#2781](https://github.com/ReVanced/revanced-patches/issues/2781)) ([`78d831f`](`78d831fc63`)) * Change package name: Append `.revanced` to package name by default ([#2750](https://github.com/ReVanced/revanced-patches/issues/2750)) ([`3cd5f57`](`3cd5f573b1`)) * Duolingo: Add `Unlock Duolingo Super` patch ([#2862](https://github.com/ReVanced/revanced-patches/issues/2862)) ([`1168c0c`](`1168c0cdf4`)) * Exclude `Custom branding` patch by default ([`52e7086`](`52e70866d9`)) * Lightroom: Add `Disable mandatory login` patch ([#2738](https://github.com/ReVanced/revanced-patches/issues/2738)) ([`9e8c4e6`](`9e8c4e61a5`)) * Lightroom: Add `Unlock premium` patch ([#2740](https://github.com/ReVanced/revanced-patches/issues/2740)) ([`204284f`](`204284f5d3`)) * Nova Launcher: Remove `Unlock prime` patch ([`dbcff62`](`dbcff623c8`)) * Publicize resource utility functions ([`520eb07`](`520eb07277`)) * Solid Explorer: Add `Remove file size limit` patch ([`a388592`](`a388592019`)) * Strava: Add `Subscription features` patch ([#2872](https://github.com/ReVanced/revanced-patches/issues/2872)) ([`3d4ef97`](`3d4ef97c1e`)) * Tasker: Remove `Unlock trial` patch ([`2ff3400`](`2ff3400ef1`)) * Use an extension property to create new exception when failing to resolve a fingerprint ([`a471605`](`a471605db7`)) * YouTube - Debug: Logging of layout proto buffer strings ([#2759](https://github.com/ReVanced/revanced-patches/issues/2759)) ([`d563085`](`d56308539b`)) * YouTube - External downloads: Recommend Seal instead of PowerTube ([#2803](https://github.com/ReVanced/revanced-patches/issues/2803)) ([`aef6813`](`aef68134b5`)) * YouTube - Hide video action buttons: Hide individual action buttons ([#2723](https://github.com/ReVanced/revanced-patches/issues/2723)) ([`7c131bf`](`7c131bfe1b`)) * YouTube Music - Exclusive audio playback: Support latest version ([`a4b33f2`](`a4b33f2063`)) * YouTube Music: Add `Permanent repeat` patch ([#2722](https://github.com/ReVanced/revanced-patches/issues/2722)) ([`21beefa`](`21beefa7e6`)) * YouTube Music: Add `Permanent Shuffle` patch ([#2730](https://github.com/ReVanced/revanced-patches/issues/2730)) ([`9725870`](`9725870e6a`)) * YouTube: Add `Alternative thumbnails` patch ([#2834](https://github.com/ReVanced/revanced-patches/issues/2834)) ([`4f7618c`](`4f7618c980`)) * YouTube: Add `Custom player overlay opacity` patch ([#2721](https://github.com/ReVanced/revanced-patches/issues/2721)) ([`004aae8`](`004aae8258`)) * YouTube: Add `Enable tablet layout` patch ([`74ef684`](`74ef6843cb`)) * YouTube: Support version `18.29.38` ([`52df1e6`](`52df1e6814`)) * YouTube: Support version `18.32.39` ([`c5ef490`](`c5ef490eee`))	2023-08-26 23:24:31 +00:00
oSumAtrIX	75a113d327	chore: merge branch `dev` to `main` (#2732 )	2023-08-27 01:21:27 +02:00
semantic-release-bot	9bc4323a80	chore(release): 2.188.0-dev.28 [skip ci] # [2.188.0-dev.28](https://github.com/ReVanced/revanced-patches/compare/v2.188.0-dev.27...v2.188.0-dev.28) (2023-08-26) ### Features * YouTube: Add `Enable tablet layout` patch ([`b9c57db`](`b9c57db166`))	2023-08-26 17:16:03 +02:00
oSumAtrIX	74ef6843cb	feat(YouTube): Add `Enable tablet layout` patch	2023-08-26 17:16:03 +02:00
semantic-release-bot	4318cf7121	chore(release): 2.188.0-dev.27 [skip ci] # [2.188.0-dev.27](https://github.com/ReVanced/revanced-patches/compare/v2.188.0-dev.26...v2.188.0-dev.27) (2023-08-26) ### Features * YouTube Music - Exclusive audio playback: Support latest version ([`65420f1`](`65420f1833`))	2023-08-26 17:16:03 +02:00
oSumAtrIX	a4b33f2063	feat(YouTube Music - Exclusive audio playback): Support latest version	2023-08-26 17:16:02 +02:00
semantic-release-bot	5979230705	chore(release): 2.188.0-dev.26 [skip ci] # [2.188.0-dev.26](https://github.com/ReVanced/revanced-patches/compare/v2.188.0-dev.25...v2.188.0-dev.26) (2023-08-26) ### Features * YouTube: Support version `18.32.39` ([`c5ef490`](`c5ef490eee`))	2023-08-26 17:16:02 +02:00
oSumAtrIX	79b037d044	chore(YouTube): Bump compatibility to `18.32.39`	2023-08-26 17:16:00 +02:00
oSumAtrIX	c5ef490eee	feat(YouTube): Support version `18.32.39`	2023-08-26 14:12:43 +02:00
semantic-release-bot	69092def55	chore(release): 2.188.0-dev.25 [skip ci] # [2.188.0-dev.25](https://github.com/ReVanced/revanced-patches/compare/v2.188.0-dev.24...v2.188.0-dev.25) (2023-08-26) ### Features * YouTube: Add `Custom player overlay opacity` patch ([#2721](https://github.com/ReVanced/revanced-patches/issues/2721)) ([`004aae8`](`004aae8258`))	2023-08-26 00:15:24 +00:00
johnconner122	004aae8258	feat(YouTube): Add `Custom player overlay opacity` patch (#2721 ) This gets rid of the `Hide player overlay` patch. Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>	2023-08-26 02:12:30 +02:00
semantic-release-bot	c378869941	chore(release): 2.188.0-dev.24 [skip ci] # [2.188.0-dev.24](https://github.com/ReVanced/revanced-patches/compare/v2.188.0-dev.23...v2.188.0-dev.24) (2023-08-25) ### Features * Exclude `Custom branding` patch by default ([`52e7086`](`52e70866d9`))	2023-08-25 15:57:17 +00:00
oSumAtrIX	52e70866d9	feat: Exclude `Custom branding` patch by default Due to design complexity of the patch the default branding included with the patch is mistaken as the branding soley meant for YouTube and not understood merely as the default branding.	2023-08-25 17:54:10 +02:00
semantic-release-bot	c7e1dd7563	chore(release): 2.188.0-dev.23 [skip ci] # [2.188.0-dev.23](https://github.com/ReVanced/revanced-patches/compare/v2.188.0-dev.22...v2.188.0-dev.23) (2023-08-25) ### Features * Strava: Add `Subscription features` patch ([#2872](https://github.com/ReVanced/revanced-patches/issues/2872)) ([`3d4ef97`](`3d4ef97c1e`))	2023-08-25 01:19:27 +00:00
xehpuk	3d4ef97c1e	feat(Strava): Add `Subscription features` patch (#2872 ) Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>	2023-08-25 03:16:12 +02:00
semantic-release-bot	040f612818	chore(release): 2.188.0-dev.22 [skip ci] # [2.188.0-dev.22](https://github.com/ReVanced/revanced-patches/compare/v2.188.0-dev.21...v2.188.0-dev.22) (2023-08-24) ### Features * Publicize resource utility functions ([`520eb07`](`520eb07277`)) * Use an extension property to create new exception when failing to resolve a fingerprint ([`a471605`](`a471605db7`))	2023-08-24 22:08:30 +00:00
oSumAtrIX	520eb07277	feat: Publicize resource utility functions This commit adds the functions to the public API	2023-08-25 00:05:32 +02:00
oSumAtrIX	a471605db7	feat: Use an extension property to create new exception when failing to resolve a fingerprint This commit adds the extension property to the public API	2023-08-25 00:05:30 +02:00
semantic-release-bot	31b5d506a5	chore(release): 2.188.0-dev.21 [skip ci] # [2.188.0-dev.21](https://github.com/ReVanced/revanced-patches/compare/v2.188.0-dev.20...v2.188.0-dev.21) (2023-08-24) ### Features * Duolingo: Add `Unlock Duolingo Super` patch ([#2862](https://github.com/ReVanced/revanced-patches/issues/2862)) ([`1168c0c`](`1168c0cdf4`))	2023-08-24 20:24:14 +00:00
Karol	1168c0cdf4	feat(Duolingo): Add `Unlock Duolingo Super` patch (#2862 )	2023-08-24 22:21:33 +02:00
semantic-release-bot	eeab2fa705	chore(release): 2.188.0-dev.20 [skip ci] # [2.188.0-dev.20](https://github.com/ReVanced/revanced-patches/compare/v2.188.0-dev.19...v2.188.0-dev.20) (2023-08-24) ### Bug Fixes * Enable android debugging: Update patch description ([#2869](https://github.com/ReVanced/revanced-patches/issues/2869)) ([`c10de2d`](`c10de2da22`))	2023-08-24 16:18:34 +00:00
LisoUseInAIKyrios	c10de2da22	fix(Enable android debugging): Update patch description (#2869 ) Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>	2023-08-24 20:15:48 +04:00
semantic-release-bot	bae5c8a70d	chore(release): 2.188.0-dev.19 [skip ci] # [2.188.0-dev.19](https://github.com/ReVanced/revanced-patches/compare/v2.188.0-dev.18...v2.188.0-dev.19) (2023-08-24) ### Features * Solid Explorer: Add `Remove file size limit` patch ([`a388592`](`a388592019`))	2023-08-24 02:24:21 +00:00
j4k0xb	a388592019	feat(Solid Explorer): Add `Remove file size limit` patch Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>	2023-08-24 04:21:18 +02:00
oSumAtrIX	269fa7fa48	refactor: remove unnecessary annotations	2023-08-23 16:48:03 +02:00
semantic-release-bot	f4c2c19f1d	chore(release): 2.188.0-dev.18 [skip ci] # [2.188.0-dev.18](https://github.com/ReVanced/revanced-patches/compare/v2.188.0-dev.17...v2.188.0-dev.18) (2023-08-23) ### Features * YouTube: Support version `18.29.38` ([`52df1e6`](`52df1e6814`))	2023-08-23 03:03:48 +00:00
oSumAtrIX	1817dbd10c	build(Needs bump): Bump dependencies	2023-08-23 05:01:09 +02:00
oSumAtrIX	3072412c79	chore(YouTube): Bump compatibility to `18.29.38`	2023-08-23 05:01:09 +02:00
oSumAtrIX	52df1e6814	feat(YouTube): Support version `18.29.38`	2023-08-23 05:01:09 +02:00
semantic-release-bot	038d6b215a	chore(release): 2.188.0-dev.17 [skip ci] # [2.188.0-dev.17](https://github.com/ReVanced/revanced-patches/compare/v2.188.0-dev.16...v2.188.0-dev.17) (2023-08-21) ### Features * YouTube: Add `Alternative thumbnails` patch ([#2834](https://github.com/ReVanced/revanced-patches/issues/2834)) ([`4f7618c`](`4f7618c980`))	2023-08-21 06:31:19 +00:00
LisoUseInAIKyrios	4f7618c980	feat(YouTube): Add `Alternative thumbnails` patch (#2834 ) Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>	2023-08-21 10:28:34 +04:00
Pun Butrach	9893c99009	build: update Gradle to v8.3 (#2843 )	2023-08-19 15:37:51 +02:00