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))
chore: merge branch dev to main (#2880 )
2026-01-17 08:13:56 +00:00 · 2023-08-27 02:44:10 +00:00 · 2023-08-27 04:40:34 +02:00 · 2023-08-27 02:40:19 +00:00 · 2023-08-27 04:37:21 +02:00 · 2023-08-26 23:24:31 +00:00
486 changed files with 2300 additions and 1842 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,123 @@
+## [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)


--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,15 +4,17 @@ plugins {

 group = "app.revanced"

+val githubUsername: String = project.findProperty("gpr.user") as? String ?: System.getenv("GITHUB_ACTOR")
+val githubPassword: String = project.findProperty("gpr.key") as? String ?: System.getenv("GITHUB_TOKEN")
+
 repositories {
    mavenCentral()
    mavenLocal()
-    google()
    maven {
        url = uri("https://maven.pkg.github.com/revanced/revanced-patcher")
        credentials {
-            username = project.findProperty("gpr.user") as? String ?: System.getenv("GITHUB_ACTOR")
-            password = project.findProperty("gpr.key") as? String ?: System.getenv("GITHUB_TOKEN")
+            username = githubUsername
+            password = githubPassword
        }
    }
    // Required for FlexVer-Java
@@ -25,15 +27,15 @@ repositories {
 }

 dependencies {
-    implementation("app.revanced:revanced-patcher:14.0.0")
-    implementation("com.android.tools.smali:smali:3.0.3")
-    // Required because build fails without it.
-    // TODO: Find a way to remove this dependency.
-    implementation("com.google.guava:guava:32.1.2-jre")
-    // Used in JsonGenerator.
+    implementation("app.revanced:revanced-patcher:11.0.4")
+    implementation("app.revanced:multidexlib2:2.5.3-a3836654")
+    // Required for meta
    implementation("com.google.code.gson:gson:2.10.1")
+    // Required for FlexVer-Java
+    implementation("com.unascribed:flexver-java:1.0.2")
+
    // A dependency to the Android library unfortunately fails the build,
-    // which is why this is required for the patch change-oauth-client-id.
+    // which is why this is required for the patch change-oauth-client-id
    compileOnly(project("dummy"))
 }

--- 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.19
+version = 2.188.1
--- 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.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-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,25 +1,25 @@
 package app.revanced.extensions

-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.MethodFingerprintExtensions.name
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.patch.PatchException
+import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.iface.Method
-import com.android.tools.smali.dexlib2.iface.instruction.WideLiteralInstruction
-import com.android.tools.smali.dexlib2.util.MethodUtil
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.Method
+import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
+import org.jf.dexlib2.util.MethodUtil
 import org.w3c.dom.Node

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

 /**
 * Find the [MutableMethod] from a given [Method] in a [MutableClass].
@@ -82,16 +82,3 @@ fun Method.indexOfFirstConstantInstructionValue(constantValue: Long): Int {
 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,6 +6,7 @@ import app.revanced.patcher.extensions.PatchExtensions.description
 import app.revanced.patcher.extensions.PatchExtensions.include
 import app.revanced.patcher.extensions.PatchExtensions.options
 import app.revanced.patcher.extensions.PatchExtensions.patchName
+import app.revanced.patcher.extensions.PatchExtensions.version
 import app.revanced.patcher.patch.PatchOption
 import com.google.gson.GsonBuilder
 import java.io.File
@@ -16,6 +17,7 @@ internal class JsonGenerator : PatchesFileGenerator {
            JsonPatch(
                it.patchName,
                it.description ?: "This patch has no description.",
+                it.version ?: "0.0.0",
                !it.include,
                it.options?.map { option ->
                    JsonPatch.Option(
@@ -46,6 +48,7 @@ internal class JsonGenerator : PatchesFileGenerator {
    private class JsonPatch(
        val name: String,
        val description: String,
+        val version: String,
        val excluded: Boolean,
        val options: Array<Option>,
        val dependencies: Array<String>,
--- a/src/main/kotlin/app/revanced/meta/PatchesFileGenerator.kt
+++ b/src/main/kotlin/app/revanced/meta/PatchesFileGenerator.kt
@@ -1,22 +1,25 @@
 package app.revanced.meta

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

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

 internal interface PatchesFileGenerator {
    fun generate(bundle: PatchBundlePatches)

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

 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.Patch

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

    private companion object {
--- 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
@@ -6,9 +6,9 @@ import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.annotations.RequiresIntegrations
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.util.patch.*
-import com.android.tools.smali.dexlib2.iface.ClassDef
-import com.android.tools.smali.dexlib2.iface.Method
-import com.android.tools.smali.dexlib2.iface.instruction.Instruction
+import org.jf.dexlib2.iface.ClassDef
+import org.jf.dexlib2.iface.Method
+import org.jf.dexlib2.iface.instruction.Instruction
 import java.util.*

@Patch(false)
--- 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,6 +3,8 @@ package app.revanced.patches.all.interaction.gestures.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.Patch

@@ -10,7 +12,7 @@ import app.revanced.patcher.patch.annotations.Patch
@Name("Predictive back gesture")
@Description("Enables the predictive back gesture introduced on Android 13.")
 class PredictiveBackGesturePatch : ResourcePatch {
-    override fun execute(context: ResourceContext) {
+    override fun execute(context: ResourceContext): PatchResult {
        context.xmlEditor["AndroidManifest.xml"].use { editor ->
            val document = editor.file

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

            }
        }
+
+        return PatchResultSuccess()
    }

    private companion object {
--- 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
@@ -11,7 +11,7 @@ import org.w3c.dom.Element
@Name("Enable android debugging")
@Description("Enables Android debugging capabilities.")
 class EnableAndroidDebuggingPatch : ResourcePatch {
-    override fun execute(context: ResourceContext) {
+    override fun execute(context: ResourceContext): PatchResult {
        context.xmlEditor["AndroidManifest.xml"].use { dom ->
            val applicationNode = dom
                .file
@@ -21,6 +21,8 @@ class EnableAndroidDebuggingPatch : ResourcePatch {
            // set application as debuggable
            applicationNode.setAttribute("android:debuggable", "true")
        }
+
+        return PatchResultSuccess()
    }

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

@Patch(false)
@Name("Change package name")
-@Description("Changes the package name. Appends \".revanced\" to the package name by default.")
+@Description("Changes the package name.")
 class ChangePackageNamePatch : ResourcePatch {
-    override fun execute(context: ResourceContext) {
-        val packageNameToUse = packageName ?: getDefaultPackageName(context)
+    override fun execute(context: ResourceContext): PatchResult {
+        packageName?.let { packageName ->
+            val packageNameRegex = Regex("^[a-z]\\w*(\\.[a-z]\\w*)+\$")
+            if (!packageName.matches(packageNameRegex))
+                return PatchResultError("Invalid package name")

-        val packageNameRegex = Regex("^[a-z]\\w*(\\.[a-z]\\w*)+\$")
-        if (!packageNameToUse.matches(packageNameRegex))
-            throw PatchException("Invalid package name")
+            var originalPackageName: String
+            context.xmlEditor["AndroidManifest.xml"].use { editor ->
+                val manifest = editor.file.getElementsByTagName("manifest").item(0) as Element
+                originalPackageName = manifest.getAttribute("package")
+            }

-        val originalPackageName = getOriginalPackageName(context)
+            if (!originalPackageName.matches(packageNameRegex))
+                return PatchResultError("Failed to get the original package name")

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

-    private fun getDefaultPackageName(context: ResourceContext): String {
-        val originalPackageName = getOriginalPackageName(context)
-        return "$originalPackageName.revanced"
-    }
+        } ?: return PatchResultError("No package name provided")

-    private fun getOriginalPackageName(context: ResourceContext): String {
-        context.xmlEditor["AndroidManifest.xml"].use { editor ->
-            val manifest = editor.file.getElementsByTagName("manifest").item(0) as Element
-            return manifest.getAttribute("package")
-        }
+        return PatchResultSuccess()
    }

    companion object : OptionsContainer() {
@@ -43,7 +41,7 @@ class ChangePackageNamePatch : ResourcePatch {
                key = "packageName",
                default = null,
                title = "Package name",
-                description = "The name of the package to rename the app to.",
+                description = "The name of the package to rename of the app.",
            )
        )
    }
--- 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
@@ -8,9 +8,9 @@ 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 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 org.jf.dexlib2.iface.ClassDef
+import org.jf.dexlib2.iface.Method
+import org.jf.dexlib2.iface.instruction.Instruction

@Patch(false)
@Name("Remove screen capture restriction")
--- 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,12 +2,14 @@ package app.revanced.patches.all.screencapture.removerestriction.resource.patch

 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import org.w3c.dom.Element

@Description("Sets allowAudioPlaybackCapture in manifest to true.")
 internal class RemoveCaptureRestrictionResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext) {
+    override fun execute(context: ResourceContext): PatchResult {
        // create an xml editor instance
        context.xmlEditor["AndroidManifest.xml"].use { dom ->
            // get the application node
@@ -19,5 +21,7 @@ internal class RemoveCaptureRestrictionResourcePatch : ResourcePatch {
            // set allowAudioPlaybackCapture attribute to true
            applicationNode.setAttribute("android:allowAudioPlaybackCapture", "true")
        }
+
+        return PatchResultSuccess()
    }
 }
--- 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
@@ -6,9 +6,9 @@ import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.annotations.RequiresIntegrations
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.util.patch.*
-import com.android.tools.smali.dexlib2.iface.ClassDef
-import com.android.tools.smali.dexlib2.iface.Method
-import com.android.tools.smali.dexlib2.iface.instruction.Instruction
+import org.jf.dexlib2.iface.ClassDef
+import org.jf.dexlib2.iface.Method
+import org.jf.dexlib2.iface.instruction.Instruction
 import java.util.*

@Patch(false)
--- a/src/main/kotlin/app/revanced/patches/backdrops/misc/pro/fingerprints/ProUnlockFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/backdrops/misc/pro/fingerprints/ProUnlockFingerprint.kt
@@ -1,7 +1,7 @@
 package app.revanced.patches.backdrops.misc.pro.fingerprints

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.Opcode

 object ProUnlockFingerprint : MethodFingerprint(
    opcodes = listOf(
--- 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
@@ -7,10 +7,12 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.backdrops.misc.pro.annotations.ProUnlockCompatibility
 import app.revanced.patches.backdrops.misc.pro.fingerprints.ProUnlockFingerprint
-import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction

@Patch
@Name("Pro unlock")
@@ -19,7 +21,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 class ProUnlockPatch : BytecodePatch(
    listOf(ProUnlockFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
        ProUnlockFingerprint.result?.let { result ->
            val registerIndex = result.scanResult.patternScanResult!!.endIndex - 1

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

-        } ?: throw ProUnlockFingerprint.toErrorResult()
+        } ?: return ProUnlockFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/candylinkvpn/patch/UnlockProPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/candylinkvpn/patch/UnlockProPatch.kt
@@ -6,6 +6,8 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.candylinkvpn.annotations.UnlockProCompatibility
 import app.revanced.patches.candylinkvpn.fingerprints.IsPremiumPurchasedFingerprint
@@ -17,13 +19,15 @@ import app.revanced.patches.candylinkvpn.fingerprints.IsPremiumPurchasedFingerpr
 class UnlockProPatch : BytecodePatch(
    listOf(IsPremiumPurchasedFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
        IsPremiumPurchasedFingerprint.result?.mutableMethod?.addInstructions(
            0,
            """
               const/4 v0, 0x1
               return v0
            """
-        ) ?: throw IsPremiumPurchasedFingerprint.toErrorResult()
+        ) ?: return IsPremiumPurchasedFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/finanzonline/detection/bootloader/fingerprints/BootStateFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/finanzonline/detection/bootloader/fingerprints/BootStateFingerprint.kt
@@ -1,8 +1,8 @@
 package app.revanced.patches.finanzonline.detection.bootloader.fingerprints

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode

 // Located @ at.gv.bmf.bmf2go.taxequalization.tools.utils.AttestationHelper#isBootStateOk (3.0.1)
 object BootStateFingerprint : MethodFingerprint(
--- a/src/main/kotlin/app/revanced/patches/finanzonline/detection/bootloader/fingerprints/CreateKeyFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/finanzonline/detection/bootloader/fingerprints/CreateKeyFingerprint.kt
@@ -1,7 +1,7 @@
 package app.revanced.patches.finanzonline.detection.bootloader.fingerprints

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags

 // Located @ at.gv.bmf.bmf2go.taxequalization.tools.utils.AttestationHelper#createKey (3.0.1)
 object CreateKeyFingerprint : MethodFingerprint(
--- 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
@@ -6,6 +6,8 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.finanzonline.detection.bootloader.fingerprints.BootStateFingerprint
 import app.revanced.patches.finanzonline.detection.bootloader.fingerprints.CreateKeyFingerprint
@@ -19,7 +21,7 @@ import app.revanced.patches.finanzonline.detection.shared.annotations.DetectionC
 class BootloaderDetectionPatch : BytecodePatch(
    listOf(CreateKeyFingerprint, BootStateFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
        arrayOf(CreateKeyFingerprint, BootStateFingerprint).forEach { fingerprint ->
            fingerprint.result?.mutableMethod?.addInstructions(
                0,
@@ -27,7 +29,9 @@ class BootloaderDetectionPatch : BytecodePatch(
                        const/4 v0, 0x1
                        return v0
                """
-            ) ?: throw fingerprint.toErrorResult()
+            ) ?: return fingerprint.toErrorResult()
        }
+
+        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/finanzonline/detection/root/fingerprints/RootDetectionFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/finanzonline/detection/root/fingerprints/RootDetectionFingerprint.kt
@@ -2,8 +2,8 @@ package app.revanced.patches.finanzonline.detection.root.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode

 // Located @ at.gv.bmf.bmf2go.taxequalization.tools.utils.RootDetection#isRooted (3.0.1)
 object RootDetectionFingerprint : MethodFingerprint(
--- 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
@@ -6,6 +6,8 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.finanzonline.detection.root.fingerprints.RootDetectionFingerprint
 import app.revanced.patches.finanzonline.detection.shared.annotations.DetectionCompatibility
@@ -17,13 +19,15 @@ import app.revanced.patches.finanzonline.detection.shared.annotations.DetectionC
 class RootDetectionPatch : BytecodePatch(
    listOf(RootDetectionFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
        RootDetectionFingerprint.result?.mutableMethod?.addInstructions(
            0,
            """
                sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
                return-object v0
            """
-        ) ?: throw RootDetectionFingerprint.toErrorResult()
+        ) ?: return RootDetectionFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/googlerecorder/restrictions/patch/RemoveDeviceRestrictions.kt
+++ b/src/main/kotlin/app/revanced/patches/googlerecorder/restrictions/patch/RemoveDeviceRestrictions.kt
@@ -10,9 +10,11 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.removeInstructions
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.googlerecorder.restrictions.fingerprints.OnApplicationCreateFingerprint
-import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction

@Patch
@Name("Remove device restrictions")
@@ -21,7 +23,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 class RemoveDeviceRestrictions : BytecodePatch(
    listOf(OnApplicationCreateFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
        OnApplicationCreateFingerprint.result?.let {
            val featureStringIndex = it.scanResult.stringsScanResult!!.matches.first().index

@@ -34,6 +36,8 @@ class RemoveDeviceRestrictions : BytecodePatch(
                // Override "isPixelDevice()" to return true.
                addInstruction(featureStringIndex, "const/4 v$featureAvailableRegister, 0x1")
            }
-        } ?: throw OnApplicationCreateFingerprint.toErrorResult()
+        } ?: return OnApplicationCreateFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
    }
 }
--- 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,6 +5,8 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstructions
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.hexeditor.ad.annotations.HexEditorAdsCompatibility
 import app.revanced.patches.hexeditor.ad.fingerprints.PrimaryAdsFingerprint
@@ -18,7 +20,7 @@ class HexEditorAdsPatch : BytecodePatch(
        PrimaryAdsFingerprint
    )
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
        val method = PrimaryAdsFingerprint.result!!.mutableMethod
        
        method.replaceInstructions(
@@ -28,5 +30,7 @@ class HexEditorAdsPatch : BytecodePatch(
                return v0
            """
        )
+
+        return PatchResultSuccess()
    }
 }
--- 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,6 +5,8 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.iconpackstudio.misc.pro.annotations.UnlockProCompatibility
 import app.revanced.patches.iconpackstudio.misc.pro.fingerprints.CheckProFingerprint
@@ -18,7 +20,7 @@ class UnlockProPatch : BytecodePatch(
        CheckProFingerprint
    )
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
        val method = CheckProFingerprint.result!!.mutableMethod
        method.addInstructions(
            0,
@@ -27,5 +29,7 @@ class UnlockProPatch : BytecodePatch(
                return v0
            """
        )
+        
+        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/idaustria/detection/root/fingerprints/RootDetectionFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/idaustria/detection/root/fingerprints/RootDetectionFingerprint.kt
@@ -1,7 +1,7 @@
 package app.revanced.patches.idaustria.detection.root.fingerprints

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags

 object RootDetectionFingerprint : MethodFingerprint(
    "V",
--- 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,6 +5,8 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.idaustria.detection.root.fingerprints.RootDetectionFingerprint
 import app.revanced.patches.idaustria.detection.shared.annotations.DetectionCompatibility
@@ -16,6 +18,8 @@ import app.revanced.patches.idaustria.detection.shared.annotations.DetectionComp
 class RootDetectionPatch : BytecodePatch(
    listOf(RootDetectionFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) =
+    override fun execute(context: BytecodeContext): PatchResult {
        RootDetectionFingerprint.result!!.mutableMethod.addInstruction(0, "return-void")
+        return PatchResultSuccess()
+    }
 }
--- a/src/main/kotlin/app/revanced/patches/idaustria/detection/signature/fingerprints/SpoofSignatureFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/idaustria/detection/signature/fingerprints/SpoofSignatureFingerprint.kt
@@ -1,7 +1,7 @@
 package app.revanced.patches.idaustria.detection.signature.fingerprints

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags

 object SpoofSignatureFingerprint : MethodFingerprint(
    "L",
--- 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,6 +5,8 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.idaustria.detection.shared.annotations.DetectionCompatibility
 import app.revanced.patches.idaustria.detection.signature.fingerprints.SpoofSignatureFingerprint
@@ -30,7 +32,7 @@ class SpoofSignaturePatch : BytecodePatch(
                "bf42c121d620ddfb7914f7a95c713d9e1c1b7bdb4a03d618e40cf7e9e235c0b5687e03b7ab3,publicExponent=10001}"
    }

-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
        SpoofSignatureFingerprint.result!!.mutableMethod.addInstructions(
            0,
            """
@@ -38,5 +40,6 @@ class SpoofSignaturePatch : BytecodePatch(
                return-object v0 
            """
        )
+        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/inshorts/ad/patch/InshortsAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/inshorts/ad/patch/InshortsAdsPatch.kt
@@ -6,6 +6,8 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.inshorts.ad.annotations.HideAdsCompatibility
 import app.revanced.patches.inshorts.ad.fingerprints.InshortsAdsFingerprint
@@ -17,7 +19,7 @@ import app.revanced.patches.inshorts.ad.fingerprints.InshortsAdsFingerprint
 class HideAdsPatch : BytecodePatch(
    listOf(InshortsAdsFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
        InshortsAdsFingerprint.result?.let { result ->
            result.apply {
                mutableMethod.addInstruction(
@@ -27,6 +29,8 @@ class HideAdsPatch : BytecodePatch(
                    """
                )
            }
-        } ?: throw InshortsAdsFingerprint.toErrorResult()
+        } ?: return InshortsAdsFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ShowAdFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ShowAdFingerprint.kt
@@ -2,8 +2,8 @@ package app.revanced.patches.instagram.patches.ads.timeline.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode

 object ShowAdFingerprint : MethodFingerprint(
    "Z",
--- a/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/GenericMediaAdFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/GenericMediaAdFingerprint.kt
@@ -1,6 +1,6 @@
 package app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads

-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.Opcode

 object GenericMediaAdFingerprint : MediaAdFingerprint(
    opcodes = listOf(
--- a/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/MediaAdFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/MediaAdFingerprint.kt
@@ -2,10 +2,10 @@ package app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.iface.ClassDef
-import com.android.tools.smali.dexlib2.iface.Method
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.ClassDef
+import org.jf.dexlib2.iface.Method

 abstract class MediaAdFingerprint(
    returnType: String? = "Z",
--- a/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/PaidPartnershipAdFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/PaidPartnershipAdFingerprint.kt
@@ -1,8 +1,8 @@
 package app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads

-import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
-import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.reference.MethodReference

 object PaidPartnershipAdFingerprint : MediaAdFingerprint(
    "V",
--- a/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/ShoppingAdFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/ShoppingAdFingerprint.kt
@@ -1,6 +1,6 @@
 package app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads

-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.Opcode

 object ShoppingAdFingerprint : MediaAdFingerprint(
    opcodes = listOf(
--- 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
@@ -8,6 +8,8 @@ import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.MediaFingerprint
@@ -16,8 +18,8 @@ import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads.Gene
 import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads.MediaAdFingerprint
 import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads.PaidPartnershipAdFingerprint
 import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads.ShoppingAdFingerprint
-import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
-import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction

@Patch
@Name("Hide timeline ads")
@@ -30,19 +32,19 @@ class HideTimelineAdsPatch : BytecodePatch(
        PaidPartnershipAdFingerprint // Unlike the other ads this one is resolved from all classes.
    )
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
        // region Resolve required methods to check for ads.

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

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

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

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

        // endregion

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

            // endregion
        }
+
+        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/irplus/ad/fingerprints/IrplusAdsFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/irplus/ad/fingerprints/IrplusAdsFingerprint.kt
@@ -2,7 +2,7 @@ package app.revanced.patches.irplus.ad.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags

 object IrplusAdsFingerprint : MethodFingerprint(
    "V",
--- 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,6 +5,8 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.irplus.ad.annotations.IrplusAdsCompatibility
 import app.revanced.patches.irplus.ad.fingerprints.IrplusAdsFingerprint
@@ -17,11 +19,13 @@ import app.revanced.patches.irplus.ad.fingerprints.IrplusAdsFingerprint
 class IrplusAdsPatch : BytecodePatch(
    listOf(IrplusAdsFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
        val method = IrplusAdsFingerprint.result!!.mutableMethod

        // By overwriting the second parameter of the method,
        // the view which holds the advertisement is removed.
        method.addInstruction(0, "const/4 p2, 0x0")
+
+        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/lightroom/misc/login/annotations/DisableMandatoryLoginCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/lightroom/misc/login/annotations/DisableMandatoryLoginCompatibility.kt
@@ -1,8 +0,0 @@
-package app.revanced.patches.lightroom.misc.login.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.adobe.lrmobile",)])
-@Target(AnnotationTarget.CLASS)
-internal annotation class DisableMandatoryLoginCompatibility
--- a/src/main/kotlin/app/revanced/patches/lightroom/misc/login/fingerprint/IsLoggedInFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/lightroom/misc/login/fingerprint/IsLoggedInFingerprint.kt
@@ -1,19 +0,0 @@
-package app.revanced.patches.lightroom.misc.login.fingerprint
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-object IsLoggedInFingerprint : MethodFingerprint(
-    returnType = "Z",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC or AccessFlags.FINAL,
-    opcodes = listOf(
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.SGET_OBJECT,
-        Opcode.IF_NE,
-        Opcode.CONST_4,
-        Opcode.GOTO
-    )
-)
--- 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,23 +0,0 @@
-package app.revanced.patches.lightroom.misc.login.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.lightroom.misc.login.annotations.DisableMandatoryLoginCompatibility
-import app.revanced.patches.lightroom.misc.login.fingerprint.IsLoggedInFingerprint
-
-@Patch
-@Name("Disable mandatory login")
-@DisableMandatoryLoginCompatibility
-class DisableMandatoryLoginPatch : BytecodePatch(listOf(IsLoggedInFingerprint)) {
-    override fun execute(context: BytecodeContext) {
-        IsLoggedInFingerprint.result?.mutableMethod?.apply {
-            val index = implementation!!.instructions.lastIndex - 1
-            // Set isLoggedIn = true.
-            replaceInstruction(index, "const/4 v0, 0x1")
-        } ?: throw IsLoggedInFingerprint.toErrorResult()
-    }
-}
--- a/src/main/kotlin/app/revanced/patches/lightroom/misc/premium/annotations/UnlockPremiumCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/lightroom/misc/premium/annotations/UnlockPremiumCompatibility.kt
@@ -1,8 +0,0 @@
-package app.revanced.patches.lightroom.misc.premium.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.adobe.lrmobile")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class UnlockPremiumCompatibility
--- a/src/main/kotlin/app/revanced/patches/lightroom/misc/premium/fingerprint/HasPurchasedFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/lightroom/misc/premium/fingerprint/HasPurchasedFingerprint.kt
@@ -1,18 +0,0 @@
-package app.revanced.patches.lightroom.misc.premium.fingerprint
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-object HasPurchasedFingerprint : MethodFingerprint(
-    returnType = "Z",
-    accessFlags = AccessFlags.PRIVATE or AccessFlags.FINAL,
-    strings = listOf("isPurchaseDoneRecently = true, access platform profile present? = "),
-    opcodes = listOf(
-        Opcode.SGET_OBJECT,
-        Opcode.CONST_4,
-        Opcode.CONST_4,
-        Opcode.CONST_4,
-    )
-)
--- 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,23 +0,0 @@
-package app.revanced.patches.lightroom.misc.premium.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.lightroom.misc.premium.annotations.UnlockPremiumCompatibility
-import app.revanced.patches.lightroom.misc.premium.fingerprint.HasPurchasedFingerprint
-
-@Patch
-@Name("Unlock premium")
-@Description("Unlocks premium features.")
-@UnlockPremiumCompatibility
-class UnlockPremiumPatch : BytecodePatch(listOf(HasPurchasedFingerprint)) {
-    override fun execute(context: BytecodeContext) {
-         // Set hasPremium = true.
-        HasPurchasedFingerprint.result?.mutableMethod?.replaceInstruction(2, "const/4 v2, 0x1")
-            ?: throw HasPurchasedFingerprint.toErrorResult()
-    }
-}
--- a/src/main/kotlin/app/revanced/patches/memegenerator/detection/license/fingerprint/LicenseValidationFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/memegenerator/detection/license/fingerprint/LicenseValidationFingerprint.kt
@@ -2,8 +2,8 @@ package app.revanced.patches.memegenerator.detection.license.fingerprint

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode

 object LicenseValidationFingerprint : MethodFingerprint(
    returnType = "Z",
--- 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
@@ -5,13 +5,15 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstructions
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patches.memegenerator.detection.license.fingerprint.LicenseValidationFingerprint

@Description("Disables Firebase license validation.")
 class LicenseValidationPatch : BytecodePatch(
    listOf(LicenseValidationFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
        LicenseValidationFingerprint.result?.apply {
            mutableMethod.replaceInstructions(
                0,
@@ -21,5 +23,7 @@ class LicenseValidationPatch : BytecodePatch(
                """
            )
        } ?: throw LicenseValidationFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/memegenerator/detection/signature/fingerprint/VerifySignatureFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/memegenerator/detection/signature/fingerprint/VerifySignatureFingerprint.kt
@@ -3,8 +3,8 @@ package app.revanced.patches.memegenerator.detection.signature.fingerprint
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode

@FuzzyPatternScanMethod(2)
 object VerifySignatureFingerprint : MethodFingerprint(
--- 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
@@ -5,13 +5,15 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstructions
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patches.memegenerator.detection.signature.fingerprint.VerifySignatureFingerprint

@Description("Disables detection of incorrect signature.")
 class SignatureVerificationPatch : BytecodePatch(
    listOf(VerifySignatureFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
        VerifySignatureFingerprint.result?.apply {
            mutableMethod.replaceInstructions(
                0,
@@ -21,5 +23,7 @@ class SignatureVerificationPatch : BytecodePatch(
                """
            )
        } ?: throw VerifySignatureFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/memegenerator/misc/pro/fingerprint/IsFreeVersionFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/memegenerator/misc/pro/fingerprint/IsFreeVersionFingerprint.kt
@@ -2,8 +2,8 @@ package app.revanced.patches.memegenerator.misc.pro.fingerprint

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode

 object IsFreeVersionFingerprint : MethodFingerprint(
    returnType = "Ljava/lang/Boolean;",
--- 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
@@ -6,6 +6,8 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstructions
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.memegenerator.detection.license.patch.LicenseValidationPatch
@@ -26,7 +28,7 @@ class UnlockProVersionPatch : BytecodePatch(
        IsFreeVersionFingerprint
    )
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
        IsFreeVersionFingerprint.result?.apply {
            mutableMethod.replaceInstructions(0,
                """
@@ -35,5 +37,7 @@ class UnlockProVersionPatch : BytecodePatch(
                """
            )
        } ?: throw IsFreeVersionFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/messenger/ads/inbox/fingerprints/LoadInboxAdsFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/messenger/ads/inbox/fingerprints/LoadInboxAdsFingerprint.kt
@@ -2,7 +2,7 @@ package app.revanced.patches.messenger.ads.inbox.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags

 object LoadInboxAdsFingerprint : MethodFingerprint(
    returnType = "V",
--- 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
@@ -5,6 +5,8 @@ import app.revanced.patcher.annotation.*
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.messenger.ads.inbox.fingerprints.LoadInboxAdsFingerprint

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

--- a/src/main/kotlin/app/revanced/patches/messenger/inputfield/fingerprints/SendTypingIndicatorFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/messenger/inputfield/fingerprints/SendTypingIndicatorFingerprint.kt
@@ -1,7 +1,7 @@
 package app.revanced.patches.messenger.inputfield.fingerprints

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.dexbacked.value.DexBackedStringEncodedValue
+import org.jf.dexlib2.dexbacked.value.DexBackedStringEncodedValue

 object SendTypingIndicatorFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/messenger/inputfield/fingerprints/SwitchMessangeInputEmojiButtonFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/messenger/inputfield/fingerprints/SwitchMessangeInputEmojiButtonFingerprint.kt
@@ -1,7 +1,7 @@
 package app.revanced.patches.messenger.inputfield.fingerprints

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.Opcode

 object SwitchMessangeInputEmojiButtonFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/messenger/inputfield/patch/DisableSwitchingEmojiToStickerInMessageInputField.kt
+++ b/src/main/kotlin/app/revanced/patches/messenger/inputfield/patch/DisableSwitchingEmojiToStickerInMessageInputField.kt
@@ -6,16 +6,18 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.messenger.inputfield.fingerprints.SwitchMessangeInputEmojiButtonFingerprint
-import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction

@Patch
@Name("Disable switching emoji to sticker in message input field")
@Description("Disables switching from emoji to sticker search mode in message input field")
@Compatibility([Package("com.facebook.orca")])
 class DisableSwitchingEmojiToStickerInMessageInputField : BytecodePatch(listOf(SwitchMessangeInputEmojiButtonFingerprint)) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
        SwitchMessangeInputEmojiButtonFingerprint.result?.let {
            val setStringIndex = it.scanResult.patternScanResult!!.startIndex + 2

@@ -28,5 +30,7 @@ class DisableSwitchingEmojiToStickerInMessageInputField : BytecodePatch(listOf(S
                )
            }
        } ?: throw SwitchMessangeInputEmojiButtonFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/messenger/inputfield/patch/DisableTypingIndicator.kt
+++ b/src/main/kotlin/app/revanced/patches/messenger/inputfield/patch/DisableTypingIndicator.kt
@@ -8,6 +8,8 @@ import app.revanced.patcher.annotation.Package
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.messenger.inputfield.fingerprints.SendTypingIndicatorFingerprint

@@ -16,8 +18,10 @@ import app.revanced.patches.messenger.inputfield.fingerprints.SendTypingIndicato
@Description("Disables the indicator while typing a message")
@Compatibility([Package("com.facebook.orca")])
 class DisableTypingIndicator : BytecodePatch(listOf(SendTypingIndicatorFingerprint)) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
        SendTypingIndicatorFingerprint.result?.mutableMethod?.replaceInstruction(0, "return-void")
            ?: throw SendTypingIndicatorFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/moneymanager/fingerprints/UnlockProFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/moneymanager/fingerprints/UnlockProFingerprint.kt
@@ -2,8 +2,8 @@ package app.revanced.patches.moneymanager.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode

 object UnlockProFingerprint : MethodFingerprint(
    "Z",
--- a/src/main/kotlin/app/revanced/patches/moneymanager/patch/UnlockProPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/moneymanager/patch/UnlockProPatch.kt
@@ -5,6 +5,8 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.moneymanager.annotations.UnlockProCompatibility
 import app.revanced.patches.moneymanager.fingerprints.UnlockProFingerprint
@@ -16,7 +18,7 @@ import app.revanced.patches.moneymanager.fingerprints.UnlockProFingerprint
 class UnlockProPatch : BytecodePatch(
    listOf(UnlockProFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
       UnlockProFingerprint.result!!.mutableMethod.addInstructions(
            0,
            """
@@ -24,5 +26,6 @@ class UnlockProPatch : BytecodePatch(
               return v0 
            """
        )
+        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/music/ad/video/fingerprints/ShowMusicVideoAdsConstructorFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/ad/video/fingerprints/ShowMusicVideoAdsConstructorFingerprint.kt
@@ -2,8 +2,8 @@ package app.revanced.patches.music.ad.video.fingerprints
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode

@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
 object ShowMusicVideoAdsConstructorFingerprint : MethodFingerprint(
--- a/src/main/kotlin/app/revanced/patches/music/ad/video/fingerprints/ShowMusicVideoAdsFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/ad/video/fingerprints/ShowMusicVideoAdsFingerprint.kt
@@ -2,8 +2,8 @@ package app.revanced.patches.music.ad.video.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode

 object ShowMusicVideoAdsFingerprint : MethodFingerprint(
    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("Z"), listOf(
--- 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,6 +6,8 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.music.ad.video.fingerprints.ShowMusicVideoAdsConstructorFingerprint
 import app.revanced.patches.music.ad.video.fingerprints.ShowMusicVideoAdsFingerprint
@@ -18,7 +20,7 @@ import app.revanced.patches.music.annotations.MusicCompatibility
 class MusicVideoAdsPatch : BytecodePatch(
    listOf(ShowMusicVideoAdsConstructorFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
        ShowMusicVideoAdsFingerprint.resolve(context, ShowMusicVideoAdsConstructorFingerprint.result!!.classDef)

        val result = ShowMusicVideoAdsFingerprint.result!!
@@ -29,5 +31,7 @@ class MusicVideoAdsPatch : BytecodePatch(
                const/4 p1, 0x0
            """
        )
+
+        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/music/audio/codecs/fingerprints/AllCodecsReferenceFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/audio/codecs/fingerprints/AllCodecsReferenceFingerprint.kt
@@ -3,8 +3,8 @@ package app.revanced.patches.music.audio.codecs.fingerprints
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode


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


@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
--- 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,13 +3,16 @@ package app.revanced.patches.music.audio.codecs.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.data.toMethodWalker
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.toInstruction
 import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.audio.codecs.fingerprints.AllCodecsReferenceFingerprint
 import app.revanced.patches.music.audio.codecs.fingerprints.CodecsLockFingerprint
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.Opcode

@Patch
@Name("Codecs unlock")
@@ -20,7 +23,7 @@ class CodecsUnlockPatch : BytecodePatch(
        CodecsLockFingerprint, AllCodecsReferenceFingerprint
    )
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
        val codecsLockResult = CodecsLockFingerprint.result!!

        val implementation = codecsLockResult.mutableMethod.implementation!!
@@ -45,5 +48,7 @@ class CodecsUnlockPatch : BytecodePatch(
            instructionIndex,
            "invoke-static {}, ${allCodecsMethod.definingClass}->${allCodecsMethod.name}()Ljava/util/Set;".toInstruction()
        )
+
+        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/fingerprints/AudioOnlyEnablerFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/fingerprints/AudioOnlyEnablerFingerprint.kt
@@ -2,8 +2,8 @@ package app.revanced.patches.music.audio.exclusiveaudio.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode

 object  AudioOnlyEnablerFingerprint: MethodFingerprint(
    "Z", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(
--- a/src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/fingerprints/ExclusiveAudioFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/fingerprints/ExclusiveAudioFingerprint.kt
@@ -3,8 +3,8 @@ package app.revanced.patches.music.audio.exclusiveaudio.fingerprints
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode


@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
--- 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
@@ -6,6 +6,8 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.audio.exclusiveaudio.fingerprints.AudioOnlyEnablerFingerprint
@@ -17,9 +19,11 @@ import app.revanced.patches.music.audio.exclusiveaudio.fingerprints.AudioOnlyEna
 class ExclusiveAudioPatch : BytecodePatch(
    listOf(AudioOnlyEnablerFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) {
+    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()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/music/interaction/permanentrepeat/fingerprints/RepeatTrackFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/interaction/permanentrepeat/fingerprints/RepeatTrackFingerprint.kt
@@ -1,22 +0,0 @@
-package app.revanced.patches.music.interaction.permanentrepeat.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-object RepeatTrackFingerprint : MethodFingerprint(
-    "V",
-    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    listOf("L", "L"),
-    listOf(
-        Opcode.CHECK_CAST,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.SGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_NEZ
-    )
-)
--- 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,36 +0,0 @@
-package app.revanced.patches.music.interaction.permanentrepeat.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.music.annotations.MusicCompatibility
-import app.revanced.patches.music.interaction.permanentrepeat.fingerprints.RepeatTrackFingerprint
-
-@Patch(false)
-@Name("Permanent repeat")
-@Description("Permanently remember your repeating preference even if the playlist ends or another track is played.")
-@MusicCompatibility
-class PermanentRepeatPatch : BytecodePatch(
-    listOf(RepeatTrackFingerprint)
-) {
-    override fun execute(context: BytecodeContext) {
-        RepeatTrackFingerprint.result?.let {
-            val startIndex = it.scanResult.patternScanResult!!.endIndex
-            val repeatIndex = startIndex + 3
-
-            it.mutableMethod.apply {
-                addInstructionsWithLabels(
-                    startIndex,
-                    "goto :repeat",
-                    ExternalLabel("repeat", getInstruction(repeatIndex))
-                )
-            }
-        } ?: throw RepeatTrackFingerprint.toErrorResult()
-    }
-}
--- a/src/main/kotlin/app/revanced/patches/music/interaction/permanentshuffle/fingerprints/DisableShuffleFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/interaction/permanentshuffle/fingerprints/DisableShuffleFingerprint.kt
@@ -1,20 +0,0 @@
-package app.revanced.patches.music.interaction.permanentshuffle.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-object DisableShuffleFingerprint : MethodFingerprint(
-    "V",
-    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    listOf(),
-    listOf(
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.SGET_OBJECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL
-    )
-)
--- 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,25 +0,0 @@
-package app.revanced.patches.music.interaction.permanentshuffle.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.music.annotations.MusicCompatibility
-import app.revanced.patches.music.interaction.permanentshuffle.fingerprints.DisableShuffleFingerprint
-
-@Patch(false)
-@Name("Permanent shuffle")
-@Description("Permanently remember your shuffle preference " +
-        "even if the playlist ends or another track is played.")
-@MusicCompatibility
-class PermanentShuffleTogglePatch : BytecodePatch(
-    listOf(DisableShuffleFingerprint)
-) {
-    override fun execute(context: BytecodeContext) {
-        DisableShuffleFingerprint.result?.mutableMethod?.addInstruction(0, "return-void")
-            ?: throw DisableShuffleFingerprint.toErrorResult()
-    }
-}
--- a/src/main/kotlin/app/revanced/patches/music/layout/compactheader/fingerprints/CompactHeaderConstructorFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/compactheader/fingerprints/CompactHeaderConstructorFingerprint.kt
@@ -2,8 +2,8 @@ package app.revanced.patches.music.layout.compactheader.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode

 object CompactHeaderConstructorFingerprint : MethodFingerprint(
    "V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, listOf("L", "L", "L", "L", "L"), listOf(
--- 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,10 +5,12 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.layout.compactheader.fingerprints.CompactHeaderConstructorFingerprint
-import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction11x
+import org.jf.dexlib2.builder.instruction.BuilderInstruction11x

@Patch(false)
@Name("Compact header")
@@ -17,7 +19,7 @@ import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction11x
 class CompactHeaderPatch : BytecodePatch(
    listOf(CompactHeaderConstructorFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
        val result = CompactHeaderConstructorFingerprint.result!!
        val method = result.mutableMethod

@@ -29,5 +31,7 @@ class CompactHeaderPatch : BytecodePatch(
                invoke-virtual {v${register}, v2}, Landroid/view/View;->setVisibility(I)V
            """
        )
+
+        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/music/layout/minimizedplayback/fingerprints/MinimizedPlaybackManagerFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/minimizedplayback/fingerprints/MinimizedPlaybackManagerFingerprint.kt
@@ -2,8 +2,8 @@ package app.revanced.patches.music.layout.minimizedplayback.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode

 object MinimizedPlaybackManagerFingerprint : MethodFingerprint(
    "V",
--- 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,6 +5,8 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.layout.minimizedplayback.fingerprints.MinimizedPlaybackManagerFingerprint
@@ -16,12 +18,14 @@ import app.revanced.patches.music.layout.minimizedplayback.fingerprints.Minimize
 class MinimizedPlaybackPatch : BytecodePatch(
    listOf(MinimizedPlaybackManagerFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
        MinimizedPlaybackManagerFingerprint.result!!.mutableMethod.addInstruction(
            0,
            """
                return-void
            """
        )
+
+        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/music/layout/premium/fingerprints/HideGetPremiumFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/premium/fingerprints/HideGetPremiumFingerprint.kt
@@ -2,8 +2,8 @@ package app.revanced.patches.music.layout.premium.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode

 object HideGetPremiumFingerprint : MethodFingerprint(
    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(
--- a/src/main/kotlin/app/revanced/patches/music/layout/premium/fingerprints/HideGetPremiumParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/premium/fingerprints/HideGetPremiumParentFingerprint.kt
@@ -2,8 +2,8 @@ package app.revanced.patches.music.layout.premium.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode

 object HideGetPremiumParentFingerprint : MethodFingerprint(
    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(
--- 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,6 +7,8 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.layout.premium.fingerprints.HideGetPremiumFingerprint
@@ -19,7 +21,7 @@ import app.revanced.patches.music.layout.premium.fingerprints.HideGetPremiumPare
 class HideGetPremiumPatch : BytecodePatch(
    listOf(HideGetPremiumParentFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
        val parentResult = HideGetPremiumParentFingerprint.result!!
        HideGetPremiumFingerprint.resolve(context, parentResult.classDef)

@@ -41,5 +43,7 @@ class HideGetPremiumPatch : BytecodePatch(
                const/16 v0, 0x8
            """
        )
+
+        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/fingerprints/PivotBarConstructorFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/fingerprints/PivotBarConstructorFingerprint.kt
@@ -3,8 +3,8 @@ package app.revanced.patches.music.layout.upgradebutton.fingerprints
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode


@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
--- 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,24 +5,26 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.toInstructions
 import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.layout.upgradebutton.fingerprints.PivotBarConstructorFingerprint
-import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction22t
-import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction22c
-import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.builder.instruction.BuilderInstruction22t
+import org.jf.dexlib2.iface.instruction.formats.Instruction22c
+import org.jf.dexlib2.iface.instruction.formats.Instruction35c


@Patch
-@Name("Remove upgrade button")
+@Name("Upgrade button remover")
@Description("Removes the upgrade tab from the pivot bar.")
@MusicCompatibility
 class RemoveUpgradeButtonPatch : BytecodePatch(
    listOf(PivotBarConstructorFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
        val result = PivotBarConstructorFingerprint.result!!
        val implementation = result.mutableMethod.implementation!!

@@ -34,7 +36,7 @@ class RemoveUpgradeButtonPatch : BytecodePatch(
        val instructionList = """
                invoke-interface { v0 }, Ljava/util/List;->size()I
                move-result v1
-                const/4 v2, 0x4
+                const/4 v2, 0x3
                invoke-interface {v0, v2}, Ljava/util/List;->remove(I)Ljava/lang/Object;
                iput-object v0, v$register, $pivotBarElementFieldRef
            """.toInstructions().toMutableList()
@@ -67,5 +69,6 @@ class RemoveUpgradeButtonPatch : BytecodePatch(
        implementation.addInstructions(
            endIndex, instructionList
        )
+        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/music/misc/androidauto/fingerprints/CheckCertificateFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/androidauto/fingerprints/CheckCertificateFingerprint.kt
@@ -2,7 +2,7 @@ package app.revanced.patches.music.misc.androidauto.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags

 object CheckCertificateFingerprint : MethodFingerprint(
    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
--- 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
@@ -6,6 +6,8 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.misc.androidauto.fingerprints.CheckCertificateFingerprint
@@ -17,7 +19,7 @@ import app.revanced.patches.music.misc.androidauto.fingerprints.CheckCertificate
 class BypassCertificateChecksPatch : BytecodePatch(
    listOf(CheckCertificateFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
        CheckCertificateFingerprint.result?.apply {
            mutableMethod.addInstructions(
                0, """
@@ -25,6 +27,8 @@ class BypassCertificateChecksPatch : BytecodePatch(
                return v0
                """
            )
-        } ?: throw CheckCertificateFingerprint.toErrorResult()
+        } ?: return CheckCertificateFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/GooglePlayUtilityFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/GooglePlayUtilityFingerprint.kt
@@ -2,7 +2,7 @@ package app.revanced.patches.music.misc.microg.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags

 object GooglePlayUtilityFingerprint : MethodFingerprint(
    "I",
--- a/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/ServiceCheckFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/ServiceCheckFingerprint.kt
@@ -3,7 +3,7 @@ package app.revanced.patches.music.misc.microg.fingerprints
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags


@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
--- 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,6 +4,7 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.music.annotations.MusicCompatibility
@@ -36,25 +37,27 @@ class MicroGBytecodePatch : BytecodePatch(
    // - "com.google.android.gms.phenotype.PACKAGE_NAME",
    // - "com.google.android.gms.phenotype.UPDATE",
    // - "com.google.android.gms.phenotype",
-    override fun execute(context: BytecodeContext) = MicroGBytecodeHelper.patchBytecode(
-        context,
-        arrayOf(
-            MicroGBytecodeHelper.packageNameTransform(
-                Constants.PACKAGE_NAME,
-                Constants.REVANCED_PACKAGE_NAME
+    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
            )
-        ),
-        MicroGBytecodeHelper.PrimeMethodTransformationData(
-            PrimeFingerprint,
-            MUSIC_PACKAGE_NAME,
-            REVANCED_MUSIC_PACKAGE_NAME
-        ),
-        listOf(
-            ServiceCheckFingerprint,
-            GooglePlayUtilityFingerprint,
-            CastDynamiteModuleFingerprint,
-            CastDynamiteModuleV2Fingerprint,
-            CastContextFetchFingerprint
-        )
-    )
+        ).let { PatchResultSuccess() }
 }
--- 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,6 +2,8 @@ package app.revanced.patches.music.misc.microg.patch.resource

 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patches.music.misc.microg.shared.Constants.MUSIC_PACKAGE_NAME
 import app.revanced.patches.music.misc.microg.shared.Constants.REVANCED_MUSIC_APP_NAME
@@ -13,7 +15,7 @@ import app.revanced.util.microg.MicroGResourceHelper

@Description("Resource patch to allow YouTube Music ReVanced to run without root and under a different package name.")
 class MicroGResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext) {
+    override fun execute(context: ResourceContext): PatchResult {
        // update manifest
        MicroGResourceHelper.patchManifest(
            context,
@@ -28,5 +30,6 @@ class MicroGResourcePatch : ResourcePatch {
            SPOOFED_PACKAGE_NAME,
            SPOOFED_PACKAGE_SIGNATURE
        )
+        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/music/premium/backgroundplay/fingerprints/BackgroundPlaybackDisableFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/premium/backgroundplay/fingerprints/BackgroundPlaybackDisableFingerprint.kt
@@ -3,8 +3,8 @@ package app.revanced.patches.music.premium.backgroundplay.fingerprints
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode


@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
--- 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,6 +5,8 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.premium.backgroundplay.fingerprints.BackgroundPlaybackDisableFingerprint
@@ -16,7 +18,7 @@ import app.revanced.patches.music.premium.backgroundplay.fingerprints.Background
 class BackgroundPlayPatch : BytecodePatch(
    listOf(BackgroundPlaybackDisableFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
        BackgroundPlaybackDisableFingerprint.result!!.mutableMethod.addInstructions(
            0,
            """
@@ -24,5 +26,7 @@ class BackgroundPlayPatch : BytecodePatch(
                return v0
            """
        )
+
+        return PatchResultSuccess()
    }
 }
--- 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,6 +5,8 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.myexpenses.misc.pro.annotations.UnlockProCompatibility
 import app.revanced.patches.myexpenses.misc.pro.fingerprints.IsEnabledFingerprint
@@ -18,7 +20,7 @@ class UnlockProPatch : BytecodePatch(
        IsEnabledFingerprint
    )
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
        val method = IsEnabledFingerprint.result!!.mutableMethod
        method.addInstructions(
            0,
@@ -27,5 +29,7 @@ class UnlockProPatch : BytecodePatch(
                return v0
            """
        )
+        
+        return PatchResultSuccess()
    }
 }
--- 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,6 +3,8 @@ package app.revanced.patches.netguard.broadcasts.removerestriction.resource.patc
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.netguard.broadcasts.removerestriction.resource.annotations.RemoveBroadcastsRestrictionCompatibility
@@ -13,7 +15,7 @@ import org.w3c.dom.Element
@Description("Enables starting/stopping NetGuard via broadcasts.")
@RemoveBroadcastsRestrictionCompatibility
 class RemoveBroadcastsRestrictionPatch : ResourcePatch {
-    override fun execute(context: ResourceContext) {
+    override fun execute(context: ResourceContext): PatchResult {
        context.xmlEditor["AndroidManifest.xml"].use { dom ->
            val applicationNode = dom
                .file
@@ -30,5 +32,7 @@ class RemoveBroadcastsRestrictionPatch : ResourcePatch {
                }
            }
        }
+
+        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/nfctoolsse/misc/pro/fingerprints/IsLicenseRegisteredFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/nfctoolsse/misc/pro/fingerprints/IsLicenseRegisteredFingerprint.kt
@@ -1,7 +1,7 @@
 package app.revanced.patches.nfctoolsse.misc.pro.fingerprints

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags

 object IsLicenseRegisteredFingerprint : MethodFingerprint(
    returnType = "Z",
--- 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
@@ -6,6 +6,8 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.nfctoolsse.misc.pro.annotations.UnlockProCompatibility
 import app.revanced.patches.nfctoolsse.misc.pro.fingerprints.IsLicenseRegisteredFingerprint
@@ -20,7 +22,7 @@ class UnlockProPatch : BytecodePatch(
        IsLicenseRegisteredFingerprint
    )
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
        IsLicenseRegisteredFingerprint.result?.mutableMethod?.apply {
            addInstructions(
                0,
@@ -29,7 +31,9 @@ class UnlockProPatch : BytecodePatch(
                    return v0
                """
            )
-        } ?: throw IsLicenseRegisteredFingerprint.toErrorResult()
+        } ?: return IsLicenseRegisteredFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
    }

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

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode

 object CheckSignatureFingerprint : MethodFingerprint(
    returnType = "V",
--- 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
@@ -6,8 +6,10 @@ 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
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction

@Description("Disables detection of incorrect signature.")
 class SignatureDetectionPatch : BytecodePatch(
@@ -15,13 +17,15 @@ class SignatureDetectionPatch : BytecodePatch(
        CheckSignatureFingerprint
    )
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
        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()
    }

 }
--- a/src/main/kotlin/app/revanced/patches/photomath/misc/unlockplus/fingerprints/IsPlusUnlockedFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/photomath/misc/unlockplus/fingerprints/IsPlusUnlockedFingerprint.kt
@@ -2,7 +2,7 @@ package app.revanced.patches.photomath.misc.unlockplus.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
+import org.jf.dexlib2.AccessFlags

 object IsPlusUnlockedFingerprint : MethodFingerprint(
    returnType = "Z",
--- 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
@@ -6,6 +6,8 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.photomath.detection.signature.patch.SignatureDetectionPatch
@@ -22,7 +24,7 @@ class UnlockPlusPatch : BytecodePatch(
        IsPlusUnlockedFingerprint
    )
 ) {
-    override fun execute(context: BytecodeContext) {
+    override fun execute(context: BytecodeContext): PatchResult {
        IsPlusUnlockedFingerprint.result?.mutableMethod?.apply {
            addInstructions(
                0,
@@ -31,7 +33,9 @@ class UnlockPlusPatch : BytecodePatch(
                    return v0
                """
            )
-        } ?: throw IsPlusUnlockedFingerprint.toErrorResult()
+        } ?: return IsPlusUnlockedFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
    }

 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
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