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

# [2.159.0-dev.2](https://github.com/revanced/revanced-patches/compare/v2.159.0-dev.1...v2.159.0-dev.2) (2023-02-01)

### Features

* `spoof-wifi-connection` patch ([#1527](https://github.com/revanced/revanced-patches/issues/1527)) ([2223b07](2223b07dbe))

CHANGELOG.md

@@ -1,3 +1,94 @@
+# [2.159.0-dev.2](https://github.com/revanced/revanced-patches/compare/v2.159.0-dev.1...v2.159.0-dev.2) (2023-02-01)
+
+
+### Features
+
+* `spoof-wifi-connection` patch ([#1527](https://github.com/revanced/revanced-patches/issues/1527)) ([adce206](https://github.com/revanced/revanced-patches/commit/adce206d66e1f7017328fe68a5818d424f70e588))
+
+# [2.159.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.158.0...v2.159.0-dev.1) (2023-02-01)
+
+
+### Bug Fixes
+
+* **youtube/custom-branding:** correct scaling, margin and images ([#1580](https://github.com/revanced/revanced-patches/issues/1580)) ([491c413](https://github.com/revanced/revanced-patches/commit/491c4138f0185664a9c5d3db9ebdf026ff4594e8))
+
+
+### Features
+
+* **music:** bump patches compatibility to v5.41.50 ([#1551](https://github.com/revanced/revanced-patches/issues/1551)) ([0b1024a](https://github.com/revanced/revanced-patches/commit/0b1024ab754a3e2ce798a54cccda6f41f97069a5))
+* **spotify-lite:** enable on-demand patch ([9f0de4f](https://github.com/revanced/revanced-patches/commit/9f0de4f5678e9f57baaf6ec788821641d75defdc))
+
+# [2.158.0](https://github.com/revanced/revanced-patches/compare/v2.157.0...v2.158.0) (2023-01-29)
+
+
+### Bug Fixes
+
+* **youtube/microg-support:** replace new permission ([3d1cce5](https://github.com/revanced/revanced-patches/commit/3d1cce5b4ca54c622b863f24febeb03a6060033c))
+* **youtube:** resolve duplicate preference keys ([#1550](https://github.com/revanced/revanced-patches/issues/1550)) ([aafdb89](https://github.com/revanced/revanced-patches/commit/aafdb891b2f0f243cb2d997a38ab3e6a7b46aba8))
+
+
+### Features
+
+* **irplus:** `remove-ads` patch ([#1554](https://github.com/revanced/revanced-patches/issues/1554)) ([9943a52](https://github.com/revanced/revanced-patches/commit/9943a520d29ee89598b4aa6aba69ff83cb4768ce))
+
+# [2.158.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.157.1-dev.2...v2.158.0-dev.1) (2023-01-28)
+
+
+### Features
+
+* **irplus:** `remove-ads` patch ([#1554](https://github.com/revanced/revanced-patches/issues/1554)) ([9943a52](https://github.com/revanced/revanced-patches/commit/9943a520d29ee89598b4aa6aba69ff83cb4768ce))
+
+## [2.157.1-dev.2](https://github.com/revanced/revanced-patches/compare/v2.157.1-dev.1...v2.157.1-dev.2) (2023-01-28)
+
+
+### Bug Fixes
+
+* **youtube:** resolve duplicate preference keys ([#1550](https://github.com/revanced/revanced-patches/issues/1550)) ([aafdb89](https://github.com/revanced/revanced-patches/commit/aafdb891b2f0f243cb2d997a38ab3e6a7b46aba8))
+
+## [2.157.1-dev.1](https://github.com/revanced/revanced-patches/compare/v2.157.0...v2.157.1-dev.1) (2023-01-28)
+
+
+### Bug Fixes
+
+* **youtube/microg-support:** replace new permission ([3d1cce5](https://github.com/revanced/revanced-patches/commit/3d1cce5b4ca54c622b863f24febeb03a6060033c))
+
+# [2.157.0](https://github.com/revanced/revanced-patches/compare/v2.156.0...v2.157.0) (2023-01-28)
+
+
+### Bug Fixes
+
+* parse any kind of patch version ([66cd88f](https://github.com/revanced/revanced-patches/commit/66cd88f4d8a9161a4c51b70f2384dcee92fe2aea))
+* **twitter/hide-views-stats:** constrain to last working version ([#1522](https://github.com/revanced/revanced-patches/issues/1522)) ([bf45817](https://github.com/revanced/revanced-patches/commit/bf45817677fd058f9b255dbef5c1ca9aaec95531))
+* **youtube/return-youtube-dislike:** do not fetch voting stats when watching shorts ([#1532](https://github.com/revanced/revanced-patches/issues/1532)) ([f46fcad](https://github.com/revanced/revanced-patches/commit/f46fcadd855a13d9f8916f21980abcf5564e97d7))
+* **youtube/settings:** resolve fingerprints robustly ([8e98605](https://github.com/revanced/revanced-patches/commit/8e98605a7491d69e99c6b1aeb2de3db9396faa20))
+* **youtube/sponsorblock:** replace missing strings ([7b8f0db](https://github.com/revanced/revanced-patches/commit/7b8f0db2c17da6488db1ec2c21a21a14ff8466aa))
+* **youtube:** reliably resolve fingerprints ([1598306](https://github.com/revanced/revanced-patches/commit/1598306eb58ae8f8dc38b472628b237e55ec0f1b))
+
+
+### Features
+
+* **finanzonline:** `remove-bootloader-detection` patch ([3952138](https://github.com/revanced/revanced-patches/commit/39521386c2296f46479e31c39ab245c2778ebd65))
+* **finanzonline:** `remove-root-detection` patch ([1d46d63](https://github.com/revanced/revanced-patches/commit/1d46d63fdcf3cbce53a7719f4490225368c4d5ae))
+* **music:** update patches compatibility to v5.40.51 ([#1541](https://github.com/revanced/revanced-patches/issues/1541)) ([13143cb](https://github.com/revanced/revanced-patches/commit/13143cb5260f8793d246633a6a506bdc9f3a3ce7))
+* **youtube/general-ads:** remove hiding video shelf ([c4c9e5b](https://github.com/revanced/revanced-patches/commit/c4c9e5bb3765d08d6653864d33546c25ba367292))
+* **youtube/microg-support:** check if Vanced MicroG is running in the background ([#1531](https://github.com/revanced/revanced-patches/issues/1531)) ([81934ef](https://github.com/revanced/revanced-patches/commit/81934efb39b8ed9b0a523ffd7c4d841227ac141f))
+* **youtube:** `open-links-externally` patch ([#1524](https://github.com/revanced/revanced-patches/issues/1524)) ([caf3d70](https://github.com/revanced/revanced-patches/commit/caf3d70c30bc440923c0e76e7331010905f6e729))
+* **youtube:** show toasts along exceptions ([#1511](https://github.com/revanced/revanced-patches/issues/1511)) ([5817e4d](https://github.com/revanced/revanced-patches/commit/5817e4d27fab692c0e95ab4aa2fa8f13005cb780))
+
+# [2.157.0-dev.6](https://github.com/revanced/revanced-patches/compare/v2.157.0-dev.5...v2.157.0-dev.6) (2023-01-28)
+
+
+### Bug Fixes
+
+* **youtube/sponsorblock:** replace missing strings ([7b8f0db](https://github.com/revanced/revanced-patches/commit/7b8f0db2c17da6488db1ec2c21a21a14ff8466aa))
+
+# [2.157.0-dev.5](https://github.com/revanced/revanced-patches/compare/v2.157.0-dev.4...v2.157.0-dev.5) (2023-01-28)
+
+
+### Features
+
+* **youtube:** show toasts along exceptions ([#1511](https://github.com/revanced/revanced-patches/issues/1511)) ([5817e4d](https://github.com/revanced/revanced-patches/commit/5817e4d27fab692c0e95ab4aa2fa8f13005cb780))
+
 # [2.157.0-dev.4](https://github.com/revanced/revanced-patches/compare/v2.157.0-dev.3...v2.157.0-dev.4) (2023-01-28)
 
 

README.md

@@ -46,7 +46,7 @@ The official Patch bundle provided by ReVanced and the community.
 | `microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG. | 18.03.36 |
 | `minimized-playback` | Enables minimized and background playback. | 18.03.36 |
 | `old-quality-layout` | Enables the original video quality flyout in the video player settings | 18.03.36 |
-| `open-links-directly` | Bypasses https://youtube.com/redirect URLs. | 18.03.36 |
+| `open-links-directly` | Skips over redirection URLs to external links. | 18.03.36 |
 | `open-links-externally` | Open links outside of the app directly in your browser. | 18.03.36 |
 | `premium-heading` | Shows premium branding on the home screen. | all |
 | `remember-playback-rate` | Adds the ability to remember the playback rate you chose in the video playback rate flyout. | 18.03.36 |
@@ -54,7 +54,7 @@ The official Patch bundle provided by ReVanced and the community.
 | `remove-player-button-background` | Removes the background from the video player buttons. | 18.03.36 |
 | `return-youtube-dislike` | Shows the dislike count of videos using the Return YouTube Dislike API. | 18.03.36 |
 | `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 18.03.36 |
-| `sponsorblock` | Integrate SponsorBlock. | 18.03.36 |
+| `sponsorblock` | Integrates SponsorBlock which allows skipping video segments such as sponsored content. | 18.03.36 |
 | `spoof-app-version` | Tricks YouTube into thinking, you are running an older version of the app. One of the side effects also includes restoring the old UI. | 18.03.36 |
 | `swipe-controls` | Adds volume and brightness swipe controls. | 18.03.36 |
 | `tablet-mini-player` | Enables the tablet mini player layout. | 18.03.36 |
@@ -160,7 +160,7 @@ The official Patch bundle provided by ReVanced and the community.
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
 | `remove-bootloader-detection` | Removes the check for an unlocked bootloader. | 2.2.0 |
-| `remove-root-detection` | Removes the check for root permissions | 2.2.0 |
+| `remove-root-detection` | Removes the check for root permissions. | 2.2.0 |
 </details>
 
 ### [📦 `at.gv.oe.app`](https://play.google.com/store/apps/details?id=at.gv.oe.app)
@@ -188,6 +188,14 @@ The official Patch bundle provided by ReVanced and the community.
 | `disable-ads` | Disables ads in HexEditor. | all |
 </details>
 
+### [📦 `com.spotify.lite`](https://play.google.com/store/apps/details?id=com.spotify.lite)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `enable-on-demand` | Enables listening to songs on-demand, allowing to play any song from playlists, albums or artists without limitations. This does not remove ads. | all |
+</details>
+
 ### [📦 `org.citra.citra_emu`](https://play.google.com/store/apps/details?id=org.citra.citra_emu)
 <details>
 
@@ -220,6 +228,14 @@ The official Patch bundle provided by ReVanced and the community.
 | `promo-code-unlock` | Disables the validation of promo code. Any code will work to unlock all features. | all |
 </details>
 
+### [📦 `net.binarymode.android.irplus`](https://play.google.com/store/apps/details?id=net.binarymode.android.irplus)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `remove-ads` | Removes all ads from the app. | all |
+</details>
+
 ### [📦 `com.teslacoilsw.launcher`](https://play.google.com/store/apps/details?id=com.teslacoilsw.launcher)
 <details>
 

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.157.0-dev.4
+version = 2.159.0-dev.2

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

@@ -0,0 +1,206 @@
+package app.revanced.patches.all.connectivity.wifi.spoof.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import app.revanced.util.patch.*
+import org.jf.dexlib2.iface.ClassDef
+import org.jf.dexlib2.iface.Method
+import org.jf.dexlib2.iface.instruction.Instruction
+import java.util.*
+
+@Patch(false)
+@Name("spoof-wifi-connection")
+@Description("Spoofs an existing Wi-Fi connection.")
+@Version("0.0.1")
+internal class SpoofWifiPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
+
+    private companion object {
+        const val INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX = "Lapp/revanced/all/connectivity/wifi/spoof/SpoofWifiPatch"
+        const val INTEGRATIONS_CLASS_DESCRIPTOR = "${INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX};"
+    }
+
+    // Information about method calls we want to replace
+    enum class MethodCall(
+        override val definedClassName: String,
+        override val methodName: String,
+        override val methodParams: Array<String>,
+        override val returnType: String,
+    ): IMethodCall {
+        GetSystemService1(
+            "Landroid/content/Context;",
+            "getSystemService",
+            arrayOf("Ljava/lang/String;"),
+            "Ljava/lang/Object;",
+        ),
+        GetSystemService2(
+            "Landroid/content/Context;",
+            "getSystemService",
+            arrayOf("Ljava/lang/Class;"),
+            "Ljava/lang/Object;",
+        ),
+        GetActiveNetworkInfo(
+            "Landroid/net/ConnectivityManager;",
+            "getActiveNetworkInfo",
+            arrayOf(),
+            "Landroid/net/NetworkInfo;",
+        ),
+        IsConnected(
+            "Landroid/net/NetworkInfo;",
+            "isConnected",
+            arrayOf(),
+            "Z",
+        ),
+        IsConnectedOrConnecting(
+            "Landroid/net/NetworkInfo;",
+            "isConnectedOrConnecting",
+            arrayOf(),
+            "Z",
+        ),
+        IsAvailable(
+            "Landroid/net/NetworkInfo;",
+            "isAvailable",
+            arrayOf(),
+            "Z",
+        ),
+        GetState(
+            "Landroid/net/NetworkInfo;",
+            "getState",
+            arrayOf(),
+            "Landroid/net/NetworkInfo\$State;",
+        ),
+        GetDetailedState(
+            "Landroid/net/NetworkInfo;",
+            "getDetailedState",
+            arrayOf(),
+            "Landroid/net/NetworkInfo\$DetailedState;",
+        ),
+        IsActiveNetworkMetered(
+            "Landroid/net/ConnectivityManager;",
+            "isActiveNetworkMetered",
+            arrayOf(),
+            "Z",
+        ),
+        GetActiveNetwork(
+            "Landroid/net/ConnectivityManager;",
+            "getActiveNetwork",
+            arrayOf(),
+            "Landroid/net/Network;",
+        ),
+        GetNetworkInfo(
+            "Landroid/net/ConnectivityManager;",
+            "getNetworkInfo",
+            arrayOf("Landroid/net/Network;"),
+            "Landroid/net/NetworkInfo;",
+        ),
+        HasTransport(
+            "Landroid/net/NetworkCapabilities;",
+            "hasTransport",
+            arrayOf("I"),
+            "Z",
+        ),
+        HasCapability(
+            "Landroid/net/NetworkCapabilities;",
+            "hasCapability",
+            arrayOf("I"),
+            "Z",
+        ),
+        RegisterBestMatchingNetworkCallback(
+            "Landroid/net/ConnectivityManager;",
+            "registerBestMatchingNetworkCallback",
+            arrayOf("Landroid/net/NetworkRequest;", "Landroid/net/ConnectivityManager\$NetworkCallback;", "Landroid/os/Handler;"),
+            "V",
+        ),
+        RegisterDefaultNetworkCallback1(
+            "Landroid/net/ConnectivityManager;",
+            "registerDefaultNetworkCallback",
+            arrayOf("Landroid/net/ConnectivityManager\$NetworkCallback;"),
+            "V",
+        ),
+        RegisterDefaultNetworkCallback2(
+            "Landroid/net/ConnectivityManager;",
+            "registerDefaultNetworkCallback",
+            arrayOf("Landroid/net/ConnectivityManager\$NetworkCallback;", "Landroid/os/Handler;"),
+            "V",
+        ),
+        RegisterNetworkCallback1(
+            "Landroid/net/ConnectivityManager;",
+            "registerNetworkCallback",
+            arrayOf("Landroid/net/NetworkRequest;", "Landroid/net/ConnectivityManager\$NetworkCallback;"),
+            "V",
+        ),
+        RegisterNetworkCallback2(
+            "Landroid/net/ConnectivityManager;",
+            "registerNetworkCallback",
+            arrayOf("Landroid/net/NetworkRequest;", "Landroid/app/PendingIntent;"),
+            "V",
+        ),
+        RegisterNetworkCallback3(
+            "Landroid/net/ConnectivityManager;",
+            "registerNetworkCallback",
+            arrayOf("Landroid/net/NetworkRequest;", "Landroid/net/ConnectivityManager\$NetworkCallback;", "Landroid/os/Handler;"),
+            "V",
+        ),
+        RequestNetwork1(
+            "Landroid/net/ConnectivityManager;",
+            "requestNetwork",
+            arrayOf("Landroid/net/NetworkRequest;", "Landroid/net/ConnectivityManager\$NetworkCallback;"),
+            "V",
+        ),
+        RequestNetwork2(
+            "Landroid/net/ConnectivityManager;",
+            "requestNetwork",
+            arrayOf("Landroid/net/NetworkRequest;", "Landroid/net/ConnectivityManager\$NetworkCallback;", "I"),
+            "V",
+        ),
+        RequestNetwork3(
+            "Landroid/net/ConnectivityManager;",
+            "requestNetwork",
+            arrayOf("Landroid/net/NetworkRequest;", "Landroid/net/ConnectivityManager\$NetworkCallback;", "Landroid/os/Handler;"),
+            "V",
+        ),
+        RequestNetwork4(
+            "Landroid/net/ConnectivityManager;",
+            "requestNetwork",
+            arrayOf("Landroid/net/NetworkRequest;", "Landroid/app/PendingIntent;"),
+            "V",
+        ),
+        RequestNetwork5(
+            "Landroid/net/ConnectivityManager;",
+            "requestNetwork",
+            arrayOf("Landroid/net/NetworkRequest;", "Landroid/net/ConnectivityManager\$NetworkCallback;", "Landroid/os/Handler;", "I"),
+            "V",
+        ),
+        UnregisterNetworkCallback1(
+            "Landroid/net/ConnectivityManager;",
+            "unregisterNetworkCallback",
+            arrayOf("Landroid/net/ConnectivityManager\$NetworkCallback;"),
+            "V",
+        ),
+        UnregisterNetworkCallback2(
+            "Landroid/net/ConnectivityManager;",
+            "unregisterNetworkCallback",
+            arrayOf("Landroid/app/PendingIntent;"),
+            "V",
+        );
+    }
+
+    override fun filterMap(
+        classDef: ClassDef,
+        method: Method,
+        instruction: Instruction,
+        instructionIndex: Int
+    ) = filterMapInstruction35c<MethodCall>(
+        INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX,
+        classDef,
+        instruction,
+        instructionIndex
+    )
+
+    override fun transform(mutableMethod: MutableMethod, entry: Instruction35cInfo) {
+        val (methodType, instruction, instructionIndex) = entry
+        methodType.replaceInvokeVirtualWithIntegrations(INTEGRATIONS_CLASS_DESCRIPTOR, mutableMethod, instruction, instructionIndex)
+    }
+}

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

@@ -1,106 +1,57 @@
 package app.revanced.patches.all.screenshot.removerestriction.patch
 
-import app.revanced.extensions.findMutableMethodOf
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.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.patcher.util.proxy.mutableTypes.MutableMethod
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.formats.Instruction35c
-import org.jf.dexlib2.iface.reference.MethodReference
+import app.revanced.util.patch.*
+import org.jf.dexlib2.iface.ClassDef
+import org.jf.dexlib2.iface.Method
+import org.jf.dexlib2.iface.instruction.Instruction
+import java.util.*
 
 @Patch(false)
 @Name("remove-screenshot-restriction")
-@Description("Removes the restriction of making screenshots.")
+@Description("Removes the restriction of taking screenshots in apps that normally wouldn't allow it.")
 @Version("0.0.1")
-class RemoveScreenshotRestrictionPatch : BytecodePatch() {
+internal class RemoveScreenshotRestrictionPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
 
     private companion object {
-        const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/all/screenshot/removerestriction/RemoveScreenshotRestrictionPatch;"
+        const val INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX =
+            "Lapp/revanced/all/screenshot/removerestriction/RemoveScreenshotRestrictionPatch"
+        const val INTEGRATIONS_CLASS_DESCRIPTOR = "$INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX;"
     }
 
     // Information about method calls we want to replace
-    private enum class MethodCall(
-        val definedClassName: String,
-        val methodName: String,
-        val replacementMethodDefinition: String
-    ) {
+    enum class MethodCall(
+        override val definedClassName: String,
+        override val methodName: String,
+        override val methodParams: Array<String>,
+        override val returnType: String
+    ): IMethodCall {
         SetFlags(
             "Landroid/view/Window;",
             "setFlags",
-            "setFlags(Landroid/view/Window;II)V",
+            arrayOf("I", "I"),
+            "V",
         );
-
-        fun replaceInstruction(method: MutableMethod, instruction: Instruction35c, instructionIndex: Int) {
-            when (this) {
-                SetFlags -> {
-                    method.replaceInstruction(
-                        instructionIndex,
-                        "invoke-static { v${instruction.registerC}, v${instruction.registerD}, v${instruction.registerE} }, ${INTEGRATIONS_CLASS_DESCRIPTOR}->${replacementMethodDefinition}"
-                    )
-                }
-            }
-        }
-
-        companion object {
-            fun fromMethodReference(methodReference: MethodReference) = values().firstOrNull { search ->
-                search.definedClassName == methodReference.definingClass && search.methodName == methodReference.name
-            }
-        }
     }
 
-    override fun execute(context: BytecodeContext): PatchResult {
-        // Find all instructions where one of the methods is called
-        buildMap {
-            context.classes.forEach { classDef ->
-                if (classDef.type == INTEGRATIONS_CLASS_DESCRIPTOR) {
-                    // avoid infinite recursion
-                    return@forEach
-                }
+    override fun filterMap(
+        classDef: ClassDef,
+        method: Method,
+        instruction: Instruction,
+        instructionIndex: Int
+    ) = filterMapInstruction35c<MethodCall>(
+        INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX,
+        classDef,
+        instruction,
+        instructionIndex
+    )
 
-                classDef.methods.let { methods ->
-                    buildMap methodList@{
-                        methods.forEach methods@{ method ->
-                            with(method.implementation?.instructions ?: return@methods) {
-                                ArrayDeque<Triple<MethodCall, Instruction35c, Int>>().also { patchIndices ->
-                                    this.forEachIndexed { index, instruction ->
-                                        if (instruction.opcode != Opcode.INVOKE_VIRTUAL) return@forEachIndexed
-
-                                        val invokeInstruction = instruction as Instruction35c
-                                        val methodRef = invokeInstruction.reference as MethodReference
-                                        val methodCall = MethodCall.fromMethodReference(methodRef) ?: return@forEachIndexed
-
-                                        patchIndices.add(Triple(methodCall, invokeInstruction, index))
-                                    }
-                                }.also { if (it.isEmpty()) return@methods }.let { patches ->
-                                    put(method, patches)
-                                }
-                            }
-                        }
-                    }
-                }.also { if (it.isEmpty()) return@forEach }.let { methodPatches ->
-                    put(classDef, methodPatches)
-                }
-            }
-        }.forEach { (classDef, methods) ->
-            // And finally replace the instructions...
-            with(context.proxy(classDef).mutableClass) {
-                methods.forEach { (method, patches) ->
-                    val mutableMethod = findMutableMethodOf(method)
-                    while (!patches.isEmpty()) {
-                        val (methodType, instruction, instructionIndex) = patches.removeLast()
-                        methodType.replaceInstruction(mutableMethod, instruction, instructionIndex)
-                    }
-                }
-            }
-        }
-
-        return PatchResultSuccess()
+    override fun transform(mutableMethod: MutableMethod, entry: Instruction35cInfo) {
+        val (methodType, instruction, instructionIndex) = entry
+        methodType.replaceInvokeVirtualWithIntegrations(INTEGRATIONS_CLASS_DESCRIPTOR, mutableMethod, instruction, instructionIndex)
     }
 }

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

@@ -15,7 +15,7 @@ import app.revanced.patches.finanzonline.detection.shared.annotations.DetectionC
 
 @Patch
 @Name("remove-root-detection")
-@Description("Removes the check for root permissions")
+@Description("Removes the check for root permissions.")
 @DetectionCompatibility
 @Version("0.0.1")
 class RootDetectionPatch : BytecodePatch(

src/main/kotlin/app/revanced/patches/irplus/ad/annotations/IrplusAdsCompatibility.kt

@@ -0,0 +1,9 @@
+package app.revanced.patches.irplus.ad.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("net.binarymode.android.irplus")])
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class IrplusAdsCompatibility

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

@@ -0,0 +1,12 @@
+package app.revanced.patches.irplus.ad.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+
+object IrplusAdsFingerprint : MethodFingerprint(
+    "V",
+    AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
+    listOf("L", "Z"),
+    strings = listOf("TAGGED")
+)

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

@@ -0,0 +1,33 @@
+package app.revanced.patches.irplus.ad.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.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
+
+
+@Patch
+@Name("remove-ads")
+@Description("Removes all ads from the app.")
+@IrplusAdsCompatibility
+@Version("0.0.1")
+class IrplusAdsPatch : BytecodePatch(
+    listOf(IrplusAdsFingerprint)
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        val method = IrplusAdsFingerprint.result!!.mutableMethod
+
+        // By overwriting the second parameter of the method,
+        // the view which holds the advertisement is removed.
+        method.addInstruction(0, "const/4 p2, 0x0")
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/music/ad/video/annotations/MusicVideoAdsCompatibility.kt

@@ -24,7 +24,8 @@ import app.revanced.patcher.annotation.Package
             "5.36.51",
             "5.38.53",
             "5.39.52",
-            "5.40.51"
+            "5.40.51",
+            "5.41.50"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/music/audio/codecs/annotations/CodecsUnlockCompatibility.kt

@@ -24,7 +24,8 @@ import app.revanced.patcher.annotation.Package
             "5.36.51",
             "5.38.53",
             "5.39.52",
-            "5.40.51"
+            "5.40.51",
+            "5.41.50"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/annotations/ExclusiveAudioCompatibility.kt

@@ -24,7 +24,8 @@ import app.revanced.patcher.annotation.Package
             "5.36.51",
             "5.38.53",
             "5.39.52",
-            "5.40.51"
+            "5.40.51",
+            "5.41.50"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/music/layout/compactheader/annotations/CompactHeaderCompatibility.kt

@@ -23,7 +23,8 @@ import app.revanced.patcher.annotation.Package
             "5.36.51",
             "5.38.53",
             "5.39.52",
-            "5.40.51"
+            "5.40.51",
+            "5.41.50"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/music/layout/minimizedplayback/annotations/MinimizedPlaybackCompatibility.kt

@@ -24,7 +24,8 @@ import app.revanced.patcher.annotation.Package
             "5.36.51",
             "5.38.53",
             "5.39.52",
-            "5.40.51"
+            "5.40.51",
+            "5.41.50"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/music/layout/tastebuilder/annotations/RemoveTasteBuilderCompatibility.kt

@@ -26,7 +26,8 @@ import app.revanced.patcher.annotation.Package
             "5.36.51",
             "5.38.53",
             "5.39.52",
-            "5.40.51"
+            "5.40.51",
+            "5.41.50"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/annotations/RemoveUpgradeButtonCompatibility.kt

@@ -24,7 +24,8 @@ import app.revanced.patcher.annotation.Package
             "5.36.51",
             "5.38.53",
             "5.39.52",
-            "5.40.51"
+            "5.40.51",
+            "5.41.50"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/music/misc/microg/annotations/MusicMicroGPatchCompatibility.kt

@@ -22,9 +22,10 @@ import app.revanced.patcher.annotation.Package
             "5.31.50",
             "5.34.51",
             "5.36.51",
-            "5.38.53",
-            "5.39.52",
-            "5.40.51"
+            "5.38.53",
+            "5.39.52",
+            "5.40.51",
+            "5.41.50"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/music/premium/backgroundplay/annotations/BackgroundPlayCompatibility.kt

@@ -24,7 +24,8 @@ import app.revanced.patcher.annotation.Package
             "5.36.51",
             "5.38.53",
             "5.39.52",
-            "5.40.51"
+            "5.40.51",
+            "5.41.50"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/spotify/lite/ondemand/annotations/OnDemandCompatibility.kt

@@ -0,0 +1,11 @@
+package app.revanced.patches.spotify.lite.ondemand.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package("com.spotify.lite")]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class OnDemandCompatibility

src/main/kotlin/app/revanced/patches/spotify/lite/ondemand/fingerprints/OnDemandFingerprint.kt

@@ -0,0 +1,25 @@
+package app.revanced.patches.spotify.lite.ondemand.fingerprints
+
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.Opcode
+
+@FuzzyPatternScanMethod(2)
+object OnDemandFingerprint : MethodFingerprint(
+    "L",
+    parameters = listOf(),
+    opcodes = listOf(
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.IF_EQZ,
+        Opcode.SGET_OBJECT,
+        Opcode.GOTO,
+        Opcode.SGET_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT,
+        Opcode.IPUT,
+        Opcode.RETURN_OBJECT
+    )
+)

src/main/kotlin/app/revanced/patches/spotify/lite/ondemand/patch/OnDemandPatch.kt

@@ -0,0 +1,34 @@
+package app.revanced.patches.spotify.lite.ondemand.patch
+
+import app.revanced.extensions.toErrorResult
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.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.spotify.lite.ondemand.annotations.OnDemandCompatibility
+import app.revanced.patches.spotify.lite.ondemand.fingerprints.OnDemandFingerprint
+
+@Patch
+@Name("enable-on-demand")
+@Description("Enables listening to songs on-demand, allowing to play any song from playlists, albums or artists without limitations. This does not remove ads.")
+@OnDemandCompatibility
+@Version("0.0.1")
+class OnDemandPatch : BytecodePatch(
+    listOf(
+        OnDemandFingerprint
+    )
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        OnDemandFingerprint.result?.apply {
+            val insertIndex = scanResult.patternScanResult!!.endIndex - 1
+            // Spoof a premium account
+            mutableMethod.addInstruction(insertIndex, "const/4 v0, 0x2")
+        } ?: return OnDemandFingerprint.toErrorResult()
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/resource/patch/CopyVideoUrlResourcePatch.kt

@@ -31,14 +31,14 @@ class CopyVideoUrlResourcePatch : ResourcePatch {
                 StringResource("revanced_copy_video_url_title", "Copy video URL settings"),
                 listOf(
                     SwitchPreference(
-                        "revanced_copy_video_url",
+                        "revanced_copy_video_url_enabled",
                         StringResource("revanced_copy_video_url_enabled_title", "Show copy video URL button"),
                         true,
                         StringResource("revanced_copy_video_url_enabled_summary_on", "Button is shown, click to copy video URL without timestamp"),
                         StringResource("revanced_copy_video_url_enabled_summary_off", "Button is not shown")
                     ),
                     SwitchPreference(
-                        "revanced_copy_video_url_timestamp",
+                        "revanced_copy_video_url_timestamp_enabled",
                         StringResource("revanced_copy_video_url_timestamp_enabled_title", "Show copy timestamp URL button"),
                         true,
                         StringResource("revanced_copy_video_url_timestamp_enabled_summary_on", "Button is shown, click to copy video URL with timestamp"),

src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/resource/patch/DownloadsResourcePatch.kt

@@ -30,7 +30,7 @@ class DownloadsResourcePatch : ResourcePatch {
                 StringResource("revanced_downloads_title", "Download settings"),
                 listOf(
                     SwitchPreference(
-                        "revanced_downloads",
+                        "revanced_downloads_enabled",
                         StringResource("revanced_downloads_enabled_title", "Show download button"),
                         true,
                         StringResource("revanced_downloads_enabled_summary_on", "Download button is shown"),

src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/RectangleFieldInvalidatorFingerprint.kt

@@ -0,0 +1,22 @@
+package app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints
+
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.reference.MethodReference
+
+object RectangleFieldInvalidatorFingerprint : MethodFingerprint(
+    "V",
+    customFingerprint = custom@{ methodDef ->
+        val instructions = methodDef.implementation?.instructions!!
+        val instructionCount = instructions.count()
+
+        // the method has definitely more than 5 instructions
+        if (instructionCount < 5) return@custom false
+
+        val referenceInstruction = instructions.elementAt(instructionCount - 2) // the second to last instruction
+        val reference = ((referenceInstruction as? ReferenceInstruction)?.reference as? MethodReference)
+
+        reference?.parameterTypes?.size == 1 && reference.name == "invalidate" // the reference is the invalidate(..) method
+    }
+)

src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/patch/SponsorBlockBytecodePatch.kt

@@ -7,9 +7,11 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.data.toMethodWalker
 import app.revanced.patcher.extensions.addInstruction
 import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.extensions.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.PatchResultError
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
@@ -17,7 +19,6 @@ import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.shared.fingerprints.SeekbarFingerprint
 import app.revanced.patches.shared.fingerprints.SeekbarOnDrawFingerprint
 import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-import app.revanced.patches.youtube.layout.autocaptions.fingerprints.StartVideoInformerFingerprint
 import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlockCompatibility
 import app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints.*
 import app.revanced.patches.youtube.layout.sponsorblock.resource.patch.SponsorBlockResourcePatch
@@ -29,7 +30,9 @@ import app.revanced.patches.youtube.misc.video.videoid.patch.VideoIdPatch
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.iface.instruction.*
 import org.jf.dexlib2.iface.instruction.formats.Instruction35c
+import org.jf.dexlib2.iface.reference.FieldReference
 import org.jf.dexlib2.iface.reference.MethodReference
+import org.jf.dexlib2.iface.reference.StringReference
 
 @Patch
 @DependsOn(
@@ -43,7 +46,7 @@ import org.jf.dexlib2.iface.reference.MethodReference
     ]
 )
 @Name("sponsorblock")
-@Description("Integrate SponsorBlock.")
+@Description("Integrates SponsorBlock which allows skipping video segments such as sponsored content.")
 @SponsorBlockCompatibility
 @Version("0.0.1")
 class SponsorBlockBytecodePatch : BytecodePatch(
@@ -52,7 +55,6 @@ class SponsorBlockBytecodePatch : BytecodePatch(
         NextGenWatchLayoutFingerprint,
         AppendTimeFingerprint,
         PlayerOverlaysLayoutInitFingerprint,
-        StartVideoInformerFingerprint
     )
 ) {
 
@@ -233,6 +235,39 @@ class SponsorBlockBytecodePatch : BytecodePatch(
             "invoke-static {p0}, Lapp/revanced/integrations/sponsorblock/player/ui/SponsorBlockView;->initialize(Ljava/lang/Object;)V"
         )
 
+        // get rectangle field name
+        RectangleFieldInvalidatorFingerprint.resolve(context, seekbarSignatureResult.classDef)
+        val rectangleFieldInvalidatorInstructions =
+            RectangleFieldInvalidatorFingerprint.result!!.method.implementation!!.instructions
+        val rectangleFieldName =
+            ((rectangleFieldInvalidatorInstructions.elementAt(rectangleFieldInvalidatorInstructions.count() - 3) as ReferenceInstruction).reference as FieldReference).name
+
+        // replace the "replaceMeWith*" strings
+        context
+            .proxy(context.classes.first { it.type.endsWith("PlayerController;") })
+            .mutableClass
+            .methods
+            .find { it.name == "setSponsorBarRect" }
+            ?.let { method ->
+                fun MutableMethod.replaceStringInstruction(index: Int, instruction: Instruction, with: String) {
+                    val register = (instruction as OneRegisterInstruction).registerA
+                    this.replaceInstruction(
+                        index, "const-string v$register, \"$with\""
+                    )
+                }
+                for ((index, it) in method.implementation!!.instructions.withIndex()) {
+                    if (it.opcode.ordinal != Opcode.CONST_STRING.ordinal) continue
+
+                    when (((it as ReferenceInstruction).reference as StringReference).string) {
+                        "replaceMeWithsetSponsorBarRect" -> method.replaceStringInstruction(
+                            index,
+                            it,
+                            rectangleFieldName
+                        )
+                    }
+                }
+            } ?: return PatchResultError("Could not find the method which contains the replaceMeWith* strings")
+
         // TODO: isSBChannelWhitelisting implementation
 
         return PatchResultSuccess()

src/main/kotlin/app/revanced/patches/youtube/misc/debugging/patch/DebuggingPatch.kt

@@ -29,7 +29,7 @@ class DebuggingPatch : ResourcePatch {
                 listOf(
                     SwitchPreference(
                         "revanced_debug_enabled",
-                        StringResource("revanced_debug_enabled_title", "Enable debug logs"),
+                        StringResource("revanced_debug_enabled_title", "Debug logging"),
                         false,
                         StringResource("revanced_debug_summary_on", "Debug logs are enabled"),
                         StringResource("revanced_debug_summary_off", "Debug logs are disabled")
@@ -38,11 +38,21 @@ class DebuggingPatch : ResourcePatch {
                         "revanced_debug_stacktrace_enabled",
                         StringResource(
                             "revanced_debug_stacktrace_enabled_title",
-                            "Print stack traces"
+                            "Log stack traces"
                         ),
                         false,
-                        StringResource("revanced_debug_stacktrace_summary_on", "Enabled printing stack traces"),
-                        StringResource("revanced_debug_stacktrace_summary_off", "Disabled printing stack traces")
+                        StringResource("revanced_debug_stacktrace_summary_on", "Debug logs include stack trace"),
+                        StringResource("revanced_debug_stacktrace_summary_off", "Debug logs do not include stack trace")
+                    ),
+                    SwitchPreference(
+                        "revanced_debug_toast_on_error_enabled",
+                        StringResource(
+                            "revanced_debug_toast_on_error_enabled_title",
+                            "Show toast on ReVanced error"
+                        ),
+                        true,
+                        StringResource("revanced_debug_toast_on_error_summary_on", "Toast shown if error occurs"),
+                        StringResource("revanced_debug_toast_on_error_summary_off", "Toast not shown if error occurs")
                     ),
                 ),
                 StringResource("revanced_debug_summary", "Enable or disable debugging options")

src/main/kotlin/app/revanced/patches/youtube/misc/openlinksdirectly/patch/OpenLinksDirectlyPatch.kt

@@ -25,7 +25,7 @@ import org.jf.dexlib2.iface.instruction.formats.Instruction35c
 @Patch
 @DependsOn([IntegrationsPatch::class, SettingsPatch::class])
 @Name("open-links-directly")
-@Description("Bypasses https://youtube.com/redirect URLs.")
+@Description("Skips over redirection URLs to external links.")
 @OpenLinksDirectlyCompatibility
 @Version("0.0.1")
 class OpenLinksDirectlyPatch : BytecodePatch(

src/main/kotlin/app/revanced/util/microg/MicroGResourceHelper.kt

@@ -14,7 +14,8 @@ internal object MicroGResourceHelper {
      * @param context The resource context.
      * @param stringsHost The file which hosts the strings.
      */
-    fun addStrings(context: ResourceContext, stringsHost: String = "microg/host/values/strings.xml") = context.mergeStrings(stringsHost)
+    fun addStrings(context: ResourceContext, stringsHost: String = "microg/host/values/strings.xml") =
+        context.mergeStrings(stringsHost)
 
     /**
      * Patch the manifest to work with MicroG.
@@ -47,6 +48,9 @@ internal object MicroGResourceHelper {
             ).replace(
                 "$fromPackageName.permission.C2D_MESSAGE",
                 "$toPackageName.permission.C2D_MESSAGE"
+            ).replace(
+                "$fromPackageName.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION",
+                "$toPackageName.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION"
             ).replace(
                 "com.google.android.c2dm",
                 "${Constants.MICROG_VENDOR}.android.c2dm"

src/main/kotlin/app/revanced/util/patch/AbstractTransformInstructionsPatch.kt

@@ -0,0 +1,63 @@
+package app.revanced.util.patch
+
+import app.revanced.extensions.findMutableMethodOf
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import org.jf.dexlib2.iface.ClassDef
+import org.jf.dexlib2.iface.Method
+import org.jf.dexlib2.iface.instruction.Instruction
+
+internal abstract class AbstractTransformInstructionsPatch<T> : BytecodePatch() {
+
+    abstract fun filterMap(
+        classDef: ClassDef,
+        method: Method,
+        instruction: Instruction,
+        instructionIndex: Int
+    ): T?
+
+    abstract fun transform(mutableMethod: MutableMethod, entry: T)
+
+    override fun execute(context: BytecodeContext): PatchResult {
+        // Find all instructions
+        buildMap {
+            context.classes.forEach { classDef ->
+                classDef.methods.let { methods ->
+                    buildMap methodList@{
+                        methods.forEach methods@{ method ->
+                            with(method.implementation?.instructions ?: return@methods) {
+                                ArrayDeque<T>().also { patchIndices ->
+                                    this.forEachIndexed { index, instruction ->
+                                        val result = filterMap(classDef, method, instruction, index)
+                                        if (result != null) {
+                                            patchIndices.add(result)
+                                        }
+                                    }
+                                }.also { if (it.isEmpty()) return@methods }.let { patches ->
+                                    put(method, patches)
+                                }
+                            }
+                        }
+                    }
+                }.also { if (it.isEmpty()) return@forEach }.let { methodPatches ->
+                    put(classDef, methodPatches)
+                }
+            }
+        }.forEach { (classDef, methods) ->
+            // And finally transform the instructions...
+            with(context.proxy(classDef).mutableClass) {
+                methods.forEach { (method, patches) ->
+                    val mutableMethod = findMutableMethodOf(method)
+                    while (!patches.isEmpty()) {
+                        transform(mutableMethod, patches.removeLast())
+                    }
+                }
+            }
+        }
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/util/patch/MethodCall.kt

@@ -0,0 +1,92 @@
+package app.revanced.util.patch
+
+import app.revanced.patcher.extensions.replaceInstruction
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.ClassDef
+import org.jf.dexlib2.iface.instruction.Instruction
+import org.jf.dexlib2.iface.instruction.formats.Instruction35c
+import org.jf.dexlib2.iface.reference.MethodReference
+
+internal typealias Instruction35cInfo = Triple<IMethodCall, Instruction35c, Int>
+
+internal interface IMethodCall {
+    val definedClassName: String
+    val methodName: String
+    val methodParams: Array<String>
+    val returnType: String
+
+    /**
+     * Replaces an invoke-virtual instruction with an invoke-static instruction,
+     * which calls a static replacement method in the respective integrations class.
+     * The method definition in the integrations class is expected to be the same,
+     * except that the method should be static and take as a first parameter
+     * an instance of the class, in which the original method was defined in.
+     *
+     * Example:
+     *
+     * original method: Window#setFlags(int, int)
+     *
+     * replacement method: Integrations#setFlags(Window, int, int)
+     */
+    fun replaceInvokeVirtualWithIntegrations(
+        definingClassDescriptor: String,
+        method: MutableMethod,
+        instruction: Instruction35c,
+        instructionIndex: Int
+    ) {
+        val registers = arrayOf(
+            instruction.registerC,
+            instruction.registerD,
+            instruction.registerE,
+            instruction.registerF,
+            instruction.registerG
+        )
+        val argsNum = methodParams.size + 1 // + 1 for instance of definedClassName
+        if (argsNum > registers.size) {
+            // should never happen, but just to be sure (also for the future) a safety check
+            throw RuntimeException(
+                "Not enough registers for ${definedClassName}#${methodName}: " +
+                        "Required $argsNum registers, but only got ${registers.size}."
+            )
+        }
+
+        val args = registers.take(argsNum).joinToString(separator = ", ") { reg -> "v${reg}" }
+        val replacementMethodDefinition =
+            "${methodName}(${definedClassName}${methodParams.joinToString(separator = "")})${returnType}"
+
+        method.replaceInstruction(
+            instructionIndex,
+            "invoke-static { $args }, ${definingClassDescriptor}->${replacementMethodDefinition}"
+        )
+    }
+}
+
+internal inline fun <reified E> fromMethodReference(methodReference: MethodReference)
+        where E : Enum<E>, E : IMethodCall = enumValues<E>().firstOrNull { search ->
+    search.definedClassName == methodReference.definingClass
+            && search.methodName == methodReference.name
+            && methodReference.parameterTypes.toTypedArray().contentEquals(search.methodParams)
+}
+
+internal inline fun <reified E> filterMapInstruction35c(
+    integrationsClassDescriptorPrefix: String,
+    classDef: ClassDef,
+    instruction: Instruction,
+    instructionIndex: Int
+): Instruction35cInfo? where E : Enum<E>, E : IMethodCall {
+    if (classDef.type.startsWith(integrationsClassDescriptorPrefix)) {
+        // avoid infinite recursion
+        return null
+    }
+
+    if (instruction.opcode != Opcode.INVOKE_VIRTUAL) {
+        return null
+    }
+
+    val invokeInstruction = instruction as Instruction35c
+    val methodRef = invokeInstruction.reference as MethodReference
+    val methodCall = fromMethodReference<E>(methodRef) ?: return null
+
+    return Instruction35cInfo(methodCall, invokeInstruction, instructionIndex)
+}

src/main/resources/returnyoutubedislike/host/values/strings.xml

@@ -3,10 +3,9 @@
 
     <string name="revanced_ryd_failure_connection_timeout">Dislikes temporarily not available (API timed out)</string>
     <string name="revanced_ryd_failure_client_rate_limit_requested">Dislikes not available (client API limit reached)</string>
-    <string name="revanced_ryd_failure_register_user">ReturnYouTubeDislike failed to register as new user</string>
-    <string name="revanced_ryd_failure_confirm_user">ReturnYouTubeDislike failed to confirm new user</string>
-    <string name="revanced_ryd_failure_send_vote_failed">ReturnYouTubeDislike failed to send vote</string>
-    <string name="revanced_ryd_failure_confirm_vote_failed">ReturnYouTubeDislike failed to confirm vote</string>
+
+    <!-- corner case situation, where user enables RYD while video is playing and then tries to vote for the video -->
+    <string name="revanced_ryd_failure_ryd_enabled_while_playing_video_then_user_voted">Reload video to vote using ReturnYouTubeDislike</string>
 
     <string name="revanced_ryd_enable_title">Return YouTube Dislike</string>
     <string name="revanced_ryd_enable_summary_on">Dislikes are shown</string>
@@ -34,16 +33,16 @@
     <string name="revanced_ryd_statistics_getFetchCallResponseTimeLast_rate_limit_summary">Dislikes temporarily not available - Client API rate limit in effect</string>
 
     <string name="revanced_ryd_statistics_getFetchCallCount_title">API fetch votes, number of calls</string>
-    <string name="revanced_ryd_statistics_getFetchCallCount_zero_summary">No network calls have been made</string>
-    <string name="revanced_ryd_statistics_getFetchCallCount_non_zero_summary">%d network calls have been made</string>
+    <string name="revanced_ryd_statistics_getFetchCallCount_zero_summary">No network calls made</string>
+    <string name="revanced_ryd_statistics_getFetchCallCount_non_zero_summary">%d network calls made</string>
 
     <string name="revanced_ryd_statistics_getFetchCallNumberOfFailures_title">API fetch votes, number of timeouts</string>
-    <string name="revanced_ryd_statistics_getFetchCallNumberOfFailures_zero_summary">No network calls have timed out</string>
+    <string name="revanced_ryd_statistics_getFetchCallNumberOfFailures_zero_summary">No network calls timed out</string>
     <string name="revanced_ryd_statistics_getFetchCallNumberOfFailures_non_zero_summary">%d network calls timed out</string>
 
     <string name="revanced_ryd_statistics_getNumberOfRateLimitRequestsEncountered_title">API client rate limits</string>
-    <string name="revanced_ryd_statistics_getNumberOfRateLimitRequestsEncountered_zero_summary">No client rate limits have been encountered</string>
-    <string name="revanced_ryd_statistics_getNumberOfRateLimitRequestsEncountered_non_zero_summary">Client rate limit was encountered %d times</string>
+    <string name="revanced_ryd_statistics_getNumberOfRateLimitRequestsEncountered_zero_summary">No client rate limits encountered</string>
+    <string name="revanced_ryd_statistics_getNumberOfRateLimitRequestsEncountered_non_zero_summary">Client rate limit encountered %d times</string>
 
     <string name="revanced_ryd_statistics_millisecond_text">%d milliseconds</string>
 </resources>