chore(release): 4.12.0-dev.5 [skip ci]

# [4.12.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v4.12.0-dev.4...v4.12.0-dev.5) (2024-07-20)

### Features

* Add `Hide mock location` patch ([#3417](https://github.com/ReVanced/revanced-patches/issues/3417)) ([250cc7c](250cc7cbde))
* **Google Photos:** Add `GmsCore support` patch ([#3414](https://github.com/ReVanced/revanced-patches/issues/3414)) ([1af65de](1af65de1f6))

.editorconfig

@@ -0,0 +1,3 @@
+[*.{kt,kts}]
+ktlint_code_style = intellij_idea
+ktlint_standard_no-wildcard-imports = disabled

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -70,7 +70,7 @@ body:
 
         Before creating a new bug report, please keep the following in mind:
 
-        - **Do not submit a duplicate bug report**: You can review existing bug reports [here](https://github.com/ReVanced/revanced-patches/labels/Bug%20report).
+        - **Do not submit a duplicate bug report**: Search for existing bug reports [here](https://github.com/ReVanced/revanced-patches/issues?q=label%3A%22Bug+report%22).
         - **Review the contribution guidelines**: Make sure your bug report adheres to it. You can find the guidelines [here](https://github.com/ReVanced/revanced-patches/blob/main/CONTRIBUTING.md).
         - **Do not use the issue page for support**: If you need help or have questions, check out other platforms on [revanced.app](https://revanced.app).
   - type: textarea
@@ -102,7 +102,7 @@ body:
       label: Acknowledgements
       description: Your bug report will be closed if you don't follow the checklist below.
       options:
-        - label: This issue is not a duplicate of an existing bug report.
+        - label: I have checked all open and closed bug reports and this is not a duplicate.
           required: true
         - label: I have chosen an appropriate title.
           required: true

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -70,8 +70,8 @@ body:
 
         Before creating a new feature request, please keep the following in mind:
 
-        - **Do not submit a duplicate feature request**: You can review existing feature requests [here](https://github.com/ReVanced/revanced-patches/labels/Feature%20request).
-        - **Review the contribution guidelines**: Make sure your bug report adheres to it. You can find the guidelines [here](https://github.com/ReVanced/revanced-patches/blob/main/CONTRIBUTING.md).
+        - **Do not submit a duplicate feature request**: Search for existing feature requests [here](https://github.com/ReVanced/revanced-patches/issues?q=label%3A%22Feature+request%22).
+        - **Review the contribution guidelines**: Make sure your feature request adheres to it. You can find the guidelines [here](https://github.com/ReVanced/revanced-patches/blob/main/CONTRIBUTING.md).
         - **Do not use the issue page for support**: If you need help or have questions, check out other platforms on [revanced.app](https://revanced.app).
   - type: textarea
     attributes:
@@ -98,7 +98,7 @@ body:
       label: Acknowledgements
       description: Your feature request will be closed if you don't follow the checklist below.
       options:
-        - label: This issue is not a duplicate of an existing feature request.
+        - label: I have checked all open and closed feature requests and this is not a duplicate
           required: true
         - label: I have chosen an appropriate title.
           required: true

.github/workflows/build_pull_request.yml

@@ -0,0 +1,25 @@
+name: Build pull request
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - dev
+
+jobs:
+  release:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Cache Gradle
+        uses: burrunan/gradle-cache-action@v1
+
+      - name: Build
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: ./gradlew build --no-daemon

.github/workflows/open_pull_request.yml

@@ -20,11 +20,11 @@ jobs:
       - name: Open pull request
         uses: repo-sync/pull-request@v2
         with:
-          destination_branch: 'main'
-          pr_title: 'chore: ${{ env.MESSAGE }}'
+          destination_branch: "main"
+          pr_title: "chore: ${{ env.MESSAGE }}"
           pr_body: |
             This pull request will ${{ env.MESSAGE }}.
-          
+
             ## Dependencies before merge
 
             - [ ] https://github.com/revanced/revanced-integrations

.github/workflows/pull_strings.yml

@@ -0,0 +1,35 @@
+name: Pull strings
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: 0 0 1 * *
+
+jobs:
+  pull:
+    name: Pull strings
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: dev
+
+      - name: Pull strings
+        uses: crowdin/github-action@v1
+        with:
+          config: crowdin.yml
+          download_translations: true
+          localization_branch_name: feat/translations
+          create_pull_request: true
+          pull_request_title: "chore: Sync translations"
+          pull_request_body: "Sync translations from [crowdin.com/project/revanced](https://crowdin.com/project/revanced)"
+          pull_request_base_branch_name: "dev"
+          commit_message: "chore: Sync translations"
+          github_user_name: revanced-bot
+          github_user_email: github@revanced.app
+        env:
+          GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }}
+          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
+          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

.github/workflows/push_strings.yml

@@ -0,0 +1,29 @@
+name: Push strings
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - dev
+    paths:
+      - src/main/resources/addresources/values/strings.xml
+
+jobs:
+  push:
+    name: Push strings
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Push strings
+        uses: crowdin/github-action@v1
+        with:
+          config: crowdin.yml
+          upload_sources: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }}
+          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
+          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

.github/workflows/release.yml

@@ -6,10 +6,6 @@ on:
     branches:
       - main
       - dev
-  pull_request:
-    branches:
-      - main
-      - dev
 
 jobs:
   release:
@@ -41,6 +37,13 @@ jobs:
       - name: Install dependencies
         run: npm install
 
+      - name: Import GPG key
+        uses: crazy-max/ghaction-import-gpg@v6
+        with:
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.GPG_PASSPHRASE }}
+          fingerprint: ${{ vars.GPG_FINGERPRINT }}
+
       - name: Release
         env:
           GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }}

.releaserc

@@ -33,7 +33,7 @@
       {
         "assets": [
           {
-            "path": "build/libs/*.jar"
+            "path": "build/libs/revanced-patches*"
           },
           {
             "path": "patches.json"

CONTRIBUTING.md

@@ -64,15 +64,15 @@ This document describes how to contribute to ReVanced Patches.
 
 ## 📖 Resources to help you get started
 
-* The [documentation](https://github.com/ReVanced/revanced-patches/tree/docs/docs) provides the fundamentals of patches 
-and everything necessary to create your own patch from scratch
+* The [documentation](https://github.com/ReVanced/revanced-patcher/tree/main/docs) contains the fundamentals
+of ReVanced Patcher and how to use ReVanced Patcher to create patches
 * [Our backlog](https://github.com/orgs/ReVanced/projects/12) is where we keep track of what we're working on
 * [Issues](https://github.com/ReVanced/revanced-patches/issues) are where we keep track of bugs and feature requests
 
 ## 🙏 Submitting a feature request
 
 Features can be requested by opening an issue using the
-[Feature request issue template](https://github.com/ReVanced/revanced-patches/issues/new?assignees=&labels=Feature+request&projects=&template=feature-request.yml&title=feat%3A+).
+[Feature request issue template](https://github.com/ReVanced/revanced-patches/issues/new?assignees=&labels=Feature+request&projects=&template=feature_request.yml&title=feat%3A+).
 
 > **Note**
 > Requests can be accepted or rejected at the discretion of maintainers of ReVanced Patches.
@@ -81,7 +81,11 @@ Features can be requested by opening an issue using the
 ## 🐞 Submitting a bug report
 
 If you encounter a bug while using ReVanced Patches, open an issue using the
-[Bug report issue template](https://github.com/ReVanced/revanced-patches/issues/new?assignees=&labels=Bug+report&projects=&template=bug-report.yml&title=bug%3A+).
+[Bug report issue template](https://github.com/ReVanced/revanced-patches/issues/new?assignees=&labels=Bug+report&projects=&template=bug_report.yml&title=bug%3A+).
+
+## 🌐 Submitting translations
+
+ You can contribute translations at [translate.revanced.app](https://translate.revanced.app).
 
 ## 🧑‍⚖️ Guidelines for requesting or contributing patches
 
@@ -107,19 +111,18 @@ are unaffected by this change.
 * Payment circumvention: We do not accept patches that exist solely to bypass payment for the app or any of its features
 * Malicious patches: Patches that are malicious in nature are not allowed
 
-
 ## 📝 How to contribute
 
-1. Before contributing, it is recommended to open an issue to discuss your change 
+1. Before contributing, it is recommended to open an issue to discuss your change
 with the maintainers of ReVanced Patches. This will help you determine whether your change is acceptable
 and whether it is worth your time to implement it
 2. Development happens on the `dev` branch. Fork the repository and create your branch from `dev`
 3. Commit your changes. In case you are contributing a new patch, make sure to follow the conventions for patches
-described in the [documentation](https://github.com/ReVanced/revanced-patches/tree/docs/docs)
+described in the [ReVanced Patcher documentation](https://github.com/ReVanced/revanced-patcher/tree/main/docs)
 4. Submit a pull request to the `dev` branch of the repository and reference issues
 that your pull request closes in the description of your pull request
 5. Our team will review your pull request and provide feedback. Once your pull request is approved,
 it will be merged into the `dev` branch and will be included in the next release of ReVanced Patches
-
+ 
 ❤️ Thank you for considering contributing to ReVanced Patches,
 ReVanced

README.md

@@ -67,7 +67,7 @@ This repository contains a collection of ReVanced Patches.
 
 ## ❓ About
 
-Patches are small modifications to Android apps that allow you to change the behaviour of or add new features, 
+Patches are small modifications to Android apps that allow you to change the behavior of or add new features,
 block ads, customize the appearance, and much more.
 
 ## 💪 Features
@@ -77,11 +77,11 @@ Some of the features the patches provide are:
 * 🚫 **Block ads**: Say goodbye to ads
 * ⭐ **Customize your app**: Personalize the appearance of apps with various layouts and themes
 * 🪄 **Add new features**: Extend the functionality of apps with lots of new features
-* ⚙️ **Miscellaneous and general purpose**: Rename packages, enable debugging, disable screen capture restrictions, 
-export activities, etc.
+* ⚙️ **Miscellaneous and general purpose**: Rename packages, enable debugging, disable screen capture restrictions,
+  export activities, etc.
 * ✨ **And much more!**
 
-For a full list of all available patches, visit [revanced.app/patches](https://revanced.app/patches).
+For a complete list of all available patches, visit [revanced.app/patches](https://revanced.app/patches).
 
 ## 🚀 How to get started
 
@@ -93,17 +93,13 @@ You can use [ReVanced CLI](https://github.com/ReVanced/revanced-cli) or [ReVance
 
 Thank you for considering contributing to ReVanced Patches. You can find the contribution guidelines [here](CONTRIBUTING.md).
 
-### 📃 Documentation
-
-The documentation provides the fundamentals of patches and everything necessary to create your own patch from scratch.
-You can find it [here](https://github.com/ReVanced/revanced-patches/tree/docs/docs).
-
 ### 🛠️ Building
 
-In order to build ReVanced Patches, you can follow the [ReVanced documentation](https://github.com/ReVanced/revanced-documentation).
+To build ReVanced Patches, you can follow the [ReVanced documentation](https://github.com/ReVanced/revanced-documentation).
 
 ## 📜 Licence
 
-ReVanced Patches is licensed under the GPLv3 licence. Please see the [licence file](LICENSE) for more information.
-[tl;dr](https://www.tldrlegal.com/license/gnu-general-public-license-v3-gpl-3) you may copy, distribute and modify ReVanced patches as long as you track changes/dates in source files.
-Any modifications to ReVanced Patches must also be made available under the GPL along with build & install instructions.
+ReVanced Patches is licensed under the GPLv3 license. Please see the [license file](LICENSE) for more information.
+[tl;dr](https://www.tldrlegal.com/license/gnu-general-public-license-v3-gpl-3) you may copy, distribute and modify ReVanced Patches as long as you track changes/dates in source files.
+Any modifications to ReVanced Patches must also be made available under the GPL,
+along with build & install instructions.

api/revanced-patches.api

@@ -1,3 +1,7 @@
+public final class app/revanced/generator/MainKt {
+	public static synthetic fun main ([Ljava/lang/String;)V
+}
+
 public final class app/revanced/patches/all/activity/exportall/ExportAllActivitiesPatch : app/revanced/patcher/patch/ResourcePatch {
 	public static final field INSTANCE Lapp/revanced/patches/all/activity/exportall/ExportAllActivitiesPatch;
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
@@ -18,12 +22,25 @@ public final class app/revanced/patches/all/interaction/gestures/PredictiveBackG
 	public fun execute (Lapp/revanced/patcher/data/ResourceContext;)V
 }
 
+public final class app/revanced/patches/all/location/hide/HideMockLocationPatch : app/revanced/patches/all/misc/transformation/BaseTransformInstructionsPatch {
+	public static final field INSTANCE Lapp/revanced/patches/all/location/hide/HideMockLocationPatch;
+	public synthetic fun filterMap (Lcom/android/tools/smali/dexlib2/iface/ClassDef;Lcom/android/tools/smali/dexlib2/iface/Method;Lcom/android/tools/smali/dexlib2/iface/instruction/Instruction;I)Ljava/lang/Object;
+	public fun filterMap (Lcom/android/tools/smali/dexlib2/iface/ClassDef;Lcom/android/tools/smali/dexlib2/iface/Method;Lcom/android/tools/smali/dexlib2/iface/instruction/Instruction;I)Lkotlin/Pair;
+	public synthetic fun transform (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;Ljava/lang/Object;)V
+	public fun transform (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;Lkotlin/Pair;)V
+}
+
 public final class app/revanced/patches/all/misc/debugging/EnableAndroidDebuggingPatch : app/revanced/patcher/patch/ResourcePatch {
 	public static final field INSTANCE Lapp/revanced/patches/all/misc/debugging/EnableAndroidDebuggingPatch;
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 	public fun execute (Lapp/revanced/patcher/data/ResourceContext;)V
 }
 
+public final class app/revanced/patches/all/misc/hex/HexPatch : app/revanced/patches/shared/misc/hex/BaseHexPatch {
+	public fun <init> ()V
+	public fun getReplacements ()Ljava/util/List;
+}
+
 public final class app/revanced/patches/all/misc/network/OverrideCertificatePinningPatch : app/revanced/patcher/patch/ResourcePatch {
 	public static final field INSTANCE Lapp/revanced/patches/all/misc/network/OverrideCertificatePinningPatch;
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
@@ -96,6 +113,12 @@ public final class app/revanced/patches/all/misc/transformation/IMethodCall$Defa
 	public static fun replaceInvokeVirtualWithIntegrations (Lapp/revanced/patches/all/misc/transformation/IMethodCall;Ljava/lang/String;Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;Lcom/android/tools/smali/dexlib2/iface/instruction/formats/Instruction35c;I)V
 }
 
+public final class app/revanced/patches/all/misc/versioncode/ChangeVersionCodePatch : app/revanced/patcher/patch/ResourcePatch {
+	public static final field INSTANCE Lapp/revanced/patches/all/misc/versioncode/ChangeVersionCodePatch;
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+	public fun execute (Lapp/revanced/patcher/data/ResourceContext;)V
+}
+
 public final class app/revanced/patches/all/screencapture/removerestriction/RemoveCaptureRestrictionPatch : app/revanced/patches/all/misc/transformation/BaseTransformInstructionsPatch {
 	public static final field INSTANCE Lapp/revanced/patches/all/screencapture/removerestriction/RemoveCaptureRestrictionPatch;
 	public synthetic fun filterMap (Lcom/android/tools/smali/dexlib2/iface/ClassDef;Lcom/android/tools/smali/dexlib2/iface/Method;Lcom/android/tools/smali/dexlib2/iface/instruction/Instruction;I)Ljava/lang/Object;
@@ -140,6 +163,12 @@ public final class app/revanced/patches/all/screenshot/removerestriction/RemoveS
 	public static fun values ()[Lapp/revanced/patches/all/screenshot/removerestriction/RemoveScreenshotRestrictionPatch$MethodCall;
 }
 
+public final class app/revanced/patches/all/shortcut/sharetargets/RemoveShareTargetsPatch : app/revanced/patcher/patch/ResourcePatch {
+	public static final field INSTANCE Lapp/revanced/patches/all/shortcut/sharetargets/RemoveShareTargetsPatch;
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+	public fun execute (Lapp/revanced/patcher/data/ResourceContext;)V
+}
+
 public final class app/revanced/patches/all/telephony/sim/spoof/SpoofSimCountryPatch : app/revanced/patches/all/misc/transformation/BaseTransformInstructionsPatch {
 	public static final field INSTANCE Lapp/revanced/patches/all/telephony/sim/spoof/SpoofSimCountryPatch;
 	public synthetic fun filterMap (Lcom/android/tools/smali/dexlib2/iface/ClassDef;Lcom/android/tools/smali/dexlib2/iface/Method;Lcom/android/tools/smali/dexlib2/iface/instruction/Instruction;I)Ljava/lang/Object;
@@ -148,12 +177,24 @@ public final class app/revanced/patches/all/telephony/sim/spoof/SpoofSimCountryP
 	public fun transform (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;Lkotlin/Pair;)V
 }
 
+public final class app/revanced/patches/amazon/deeplinking/DeepLinkingPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/amazon/deeplinking/DeepLinkingPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/backdrops/misc/pro/ProUnlockPatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/backdrops/misc/pro/ProUnlockPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public final class app/revanced/patches/bandcamp/limitations/RemovePlayLimitsPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/bandcamp/limitations/RemovePlayLimitsPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/candylinkvpn/UnlockProPatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/candylinkvpn/UnlockProPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -184,6 +225,36 @@ public final class app/revanced/patches/finanzonline/detection/root/RootDetectio
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public final class app/revanced/patches/googlenews/customtabs/EnableCustomTabs : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/googlenews/customtabs/EnableCustomTabs;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
+public final class app/revanced/patches/googlenews/misc/gms/GmsCoreSupportPatch : app/revanced/patches/shared/misc/gms/BaseGmsCoreSupportPatch {
+	public static final field INSTANCE Lapp/revanced/patches/googlenews/misc/gms/GmsCoreSupportPatch;
+}
+
+public final class app/revanced/patches/googlenews/misc/gms/GmsCoreSupportResourcePatch : app/revanced/patches/shared/misc/gms/BaseGmsCoreSupportResourcePatch {
+	public static final field INSTANCE Lapp/revanced/patches/googlenews/misc/gms/GmsCoreSupportResourcePatch;
+}
+
+public final class app/revanced/patches/googlenews/misc/integrations/IntegrationsPatch : app/revanced/patches/shared/misc/integrations/BaseIntegrationsPatch {
+	public static final field INSTANCE Lapp/revanced/patches/googlenews/misc/integrations/IntegrationsPatch;
+}
+
+public final class app/revanced/patches/googlephotos/misc/gms/GmsCoreSupportPatch : app/revanced/patches/shared/misc/gms/BaseGmsCoreSupportPatch {
+	public static final field INSTANCE Lapp/revanced/patches/googlephotos/misc/gms/GmsCoreSupportPatch;
+}
+
+public final class app/revanced/patches/googlephotos/misc/gms/GmsCoreSupportResourcePatch : app/revanced/patches/shared/misc/gms/BaseGmsCoreSupportResourcePatch {
+	public static final field INSTANCE Lapp/revanced/patches/googlephotos/misc/gms/GmsCoreSupportResourcePatch;
+}
+
+public final class app/revanced/patches/googlephotos/misc/integrations/IntegrationsPatch : app/revanced/patches/shared/misc/integrations/BaseIntegrationsPatch {
+	public static final field INSTANCE Lapp/revanced/patches/googlephotos/misc/integrations/IntegrationsPatch;
+}
+
 public final class app/revanced/patches/googlerecorder/restrictions/RemoveDeviceRestrictions : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/googlerecorder/restrictions/RemoveDeviceRestrictions;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -220,6 +291,12 @@ public final class app/revanced/patches/inshorts/ad/HideAdsPatch : app/revanced/
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public final class app/revanced/patches/instagram/patches/ad/HideAdsPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/instagram/patches/ad/HideAdsPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/instagram/patches/ads/timeline/HideTimelineAdsPatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/instagram/patches/ads/timeline/HideTimelineAdsPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -262,20 +339,38 @@ public final class app/revanced/patches/memegenerator/misc/pro/UnlockProVersionP
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
-public final class app/revanced/patches/messenger/ads/inbox/patch/HideInboxAdsPatch : app/revanced/patcher/patch/BytecodePatch {
-	public static final field INSTANCE Lapp/revanced/patches/messenger/ads/inbox/patch/HideInboxAdsPatch;
+public final class app/revanced/patches/messenger/inbox/HideInboxAdsPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/messenger/inbox/HideInboxAdsPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
-public final class app/revanced/patches/messenger/inputfield/patch/DisableSwitchingEmojiToStickerPatch : app/revanced/patcher/patch/BytecodePatch {
-	public static final field INSTANCE Lapp/revanced/patches/messenger/inputfield/patch/DisableSwitchingEmojiToStickerPatch;
+public final class app/revanced/patches/messenger/inbox/HideInboxSubtabsPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/messenger/inbox/HideInboxSubtabsPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
-public final class app/revanced/patches/messenger/inputfield/patch/DisableTypingIndicatorPatch : app/revanced/patcher/patch/BytecodePatch {
-	public static final field INSTANCE Lapp/revanced/patches/messenger/inputfield/patch/DisableTypingIndicatorPatch;
+public final class app/revanced/patches/messenger/inputfield/DisableSwitchingEmojiToStickerPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/messenger/inputfield/DisableSwitchingEmojiToStickerPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
+public final class app/revanced/patches/messenger/inputfield/DisableTypingIndicatorPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/messenger/inputfield/DisableTypingIndicatorPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
+public final class app/revanced/patches/mifitness/misc/locale/ForceEnglishLocalePatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/mifitness/misc/locale/ForceEnglishLocalePatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
+public final class app/revanced/patches/mifitness/misc/login/FixLoginPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/mifitness/misc/login/FixLoginPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
@@ -286,6 +381,12 @@ public final class app/revanced/patches/moneymanager/UnlockProPatch : app/revanc
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public final class app/revanced/patches/music/ad/video/HideMusicVideoAds : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/music/ad/video/HideMusicVideoAds;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/music/ad/video/MusicVideoAdsPatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/music/ad/video/MusicVideoAdsPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -298,6 +399,12 @@ public final class app/revanced/patches/music/audio/codecs/CodecsUnlockPatch : a
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public final class app/revanced/patches/music/audio/exclusiveaudio/EnableExclusiveAudioPlayback : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/music/audio/exclusiveaudio/EnableExclusiveAudioPlayback;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/music/audio/exclusiveaudio/ExclusiveAudioPatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/music/audio/exclusiveaudio/ExclusiveAudioPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -310,6 +417,12 @@ public final class app/revanced/patches/music/interaction/permanentrepeat/Perman
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public final class app/revanced/patches/music/interaction/permanentshuffle/PermanentShufflePatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/music/interaction/permanentshuffle/PermanentShufflePatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/music/interaction/permanentshuffle/PermanentShuffleTogglePatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/music/interaction/permanentshuffle/PermanentShuffleTogglePatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -322,6 +435,12 @@ public final class app/revanced/patches/music/layout/compactheader/CompactHeader
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public final class app/revanced/patches/music/layout/compactheader/HideCategoryBar : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/music/layout/compactheader/HideCategoryBar;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/music/layout/minimizedplayback/MinimizedPlaybackPatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/music/layout/minimizedplayback/MinimizedPlaybackPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -346,6 +465,12 @@ public final class app/revanced/patches/music/misc/androidauto/BypassCertificate
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public final class app/revanced/patches/music/misc/backgroundplayback/BackgroundPlaybackPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/music/misc/backgroundplayback/BackgroundPlaybackPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/music/misc/gms/Constants {
 	public static final field INSTANCE Lapp/revanced/patches/music/misc/gms/Constants;
 }
@@ -406,6 +531,12 @@ public final class app/revanced/patches/nyx/misc/pro/UnlockProPatch : app/revanc
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public final class app/revanced/patches/openinghours/misc/fix/crash/FixCrashPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/openinghours/misc/fix/crash/FixCrashPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/photomath/detection/deviceid/SpoofDeviceIdPatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/photomath/detection/deviceid/SpoofDeviceIdPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -430,12 +561,34 @@ public final class app/revanced/patches/photomath/misc/unlock/plus/UnlockPlusPat
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public final class app/revanced/patches/piccomafr/misc/SpoofAndroidDeviceIdPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/piccomafr/misc/SpoofAndroidDeviceIdPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
+public final class app/revanced/patches/piccomafr/tracking/DisableTrackingPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/piccomafr/tracking/DisableTrackingPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/pixiv/ads/HideAdsPatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/pixiv/ads/HideAdsPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public final class app/revanced/patches/rar/misc/annoyances/purchasereminder/HidePurchaseReminderPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/rar/misc/annoyances/purchasereminder/HidePurchaseReminderPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
+public final class app/revanced/patches/rar/misc/annoyances/purchasereminder/fingerprints/ShowReminderFingerprint : app/revanced/patcher/fingerprint/MethodFingerprint {
+	public static final field INSTANCE Lapp/revanced/patches/rar/misc/annoyances/purchasereminder/fingerprints/ShowReminderFingerprint;
+}
+
 public final class app/revanced/patches/reddit/ad/banner/HideBannerPatch : app/revanced/patcher/patch/ResourcePatch {
 	public static final field INSTANCE Lapp/revanced/patches/reddit/ad/banner/HideBannerPatch;
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
@@ -454,6 +607,18 @@ public final class app/revanced/patches/reddit/ad/general/HideAdsPatch : app/rev
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public abstract class app/revanced/patches/reddit/customclients/BaseFixSLinksPatch : app/revanced/patcher/patch/BytecodePatch {
+	public fun <init> (Lapp/revanced/patcher/fingerprint/MethodFingerprint;Lapp/revanced/patcher/fingerprint/MethodFingerprint;Ljava/util/Set;Ljava/util/Set;)V
+	public synthetic fun <init> (Lapp/revanced/patcher/fingerprint/MethodFingerprint;Lapp/revanced/patcher/fingerprint/MethodFingerprint;Ljava/util/Set;Ljava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+	protected abstract fun getIntegrationsClassDescriptor ()Ljava/lang/String;
+	protected final fun getResolveSLinkMethod ()Ljava/lang/String;
+	protected final fun getSetAccessTokenMethod ()Ljava/lang/String;
+	protected abstract fun patchNavigationHandler (Lapp/revanced/patcher/fingerprint/MethodFingerprintResult;Lapp/revanced/patcher/data/BytecodeContext;)V
+	protected abstract fun patchSetAccessToken (Lapp/revanced/patcher/fingerprint/MethodFingerprintResult;Lapp/revanced/patcher/data/BytecodeContext;)V
+}
+
 public abstract class app/revanced/patches/reddit/customclients/BaseSpoofClientPatch : app/revanced/patcher/patch/BytecodePatch {
 	public fun <init> (Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;)V
 	public synthetic fun <init> (Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -471,6 +636,13 @@ public final class app/revanced/patches/reddit/customclients/Constants {
 	public static final field OAUTH_USER_AGENT Ljava/lang/String;
 }
 
+public abstract class app/revanced/patches/reddit/customclients/ads/BaseDisableAdsPatch : app/revanced/patcher/patch/BytecodePatch {
+	public fun <init> (Ljava/util/Set;Ljava/util/Set;)V
+	public synthetic fun <init> (Ljava/util/Set;Ljava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/reddit/customclients/baconreader/api/SpoofClientPatch : app/revanced/patches/reddit/customclients/BaseSpoofClientPatch {
 	public static final field INSTANCE Lapp/revanced/patches/reddit/customclients/baconreader/api/SpoofClientPatch;
 	public fun patchClientId (Ljava/util/Set;Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -479,6 +651,21 @@ public final class app/revanced/patches/reddit/customclients/baconreader/api/Spo
 public final class app/revanced/patches/reddit/customclients/boostforreddit/api/SpoofClientPatch : app/revanced/patches/reddit/customclients/BaseSpoofClientPatch {
 	public static final field INSTANCE Lapp/revanced/patches/reddit/customclients/boostforreddit/api/SpoofClientPatch;
 	public fun patchClientId (Ljava/util/Set;Lapp/revanced/patcher/data/BytecodeContext;)V
+	public fun patchUserAgent (Ljava/util/Set;Lapp/revanced/patcher/data/BytecodeContext;)V
+}
+
+public final class app/revanced/patches/reddit/customclients/boostforreddit/fix/downloads/FixAudioMissingInDownloadsPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/reddit/customclients/boostforreddit/fix/downloads/FixAudioMissingInDownloadsPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
+public final class app/revanced/patches/reddit/customclients/boostforreddit/fix/slink/FixSLinksPatch : app/revanced/patches/reddit/customclients/BaseFixSLinksPatch {
+	public static final field INSTANCE Lapp/revanced/patches/reddit/customclients/boostforreddit/fix/slink/FixSLinksPatch;
+}
+
+public final class app/revanced/patches/reddit/customclients/boostforreddit/misc/integrations/IntegrationsPatch : app/revanced/patches/shared/misc/integrations/BaseIntegrationsPatch {
+	public static final field INSTANCE Lapp/revanced/patches/reddit/customclients/boostforreddit/misc/integrations/IntegrationsPatch;
 }
 
 public final class app/revanced/patches/reddit/customclients/infinityforreddit/api/SpoofClientPatch : app/revanced/patches/reddit/customclients/BaseSpoofClientPatch {
@@ -501,6 +688,11 @@ public final class app/revanced/patches/reddit/customclients/joeyforreddit/ads/D
 public final class app/revanced/patches/reddit/customclients/joeyforreddit/api/SpoofClientPatch : app/revanced/patches/reddit/customclients/BaseSpoofClientPatch {
 	public static final field INSTANCE Lapp/revanced/patches/reddit/customclients/joeyforreddit/api/SpoofClientPatch;
 	public fun patchClientId (Ljava/util/Set;Lapp/revanced/patcher/data/BytecodeContext;)V
+	public fun patchUserAgent (Ljava/util/Set;Lapp/revanced/patcher/data/BytecodeContext;)V
+}
+
+public final class app/revanced/patches/reddit/customclients/joeyforreddit/api/fingerprints/AuthUtilityUserAgent : app/revanced/patcher/fingerprint/MethodFingerprint {
+	public static final field INSTANCE Lapp/revanced/patches/reddit/customclients/joeyforreddit/api/fingerprints/AuthUtilityUserAgent;
 }
 
 public final class app/revanced/patches/reddit/customclients/joeyforreddit/detection/piracy/DisablePiracyDetectionPatch : app/revanced/patcher/patch/BytecodePatch {
@@ -512,6 +704,7 @@ public final class app/revanced/patches/reddit/customclients/joeyforreddit/detec
 public final class app/revanced/patches/reddit/customclients/redditisfun/api/SpoofClientPatch : app/revanced/patches/reddit/customclients/BaseSpoofClientPatch {
 	public static final field INSTANCE Lapp/revanced/patches/reddit/customclients/redditisfun/api/SpoofClientPatch;
 	public fun patchClientId (Ljava/util/Set;Lapp/revanced/patcher/data/BytecodeContext;)V
+	public fun patchMiscellaneous (Ljava/util/Set;Lapp/revanced/patcher/data/BytecodeContext;)V
 	public fun patchUserAgent (Ljava/util/Set;Lapp/revanced/patcher/data/BytecodeContext;)V
 }
 
@@ -526,10 +719,12 @@ public final class app/revanced/patches/reddit/customclients/slide/api/SpoofClie
 	public fun patchClientId (Ljava/util/Set;Lapp/revanced/patcher/data/BytecodeContext;)V
 }
 
-public final class app/revanced/patches/reddit/customclients/syncforreddit/ads/DisableAdsPatch : app/revanced/patcher/patch/BytecodePatch {
+public final class app/revanced/patches/reddit/customclients/syncforlemmy/ads/DisableAdsPatch : app/revanced/patches/reddit/customclients/ads/BaseDisableAdsPatch {
+	public static final field INSTANCE Lapp/revanced/patches/reddit/customclients/syncforlemmy/ads/DisableAdsPatch;
+}
+
+public final class app/revanced/patches/reddit/customclients/syncforreddit/ads/DisableAdsPatch : app/revanced/patches/reddit/customclients/ads/BaseDisableAdsPatch {
 	public static final field INSTANCE Lapp/revanced/patches/reddit/customclients/syncforreddit/ads/DisableAdsPatch;
-	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
-	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
 public final class app/revanced/patches/reddit/customclients/syncforreddit/annoyances/startup/DisableSyncForLemmyBottomSheetPatch : app/revanced/patcher/patch/BytecodePatch {
@@ -542,6 +737,7 @@ public final class app/revanced/patches/reddit/customclients/syncforreddit/api/S
 	public static final field INSTANCE Lapp/revanced/patches/reddit/customclients/syncforreddit/api/SpoofClientPatch;
 	public fun patchClientId (Ljava/util/Set;Lapp/revanced/patcher/data/BytecodeContext;)V
 	public fun patchMiscellaneous (Ljava/util/Set;Lapp/revanced/patcher/data/BytecodeContext;)V
+	public fun patchUserAgent (Ljava/util/Set;Lapp/revanced/patcher/data/BytecodeContext;)V
 }
 
 public final class app/revanced/patches/reddit/customclients/syncforreddit/detection/piracy/DisablePiracyDetectionPatch : app/revanced/patcher/patch/BytecodePatch {
@@ -550,6 +746,14 @@ public final class app/revanced/patches/reddit/customclients/syncforreddit/detec
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public final class app/revanced/patches/reddit/customclients/syncforreddit/fix/slink/FixSLinksPatch : app/revanced/patches/reddit/customclients/BaseFixSLinksPatch {
+	public static final field INSTANCE Lapp/revanced/patches/reddit/customclients/syncforreddit/fix/slink/FixSLinksPatch;
+}
+
+public final class app/revanced/patches/reddit/customclients/syncforreddit/misc/integrations/IntegrationsPatch : app/revanced/patches/shared/misc/integrations/BaseIntegrationsPatch {
+	public static final field INSTANCE Lapp/revanced/patches/reddit/customclients/syncforreddit/misc/integrations/IntegrationsPatch;
+}
+
 public final class app/revanced/patches/reddit/layout/disablescreenshotpopup/DisableScreenshotPopupPatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/reddit/layout/disablescreenshotpopup/DisableScreenshotPopupPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -599,6 +803,23 @@ public abstract class app/revanced/patches/shared/misc/gms/BaseGmsCoreSupportRes
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 	public fun execute (Lapp/revanced/patcher/data/ResourceContext;)V
 	protected final fun getGmsCoreVendor ()Ljava/lang/String;
+	protected final fun getGmsCoreVendorGroupId ()Ljava/lang/String;
+}
+
+public abstract class app/revanced/patches/shared/misc/hex/BaseHexPatch : app/revanced/patcher/patch/RawResourcePatch {
+	public fun <init> ()V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+	public fun execute (Lapp/revanced/patcher/data/ResourceContext;)V
+	public abstract fun getReplacements ()Ljava/util/List;
+}
+
+public final class app/revanced/patches/shared/misc/hex/BaseHexPatch$Replacement {
+	public static final field Companion Lapp/revanced/patches/shared/misc/hex/BaseHexPatch$Replacement$Companion;
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+	public final fun replacePattern ([B)V
+}
+
+public final class app/revanced/patches/shared/misc/hex/BaseHexPatch$Replacement$Companion {
 }
 
 public abstract class app/revanced/patches/shared/misc/integrations/BaseIntegrationsPatch : app/revanced/patcher/patch/BytecodePatch {
@@ -612,9 +833,19 @@ public abstract class app/revanced/patches/shared/misc/integrations/BaseIntegrat
 	public fun <init> ()V
 	public fun <init> (Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Iterable;Ljava/lang/Iterable;Ljava/lang/Iterable;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;)V
 	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Iterable;Ljava/lang/Iterable;Ljava/lang/Iterable;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Iterable;Ljava/lang/Iterable;Ljava/lang/Iterable;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Iterable;Ljava/lang/Iterable;Ljava/lang/Iterable;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun invoke (Ljava/lang/String;)V
 }
 
+public abstract interface class app/revanced/patches/shared/misc/integrations/BaseIntegrationsPatch$IntegrationsFingerprint$IHookInsertIndexResolver : kotlin/jvm/functions/Function1 {
+	public abstract fun invoke (Lcom/android/tools/smali/dexlib2/iface/Method;)Ljava/lang/Integer;
+}
+
+public final class app/revanced/patches/shared/misc/integrations/BaseIntegrationsPatch$IntegrationsFingerprint$IHookInsertIndexResolver$DefaultImpls {
+	public static fun invoke (Lapp/revanced/patches/shared/misc/integrations/BaseIntegrationsPatch$IntegrationsFingerprint$IHookInsertIndexResolver;Lcom/android/tools/smali/dexlib2/iface/Method;)Ljava/lang/Integer;
+}
+
 public abstract interface class app/revanced/patches/shared/misc/integrations/BaseIntegrationsPatch$IntegrationsFingerprint$IRegisterResolver : kotlin/jvm/functions/Function1 {
 	public abstract fun invoke (Lcom/android/tools/smali/dexlib2/iface/Method;)Ljava/lang/Integer;
 }
@@ -627,6 +858,7 @@ public final class app/revanced/patches/shared/misc/mapping/ResourceMappingPatch
 	public static final field INSTANCE Lapp/revanced/patches/shared/misc/mapping/ResourceMappingPatch;
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 	public fun execute (Lapp/revanced/patcher/data/ResourceContext;)V
+	public final fun get (Ljava/lang/String;Ljava/lang/String;)J
 }
 
 public final class app/revanced/patches/shared/misc/mapping/ResourceMappingPatch$ResourceElement {
@@ -707,10 +939,8 @@ public abstract class app/revanced/patches/shared/misc/settings/preference/BaseP
 }
 
 public class app/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen$Screen : app/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen$BasePreferenceCollection {
-	public fun <init> (Lapp/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;)V
-	public synthetic fun <init> (Lapp/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun <init> (Lapp/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen;Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;)V
-	public synthetic fun <init> (Lapp/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen;Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lapp/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;Lapp/revanced/patches/shared/misc/settings/preference/PreferenceScreen$Sorting;)V
+	public synthetic fun <init> (Lapp/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;Lapp/revanced/patches/shared/misc/settings/preference/PreferenceScreen$Sorting;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun addPreferences ([Lapp/revanced/patches/shared/misc/settings/preference/BasePreference;)V
 	public final fun getCategories ()Ljava/util/Set;
 	public synthetic fun transform ()Lapp/revanced/patches/shared/misc/settings/preference/BasePreference;
@@ -768,6 +998,8 @@ public final class app/revanced/patches/shared/misc/settings/preference/ListPref
 }
 
 public final class app/revanced/patches/shared/misc/settings/preference/NonInteractivePreference : app/revanced/patches/shared/misc/settings/preference/BasePreference {
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V
 	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun getSelectable ()Z
@@ -782,12 +1014,22 @@ public class app/revanced/patches/shared/misc/settings/preference/PreferenceCate
 }
 
 public class app/revanced/patches/shared/misc/settings/preference/PreferenceScreen : app/revanced/patches/shared/misc/settings/preference/BasePreference {
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lapp/revanced/patches/shared/misc/settings/preference/PreferenceScreen$Sorting;Ljava/lang/String;Ljava/util/Set;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lapp/revanced/patches/shared/misc/settings/preference/PreferenceScreen$Sorting;Ljava/lang/String;Ljava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun getPreferences ()Ljava/util/Set;
 	public fun serialize (Lorg/w3c/dom/Document;Lkotlin/jvm/functions/Function1;)Lorg/w3c/dom/Element;
 }
 
+public final class app/revanced/patches/shared/misc/settings/preference/PreferenceScreen$Sorting : java/lang/Enum {
+	public static final field BY_KEY Lapp/revanced/patches/shared/misc/settings/preference/PreferenceScreen$Sorting;
+	public static final field BY_TITLE Lapp/revanced/patches/shared/misc/settings/preference/PreferenceScreen$Sorting;
+	public static final field UNSORTED Lapp/revanced/patches/shared/misc/settings/preference/PreferenceScreen$Sorting;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
+	public final fun getKeySuffix ()Ljava/lang/String;
+	public static fun valueOf (Ljava/lang/String;)Lapp/revanced/patches/shared/misc/settings/preference/PreferenceScreen$Sorting;
+	public static fun values ()[Lapp/revanced/patches/shared/misc/settings/preference/PreferenceScreen$Sorting;
+}
+
 public final class app/revanced/patches/shared/misc/settings/preference/SummaryType : java/lang/Enum {
 	public static final field DEFAULT Lapp/revanced/patches/shared/misc/settings/preference/SummaryType;
 	public static final field OFF Lapp/revanced/patches/shared/misc/settings/preference/SummaryType;
@@ -834,6 +1076,24 @@ public final class app/revanced/patches/songpal/badge/RemoveNotificationBadgePat
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public final class app/revanced/patches/soundcloud/ad/HideAdsPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/soundcloud/ad/HideAdsPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
+public final class app/revanced/patches/soundcloud/analytics/DisableTelemetryPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/soundcloud/analytics/DisableTelemetryPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
+public final class app/revanced/patches/soundcloud/offlinesync/EnableOfflineSyncPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/soundcloud/offlinesync/EnableOfflineSyncPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/spotify/layout/theme/CustomThemePatch : app/revanced/patcher/patch/ResourcePatch {
 	public static final field INSTANCE Lapp/revanced/patches/spotify/layout/theme/CustomThemePatch;
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
@@ -858,6 +1118,18 @@ public final class app/revanced/patches/spotify/navbar/PremiumNavbarTabResourceP
 	public fun execute (Lapp/revanced/patcher/data/ResourceContext;)V
 }
 
+public final class app/revanced/patches/stocard/layout/HideOffersTabPatch : app/revanced/patcher/patch/ResourcePatch {
+	public static final field INSTANCE Lapp/revanced/patches/stocard/layout/HideOffersTabPatch;
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+	public fun execute (Lapp/revanced/patcher/data/ResourceContext;)V
+}
+
+public final class app/revanced/patches/stocard/layout/HideStoryBubblesPatch : app/revanced/patcher/patch/ResourcePatch {
+	public static final field INSTANCE Lapp/revanced/patches/stocard/layout/HideStoryBubblesPatch;
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+	public fun execute (Lapp/revanced/patcher/data/ResourceContext;)V
+}
+
 public final class app/revanced/patches/strava/subscription/UnlockSubscriptionPatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/strava/subscription/UnlockSubscriptionPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -952,6 +1224,12 @@ public final class app/revanced/patches/tumblr/ads/DisableDashboardAds : app/rev
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public final class app/revanced/patches/tumblr/annoyances/adfree/DisableAdFreeBannerPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/tumblr/annoyances/adfree/DisableAdFreeBannerPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/tumblr/annoyances/inappupdate/DisableInAppUpdatePatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/tumblr/annoyances/inappupdate/DisableInAppUpdatePatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -976,6 +1254,12 @@ public final class app/revanced/patches/tumblr/featureflags/OverrideFeatureFlags
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public final class app/revanced/patches/tumblr/fixes/FixOldVersionsPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/tumblr/fixes/FixOldVersionsPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/tumblr/live/DisableTumblrLivePatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/tumblr/live/DisableTumblrLivePatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -1065,6 +1349,18 @@ public final class app/revanced/patches/twitch/misc/settings/SettingsResourcePat
 	public static final field INSTANCE Lapp/revanced/patches/twitch/misc/settings/SettingsResourcePatch;
 }
 
+public final class app/revanced/patches/twitter/interaction/downloads/UnlockDownloadsPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/twitter/interaction/downloads/UnlockDownloadsPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
+public final class app/revanced/patches/twitter/layout/viewcount/HideViewCountPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/twitter/layout/viewcount/HideViewCountPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/twitter/misc/dynamiccolor/DynamicColorPatch : app/revanced/patcher/patch/ResourcePatch {
 	public static final field INSTANCE Lapp/revanced/patches/twitter/misc/dynamiccolor/DynamicColorPatch;
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
@@ -1092,6 +1388,18 @@ public final class app/revanced/patches/twitter/misc/hook/patch/recommendation/H
 	public static final field INSTANCE Lapp/revanced/patches/twitter/misc/hook/patch/recommendation/HideRecommendedUsersPatch;
 }
 
+public final class app/revanced/patches/twitter/misc/links/OpenLinksWithAppChooserPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/twitter/misc/links/OpenLinksWithAppChooserPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
+public final class app/revanced/patches/twitter/misc/links/SanitizeSharingLinksPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/twitter/misc/links/SanitizeSharingLinksPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/vsco/misc/pro/UnlockProPatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/vsco/misc/pro/UnlockProPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -1152,8 +1460,8 @@ public final class app/revanced/patches/youtube/interaction/dialog/RemoveViewerD
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
-public final class app/revanced/patches/youtube/interaction/downloads/ExternalDownloadsBytecodePatch : app/revanced/patcher/patch/BytecodePatch {
-	public static final field INSTANCE Lapp/revanced/patches/youtube/interaction/downloads/ExternalDownloadsBytecodePatch;
+public final class app/revanced/patches/youtube/interaction/downloads/DownloadsPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/youtube/interaction/downloads/DownloadsPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
@@ -1356,6 +1664,12 @@ public final class app/revanced/patches/youtube/layout/hide/time/HideTimestampPa
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public final class app/revanced/patches/youtube/layout/miniplayer/MiniplayerPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/youtube/layout/miniplayer/MiniplayerPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/youtube/layout/panels/popup/PlayerPopupPanelsPatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/youtube/layout/panels/popup/PlayerPopupPanelsPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -1420,6 +1734,10 @@ public final class app/revanced/patches/youtube/layout/startupshortsreset/Disabl
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public final class app/revanced/patches/youtube/layout/startupshortsreset/fingerprints/UserWasInShortsFingerprint : app/revanced/patcher/fingerprint/MethodFingerprint {
+	public static final field INSTANCE Lapp/revanced/patches/youtube/layout/startupshortsreset/fingerprints/UserWasInShortsFingerprint;
+}
+
 public final class app/revanced/patches/youtube/layout/tablet/EnableTabletLayoutPatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/youtube/layout/tablet/EnableTabletLayoutPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -1430,7 +1748,6 @@ public final class app/revanced/patches/youtube/layout/tabletminiplayer/TabletMi
 	public static final field INSTANCE Lapp/revanced/patches/youtube/layout/tabletminiplayer/TabletMiniPlayerPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
-	public final fun unwrap (Lapp/revanced/patcher/fingerprint/MethodFingerprint;)Lkotlin/Triple;
 }
 
 public final class app/revanced/patches/youtube/layout/theme/ThemeBytecodePatch : app/revanced/patcher/patch/BytecodePatch {
@@ -1445,6 +1762,12 @@ public final class app/revanced/patches/youtube/layout/thumbnails/AlternativeThu
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public final class app/revanced/patches/youtube/layout/thumbnails/BypassImageRegionRestrictions : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/youtube/layout/thumbnails/BypassImageRegionRestrictions;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/youtube/misc/announcements/AnnouncementsPatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/youtube/misc/announcements/AnnouncementsPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -1457,6 +1780,12 @@ public final class app/revanced/patches/youtube/misc/autorepeat/AutoRepeatPatch
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public final class app/revanced/patches/youtube/misc/backgroundplayback/BackgroundPlaybackPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/youtube/misc/backgroundplayback/BackgroundPlaybackPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/youtube/misc/debugging/DebuggingPatch : app/revanced/patcher/patch/ResourcePatch {
 	public static final field INSTANCE Lapp/revanced/patches/youtube/misc/debugging/DebuggingPatch;
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
@@ -1469,8 +1798,8 @@ public final class app/revanced/patches/youtube/misc/dimensions/spoof/SpoofDevic
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
-public final class app/revanced/patches/youtube/misc/fix/playback/ClientSpoofPatch : app/revanced/patcher/patch/BytecodePatch {
-	public static final field INSTANCE Lapp/revanced/patches/youtube/misc/fix/playback/ClientSpoofPatch;
+public final class app/revanced/patches/youtube/misc/fix/playback/SpoofClientPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/youtube/misc/fix/playback/SpoofClientPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
@@ -1487,6 +1816,14 @@ public final class app/revanced/patches/youtube/misc/fix/playback/SpoofSignature
 	public fun execute (Lapp/revanced/patcher/data/ResourceContext;)V
 }
 
+public final class app/revanced/patches/youtube/misc/fix/playback/UserAgentClientSpoofPatch : app/revanced/patches/all/misc/transformation/BaseTransformInstructionsPatch {
+	public static final field INSTANCE Lapp/revanced/patches/youtube/misc/fix/playback/UserAgentClientSpoofPatch;
+	public synthetic fun filterMap (Lcom/android/tools/smali/dexlib2/iface/ClassDef;Lcom/android/tools/smali/dexlib2/iface/Method;Lcom/android/tools/smali/dexlib2/iface/instruction/Instruction;I)Ljava/lang/Object;
+	public fun filterMap (Lcom/android/tools/smali/dexlib2/iface/ClassDef;Lcom/android/tools/smali/dexlib2/iface/Method;Lcom/android/tools/smali/dexlib2/iface/instruction/Instruction;I)Lkotlin/Triple;
+	public synthetic fun transform (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;Ljava/lang/Object;)V
+	public fun transform (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;Lkotlin/Triple;)V
+}
+
 public final class app/revanced/patches/youtube/misc/gms/GmsCoreSupportPatch : app/revanced/patches/shared/misc/gms/BaseGmsCoreSupportPatch {
 	public static final field INSTANCE Lapp/revanced/patches/youtube/misc/gms/GmsCoreSupportPatch;
 }
@@ -1497,6 +1834,16 @@ public final class app/revanced/patches/youtube/misc/gms/GmsCoreSupportResourceP
 	public fun execute (Lapp/revanced/patcher/data/ResourceContext;)V
 }
 
+public final class app/revanced/patches/youtube/misc/imageurlhook/CronetImageUrlHook : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/youtube/misc/imageurlhook/CronetImageUrlHook;
+	public final fun addImageUrlErrorCallbackHook (Ljava/lang/String;)V
+	public final fun addImageUrlHook (Ljava/lang/String;Z)V
+	public static synthetic fun addImageUrlHook$default (Lapp/revanced/patches/youtube/misc/imageurlhook/CronetImageUrlHook;Ljava/lang/String;ZILjava/lang/Object;)V
+	public final fun addImageUrlSuccessCallbackHook (Ljava/lang/String;)V
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/youtube/misc/integrations/IntegrationsPatch : app/revanced/patches/shared/misc/integrations/BaseIntegrationsPatch {
 	public static final field INSTANCE Lapp/revanced/patches/youtube/misc/integrations/IntegrationsPatch;
 }
@@ -1530,6 +1877,13 @@ public final class app/revanced/patches/youtube/misc/minimizedplayback/Minimized
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public final class app/revanced/patches/youtube/misc/navigation/NavigationBarHookPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/youtube/misc/navigation/NavigationBarHookPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+	public final fun getHookNavigationButtonCreated ()Lkotlin/jvm/functions/Function1;
+}
+
 public final class app/revanced/patches/youtube/misc/playercontrols/BottomControlsResourcePatch : app/revanced/patcher/patch/ResourcePatch, java/io/Closeable {
 	public static final field INSTANCE Lapp/revanced/patches/youtube/misc/playercontrols/BottomControlsResourcePatch;
 	public final fun addControls (Ljava/lang/String;)V
@@ -1579,9 +1933,14 @@ public final class app/revanced/patches/youtube/misc/settings/SettingsPatch$Pref
 	public static final field INSTANCE Lapp/revanced/patches/youtube/misc/settings/SettingsPatch$PreferenceScreen;
 	public fun commit (Lapp/revanced/patches/shared/misc/settings/preference/PreferenceScreen;)V
 	public final fun getADS ()Lapp/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen$Screen;
-	public final fun getINTERACTIONS ()Lapp/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen$Screen;
-	public final fun getLAYOUT ()Lapp/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen$Screen;
+	public final fun getALTERNATIVE_THUMBNAILS ()Lapp/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen$Screen;
+	public final fun getFEED ()Lapp/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen$Screen;
+	public final fun getGENERAL_LAYOUT ()Lapp/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen$Screen;
 	public final fun getMISC ()Lapp/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen$Screen;
+	public final fun getPLAYER ()Lapp/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen$Screen;
+	public final fun getSEEKBAR ()Lapp/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen$Screen;
+	public final fun getSHORTS ()Lapp/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen$Screen;
+	public final fun getSWIPE_CONTROLS ()Lapp/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen$Screen;
 	public final fun getVIDEO ()Lapp/revanced/patches/shared/misc/settings/preference/BasePreferenceScreen$Screen;
 }
 
@@ -1645,6 +2004,12 @@ public final class app/revanced/patches/youtube/video/speed/PlaybackSpeedPatch :
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public final class app/revanced/patches/youtube/video/speed/button/PlaybackSpeedButtonPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/youtube/video/speed/button/PlaybackSpeedButtonPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/youtube/video/speed/custom/CustomPlaybackSpeedPatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/youtube/video/speed/custom/CustomPlaybackSpeedPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -1692,13 +2057,25 @@ public final class app/revanced/patches/yuka/misc/unlockpremium/UnlockPremiumPat
 
 public final class app/revanced/util/BytecodeUtilsKt {
 	public static final fun containsWideLiteralInstructionValue (Lcom/android/tools/smali/dexlib2/iface/Method;J)Z
-	public static final fun findIndexForIdResource (Lcom/android/tools/smali/dexlib2/iface/Method;Ljava/lang/String;)I
 	public static final fun findMutableMethodOf (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableClass;Lcom/android/tools/smali/dexlib2/iface/Method;)Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;
+	public static final fun findOpcodeIndicesReversed (Lcom/android/tools/smali/dexlib2/iface/Method;Lcom/android/tools/smali/dexlib2/Opcode;)Ljava/util/List;
 	public static final fun getException (Lapp/revanced/patcher/fingerprint/MethodFingerprint;)Lapp/revanced/patcher/patch/PatchException;
+	public static final fun indexOfFirstInstruction (Lcom/android/tools/smali/dexlib2/iface/Method;ILkotlin/jvm/functions/Function1;)I
 	public static final fun indexOfFirstInstruction (Lcom/android/tools/smali/dexlib2/iface/Method;Lkotlin/jvm/functions/Function1;)I
+	public static synthetic fun indexOfFirstInstruction$default (Lcom/android/tools/smali/dexlib2/iface/Method;ILkotlin/jvm/functions/Function1;ILjava/lang/Object;)I
+	public static final fun indexOfFirstInstructionOrThrow (Lcom/android/tools/smali/dexlib2/iface/Method;ILkotlin/jvm/functions/Function1;)I
+	public static synthetic fun indexOfFirstInstructionOrThrow$default (Lcom/android/tools/smali/dexlib2/iface/Method;ILkotlin/jvm/functions/Function1;ILjava/lang/Object;)I
 	public static final fun indexOfFirstWideLiteralInstructionValue (Lcom/android/tools/smali/dexlib2/iface/Method;J)I
+	public static final fun indexOfFirstWideLiteralInstructionValueOrThrow (Lcom/android/tools/smali/dexlib2/iface/Method;J)I
+	public static final fun indexOfIdResource (Lcom/android/tools/smali/dexlib2/iface/Method;Ljava/lang/String;)I
+	public static final fun indexOfIdResourceOrThrow (Lcom/android/tools/smali/dexlib2/iface/Method;Ljava/lang/String;)I
 	public static final fun injectHideViewCall (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;IILjava/lang/String;Ljava/lang/String;)V
+	public static final fun resultOrThrow (Lapp/revanced/patcher/fingerprint/MethodFingerprint;)Lapp/revanced/patcher/fingerprint/MethodFingerprintResult;
+	public static final fun returnEarly (Lapp/revanced/patcher/fingerprint/MethodFingerprint;Z)V
+	public static final fun returnEarly (Ljava/lang/Iterable;Z)V
 	public static final fun returnEarly (Ljava/util/List;Z)V
+	public static synthetic fun returnEarly$default (Lapp/revanced/patcher/fingerprint/MethodFingerprint;ZILjava/lang/Object;)V
+	public static synthetic fun returnEarly$default (Ljava/lang/Iterable;ZILjava/lang/Object;)V
 	public static synthetic fun returnEarly$default (Ljava/util/List;ZILjava/lang/Object;)V
 	public static final fun transformMethods (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableClass;Lkotlin/jvm/functions/Function1;)V
 	public static final fun traverseClassHierarchy (Lapp/revanced/patcher/data/BytecodeContext;Lapp/revanced/patcher/util/proxy/mutableTypes/MutableClass;Lkotlin/jvm/functions/Function1;)V

build.gradle.kts

@@ -1,9 +1,11 @@
 import org.gradle.kotlin.dsl.support.listFilesOrdered
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
-    kotlin("jvm") version "1.9.22"
+    alias(libs.plugins.kotlin)
     alias(libs.plugins.binary.compatibility.validator)
     `maven-publish`
+    signing
 }
 
 group = "app.revanced"
@@ -12,7 +14,14 @@ repositories {
     mavenCentral()
     mavenLocal()
     google()
-    maven { url = uri("https://jitpack.io") }
+    maven {
+        // A repository must be specified for some reason. "registry" is a dummy.
+        url = uri("https://maven.pkg.github.com/revanced/registry")
+        credentials {
+            username = project.findProperty("gpr.user") as String? ?: System.getenv("GITHUB_ACTOR")
+            password = project.findProperty("gpr.key") as String? ?: System.getenv("GITHUB_TOKEN")
+        }
+    }
 }
 
 dependencies {
@@ -22,34 +31,38 @@ dependencies {
     implementation(libs.guava)
     // Used in JsonGenerator.
     implementation(libs.gson)
-
-    // A dependency to the Android library unfortunately fails the build, which is why this is required.
-    compileOnly(project("dummy"))
 }
 
 kotlin {
-    jvmToolchain(11)
-}
-
-tasks.withType(Jar::class) {
-    exclude("app/revanced/meta")
-
-    manifest {
-        attributes["Name"] = "ReVanced Patches"
-        attributes["Description"] = "Patches for ReVanced."
-        attributes["Version"] = version
-        attributes["Timestamp"] = System.currentTimeMillis().toString()
-        attributes["Source"] = "git@github.com:revanced/revanced-patches.git"
-        attributes["Author"] = "ReVanced"
-        attributes["Contact"] = "contact@revanced.app"
-        attributes["Origin"] = "https://revanced.app"
-        attributes["License"] = "GNU General Public License v3.0"
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_11)
     }
 }
 
+java {
+    targetCompatibility = JavaVersion.VERSION_11
+}
+
 tasks {
-    register<DefaultTask>("generateBundle") {
-        description = "Generate DEX files and add them in the JAR file"
+    withType(Jar::class) {
+        exclude("app/revanced/meta")
+
+        manifest {
+            attributes["Name"] = "ReVanced Patches"
+            attributes["Description"] = "Patches for ReVanced."
+            attributes["Version"] = version
+            attributes["Timestamp"] = System.currentTimeMillis().toString()
+            attributes["Source"] = "git@github.com:revanced/revanced-patches.git"
+            attributes["Author"] = "ReVanced"
+            attributes["Contact"] = "contact@revanced.app"
+            attributes["Origin"] = "https://revanced.app"
+            attributes["License"] = "GNU General Public License v3.0"
+        }
+    }
+
+    register("buildDexJar") {
+        description = "Build and add a DEX to the JAR file"
+        group = "build"
 
         dependsOn(build)
 
@@ -57,39 +70,50 @@ tasks {
             val d8 = File(System.getenv("ANDROID_HOME")).resolve("build-tools")
                 .listFilesOrdered().last().resolve("d8").absolutePath
 
-            val artifacts = configurations.archives.get().allArtifacts.files.files.first().absolutePath
+            val patchesJar = configurations.archives.get().allArtifacts.files.files.first().absolutePath
             val workingDirectory = layout.buildDirectory.dir("libs").get().asFile
 
             exec {
                 workingDir = workingDirectory
-                commandLine = listOf(d8, artifacts)
+                commandLine = listOf(d8, "--release", patchesJar)
             }
 
             exec {
                 workingDir = workingDirectory
-                commandLine = listOf("zip", "-u", artifacts, "classes.dex")
+                commandLine = listOf("zip", "-u", patchesJar, "classes.dex")
             }
         }
     }
 
-    register<JavaExec>("generateMeta") {
-        description = "Generate metadata for this bundle"
+    register<JavaExec>("generatePatchesFiles") {
+        description = "Generate patches files"
 
         dependsOn(build)
 
         classpath = sourceSets["main"].runtimeClasspath
-        mainClass.set("app.revanced.meta.IPatchesFileGenerator")
+        mainClass.set("app.revanced.generator.MainKt")
     }
 
-    // Required to run tasks because Gradle semantic-release plugin runs the publish task.
+    // Needed by gradle-semantic-release-plugin.
     // Tracking: https://github.com/KengoTODA/gradle-semantic-release-plugin/issues/435
-    named("publish") {
-        dependsOn("generateBundle")
-        dependsOn("generateMeta")
+    publish {
+        dependsOn("buildDexJar")
+        dependsOn("generatePatchesFiles")
     }
 }
 
 publishing {
+    repositories {
+        maven {
+            name = "GitHubPackages"
+            url = uri("https://maven.pkg.github.com/revanced/revanced-patches")
+            credentials {
+                username = System.getenv("GITHUB_ACTOR")
+                password = System.getenv("GITHUB_TOKEN")
+            }
+        }
+    }
+
     publications {
         create<MavenPublication>("revanced-patches-publication") {
             from(components["java"])
@@ -120,4 +144,10 @@ publishing {
             }
         }
     }
-}
+}
+
+signing {
+    useGpgCmd()
+
+    sign(publishing.publications["revanced-patches-publication"])
+}

crowdin.yml

@@ -0,0 +1,8 @@
+project_id_env: "CROWDIN_PROJECT_ID"
+api_token_env: "CROWDIN_PERSONAL_TOKEN"
+
+preserve_hierarchy: false
+files:
+    - source: src/main/resources/addresources/values/strings.xml
+      translation: src/main/resources/addresources/values-%android_code%/strings.xml
+      skip_untranslated_strings: true

dummy/build.gradle.kts

@@ -1,9 +0,0 @@
-plugins {
-    id("java")
-}
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(11))
-    }
-}

dummy/src/main/java/android/os/Environment.java

@@ -1,9 +0,0 @@
-package android.os;
-
-import java.io.File;
-
-public final class Environment {
-    public static File getExternalStorageDirectory() {
-        throw new UnsupportedOperationException("Stub");
-    }
-}

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 4.0.3-dev.1
+version = 4.12.0-dev.5

gradle/libs.versions.toml

@@ -1,9 +1,11 @@
 [versions]
-revanced-patcher = "19.2.0"
-smali = "3.0.3"
-guava = "33.0.0-jre"
+revanced-patcher = "19.3.1"
+#noinspection GradleDependency
+smali = "3.0.5" # 3.0.7 breaks binary compatibility. Tracking https://github.com/google/smali/issues/58.
+guava = "33.1.0-jre"
 gson = "2.10.1"
-binary-compatibility-validator = "0.13.2"
+binary-compatibility-validator = "0.14.0"
+kotlin = "2.0.0"
 
 [libraries]
 revanced-patcher = { module = "app.revanced:revanced-patcher", version.ref = "revanced-patcher" }
@@ -13,3 +15,4 @@ gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
 
 [plugins]
 binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binary-compatibility-validator" }
+kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

package.json

@@ -4,6 +4,6 @@
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
     "gradle-semantic-release-plugin": "^1.9.1",
-    "semantic-release": "^23.0.0"
+    "semantic-release": "^23.0.8"
   }
 }

settings.gradle.kts

@@ -1,5 +1,3 @@
-include("dummy")
-
 rootProject.name = "revanced-patches"
 
 buildCache {

src/main/kotlin/app/revanced/generator/JsonPatchesFileGenerator.kt

@@ -1,11 +1,11 @@
-package app.revanced.meta
+package app.revanced.generator
 
 import app.revanced.patcher.PatchSet
 import app.revanced.patcher.patch.Patch
 import com.google.gson.GsonBuilder
 import java.io.File
 
-internal class JsonPatchesFileGenerator : IPatchesFileGenerator {
+internal class JsonPatchesFileGenerator : PatchesFileGenerator {
     override fun generate(patches: PatchSet) = patches.map {
         JsonPatch(
             it.name!!,
@@ -20,9 +20,9 @@ internal class JsonPatchesFileGenerator : IPatchesFileGenerator {
                     option.values,
                     option.title,
                     option.description,
-                    option.required
+                    option.required,
                 )
-            }
+            },
         )
     }.let {
         File("patches.json").writeText(GsonBuilder().serializeNulls().create().toJson(it))
@@ -35,7 +35,7 @@ internal class JsonPatchesFileGenerator : IPatchesFileGenerator {
         val compatiblePackages: Set<Patch.CompatiblePackage>? = null,
         val use: Boolean = true,
         val requiresIntegrations: Boolean = false,
-        val options: List<Option>
+        val options: List<Option>,
     ) {
         class Option(
             val key: String,
@@ -46,4 +46,4 @@ internal class JsonPatchesFileGenerator : IPatchesFileGenerator {
             val required: Boolean,
         )
     }
-}
+}

src/main/kotlin/app/revanced/generator/Main.kt

@@ -0,0 +1,12 @@
+package app.revanced.generator
+
+import app.revanced.patcher.PatchBundleLoader
+import java.io.File
+
+internal fun main() = PatchBundleLoader.Jar(
+    File("build/libs/").listFiles { it -> it.name.endsWith(".jar") }!!.first(),
+).also { loader ->
+    if (loader.isEmpty()) throw IllegalStateException("No patches found")
+}.let { bundle ->
+    arrayOf(JsonPatchesFileGenerator()).forEach { generator -> generator.generate(bundle) }
+}

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

@@ -0,0 +1,7 @@
+package app.revanced.generator
+
+import app.revanced.patcher.PatchSet
+
+internal interface PatchesFileGenerator {
+    fun generate(patches: PatchSet)
+}

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

@@ -1,20 +0,0 @@
-package app.revanced.meta
-
-import app.revanced.patcher.PatchBundleLoader
-import app.revanced.patcher.PatchSet
-import java.io.File
-
-internal interface IPatchesFileGenerator {
-    fun generate(patches: PatchSet)
-
-    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")
-        }.let { bundle ->
-            arrayOf(JsonPatchesFileGenerator()).forEach { generator -> generator.generate(bundle) }
-        }
-    }
-}

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

@@ -7,29 +7,34 @@ import app.revanced.patcher.patch.annotation.Patch
 @Patch(
     name = "Export all activities",
     description = "Makes all app activities exportable.",
-    use = false
+    use = false,
 )
 @Suppress("unused")
 object ExportAllActivitiesPatch : ResourcePatch() {
     private const val EXPORTED_FLAG = "android:exported"
+
     override fun execute(context: ResourceContext) {
         context.xmlEditor["AndroidManifest.xml"].use { editor ->
             val document = editor.file
+
             val activities = document.getElementsByTagName("activity")
 
-            for(i in 0..activities.length) {
+            for (i in 0..activities.length) {
                 activities.item(i)?.apply {
                     val exportedAttribute = attributes.getNamedItem(EXPORTED_FLAG)
 
                     if (exportedAttribute != null) {
-                        if (exportedAttribute.nodeValue != "true")
+                        if (exportedAttribute.nodeValue != "true") {
                             exportedAttribute.nodeValue = "true"
+                        }
                     }
                     // Reason why the attribute is added in the case it does not exist:
                     // https://github.com/revanced/revanced-patches/pull/1751/files#r1141481604
-                    else document.createAttribute(EXPORTED_FLAG)
-                        .apply { value = "true" }
-                        .let(attributes::setNamedItem)
+                    else {
+                        document.createAttribute(EXPORTED_FLAG)
+                            .apply { value = "true" }
+                            .let(attributes::setNamedItem)
+                    }
                 }
             }
         }

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

@@ -7,7 +7,7 @@ import app.revanced.patcher.patch.annotation.Patch
 @Patch(
     name = "Predictive back gesture",
     description = "Enables the predictive back gesture introduced on Android 13.",
-    use = false
+    use = false,
 )
 @Suppress("unused")
 object PredictiveBackGesturePatch : ResourcePatch() {

src/main/kotlin/app/revanced/patches/all/location/hide/HideMockLocationPatch.kt

@@ -0,0 +1,56 @@
+@file:Suppress("unused")
+
+package app.revanced.patches.all.location.hide
+
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import app.revanced.patches.all.misc.transformation.BaseTransformInstructionsPatch
+import app.revanced.patches.all.misc.transformation.IMethodCall
+import app.revanced.patches.all.misc.transformation.fromMethodReference
+import app.revanced.util.getReference
+import com.android.tools.smali.dexlib2.iface.ClassDef
+import com.android.tools.smali.dexlib2.iface.Method
+import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.Instruction
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+
+@Patch(
+    name = "Hide mock location",
+    description = "Prevents the app from knowing the device location is being mocked by a third party app.",
+    use = false
+)
+object HideMockLocationPatch : BaseTransformInstructionsPatch<Pair<Instruction, Int>>() {
+    override fun filterMap(
+        classDef: ClassDef,
+        method: Method,
+        instruction: Instruction,
+        instructionIndex: Int
+    ): Pair<Instruction, Int>? {
+        val reference = instruction.getReference<MethodReference>() ?: return null
+        if (fromMethodReference<MethodCall>(reference) == null) return null
+
+        return instruction to instructionIndex
+    }
+
+    override fun transform(mutableMethod: MutableMethod, entry: Pair<Instruction, Int>) {
+        val (instruction, index) = entry
+        instruction as FiveRegisterInstruction
+
+        // Replace return value with a constant `false` boolean.
+        mutableMethod.replaceInstruction(
+            index + 1,
+            "const/4 v${instruction.registerC}, 0x0"
+        )
+    }
+}
+
+private enum class MethodCall(
+    override val definedClassName: String,
+    override val methodName: String,
+    override val methodParams: Array<String>,
+    override val returnType: String
+) : IMethodCall {
+    IsMock("Landroid/location/Location;", "isMock", emptyArray(), "Z"),
+    IsFromMockProvider("Landroid/location/Location;", "isFromMockProvider", emptyArray(), "Z")
+}

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

@@ -8,16 +8,18 @@ import org.w3c.dom.Element
 @Patch(
     name = "Enable Android debugging",
     description = "Enables Android debugging capabilities. This can slow down the app.",
-    use = false
+    use = false,
 )
 @Suppress("unused")
 object EnableAndroidDebuggingPatch : ResourcePatch() {
     override fun execute(context: ResourceContext) {
-        context.xmlEditor["AndroidManifest.xml"].use { dom ->
-            val applicationNode = dom
-                .file
-                .getElementsByTagName("application")
-                .item(0) as Element
+        context.xmlEditor["AndroidManifest.xml"].use { editor ->
+            val document = editor.file
+
+            val applicationNode =
+                document
+                    .getElementsByTagName("application")
+                    .item(0) as Element
 
             // set application as debuggable
             applicationNode.setAttribute("android:debuggable", "true")

src/main/kotlin/app/revanced/patches/all/misc/hex/HexPatch.kt

@@ -0,0 +1,55 @@
+package app.revanced.patches.all.misc.hex
+
+import app.revanced.patcher.patch.PatchException
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.registerNewPatchOption
+import app.revanced.patches.shared.misc.hex.BaseHexPatch
+import app.revanced.util.Utils.trimIndentMultiline
+import app.revanced.patcher.patch.Patch as PatchClass
+
+@Patch(
+    name = "Hex",
+    description = "Replaces a hexadecimal patterns of bytes of files in an APK.",
+    use = false,
+)
+@Suppress("unused")
+class HexPatch : BaseHexPatch() {
+    // TODO: Instead of stringArrayOption, use a custom option type to work around
+    //  https://github.com/ReVanced/revanced-library/issues/48.
+    //  Replace the custom option type with a stringArrayOption once the issue is resolved.
+    private val replacementsOption by registerNewPatchOption<PatchClass<*>, List<String>>(
+        key = "replacements",
+        title = "Replacements",
+        description = """
+            Hexadecimal patterns to search for and replace with another in a target file.
+            
+            A pattern is a sequence of case insensitive strings, each representing hexadecimal bytes, separated by spaces.
+            An example pattern is 'aa 01 02 FF'.
+
+            Every pattern must be followed by a pipe ('|'), the replacement pattern,
+            another pipe ('|'), and the path to the file to make the changes in relative to the APK root. 
+            The replacement pattern must have the same length as the original pattern.
+
+            Full example of a valid input:
+            'aa 01 02 FF|00 00 00 00|path/to/file'
+        """.trimIndentMultiline(),
+        required = true,
+        valueType = "StringArray",
+    )
+
+    override val replacements
+        get() = replacementsOption!!.map { from ->
+            val (pattern, replacementPattern, targetFilePath) = try {
+                from.split("|", limit = 3)
+            } catch (e: Exception) {
+                throw PatchException(
+                    "Invalid input: $from.\n" +
+                        "Every pattern must be followed by a pipe ('|'), " +
+                        "the replacement pattern, another pipe ('|'), " +
+                        "and the path to the file to make the changes in relative to the APK root. ",
+                )
+            }
+
+            Replacement(pattern, replacementPattern, targetFilePath)
+        }
+}

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

@@ -4,6 +4,7 @@ import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.all.misc.debugging.EnableAndroidDebuggingPatch
+import app.revanced.util.Utils.trimIndentMultiline
 import org.w3c.dom.Element
 import java.io.File
 
@@ -11,16 +12,17 @@ import java.io.File
     name = "Override certificate pinning",
     description = "Overrides certificate pinning, allowing to inspect traffic via a proxy.",
     dependencies = [EnableAndroidDebuggingPatch::class],
-    use = false
+    use = false,
 )
 @Suppress("unused")
 object OverrideCertificatePinningPatch : ResourcePatch() {
     override fun execute(context: ResourceContext) {
-        val resXmlDirectory = context["res/xml"]
+        val resXmlDirectory = context.get("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")) {
@@ -31,10 +33,8 @@ object OverrideCertificatePinningPatch : ResourcePatch() {
 
         // 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(
-                    """
+            writeText(
+                """
                     <?xml version="1.0" encoding="utf-8"?>
                     <network-security-config>
                         <base-config cleartextTrafficPermitted="true">
@@ -54,22 +54,8 @@ object OverrideCertificatePinningPatch : ResourcePatch() {
                             </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\" />"
-                            )
-                        )
-                    }
-                }
-
-            }
+                    """.trimIndentMultiline(),
+            )
         }
     }
 }

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

@@ -11,20 +11,21 @@ import java.io.Closeable
 @Patch(
     name = "Change package name",
     description = "Appends \".revanced\" to the package name by default. Changing the package name of the app can lead to unexpected issues.",
-    use = false
+    use = false,
 )
 @Suppress("unused")
 object ChangePackageNamePatch : ResourcePatch(), Closeable {
-    private val packageNameOption = stringPatchOption(
-        key = "packageName",
-        default = "Default",
-        values = mapOf("Default" to "Default"),
-        title = "Package name",
-        description = "The name of the package to rename the app to.",
-        required = true
-    ) {
-        it == "Default" || it!!.matches(Regex("^[a-z]\\w*(\\.[a-z]\\w*)+\$"))
-    }
+    private val packageNameOption =
+        stringPatchOption(
+            key = "packageName",
+            default = "Default",
+            values = mapOf("Default" to "Default"),
+            title = "Package name",
+            description = "The name of the package to rename the app to.",
+            required = true,
+        ) {
+            it == "Default" || it!!.matches(Regex("^[a-z]\\w*(\\.[a-z]\\w*)+\$"))
+        }
 
     private lateinit var context: ResourceContext
 
@@ -43,20 +44,27 @@ object ChangePackageNamePatch : ResourcePatch(), Closeable {
     fun setOrGetFallbackPackageName(fallbackPackageName: String): String {
         val packageName = packageNameOption.value!!
 
-        return if (packageName == packageNameOption.default)
+        return if (packageName == packageNameOption.default) {
             fallbackPackageName.also { packageNameOption.value = it }
-        else
+        } else {
             packageName
+        }
     }
 
-    override fun close() = context.xmlEditor["AndroidManifest.xml"].use { editor ->
-        val replacementPackageName = packageNameOption.value
+    override fun close() =
+        context.xmlEditor["AndroidManifest.xml"].use { editor ->
+            val document = editor.file
 
-        val manifest = editor.file.getElementsByTagName("manifest").item(0) as Element
-        manifest.setAttribute(
-            "package",
-            if (replacementPackageName != packageNameOption.default) replacementPackageName
-            else "${manifest.getAttribute("package")}.revanced"
-        )
-    }
+            val replacementPackageName = packageNameOption.value
+
+            val manifest = document.getElementsByTagName("manifest").item(0) as Element
+            manifest.setAttribute(
+                "package",
+                if (replacementPackageName != packageNameOption.default) {
+                    replacementPackageName
+                } else {
+                    "${manifest.getAttribute("package")}.revanced"
+                },
+            )
+        }
 }

src/main/kotlin/app/revanced/patches/all/misc/resources/AddResourcesPatch.kt

@@ -13,12 +13,12 @@ import app.revanced.util.resource.BaseResource
 import app.revanced.util.resource.StringResource
 import org.w3c.dom.Node
 import java.io.Closeable
-import java.util.*
 
 /**
  * An identifier of an app. For example, `youtube`.
  */
 private typealias AppId = String
+
 /**
  * An identifier of a patch. For example, `ad.general.HideAdsPatch`.
  */
@@ -28,10 +28,12 @@ private typealias PatchId = String
  * A set of resources of a patch.
  */
 private typealias PatchResources = MutableSet<BaseResource>
+
 /**
  * A map of resources belonging to a patch.
  */
 private typealias AppResources = MutableMap<PatchId, PatchResources>
+
 /**
  * A map of resources belonging to an app.
  */
@@ -52,6 +54,95 @@ object AddResourcesPatch : ResourcePatch(), MutableMap<Value, MutableSet<BaseRes
      */
     private lateinit var resources: Map<Value, Resources>
 
+    /**
+     * Map of Crowdin locales to Android resource locale names.
+     *
+     * Fixme: Instead this patch should detect what locale regions are present in both patches and the target app,
+     * and automatically merge into the appropriate existing target file.
+     * So if a target app has only 'es', then the Crowdin file of 'es-rES' should merge into that.
+     * But if a target app has specific regions (such as 'pt-rBR'),
+     * then the Crowdin region specific file should merged into that.
+     */
+    private val locales = mapOf(
+        "af-rZA" to "af",
+        "am-rET" to "am",
+        "ar-rSA" to "ar",
+        "as-rIN" to "as",
+        "az-rAZ" to "az",
+        "be-rBY" to "be",
+        "bg-rBG" to "bg",
+        "bn-rBD" to "bn",
+        "bs-rBA" to "bs",
+        "ca-rES" to "ca",
+        "cs-rCZ" to "cs",
+        "da-rDK" to "da",
+        "de-rDE" to "de",
+        "el-rGR" to "el",
+        "es-rES" to "es",
+        "et-rEE" to "et",
+        "eu-rES" to "eu",
+        "fa-rIR" to "fa",
+        "fi-rFI" to "fi",
+        "tl-rPH" to "tl",
+        "fr-rFR" to "fr",
+        "gl-rES" to "gl",
+        "gu-rIN" to "gu",
+        "hi-rIN" to "hi",
+        "hr-rHR" to "hr",
+        "hu-rHU" to "hu",
+        "hy-rAM" to "hy",
+        "in-rID" to "in",
+        "is-rIS" to "is",
+        "it-rIT" to "it",
+        "iw-rIL" to "iw",
+        "ja-rJP" to "ja",
+        "ka-rGE" to "ka",
+        "kk-rKZ" to "kk",
+        "km-rKH" to "km",
+        "kn-rIN" to "kn",
+        "ko-rKR" to "ko",
+        "ky-rKG" to "ky",
+        "lo-rLA" to "lo",
+        "lt-rLT" to "lt",
+        "lv-rLV" to "lv",
+        "mk-rMK" to "mk",
+        "ml-rIN" to "ml",
+        "mn-rMN" to "mn",
+        "mr-rIN" to "mr",
+        "ms-rMY" to "ms",
+        "my-rMM" to "my",
+        "nb-rNO" to "nb",
+        "ne-rIN" to "ne",
+        "nl-rNL" to "nl",
+        "or-rIN" to "or",
+        "pa-rIN" to "pa",
+        "pl-rPL" to "pl",
+        "pt-rBR" to "pt-rBR",
+        "pt-rPT" to "pt-rPT",
+        "ro-rRO" to "ro",
+        "ru-rRU" to "ru",
+        "si-rLK" to "si",
+        "sk-rSK" to "sk",
+        "sl-rSI" to "sl",
+        "sq-rAL" to "sq",
+        "sr-rSP" to "sr",
+        "sv-rSE" to "sv",
+        "sw-rKE" to "sw",
+        "ta-rIN" to "ta",
+        "te-rIN" to "te",
+        "th-rTH" to "th",
+        "tl-rPH" to "tl",
+        "tr-rTR" to "tr",
+        "uk-rUA" to "uk",
+        "ur-rIN" to "ur",
+        "uz-rUZ" to "uz",
+        "vi-rVN" to "vi",
+        "zh-rCN" to "zh-rCN",
+        "zh-rHK" to "zh-rHK",
+        "zh-rTW" to "zh-rTW",
+        "zu-rZA" to "zu",
+    )
+
     /*
     The strategy of this patch is to stage resources present in `/resources/addresources`.
     These resources are organized by their respective value and patch.
@@ -67,40 +158,46 @@ object AddResourcesPatch : ResourcePatch(), MutableMap<Value, MutableSet<BaseRes
     override fun execute(context: ResourceContext) {
         this.context = context
 
-        resources = buildMap {
-            /**
-             * Puts resources under `/resources/addresources/<value>/<resourceKind>.xml` into the map.
-             *
-             * @param value The value of the resource. For example, `values` or `values-de`.
-             * @param resourceKind The kind of the resource. For example, `strings` or `arrays`.
-             * @param transform A function that transforms the [Node]s from the XML files to a [BaseResource].
-             */
-            fun addResources(
-                value: Value,
-                resourceKind: String,
-                transform: (Node) -> BaseResource,
-            ) {
-                inputStreamFromBundledResource(
-                    "addresources",
-                    "$value/$resourceKind.xml"
-                )?.let { stream ->
-                    // Add the resources associated with the given value to the map,
-                    // instead of overwriting it.
-                    // This covers the example case such as adding strings and arrays of the same value.
-                    getOrPut(value, ::mutableMapOf).apply {
-                        context.xmlEditor[stream].use {
-                            it.file.getElementsByTagName("app").asSequence().forEach { app ->
-                                val appId = app.attributes.getNamedItem("id").textContent
+        resources =
+            buildMap {
+                /**
+                 * Puts resources under `/resources/addresources/<value>/<resourceKind>.xml` into the map.
+                 *
+                 * @param sourceValue The source value of the resource. For example, `values` or `values-de-rDE`.
+                 * @param destValue The destination value of the resource. For example, 'values' or 'values-de'.
+                 * @param resourceKind The kind of the resource. For example, `strings` or `arrays`.
+                 * @param transform A function that transforms the [Node]s from the XML files to a [BaseResource].
+                 */
+                fun addResources(
+                    sourceValue: Value,
+                    destValue: Value = sourceValue,
+                    resourceKind: String,
+                    transform: (Node) -> BaseResource,
+                ) {
+                    inputStreamFromBundledResource(
+                        "addresources",
+                        "$sourceValue/$resourceKind.xml",
+                    )?.let { stream ->
+                        // Add the resources associated with the given value to the map,
+                        // instead of overwriting it.
+                        // This covers the example case such as adding strings and arrays of the same value.
+                        getOrPut(destValue, ::mutableMapOf).apply {
+                            context.xmlEditor[stream].use { editor ->
+                                val document = editor.file
 
-                                getOrPut(appId, ::mutableMapOf).apply {
-                                    app.forEachChildElement { patch ->
-                                        val patchId = patch.attributes.getNamedItem("id").textContent
+                                document.getElementsByTagName("app").asSequence().forEach { app ->
+                                    val appId = app.attributes.getNamedItem("id").textContent
 
-                                        getOrPut(patchId, ::mutableSetOf).apply {
-                                            patch.forEachChildElement { resourceNode ->
-                                                val resource = transform(resourceNode)
+                                    getOrPut(appId, ::mutableMapOf).apply {
+                                        app.forEachChildElement { patch ->
+                                            val patchId = patch.attributes.getNamedItem("id").textContent
 
-                                                add(resource)
+                                            getOrPut(patchId, ::mutableSetOf).apply {
+                                                patch.forEachChildElement { resourceNode ->
+                                                    val resource = transform(resourceNode)
+
+                                                    add(resource)
+                                                }
                                             }
                                         }
                                     }
@@ -109,23 +206,22 @@ object AddResourcesPatch : ResourcePatch(), MutableMap<Value, MutableSet<BaseRes
                         }
                     }
                 }
-            }
 
-            // Stage all resources to a temporary map.
-            // Staged resources consumed by AddResourcesPatch#invoke(PatchClass)
-            // are later used in AddResourcesPatch#close.
-            try {
-                val addStringResources = { value: Value ->
-                    addResources(value, "strings", StringResource::fromNode)
+                // Stage all resources to a temporary map.
+                // Staged resources consumed by AddResourcesPatch#invoke(PatchClass)
+                // are later used in AddResourcesPatch#close.
+                try {
+                    val addStringResources = { source: Value, dest: Value ->
+                        addResources(source, dest, "strings", StringResource::fromNode)
+                    }
+                    locales.forEach { (source, dest) -> addStringResources("values-$source", "values-$dest") }
+                    addStringResources("values", "values")
+
+                    addResources("values", "values", "arrays", ArrayResource::fromNode)
+                } catch (e: Exception) {
+                    throw PatchException("Failed to read resources", e)
                 }
-                Locale.getISOLanguages().asSequence().map { "values-$it" }.forEach { addStringResources(it) }
-                addStringResources("values")
-
-                addResources("values", "arrays", ArrayResource::fromNode)
-            } catch (e: Exception) {
-                throw PatchException("Failed to read resources", e)
             }
-        }
     }
 
     /**
@@ -136,8 +232,10 @@ object AddResourcesPatch : ResourcePatch(), MutableMap<Value, MutableSet<BaseRes
      *
      * @return True if the resource was added, false if it already existed.
      */
-    operator fun invoke(value: Value, resource: BaseResource) =
-        getOrPut(value, ::mutableSetOf).add(resource)
+    operator fun invoke(
+        value: Value,
+        resource: BaseResource,
+    ) = getOrPut(value, ::mutableSetOf).add(resource)
 
     /**
      * Adds a list of [BaseResource]s to the map using [MutableMap.getOrPut].
@@ -147,8 +245,10 @@ object AddResourcesPatch : ResourcePatch(), MutableMap<Value, MutableSet<BaseRes
      *
      * @return True if the resources were added, false if they already existed.
      */
-    operator fun invoke(value: Value, resources: Iterable<BaseResource>) =
-        getOrPut(value, ::mutableSetOf).addAll(resources)
+    operator fun invoke(
+        value: Value,
+        resources: Iterable<BaseResource>,
+    ) = getOrPut(value, ::mutableSetOf).addAll(resources)
 
     /**
      * Adds a [StringResource].
@@ -177,10 +277,9 @@ object AddResourcesPatch : ResourcePatch(), MutableMap<Value, MutableSet<BaseRes
      */
     operator fun invoke(
         name: String,
-        items: List<String>
+        items: List<String>,
     ) = invoke("values", ArrayResource(name, items))
 
-
     /**
      * Puts all resources of any [Value] staged in [resources] for the given [PatchClass] to [AddResourcesPatch].
      *
@@ -209,7 +308,7 @@ object AddResourcesPatch : ResourcePatch(), MutableMap<Value, MutableSet<BaseRes
 
                 appId to patchId
             }
-        }
+        },
     ): Boolean {
         val (appId, patchId) = patch.parseIds()
 
@@ -218,7 +317,7 @@ object AddResourcesPatch : ResourcePatch(), MutableMap<Value, MutableSet<BaseRes
         // Stage resources for the given patch to AddResourcesPatch associated with their value.
         resources.forEach { (value, resources) ->
             resources[appId]?.get(patchId)?.let { patchResources ->
-               if (invoke(value, patchResources)) result = true
+                if (invoke(value, patchResources)) result = true
             }
         }
 
@@ -232,28 +331,35 @@ object AddResourcesPatch : ResourcePatch(), MutableMap<Value, MutableSet<BaseRes
     override fun close() {
         operator fun MutableMap<String, Pair<DomFileEditor, Node>>.invoke(
             value: Value,
-            resource: BaseResource
+            resource: BaseResource,
         ) {
             // TODO: Fix open-closed principle violation by modifying BaseResource#serialize so that it accepts
-            //  a Value and the map of editors. It will then get or put the editor suitable for its resource type
+            //  a Value and the map of documents. It will then get or put the document suitable for its resource type
             //  to serialize itself to it.
-            val resourceFileName = when (resource) {
-                is StringResource -> "strings"
-                is ArrayResource -> "arrays"
-                else -> throw NotImplementedError("Unsupported resource type")
-            }
-
-            getOrPut(resourceFileName) {
-                val targetFile = context["res/$value/$resourceFileName.xml"].also {
-                    it.parentFile?.mkdirs()
-                    it.createNewFile()
+            val resourceFileName =
+                when (resource) {
+                    is StringResource -> "strings"
+                    is ArrayResource -> "arrays"
+                    else -> throw NotImplementedError("Unsupported resource type")
                 }
 
+            getOrPut(resourceFileName) {
+                val targetFile =
+                    context.get("res/$value/$resourceFileName.xml").also {
+                        it.parentFile?.mkdirs()
+
+                        if(it.createNewFile()) {
+                            it.writeText("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<resources>\n</resources>")
+                        }
+                    }
+
                 context.xmlEditor[targetFile.path].let { editor ->
+                    val document = editor.file
+
                     // Save the target node here as well
-                    // in order to avoid having to call editor.getNode("resources")
-                    // every time addUsingEditors is called but also save the editor so that it can be closed later.
-                    editor to editor.getNode("resources")
+                    // in order to avoid having to call document.getNode("resources")
+                    // but also save the document so that it can be closed later.
+                    editor to document.getNode("resources")
                 }
             }.let { (_, targetNode) ->
                 targetNode.addResource(resource) { invoke(value, it) }
@@ -261,17 +367,17 @@ object AddResourcesPatch : ResourcePatch(), MutableMap<Value, MutableSet<BaseRes
         }
 
         forEach { (value, resources) ->
-            // A map of editors associated by their kind (e.g. strings, arrays).
-            // Each editor is accompanied by the target node to which resources are added.
-            // A map is used because Map#getOrPut allows opening a new editor for the duration of a resource value.
+            // A map of document associated by their kind (e.g. strings, arrays).
+            // Each document is accompanied by the target node to which resources are added.
+            // A map is used because Map#getOrPut allows opening a new document for the duration of a resource value.
             // This is done to prevent having to open the files for every resource that is added.
             // Instead, it is cached once and reused for resources of the same value.
-            // This map is later accessed to close all editors for the current resource value.
-            val resourceFileEditors = mutableMapOf<String, Pair<DomFileEditor, Node>>()
+            // This map is later accessed to close all documents for the current resource value.
+            val documents = mutableMapOf<String, Pair<DomFileEditor, Node>>()
 
-            resources.forEach { resource -> resourceFileEditors(value, resource) }
+            resources.forEach { resource -> documents(value, resource) }
 
-            resourceFileEditors.values.forEach { (editor, _) -> editor.close() }
+            documents.values.forEach { (document, _) -> document.close() }
         }
     }
 }

src/main/kotlin/app/revanced/patches/all/misc/transformation/BaseTransformInstructionsPatch.kt

@@ -9,12 +9,12 @@ import com.android.tools.smali.dexlib2.iface.Method
 import com.android.tools.smali.dexlib2.iface.instruction.Instruction
 
 @Suppress("MemberVisibilityCanBePrivate")
-abstract class BaseTransformInstructionsPatch<T> : BytecodePatch() {
+abstract class BaseTransformInstructionsPatch<T> : BytecodePatch(emptySet()) {
     abstract fun filterMap(
         classDef: ClassDef,
         method: Method,
         instruction: Instruction,
-        instructionIndex: Int
+        instructionIndex: Int,
     ): T?
 
     abstract fun transform(mutableMethod: MutableMethod, entry: T)

src/main/kotlin/app/revanced/patches/all/misc/versioncode/ChangeVersionCodePatch.kt

@@ -0,0 +1,39 @@
+package app.revanced.patches.all.misc.versioncode
+
+import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.ResourcePatch
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.intPatchOption
+import app.revanced.util.getNode
+import org.w3c.dom.Element
+
+@Patch(
+    name = "Change version code",
+    description = "Changes the version code of the app. By default the highest version code is set. " +
+        "This allows older versions of an app to be installed " +
+        "if their version code is set to the same or a higher value and can stop app stores to update the app.",
+    use = false,
+)
+@Suppress("unused")
+object ChangeVersionCodePatch : ResourcePatch() {
+    private val versionCode by intPatchOption(
+        key = "versionCode",
+        default = Int.MAX_VALUE,
+        values = mapOf(
+            "Lowest" to 1,
+            "Highest" to Int.MAX_VALUE,
+        ),
+        title = "Version code",
+        description = "The version code to use",
+        required = true,
+    ) {
+        it!! >= 1
+    }
+
+    override fun execute(context: ResourceContext) {
+        context.document["AndroidManifest.xml"].use { document ->
+            val manifestElement = document.getNode("manifest") as Element
+            manifestElement.setAttribute("android:versionCode", "$versionCode")
+        }
+    }
+}

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

@@ -8,16 +8,17 @@ import org.w3c.dom.Element
 @Patch(description = "Sets allowAudioPlaybackCapture in manifest to true.")
 internal object RemoveCaptureRestrictionResourcePatch : ResourcePatch() {
     override fun execute(context: ResourceContext) {
-        // create an xml editor instance
-        context.xmlEditor["AndroidManifest.xml"].use { dom ->
+        context.xmlEditor["AndroidManifest.xml"].use { editor ->
+            val document = editor.file
+
             // get the application node
-            val applicationNode = dom
-                .file
-                .getElementsByTagName("application")
-                .item(0) as Element
+            val applicationNode =
+                document
+                    .getElementsByTagName("application")
+                    .item(0) as Element
 
             // set allowAudioPlaybackCapture attribute to true
             applicationNode.setAttribute("android:allowAudioPlaybackCapture", "true")
         }
     }
-}
+}

src/main/kotlin/app/revanced/patches/all/shortcut/sharetargets/RemoveShareTargetsPatch.kt

@@ -0,0 +1,32 @@
+package app.revanced.patches.all.shortcut.sharetargets
+
+import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.ResourcePatch
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.util.asSequence
+import app.revanced.util.getNode
+import org.w3c.dom.Element
+import java.io.FileNotFoundException
+import java.util.logging.Logger
+
+@Patch(
+    name = "Remove share targets",
+    description = "Removes share targets like directly sharing to a frequent contact.",
+    use = false,
+)
+@Suppress("unused")
+object RemoveShareTargetsPatch : ResourcePatch() {
+    override fun execute(context: ResourceContext) {
+        try {
+            context.document["res/xml/shortcuts.xml"]
+        } catch (_: FileNotFoundException) {
+            return Logger.getLogger(this::class.java.name).warning("The app has no shortcuts")
+        }.use { document ->
+            val rootNode = document.getNode("shortcuts") as? Element ?: return@use
+
+            document.getElementsByTagName("share-target").asSequence().forEach {
+                rootNode.removeChild(it)
+            }
+        }
+    }
+}

src/main/kotlin/app/revanced/patches/amazon/deeplinking/DeepLinkingFingerprint.kt

@@ -0,0 +1,11 @@
+package app.revanced.patches.amazon.deeplinking
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+internal object DeepLinkingFingerprint : MethodFingerprint(
+    "Z",
+    parameters = listOf("L"),
+    accessFlags = AccessFlags.PRIVATE.value,
+    strings = listOf("https://www.", "android.intent.action.VIEW")
+)

src/main/kotlin/app/revanced/patches/amazon/deeplinking/DeepLinkingPatch.kt

@@ -0,0 +1,28 @@
+package app.revanced.patches.amazon.deeplinking
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.util.exception
+
+@Patch(
+    name = "Always allow deep-linking",
+    description = "Open Amazon links, even if the app is not set to handle Amazon links.",
+    compatiblePackages = [CompatiblePackage("com.amazon.mShop.android.shopping")]
+)
+@Suppress("unused")
+object DeepLinkingPatch : BytecodePatch(
+    setOf(DeepLinkingFingerprint)
+) {
+    override fun execute(context: BytecodeContext) {
+        DeepLinkingFingerprint.result?.mutableMethod?.addInstructions(
+            0,
+            """
+                const/4 v0, 0x1
+                return v0
+            """
+        ) ?: throw DeepLinkingFingerprint.exception
+    }
+}

src/main/kotlin/app/revanced/patches/bandcamp/limitations/RemovePlayLimitsPatch.kt

@@ -0,0 +1,23 @@
+package app.revanced.patches.bandcamp.limitations
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.bandcamp.limitations.fingerprints.HandlePlaybackLimitsPatch
+import app.revanced.util.exception
+
+@Patch(
+    name = "Remove play limits",
+    description = "Disables purchase nagging and playback limits of not purchased tracks.",
+    compatiblePackages = [CompatiblePackage("com.bandcamp.android")],
+)
+@Suppress("unused")
+object RemovePlayLimitsPatch : BytecodePatch(
+    setOf(HandlePlaybackLimitsPatch),
+) {
+    override fun execute(context: BytecodeContext) =
+        HandlePlaybackLimitsPatch.result?.mutableMethod?.addInstructions(0, "return-void")
+            ?: throw HandlePlaybackLimitsPatch.exception
+}

src/main/kotlin/app/revanced/patches/bandcamp/limitations/fingerprints/HandlePlaybackLimitsPatch.kt

@@ -0,0 +1,7 @@
+package app.revanced.patches.bandcamp.limitations.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+
+internal object HandlePlaybackLimitsPatch : MethodFingerprint(
+    strings = listOf("play limits processing track", "found play_count"),
+)

src/main/kotlin/app/revanced/patches/googlenews/customtabs/EnableCustomTabs.kt

@@ -0,0 +1,32 @@
+package app.revanced.patches.googlenews.customtabs
+
+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.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.googlenews.customtabs.fingerprints.LaunchCustomTabFingerprint
+import app.revanced.util.resultOrThrow
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+
+@Patch(
+    name = "Enable CustomTabs",
+    description = "Enables CustomTabs to open articles in your default browser.",
+    compatiblePackages = [CompatiblePackage("com.google.android.apps.magazines")],
+)
+@Suppress("unused")
+object EnableCustomTabs : BytecodePatch(
+    setOf(LaunchCustomTabFingerprint)
+) {
+    override fun execute(context: BytecodeContext) {
+        LaunchCustomTabFingerprint.resultOrThrow().let { result ->
+            result.mutableMethod.apply {
+                val checkIndex = result.scanResult.patternScanResult!!.endIndex + 1
+                val register = getInstruction<OneRegisterInstruction>(checkIndex).registerA
+
+                replaceInstruction(checkIndex, "const/4 v$register, 0x1")
+            }
+        }
+    }
+}

src/main/kotlin/app/revanced/patches/googlenews/customtabs/fingerprints/LaunchCustomTabFingerprint.kt

@@ -0,0 +1,18 @@
+package app.revanced.patches.googlenews.customtabs.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+
+internal object LaunchCustomTabFingerprint : MethodFingerprint(
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
+    opcodes = listOf(
+        Opcode.IPUT_OBJECT,
+        Opcode.CONST_4,
+        Opcode.IPUT,
+        Opcode.CONST_4,
+        Opcode.IPUT_BOOLEAN,
+    ),
+    customFingerprint = { _, classDef -> classDef.endsWith("CustomTabsArticleLauncher;") },
+)

src/main/kotlin/app/revanced/patches/googlenews/misc/gms/Constants.kt

@@ -0,0 +1,6 @@
+package app.revanced.patches.googlenews.misc.gms
+
+internal object Constants {
+    const val MAGAZINES_PACKAGE_NAME = "com.google.android.apps.magazines"
+    const val REVANCED_MAGAZINES_PACKAGE_NAME = "app.revanced.android.magazines"
+}

src/main/kotlin/app/revanced/patches/googlenews/misc/gms/GmsCoreSupportPatch.kt

@@ -0,0 +1,23 @@
+package app.revanced.patches.googlenews.misc.gms
+
+import app.revanced.patches.googlenews.misc.gms.Constants.MAGAZINES_PACKAGE_NAME
+import app.revanced.patches.googlenews.misc.gms.Constants.REVANCED_MAGAZINES_PACKAGE_NAME
+import app.revanced.patches.googlenews.misc.gms.GmsCoreSupportResourcePatch.gmsCoreVendorGroupIdOption
+import app.revanced.patches.googlenews.misc.gms.fingerprints.MagazinesActivityOnCreateFingerprint
+import app.revanced.patches.googlenews.misc.integrations.IntegrationsPatch
+import app.revanced.patches.shared.misc.gms.BaseGmsCoreSupportPatch
+
+@Suppress("unused")
+object GmsCoreSupportPatch : BaseGmsCoreSupportPatch(
+    fromPackageName = MAGAZINES_PACKAGE_NAME,
+    toPackageName = REVANCED_MAGAZINES_PACKAGE_NAME,
+    primeMethodFingerprint = null,
+    mainActivityOnCreateFingerprint = MagazinesActivityOnCreateFingerprint,
+    integrationsPatchDependency = IntegrationsPatch::class,
+    gmsCoreSupportResourcePatch = GmsCoreSupportResourcePatch,
+    // Remove version constraint,
+    // once https://github.com/ReVanced/revanced-patches/pull/3111#issuecomment-2240877277 is resolved.
+    compatiblePackages = setOf(CompatiblePackage(MAGAZINES_PACKAGE_NAME, setOf("5.108.0.644447823"))),
+) {
+    override val gmsCoreVendorGroupId by gmsCoreVendorGroupIdOption
+}

src/main/kotlin/app/revanced/patches/googlenews/misc/gms/GmsCoreSupportResourcePatch.kt

@@ -0,0 +1,11 @@
+package app.revanced.patches.googlenews.misc.gms
+
+import app.revanced.patches.googlenews.misc.gms.Constants.MAGAZINES_PACKAGE_NAME
+import app.revanced.patches.googlenews.misc.gms.Constants.REVANCED_MAGAZINES_PACKAGE_NAME
+import app.revanced.patches.shared.misc.gms.BaseGmsCoreSupportResourcePatch
+
+object GmsCoreSupportResourcePatch : BaseGmsCoreSupportResourcePatch(
+    fromPackageName = MAGAZINES_PACKAGE_NAME,
+    toPackageName = REVANCED_MAGAZINES_PACKAGE_NAME,
+    spoofedPackageSignature = "24bb24c05e47e0aefa68a58a766179d9b613a666",
+)

src/main/kotlin/app/revanced/patches/googlenews/misc/gms/fingerprints/MagazinesActivityOnCreateFingerprint.kt

@@ -0,0 +1,9 @@
+package app.revanced.patches.googlenews.misc.gms.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+
+internal object MagazinesActivityOnCreateFingerprint : MethodFingerprint(
+    customFingerprint = { methodDef, classDef ->
+        methodDef.name == "onCreate" && classDef.endsWith("/StartActivity;")
+    },
+)

src/main/kotlin/app/revanced/patches/googlenews/misc/gms/fingerprints/PrimeMethodFingerprint.kt

@@ -0,0 +1,7 @@
+package app.revanced.patches.googlenews.misc.gms.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+
+internal object PrimeMethodFingerprint : MethodFingerprint(
+    strings = listOf("com.google.android.GoogleCamera", "com.android.vending"),
+)

src/main/kotlin/app/revanced/patches/googlenews/misc/integrations/IntegrationsPatch.kt

@@ -0,0 +1,10 @@
+package app.revanced.patches.googlenews.misc.integrations
+
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.googlenews.misc.integrations.fingerprints.StartActivityInitFingerprint
+import app.revanced.patches.shared.misc.integrations.BaseIntegrationsPatch
+
+@Patch(requiresIntegrations = true)
+object IntegrationsPatch : BaseIntegrationsPatch(
+    setOf(StartActivityInitFingerprint),
+)

src/main/kotlin/app/revanced/patches/googlenews/misc/integrations/fingerprints/StartActivityInitFingerprint.kt

@@ -0,0 +1,41 @@
+package app.revanced.patches.googlenews.misc.integrations.fingerprints
+
+import app.revanced.patches.googlenews.misc.integrations.fingerprints.StartActivityInitFingerprint.getApplicationContextIndex
+import app.revanced.patches.shared.misc.integrations.BaseIntegrationsPatch.IntegrationsFingerprint
+import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstructionOrThrow
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+
+internal object StartActivityInitFingerprint : IntegrationsFingerprint(
+    opcodes = listOf(
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT,
+        Opcode.CONST_4,
+        Opcode.IF_EQZ,
+        Opcode.CONST,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.IPUT_OBJECT,
+        Opcode.IPUT_BOOLEAN,
+        Opcode.INVOKE_VIRTUAL, // Calls startActivity.getApplicationContext().
+        Opcode.MOVE_RESULT_OBJECT,
+    ),
+    insertIndexResolver = { method ->
+        getApplicationContextIndex = method.indexOfFirstInstructionOrThrow {
+            getReference<MethodReference>()?.name == "getApplicationContext"
+        }
+
+        getApplicationContextIndex + 2 // Below the move-result-object instruction.
+    },
+    contextRegisterResolver = { method ->
+        val moveResultInstruction = method.implementation!!.instructions.elementAt(getApplicationContextIndex + 1)
+            as OneRegisterInstruction
+        moveResultInstruction.registerA
+    },
+    customFingerprint = { methodDef, classDef ->
+        methodDef.name == "onCreate" && classDef.endsWith("/StartActivity;")
+    },
+) {
+    private var getApplicationContextIndex = -1
+}

src/main/kotlin/app/revanced/patches/googlephotos/misc/gms/Constants.kt

@@ -0,0 +1,6 @@
+package app.revanced.patches.googlephotos.misc.gms
+
+internal object Constants {
+    const val PHOTOS_PACKAGE_NAME = "com.google.android.apps.photos"
+    const val REVANCED_PHOTOS_PACKAGE_NAME = "app.revanced.android.photos"
+}

src/main/kotlin/app/revanced/patches/googlephotos/misc/gms/GmsCoreSupportPatch.kt

@@ -0,0 +1,21 @@
+package app.revanced.patches.googlephotos.misc.gms
+
+import app.revanced.patches.googlephotos.misc.gms.Constants.PHOTOS_PACKAGE_NAME
+import app.revanced.patches.googlephotos.misc.gms.Constants.REVANCED_PHOTOS_PACKAGE_NAME
+import app.revanced.patches.googlephotos.misc.gms.GmsCoreSupportResourcePatch.gmsCoreVendorGroupIdOption
+import app.revanced.patches.googlephotos.misc.gms.fingerprints.PhotosActivityOnCreateFingerprint
+import app.revanced.patches.googlephotos.misc.integrations.IntegrationsPatch
+import app.revanced.patches.shared.misc.gms.BaseGmsCoreSupportPatch
+
+@Suppress("unused")
+object GmsCoreSupportPatch : BaseGmsCoreSupportPatch(
+    fromPackageName = PHOTOS_PACKAGE_NAME,
+    toPackageName = REVANCED_PHOTOS_PACKAGE_NAME,
+    primeMethodFingerprint = null,
+    mainActivityOnCreateFingerprint = PhotosActivityOnCreateFingerprint,
+    integrationsPatchDependency = IntegrationsPatch::class,
+    gmsCoreSupportResourcePatch = GmsCoreSupportResourcePatch,
+    compatiblePackages = setOf(CompatiblePackage(PHOTOS_PACKAGE_NAME)),
+) {
+    override val gmsCoreVendorGroupId by gmsCoreVendorGroupIdOption
+}

src/main/kotlin/app/revanced/patches/googlephotos/misc/gms/GmsCoreSupportResourcePatch.kt

@@ -0,0 +1,11 @@
+package app.revanced.patches.googlephotos.misc.gms
+
+import app.revanced.patches.googlephotos.misc.gms.Constants.PHOTOS_PACKAGE_NAME
+import app.revanced.patches.googlephotos.misc.gms.Constants.REVANCED_PHOTOS_PACKAGE_NAME
+import app.revanced.patches.shared.misc.gms.BaseGmsCoreSupportResourcePatch
+
+object GmsCoreSupportResourcePatch : BaseGmsCoreSupportResourcePatch(
+    fromPackageName = PHOTOS_PACKAGE_NAME,
+    toPackageName = REVANCED_PHOTOS_PACKAGE_NAME,
+    spoofedPackageSignature = "24bb24c05e47e0aefa68a58a766179d9b613a600",
+)

src/main/kotlin/app/revanced/patches/googlephotos/misc/gms/fingerprints/PhotosActivityOnCreateFingerprint.kt

@@ -0,0 +1,9 @@
+package app.revanced.patches.googlephotos.misc.gms.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+
+internal object PhotosActivityOnCreateFingerprint : MethodFingerprint(
+    customFingerprint = { methodDef, classDef ->
+        methodDef.name == "onCreate" && classDef.endsWith("/HomeActivity;")
+    },
+)

src/main/kotlin/app/revanced/patches/googlephotos/misc/integrations/IntegrationsPatch.kt

@@ -0,0 +1,10 @@
+package app.revanced.patches.googlephotos.misc.integrations
+
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.googlephotos.misc.integrations.fingerprints.HomeActivityInitFingerprint
+import app.revanced.patches.shared.misc.integrations.BaseIntegrationsPatch
+
+@Patch(requiresIntegrations = true)
+object IntegrationsPatch : BaseIntegrationsPatch(
+    setOf(HomeActivityInitFingerprint),
+)

src/main/kotlin/app/revanced/patches/googlephotos/misc/integrations/fingerprints/HomeActivityInitFingerprint.kt

@@ -0,0 +1,37 @@
+package app.revanced.patches.googlephotos.misc.integrations.fingerprints
+
+import app.revanced.patches.googlephotos.misc.integrations.fingerprints.HomeActivityInitFingerprint.getApplicationContextIndex
+import app.revanced.patches.shared.misc.integrations.BaseIntegrationsPatch.IntegrationsFingerprint
+import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstructionOrThrow
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+
+internal object HomeActivityInitFingerprint : IntegrationsFingerprint(
+    opcodes = listOf(
+        Opcode.CONST_STRING,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.IF_NEZ,
+        Opcode.INVOKE_VIRTUAL, // Calls getApplicationContext().
+        Opcode.MOVE_RESULT_OBJECT,
+    ),
+    insertIndexResolver = { method ->
+        getApplicationContextIndex = method.indexOfFirstInstructionOrThrow {
+            getReference<MethodReference>()?.name == "getApplicationContext"
+        }
+
+        getApplicationContextIndex + 2 // Below the move-result-object instruction.
+    },
+    contextRegisterResolver = { method ->
+        val moveResultInstruction = method.implementation!!.instructions.elementAt(getApplicationContextIndex + 1)
+            as OneRegisterInstruction
+        moveResultInstruction.registerA
+    },
+    customFingerprint = { methodDef, classDef ->
+        methodDef.name == "onCreate" && classDef.endsWith("/HomeActivity;")
+    },
+) {
+    private var getApplicationContextIndex = -1
+}

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

@@ -12,15 +12,15 @@ import app.revanced.util.returnEarly
 @Patch(
     name = "Remove root detection",
     description = "Removes the check for root permissions and unlocked bootloader.",
-    compatiblePackages = [CompatiblePackage("at.gv.oe.app")]
+    compatiblePackages = [CompatiblePackage("at.gv.oe.app")],
 )
 @Suppress("unused")
 object RootDetectionPatch : BytecodePatch(
-    setOf(AttestationSupportedCheckFingerprint, BootloaderCheckFingerprint, RootCheckFingerprint)
+    setOf(AttestationSupportedCheckFingerprint, BootloaderCheckFingerprint, RootCheckFingerprint),
 ) {
-    override fun execute(context: BytecodeContext) = listOf(
+    override fun execute(context: BytecodeContext) = setOf(
         AttestationSupportedCheckFingerprint,
         BootloaderCheckFingerprint,
-        RootCheckFingerprint
+        RootCheckFingerprint,
     ).returnEarly(true)
 }

src/main/kotlin/app/revanced/patches/instagram/patches/ad/HideAdsPatch.kt

@@ -0,0 +1,29 @@
+package app.revanced.patches.instagram.patches.ad
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.instagram.patches.ad.fingerprints.AdInjectorFingerprint
+import app.revanced.util.exception
+
+@Patch(
+    name = "Hide ads",
+    description = "Hides ads in stories, discover, profile, etc." +
+        "An ad can still appear once when refreshing the home feed.",
+    compatiblePackages = [CompatiblePackage("com.instagram.android")],
+)
+@Suppress("unused")
+object HideAdsPatch : BytecodePatch(
+    setOf(AdInjectorFingerprint),
+) {
+    override fun execute(context: BytecodeContext) =
+        AdInjectorFingerprint.result?.mutableMethod?.addInstructions(
+            0,
+            """
+                const/4 v0, 0x0
+                return v0
+            """,
+        ) ?: throw AdInjectorFingerprint.exception
+}

src/main/kotlin/app/revanced/patches/instagram/patches/ad/fingerprints/AdInjectorFingerprint.kt

@@ -0,0 +1,14 @@
+package app.revanced.patches.instagram.patches.ad.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+internal object AdInjectorFingerprint : MethodFingerprint(
+    returnType = "Z",
+    accessFlags = AccessFlags.PRIVATE.value,
+    parameters = listOf("L", "L"),
+    strings = listOf(
+        "SponsoredContentController.insertItem",
+        "SponsoredContentController::Delivery",
+    ),
+)

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

@@ -1,102 +1,63 @@
 package app.revanced.patches.instagram.patches.ads.timeline
 
-import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.MediaFingerprint
+import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.IsAdCheckOneFingerprint
+import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.IsAdCheckTwoFingerprint
 import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ShowAdFingerprint
-import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads.GenericMediaAdFingerprint
-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 app.revanced.util.exception
 import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
-import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 
 @Patch(
     name = "Hide timeline ads",
-    description = "Removes ads from the timeline.",
-    compatiblePackages = [CompatiblePackage("com.instagram.android", ["275.0.0.27.98"])]
+    compatiblePackages = [CompatiblePackage("com.instagram.android")],
 )
 @Suppress("unused")
 object HideTimelineAdsPatch : BytecodePatch(
     setOf(
         ShowAdFingerprint,
-        MediaFingerprint,
-        PaidPartnershipAdFingerprint // Unlike the other ads this one is resolved from all classes.
-    )
+        IsAdCheckOneFingerprint,
+        IsAdCheckTwoFingerprint,
+    ),
 ) {
     override fun execute(context: BytecodeContext) {
-        // region Resolve required methods to check for ads.
+        // The exact function of the following methods is unknown.
+        // They are used to check if a post is an ad.
+        val isAdCheckOneMethod = IsAdCheckOneFingerprint.result?.method ?: throw IsAdCheckOneFingerprint.exception
+        val isAdCheckTwoMethod = IsAdCheckTwoFingerprint.result?.method ?: throw IsAdCheckTwoFingerprint.exception
 
-        ShowAdFingerprint.result ?: throw ShowAdFingerprint.exception
+        ShowAdFingerprint.result?.let {
+            it.mutableMethod.apply {
+                // The register that holds the post object.
+                val postRegister = getInstruction<FiveRegisterInstruction>(1).registerC
 
-        PaidPartnershipAdFingerprint.result ?: throw PaidPartnershipAdFingerprint.exception
+                // At this index the check for an ad can be performed.
+                val checkIndex = it.scanResult.patternScanResult!!.endIndex
 
-        MediaFingerprint.result?.let {
-            GenericMediaAdFingerprint.resolve(context, it.classDef)
-            ShoppingAdFingerprint.resolve(context, it.classDef)
-
-            return@let
-        } ?: throw MediaFingerprint.exception
-
-        // endregion
-
-        ShowAdFingerprint.result!!.apply {
-            // region Create instructions.
-
-            val scanStart = scanResult.patternScanResult!!.startIndex
-            val jumpIndex = scanStart - 1
-
-            val mediaInstanceRegister = mutableMethod.getInstruction<FiveRegisterInstruction>(scanStart).registerC
-            val freeRegister = mutableMethod.getInstruction<OneRegisterInstruction>(jumpIndex).registerA
-
-            val returnFalseLabel = "an_ad"
-
-            val checkForAdInstructions =
-                listOf(GenericMediaAdFingerprint, PaidPartnershipAdFingerprint, ShoppingAdFingerprint)
-                    .map(MediaAdFingerprint::toString)
-                    .joinToString("\n") {
-                        """ 
-                            invoke-virtual {v$mediaInstanceRegister}, $it
-                            move-result v$freeRegister
-                            if-nez v$freeRegister, :$returnFalseLabel
-                        """.trimIndent()
-                    }.let { "$it\nconst/4 v0, 0x1\nreturn v0" }
-
-            // endregion
-
-            // region Patch.
-
-            val insertIndex = scanStart + 3
-
-            mutableMethod.addInstructionsWithLabels(
-                insertIndex,
-                checkForAdInstructions,
-                ExternalLabel(
-                    returnFalseLabel,
-                    mutableMethod.getInstruction(mutableMethod.implementation!!.instructions.size - 2 /* return false = ad */)
-                )
-            )
-
-            // endregion
-
-            // region Jump to checks for ads from previous patch.
-
-            mutableMethod.apply {
+                // If either check returns true, the post is an ad and is hidden by returning false.
                 addInstructionsWithLabels(
-                    jumpIndex + 1,
-                    "if-nez v$freeRegister, :start_check",
-                    ExternalLabel("start_check", getInstruction(insertIndex))
+                    checkIndex,
+                    """
+                        invoke-virtual { v$postRegister }, $isAdCheckOneMethod
+                        move-result v0
+                        if-nez v0, :hide_ad
+                        
+                        invoke-static { v$postRegister }, $isAdCheckTwoMethod
+                        move-result v0
+                        if-eqz v0, :not_an_ad
+                        
+                        :hide_ad
+                        const/4 v0, 0x0 # Returning false to hide the ad.
+                        return v0
+                    """,
+                    ExternalLabel("not_an_ad", getInstruction(checkIndex)),
                 )
-            }.removeInstruction(jumpIndex)
-
-            // endregion
-        }
+            }
+        } ?: throw ShowAdFingerprint.exception
     }
-}
+}

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

@@ -0,0 +1,18 @@
+package app.revanced.patches.instagram.patches.ads.timeline.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+
+internal object IsAdCheckOneFingerprint : MethodFingerprint(
+    returnType = "Z",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    parameters = listOf(),
+    opcodes = listOf(
+        Opcode.XOR_INT_LIT8,
+        Opcode.IF_NE,
+        Opcode.RETURN,
+        Opcode.INVOKE_VIRTUAL,
+    ),
+)

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

@@ -1,8 +1,14 @@
-package app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads
+package app.revanced.patches.instagram.patches.ads.timeline.fingerprints
 
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 
-internal object GenericMediaAdFingerprint : MediaAdFingerprint(
+internal object IsAdCheckTwoFingerprint : MethodFingerprint(
+    returnType = "Z",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
+    parameters = listOf("L"),
     opcodes = listOf(
         Opcode.INVOKE_INTERFACE,
         Opcode.MOVE_RESULT_OBJECT,
@@ -12,7 +18,5 @@ internal object GenericMediaAdFingerprint : MediaAdFingerprint(
         Opcode.IF_EQZ,
         Opcode.CONST_4,
         Opcode.RETURN,
-    )
-) {
-    override fun toString() = result!!.method.toString()
-}
+    ),
+)

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

@@ -1,7 +0,0 @@
-package app.revanced.patches.instagram.patches.ads.timeline.fingerprints
-
-import app.revanced.patcher.fingerprint.MethodFingerprint
-
-internal object MediaFingerprint : MethodFingerprint(
-    strings = listOf("force_overlay", "Media#updateFields", "live_reels_metadata")
-)

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

@@ -10,16 +10,12 @@ internal object ShowAdFingerprint : MethodFingerprint(
     AccessFlags.PUBLIC or AccessFlags.STATIC or AccessFlags.FINAL,
     listOf("L", "L", "Z", "Z"),
     opcodes = listOf(
+        Opcode.SGET_OBJECT,
+        Opcode.IF_NE,
+        Opcode.IF_NEZ,
         Opcode.INVOKE_STATIC,
         Opcode.MOVE_RESULT,
         Opcode.IF_NEZ,
         Opcode.RETURN,
-        Opcode.CONST_4,
-        Opcode.GOTO,
-        Opcode.CONST_4,
-        Opcode.GOTO,
-        Opcode.CONST_4,
-        Opcode.GOTO,
-        Opcode.CONST_4,
     ),
 )

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

@@ -1,24 +0,0 @@
-package app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.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
-
-internal abstract class MediaAdFingerprint(
-    returnType: String? = "Z",
-    accessFlags: Int? = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters: Iterable<String>? = listOf(),
-    opcodes: Iterable<Opcode>?,
-    customFingerprint: ((methodDef: Method, classDef: ClassDef) -> Boolean)? = null
-) : MethodFingerprint(
-    returnType,
-    accessFlags,
-    parameters,
-    opcodes,
-    customFingerprint = customFingerprint
-) {
-    abstract override fun toString(): String
-}

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

@@ -1,29 +0,0 @@
-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
-
-internal object PaidPartnershipAdFingerprint : MediaAdFingerprint(
-    "V",
-    null,
-    listOf("L", "L"),
-    listOf(
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IPUT_BOOLEAN,
-        Opcode.IPUT_BOOLEAN
-    ),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("ClipsEditMetadataController;")
-    }
-) {
-    override fun toString() = result!!.let {
-        val adCheckIndex = it.scanResult.patternScanResult!!.startIndex
-        val adCheckInstruction = it.method.implementation!!.instructions.elementAt(adCheckIndex)
-
-        val adCheckMethod = (adCheckInstruction as ReferenceInstruction).reference as MethodReference
-
-        adCheckMethod.toString()
-    }
-}

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

@@ -1,21 +0,0 @@
-package app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads
-
-import com.android.tools.smali.dexlib2.Opcode
-
-internal object ShoppingAdFingerprint : MediaAdFingerprint(
-    opcodes = listOf(
-        Opcode.IF_EQZ,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_EQZ,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_EQZ,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.XOR_INT_LIT8,
-        Opcode.IF_EQZ,
-    )
-) {
-    override fun toString() = result!!.method.toString()
-}

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

@@ -1,21 +1,21 @@
-package app.revanced.patches.messenger.ads.inbox.patch
+package app.revanced.patches.messenger.inbox
 
-import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patches.messenger.ads.inbox.fingerprints.LoadInboxAdsFingerprint
+import app.revanced.patches.messenger.inbox.fingerprints.LoadInboxAdsFingerprint
+import app.revanced.util.exception
 
 @Patch(
     name = "Hide inbox ads",
     description = "Hides ads in inbox.",
-    compatiblePackages = [CompatiblePackage("com.facebook.orca")]
+    compatiblePackages = [CompatiblePackage("com.facebook.orca")],
 )
 @Suppress("unused")
 object HideInboxAdsPatch : BytecodePatch(
-    setOf(LoadInboxAdsFingerprint)
+    setOf(LoadInboxAdsFingerprint),
 ) {
     override fun execute(context: BytecodeContext) {
         LoadInboxAdsFingerprint.result?.mutableMethod?.apply {
@@ -23,4 +23,3 @@ object HideInboxAdsPatch : BytecodePatch(
         } ?: throw LoadInboxAdsFingerprint.exception
     }
 }
-

src/main/kotlin/app/revanced/patches/messenger/inbox/HideInboxSubtabsPatch.kt

@@ -0,0 +1,24 @@
+package app.revanced.patches.messenger.inbox
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.messenger.inbox.fingerprints.CreateInboxSubTabsFingerprint
+import app.revanced.util.exception
+
+@Patch(
+    name = "Hide inbox subtabs",
+    description = "Hides Home and Channels tabs between active now tray and chats.",
+    compatiblePackages = [CompatiblePackage("com.facebook.orca")],
+)
+@Suppress("unused")
+object HideInboxSubtabsPatch : BytecodePatch(
+    setOf(CreateInboxSubTabsFingerprint),
+) {
+    // Set InboxSubtabsItemSupplierImplementation boolean attribute to false.
+    override fun execute(context: BytecodeContext) = CreateInboxSubTabsFingerprint.result?.mutableMethod
+        ?.replaceInstruction(2, "const/4 v0, 0x0")
+        ?: throw CreateInboxSubTabsFingerprint.exception
+}

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

@@ -0,0 +1,23 @@
+package app.revanced.patches.messenger.inbox.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.value.StringEncodedValue
+
+internal object CreateInboxSubTabsFingerprint : MethodFingerprint(
+    returnType = "V",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    opcodes = listOf(
+        Opcode.CONST_4,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.RETURN_VOID,
+    ),
+    customFingerprint = { methodDef, classDef ->
+        methodDef.name == "run" && classDef.fields.any any@{ field ->
+            if (field.name != "__redex_internal_original_name") return@any false
+            (field.initialValue as? StringEncodedValue)?.value == "InboxSubtabsItemSupplierImplementation\$onSubscribe\$1"
+        }
+    },
+)

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

@@ -1,4 +1,4 @@
-package app.revanced.patches.messenger.ads.inbox.fingerprints
+package app.revanced.patches.messenger.inbox.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.MethodFingerprint
@@ -8,11 +8,10 @@ internal object LoadInboxAdsFingerprint : MethodFingerprint(
     returnType = "V",
     strings = listOf(
         "ads_load_begin",
-        "inbox_ads_fetch_start"
+        "inbox_ads_fetch_start",
     ),
     accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
     customFingerprint = { methodDef, _ ->
         methodDef.definingClass == "Lcom/facebook/messaging/business/inboxads/plugins/inboxads/itemsupplier/InboxAdsItemSupplierImplementation;"
-    }
+    },
 )
-

src/main/kotlin/app/revanced/patches/messenger/inputfield/DisableSwitchingEmojiToStickerPatch.kt

@@ -1,6 +1,5 @@
-package app.revanced.patches.messenger.inputfield.patch
+package app.revanced.patches.messenger.inputfield
 
-import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
@@ -8,16 +7,17 @@ import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.messenger.inputfield.fingerprints.SwitchMessangeInputEmojiButtonFingerprint
+import app.revanced.util.exception
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 
 @Patch(
     name = "Disable switching emoji to sticker",
     description = "Disables switching from emoji to sticker search mode in message input field.",
-    compatiblePackages = [CompatiblePackage("com.facebook.orca")]
+    compatiblePackages = [CompatiblePackage("com.facebook.orca")],
 )
 @Suppress("unused")
 object DisableSwitchingEmojiToStickerPatch : BytecodePatch(
-    setOf(SwitchMessangeInputEmojiButtonFingerprint)
+    setOf(SwitchMessangeInputEmojiButtonFingerprint),
 ) {
     override fun execute(context: BytecodeContext) {
         SwitchMessangeInputEmojiButtonFingerprint.result?.let {
@@ -28,7 +28,7 @@ object DisableSwitchingEmojiToStickerPatch : BytecodePatch(
 
                 replaceInstruction(
                     setStringIndex,
-                    "const-string v$targetRegister, \"expression\""
+                    "const-string v$targetRegister, \"expression\"",
                 )
             }
         } ?: throw SwitchMessangeInputEmojiButtonFingerprint.exception

src/main/kotlin/app/revanced/patches/messenger/inputfield/DisableTypingIndicatorPatch.kt

@@ -1,22 +1,22 @@
-package app.revanced.patches.messenger.inputfield.patch
+package app.revanced.patches.messenger.inputfield
 
-import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.messenger.inputfield.fingerprints.SendTypingIndicatorFingerprint
+import app.revanced.util.exception
 
 @Patch(
     name = "Disable typing indicator",
     description = "Disables the indicator while typing a message.",
-    compatiblePackages = [CompatiblePackage("com.facebook.orca")]
+    compatiblePackages = [CompatiblePackage("com.facebook.orca")],
 )
 @Suppress("unused")
 object DisableTypingIndicatorPatch : BytecodePatch(
-    setOf(SendTypingIndicatorFingerprint)
-){
+    setOf(SendTypingIndicatorFingerprint),
+) {
     override fun execute(context: BytecodeContext) {
         SendTypingIndicatorFingerprint.result?.mutableMethod?.replaceInstruction(0, "return-void")
             ?: throw SendTypingIndicatorFingerprint.exception

src/main/kotlin/app/revanced/patches/mifitness/misc/locale/ForceEnglishLocalePatch.kt

@@ -0,0 +1,39 @@
+package app.revanced.patches.mifitness.misc.locale
+
+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.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.mifitness.misc.locale.fingerprints.SyncBluetoothLanguageFingerprint
+import app.revanced.patches.mifitness.misc.login.FixLoginPatch
+import app.revanced.util.exception
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+
+@Patch(
+    name = "Force English locale",
+    description = "Forces wearable devices to use the English locale.",
+    compatiblePackages = [CompatiblePackage("com.xiaomi.wearable")],
+    dependencies = [FixLoginPatch::class],
+)
+@Suppress("unused")
+object ForceEnglishLocalePatch : BytecodePatch(
+    setOf(SyncBluetoothLanguageFingerprint),
+) {
+    override fun execute(context: BytecodeContext) {
+        SyncBluetoothLanguageFingerprint.result?.let {
+            val resolvePhoneLocaleInstruction = it.scanResult.patternScanResult!!.startIndex
+
+            it.mutableMethod.apply {
+                val registerIndexToUpdate =
+                    getInstruction<OneRegisterInstruction>(resolvePhoneLocaleInstruction).registerA
+
+                replaceInstruction(
+                    resolvePhoneLocaleInstruction,
+                    "const-string v$registerIndexToUpdate, \"en_gb\"",
+                )
+            }
+        } ?: throw SyncBluetoothLanguageFingerprint.exception
+    }
+}

src/main/kotlin/app/revanced/patches/mifitness/misc/locale/fingerprints/SyncBluetoothLanguageFingerprint.kt

@@ -0,0 +1,12 @@
+package app.revanced.patches.mifitness.misc.locale.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.Opcode
+
+internal object SyncBluetoothLanguageFingerprint : MethodFingerprint(
+    customFingerprint = { methodDef, _ ->
+        methodDef.definingClass == "Lcom/xiaomi/fitness/devicesettings/DeviceSettingsSyncer;" &&
+            methodDef.name == "syncBluetoothLanguage"
+    },
+    opcodes = listOf(Opcode.MOVE_RESULT_OBJECT),
+)

src/main/kotlin/app/revanced/patches/mifitness/misc/login/FixLoginPatch.kt

@@ -0,0 +1,26 @@
+package app.revanced.patches.mifitness.misc.login
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.mifitness.misc.login.fingerprints.XiaomiAccountManagerConstructorFingerprint
+import app.revanced.util.exception
+
+@Patch(
+    name = "Fix login",
+    description = "Fixes login for uncertified Mi Fitness app",
+    compatiblePackages = [CompatiblePackage("com.xiaomi.wearable")],
+)
+@Suppress("unused")
+object FixLoginPatch : BytecodePatch(
+    setOf(XiaomiAccountManagerConstructorFingerprint),
+) {
+    override fun execute(context: BytecodeContext) {
+        XiaomiAccountManagerConstructorFingerprint.result?.mutableMethod?.addInstruction(
+            0,
+            "const/16 p2, 0x0",
+        ) ?: throw XiaomiAccountManagerConstructorFingerprint.exception
+    }
+}

src/main/kotlin/app/revanced/patches/mifitness/misc/login/fingerprints/XiaomiAccountManagerConstructorFingerprint.kt

@@ -0,0 +1,16 @@
+package app.revanced.patches.mifitness.misc.login.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+internal object XiaomiAccountManagerConstructorFingerprint : MethodFingerprint(
+    accessFlags = AccessFlags.PRIVATE or AccessFlags.CONSTRUCTOR,
+    customFingerprint = { methodDef, _ ->
+        methodDef.definingClass == "Lcom/xiaomi/passport/accountmanager/XiaomiAccountManager;"
+    },
+    parameters = listOf(
+        "Landroid/content/Context;",
+        "Z",
+    ),
+)

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

@@ -0,0 +1,48 @@
+package app.revanced.patches.music.ad.video
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import app.revanced.patches.music.ad.video.fingerprints.ShowMusicVideoAdsParentFingerprint
+import app.revanced.util.exception
+
+@Patch(
+    name = "Hide music video ads",
+    compatiblePackages = [
+        CompatiblePackage(
+            "com.google.android.apps.youtube.music",
+            [
+                "6.45.54",
+                "6.51.53",
+                "7.01.53",
+                "7.02.52",
+                "7.03.52",
+            ]
+        )
+    ],
+)
+@Suppress("unused")
+object HideMusicVideoAds : BytecodePatch(
+    setOf(ShowMusicVideoAdsParentFingerprint),
+) {
+    override fun execute(context: BytecodeContext) {
+        ShowMusicVideoAdsParentFingerprint.result?.let {
+            val showMusicVideoAdsMethod = context
+                .toMethodWalker(it.mutableMethod)
+                .nextMethod(it.scanResult.patternScanResult!!.startIndex + 1, true).getMethod() as MutableMethod
+
+            showMusicVideoAdsMethod.addInstruction(0, "const/4 p1, 0x0")
+        } ?: throw ShowMusicVideoAdsParentFingerprint.exception
+    }
+}
+
+@Deprecated("This patch class has been renamed to HideMusicVideoAds.")
+object MusicVideoAdsPatch : BytecodePatch(
+    dependencies = setOf(HideMusicVideoAds::class),
+) {
+    override fun execute(context: BytecodeContext) {
+    }
+}

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

@@ -1,32 +0,0 @@
-package app.revanced.patches.music.ad.video
-
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotation.CompatiblePackage
-import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patches.music.ad.video.fingerprints.ShowMusicVideoAdsConstructorFingerprint
-import app.revanced.patches.music.ad.video.fingerprints.ShowMusicVideoAdsFingerprint
-
-@Patch(
-    name = "Music video ads",
-    description = "Removes ads in the music player.",
-    compatiblePackages = [CompatiblePackage("com.google.android.apps.youtube.music")]
-)
-@Suppress("unused")
-object MusicVideoAdsPatch : BytecodePatch(
-    setOf(ShowMusicVideoAdsConstructorFingerprint)
-) {
-    override fun execute(context: BytecodeContext) {
-        ShowMusicVideoAdsFingerprint.resolve(context, ShowMusicVideoAdsConstructorFingerprint.result!!.classDef)
-
-        val result = ShowMusicVideoAdsFingerprint.result!!
-
-        result.mutableMethod.addInstruction(
-            result.scanResult.patternScanResult!!.startIndex,
-            """
-                const/4 p1, 0x0
-            """
-        )
-    }
-}

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

@@ -1,27 +0,0 @@
-package app.revanced.patches.music.ad.video.fingerprints
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-internal object ShowMusicVideoAdsConstructorFingerprint : MethodFingerprint(
-    "V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, listOf("L", "L", "L"), listOf(
-        Opcode.INVOKE_DIRECT,
-        Opcode.NEW_INSTANCE,
-        Opcode.INVOKE_DIRECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.NEW_INSTANCE,
-        Opcode.INVOKE_DIRECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.NEW_INSTANCE,
-        Opcode.INVOKE_DIRECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.CONST_4,
-        Opcode.IPUT_BOOLEAN,
-        Opcode.RETURN_VOID
-    )
-)

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

@@ -1,14 +0,0 @@
-package app.revanced.patches.music.ad.video.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-internal object ShowMusicVideoAdsFingerprint : MethodFingerprint(
-    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("Z"), listOf(
-        Opcode.IPUT_BOOLEAN,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.RETURN_VOID
-    )
-)

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

@@ -0,0 +1,13 @@
+package app.revanced.patches.music.ad.video.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.Opcode
+
+internal object ShowMusicVideoAdsParentFingerprint : MethodFingerprint(
+    opcodes = listOf(
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.IGET_OBJECT,
+    ),
+    strings = listOf("maybeRegenerateCpnAndStatsClient called unexpectedly, but no error."),
+)

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

@@ -10,13 +10,23 @@ import app.revanced.patches.music.audio.codecs.fingerprints.CodecsLockFingerprin
 import com.android.tools.smali.dexlib2.Opcode
 
 @Patch(
-    name = "Codecs unlock",
     description = "Adds more audio codec options. The new audio codecs usually result in better audio quality.",
-    compatiblePackages = [CompatiblePackage("com.google.android.apps.youtube.music")]
+    compatiblePackages = [
+        CompatiblePackage(
+            "com.google.android.apps.youtube.music",
+            [
+                "6.45.54",
+                "6.51.53",
+                "7.01.53",
+                "7.02.52",
+                "7.03.52",
+            ]
+        )
+    ]
 )
-@Suppress("unused")
+@Deprecated("This patch is no longer needed as the feature is now enabled by default.")
 object CodecsUnlockPatch : BytecodePatch(
-    setOf(CodecsLockFingerprint, AllCodecsReferenceFingerprint)
+    setOf(CodecsLockFingerprint, AllCodecsReferenceFingerprint),
 ) {
     override fun execute(context: BytecodeContext) {
         val codecsLockResult = CodecsLockFingerprint.result!!
@@ -25,13 +35,13 @@ object CodecsUnlockPatch : BytecodePatch(
 
         val scanResultStartIndex = codecsLockResult.scanResult.patternScanResult!!.startIndex
         val instructionIndex = scanResultStartIndex +
-                if (implementation.instructions[scanResultStartIndex - 1].opcode == Opcode.CHECK_CAST) {
-                    // for 5.16.xx and lower
-                    -3
-                } else {
-                    // since 5.17.xx
-                    -2
-                }
+            if (implementation.instructions[scanResultStartIndex - 1].opcode == Opcode.CHECK_CAST) {
+                // for 5.16.xx and lower
+                -3
+            } else {
+                // since 5.17.xx
+                -2
+            }
 
         val allCodecsResult = AllCodecsReferenceFingerprint.result!!
         val allCodecsMethod =
@@ -41,7 +51,7 @@ object CodecsUnlockPatch : BytecodePatch(
 
         implementation.replaceInstruction(
             instructionIndex,
-            "invoke-static {}, ${allCodecsMethod.definingClass}->${allCodecsMethod.name}()Ljava/util/Set;".toInstruction()
+            "invoke-static {}, ${allCodecsMethod.definingClass}->${allCodecsMethod.name}()Ljava/util/Set;".toInstruction(),
         )
     }
 }

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

@@ -1,31 +1,47 @@
 package app.revanced.patches.music.audio.exclusiveaudio
 
-import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.music.audio.exclusiveaudio.fingerprints.AllowExclusiveAudioPlaybackFingerprint
+import app.revanced.util.exception
 
 @Patch(
-    name = "Exclusive audio playback",
+    name = "Enable exclusive audio playback",
     description = "Enables the option to play audio without video.",
-    compatiblePackages = [CompatiblePackage("com.google.android.apps.youtube.music")]
+    compatiblePackages = [
+        CompatiblePackage(
+            "com.google.android.apps.youtube.music",
+            [
+                "6.45.54",
+                "6.51.53",
+                "7.01.53",
+                "7.02.52",
+                "7.03.52",
+            ]
+        )
+    ]
 )
 @Suppress("unused")
-object ExclusiveAudioPatch : BytecodePatch(
-    setOf(AllowExclusiveAudioPlaybackFingerprint)
+object EnableExclusiveAudioPlayback : BytecodePatch(
+    setOf(AllowExclusiveAudioPlaybackFingerprint),
 ) {
     override fun execute(context: BytecodeContext) {
         AllowExclusiveAudioPlaybackFingerprint.result?.mutableMethod?.apply {
             addInstructions(
                 0,
-            """
+                """
                 const/4 v0, 0x1
                 return v0
-            """
+            """,
             )
         } ?: throw AllowExclusiveAudioPlaybackFingerprint.exception
     }
-}
+}
+
+@Deprecated("This patch class has been renamed to EnableExclusiveAudioPlayback.")
+object ExclusiveAudioPatch : BytecodePatch(emptySet()) {
+    override fun execute(context: BytecodeContext) = EnableExclusiveAudioPlayback.execute(context)
+}

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

@@ -1,51 +0,0 @@
-package app.revanced.patches.music.audio.exclusiveaudio.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-
-@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-internal object ExclusiveAudioFingerprint : MethodFingerprint(
-    "V",
-    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    listOf("L", "Z"),
-    listOf(
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_EQ,
-        Opcode.CONST_4,
-        Opcode.GOTO,
-        Opcode.NOP,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_EQZ,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.IF_EQZ,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.IF_EQZ,
-        Opcode.IF_EQZ,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.GOTO,
-        Opcode.RETURN_VOID
-    )
-)

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

@@ -13,7 +13,18 @@ import app.revanced.patches.music.interaction.permanentrepeat.fingerprints.Repea
 @Patch(
     name = "Permanent repeat",
     description = "Permanently remember your repeating preference even if the playlist ends or another track is played.",
-    compatiblePackages = [CompatiblePackage("com.google.android.apps.youtube.music")],
+    compatiblePackages = [
+        CompatiblePackage(
+            "com.google.android.apps.youtube.music",
+            [
+                "6.45.54",
+                "6.51.53",
+                "7.01.53",
+                "7.02.52",
+                "7.03.52",
+            ]
+        )
+    ],
     use = false
 )
 @Suppress("unused")
@@ -23,7 +34,7 @@ object PermanentRepeatPatch : BytecodePatch(
     override fun execute(context: BytecodeContext) {
         RepeatTrackFingerprint.result?.let {
             val startIndex = it.scanResult.patternScanResult!!.endIndex
-            val repeatIndex = startIndex + 3
+            val repeatIndex = startIndex + 1
 
             it.mutableMethod.apply {
                 addInstructionsWithLabels(

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

@@ -6,17 +6,16 @@ import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 
 internal object RepeatTrackFingerprint : MethodFingerprint(
-    "V",
-    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    listOf("L", "L"),
-    listOf(
-        Opcode.CHECK_CAST,
-        Opcode.INVOKE_INTERFACE,
+    returnType = "V",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    parameters = listOf("L", "L"),
+    opcodes = listOf(
         Opcode.IGET_OBJECT,
         Opcode.IGET_OBJECT,
         Opcode.SGET_OBJECT,
         Opcode.INVOKE_VIRTUAL,
         Opcode.MOVE_RESULT,
         Opcode.IF_NEZ
-    )
+    ),
+    strings = listOf("w_st")
 )

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

@@ -1,25 +1,43 @@
 package app.revanced.patches.music.interaction.permanentshuffle
 
-import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.music.interaction.permanentshuffle.fingerprints.DisableShuffleFingerprint
-
+import app.revanced.util.exception
 
 @Patch(
     name = "Permanent shuffle",
     description = "Permanently remember your shuffle preference " +
-            "even if the playlist ends or another track is played.",
-    compatiblePackages = [CompatiblePackage("com.google.android.apps.youtube.music")],
-    use = false
+        "even if the playlist ends or another track is played.",
+    compatiblePackages = [
+        CompatiblePackage(
+            "com.google.android.apps.youtube.music",
+            [
+                "6.45.54",
+                "6.51.53",
+                "7.01.53",
+                "7.02.52",
+                "7.03.52",
+            ]
+        )
+    ],
+    use = false,
 )
 @Suppress("unused")
-object PermanentShuffleTogglePatch : BytecodePatch(setOf(DisableShuffleFingerprint)) {
+object PermanentShufflePatch : BytecodePatch(setOf(DisableShuffleFingerprint)) {
     override fun execute(context: BytecodeContext) {
         DisableShuffleFingerprint.result?.mutableMethod?.addInstruction(0, "return-void")
             ?: throw DisableShuffleFingerprint.exception
     }
 }
+
+@Deprecated("This patch class has been renamed to PermanentShufflePatch.")
+object PermanentShuffleTogglePatch : BytecodePatch(
+    dependencies = setOf(PermanentShufflePatch::class),
+) {
+    override fun execute(context: BytecodeContext) {
+    }
+}

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

@@ -1,34 +0,0 @@
-package app.revanced.patches.music.layout.compactheader
-
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotation.CompatiblePackage
-import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patches.music.layout.compactheader.fingerprints.CompactHeaderConstructorFingerprint
-import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction11x
-
-@Patch(
-    name = "Compact header",
-    description = "Hides the music category bar at the top of the homepage.",
-    compatiblePackages = [CompatiblePackage("com.google.android.apps.youtube.music")],
-    use = false
-)
-@Suppress("unused")
-object CompactHeaderPatch : BytecodePatch(
-    setOf(CompactHeaderConstructorFingerprint)
-) {
-    override fun execute(context: BytecodeContext) {
-        val result = CompactHeaderConstructorFingerprint.result!!
-        val method = result.mutableMethod
-
-        val insertIndex = result.scanResult.patternScanResult!!.endIndex
-        val register = (method.implementation!!.instructions[insertIndex - 1] as BuilderInstruction11x).registerA
-        method.addInstructions(
-            insertIndex, """
-                const/16 v2, 0x8
-                invoke-virtual {v${register}, v2}, Landroid/view/View;->setVisibility(I)V
-            """
-        )
-    }
-}

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

@@ -0,0 +1,58 @@
+package app.revanced.patches.music.layout.compactheader
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.music.layout.compactheader.fingerprints.ConstructCategoryBarFingerprint
+import app.revanced.util.exception
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+
+@Patch(
+    name = "Hide category bar",
+    description = "Hides the category bar at the top of the homepage.",
+    compatiblePackages = [
+        CompatiblePackage(
+            "com.google.android.apps.youtube.music",
+            [
+                "6.45.54",
+                "6.51.53",
+                "7.01.53",
+                "7.02.52",
+                "7.03.52",
+            ]
+        )
+    ],
+    use = false,
+)
+@Suppress("unused")
+object HideCategoryBar : BytecodePatch(
+    setOf(ConstructCategoryBarFingerprint),
+) {
+    override fun execute(context: BytecodeContext) {
+        ConstructCategoryBarFingerprint.result?.let {
+            it.mutableMethod.apply {
+                val insertIndex = it.scanResult.patternScanResult!!.startIndex
+                val register = getInstruction<OneRegisterInstruction>(insertIndex - 1).registerA
+
+                addInstructions(
+                    insertIndex,
+                    """
+                        const/16 v2, 0x8
+                        invoke-virtual {v$register, v2}, Landroid/view/View;->setVisibility(I)V
+                    """,
+                )
+            }
+        } ?: throw ConstructCategoryBarFingerprint.exception
+    }
+}
+
+@Deprecated("This patch class has been renamed to HideCategoryBar.")
+object CompactHeaderPatch : BytecodePatch(
+    dependencies = setOf(HideCategoryBar::class),
+) {
+    override fun execute(context: BytecodeContext) {
+    }
+}

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

@@ -5,19 +5,19 @@ import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 
-internal object CompactHeaderConstructorFingerprint : MethodFingerprint(
-    "V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, listOf("L", "L", "L", "L", "L"), listOf(
-        Opcode.INVOKE_DIRECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.NEW_INSTANCE,
-        Opcode.INVOKE_DIRECT,
+internal object ConstructCategoryBarFingerprint : MethodFingerprint(
+    "V",
+    AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
+    listOf("Landroid/content/Context;", "L", "L", "L"),
+    listOf(
         Opcode.IPUT_OBJECT,
         Opcode.CONST,
-        Opcode.CONST_4,
-        Opcode.INVOKE_STATIC,
+        Opcode.INVOKE_VIRTUAL,
         Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST
-    )
+        Opcode.IPUT_OBJECT,
+        Opcode.CONST,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.NEW_INSTANCE,
+        Opcode.INVOKE_DIRECT,
+    ),
 )

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

@@ -1,26 +1,13 @@
 package app.revanced.patches.music.layout.minimizedplayback
 
-import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotation.CompatiblePackage
-import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patches.music.layout.minimizedplayback.fingerprints.MinimizedPlaybackManagerFingerprint
+import app.revanced.patches.music.misc.backgroundplayback.BackgroundPlaybackPatch
 
-
-@Patch(
-    name = "Minimized playback music",
-    description = "Enables minimized playback on Kids music.",
-    compatiblePackages = [CompatiblePackage("com.google.android.apps.youtube.music")]
-)
-@Suppress("unused")
-object MinimizedPlaybackPatch : BytecodePatch(setOf(MinimizedPlaybackManagerFingerprint)) {
-    override fun execute(context: BytecodeContext) =
-        MinimizedPlaybackManagerFingerprint.result?.mutableMethod?.addInstruction(
-            0,
-            """
-                return-void
-            """
-        ) ?: throw MinimizedPlaybackManagerFingerprint.exception
-}
+@Deprecated("This patch has been merged into BackgroundPlaybackPatch.")
+object MinimizedPlaybackPatch : BytecodePatch(
+    dependencies = setOf(BackgroundPlaybackPatch::class),
+) {
+    override fun execute(context: BytecodeContext) {
+    }
+}

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

@@ -2,41 +2,68 @@ package app.revanced.patches.music.layout.premium
 
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+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.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.music.layout.premium.fingerprints.HideGetPremiumFingerprint
-import app.revanced.patches.music.layout.premium.fingerprints.HideGetPremiumParentFingerprint
+import app.revanced.patches.music.layout.premium.fingerprints.MembershipSettingsFingerprint
+import app.revanced.util.exception
+import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
 
 @Patch(
-    name = "Hide get premium",
-    description = "Removes all \"Get Premium\" evidences from the avatar menu.",
-    compatiblePackages = [CompatiblePackage("com.google.android.apps.youtube.music")]
+    name = "Hide 'Get Music Premium' label",
+    description = "Hides the \"Get Music Premium\" label from the account menu and settings.",
+    compatiblePackages = [
+        CompatiblePackage(
+            "com.google.android.apps.youtube.music",
+            [
+                "6.45.54",
+                "6.51.53",
+                "7.01.53",
+                "7.02.52",
+                "7.03.52",
+            ]
+        )
+    ]
 )
 @Suppress("unused")
-object HideGetPremiumPatch : BytecodePatch(setOf(HideGetPremiumParentFingerprint)) {
+object HideGetPremiumPatch : BytecodePatch(
+    setOf(
+        HideGetPremiumFingerprint,
+        MembershipSettingsFingerprint,
+    ),
+) {
     override fun execute(context: BytecodeContext) {
-        val parentResult = HideGetPremiumParentFingerprint.result!!
-        HideGetPremiumFingerprint.resolve(context, parentResult.classDef)
+        HideGetPremiumFingerprint.result?.let {
+            it.mutableMethod.apply {
+                val insertIndex = it.scanResult.patternScanResult!!.endIndex
 
-        val startIndex = parentResult.scanResult.patternScanResult!!.startIndex
+                val setVisibilityInstruction = getInstruction<FiveRegisterInstruction>(insertIndex)
+                val getPremiumViewRegister = setVisibilityInstruction.registerC
+                val visibilityRegister = setVisibilityInstruction.registerD
 
-        val parentMethod = parentResult.mutableMethod
-        parentMethod.replaceInstruction(
-            startIndex,
-            """
-                const/4 v1, 0x0
-            """
-        )
+                replaceInstruction(
+                    insertIndex,
+                    "const/16 v$visibilityRegister, 0x8",
+                )
 
-        val result = HideGetPremiumFingerprint.result!!
-        val method = result.mutableMethod
-        method.addInstruction(
-            startIndex,
+                addInstruction(
+                    insertIndex + 1,
+                    "invoke-virtual {v$getPremiumViewRegister, v$visibilityRegister}, " +
+                        "Landroid/view/View;->setVisibility(I)V",
+                )
+            }
+        } ?: throw HideGetPremiumFingerprint.exception
+
+        MembershipSettingsFingerprint.result?.mutableMethod?.addInstructions(
+            0,
             """
-                const/16 v0, 0x8
-            """
-        )
+                const/4 v0, 0x0
+                return-object v0
+            """,
+        ) ?: throw MembershipSettingsFingerprint.exception
     }
 }

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

@@ -6,11 +6,13 @@ import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 
 internal object HideGetPremiumFingerprint : MethodFingerprint(
-    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(
+    "V",
+    AccessFlags.PUBLIC or AccessFlags.FINAL,
+    listOf(),
+    listOf(
         Opcode.IF_NEZ,
         Opcode.CONST_16,
-        Opcode.GOTO,
-        Opcode.NOP,
-        Opcode.INVOKE_VIRTUAL
-    )
+        Opcode.INVOKE_VIRTUAL,
+    ),
+    listOf("FEmusic_history", "FEmusic_offline"),
 )

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

@@ -5,15 +5,16 @@ import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 
-internal object HideGetPremiumParentFingerprint : MethodFingerprint(
-    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(
-        Opcode.IGET_BOOLEAN,
-        Opcode.CONST_4,
-        Opcode.IF_EQZ,
+internal object MembershipSettingsFingerprint : MethodFingerprint(
+    returnType = "Ljava/lang/CharSequence;",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    opcodes = listOf(
         Opcode.IGET_OBJECT,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT_OBJECT,
         Opcode.INVOKE_VIRTUAL,
         Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_STATIC
-    ),
-    listOf("FEmusic_history"),
+        Opcode.IF_EQZ,
+        Opcode.IGET_OBJECT
+    )
 )

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

@@ -1,71 +1,95 @@
 package app.revanced.patches.music.layout.upgradebutton
 
 import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.getInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patcher.extensions.newLabel
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.util.smali.toInstructions
 import app.revanced.patches.music.layout.upgradebutton.fingerprints.PivotBarConstructorFingerprint
+import app.revanced.util.exception
+import app.revanced.util.getReference
 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 com.android.tools.smali.dexlib2.iface.reference.FieldReference
 
 @Patch(
     name = "Remove upgrade button",
     description = "Removes the upgrade tab from the pivot bar.",
-    compatiblePackages = [CompatiblePackage("com.google.android.apps.youtube.music")]
+    compatiblePackages = [
+        CompatiblePackage(
+            "com.google.android.apps.youtube.music",
+            [
+                "6.45.54",
+                "6.51.53",
+                "7.01.53",
+                "7.02.52",
+                "7.03.52",
+            ]
+        )
+    ]
 )
 @Suppress("unused")
 object RemoveUpgradeButtonPatch : BytecodePatch(
-    setOf(PivotBarConstructorFingerprint)
+    setOf(PivotBarConstructorFingerprint),
 ) {
     override fun execute(context: BytecodeContext) {
-        val result = PivotBarConstructorFingerprint.result!!
-        val implementation = result.mutableMethod.implementation!!
+        PivotBarConstructorFingerprint.result?.let {
+            it.mutableMethod.apply {
+                val pivotBarElementFieldReference = getInstruction(it.scanResult.patternScanResult!!.endIndex - 1)
+                    .getReference<FieldReference>()
 
-        val pivotBarElementFieldRef =
-            (implementation.instructions[result.scanResult.patternScanResult!!.endIndex - 1] as Instruction22c).reference
+                val register = (getInstructions().first() as Instruction35c).registerC
 
-        val register = (implementation.instructions.first() as Instruction35c).registerC
-        // first compile all the needed instructions
-        val instructionList = """
-                invoke-interface { v0 }, Ljava/util/List;->size()I
-                move-result v1
-                const/4 v2, 0x4
-                invoke-interface {v0, v2}, Ljava/util/List;->remove(I)Ljava/lang/Object;
-                iput-object v0, v$register, $pivotBarElementFieldRef
-            """.toInstructions().toMutableList()
+                // First compile all the needed instructions.
+                val instructionList = """
+                    invoke-interface { v0 }, Ljava/util/List;->size()I
+                    move-result v1
+                    const/4 v2, 0x4
+                    invoke-interface {v0, v2}, Ljava/util/List;->remove(I)Ljava/lang/Object;
+                    iput-object v0, v$register, $pivotBarElementFieldReference
+                """.toInstructions().toMutableList()
 
+                val endIndex = it.scanResult.patternScanResult!!.endIndex
 
-        val endIndex = result.scanResult.patternScanResult!!.endIndex
+                // Replace the instruction to retain the label at given index.
+                replaceInstruction(
+                    endIndex - 1,
+                    instructionList[0], // invoke-interface.
+                )
+                // Do not forget to remove this instruction since we added it already.
+                instructionList.removeFirst()
 
-        // replace the instruction to retain the label at given index
-        implementation.replaceInstruction(
-            endIndex - 1, instructionList[0] // invoke-interface
-        )
-        // do not forget to remove this instruction since we added it already
-        instructionList.removeFirst()
+                val exitInstruction = instructionList.last() // iput-object
+                addInstruction(
+                    endIndex,
+                    exitInstruction,
+                )
+                // Do not forget to remove this instruction since we added it already.
+                instructionList.removeLast()
 
-        val exitInstruction = instructionList.last() // iput-object
-        implementation.addInstruction(
-            endIndex, exitInstruction
-        )
-        // do not forget to remove this instruction since we added it already
-        instructionList.removeLast()
+                // Add the necessary if statement to remove the upgrade tab button in case it exists.
+                instructionList.add(
+                    2, // if-le.
+                    BuilderInstruction22t(
+                        Opcode.IF_LE,
+                        1,
+                        2,
+                        newLabel(endIndex),
+                    ),
+                )
 
-        // add the necessary if statement to remove the upgrade tab button in case it exists
-        instructionList.add(
-            2, // if-le
-            BuilderInstruction22t(
-                Opcode.IF_LE, 1, 2, implementation.newLabelForIndex(endIndex)
-            )
-        )
-
-        implementation.addInstructions(
-            endIndex, instructionList
-        )
+                addInstructions(
+                    endIndex,
+                    instructionList,
+                )
+            }
+        } ?: throw PivotBarConstructorFingerprint.exception
     }
 }