chore(release): 2.188.0-dev.27 [skip ci]

# [2.188.0-dev.27](https://github.com/ReVanced/revanced-patches/compare/v2.188.0-dev.26...v2.188.0-dev.27) (2023-08-26)

### Features

* **YouTube Music - Exclusive audio playback:** Support latest version ([65420f1](65420f1833))

.editorconfig

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

.github/ISSUE_TEMPLATE/bug-issue.yml

@@ -0,0 +1,73 @@
+name: 🐞 Bug report
+description: Report a very clearly broken issue.
+title: 'bug: '
+labels: [bug]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        # ReVanced bug report
+
+        Important to note that your issue may have already been reported before. Please check for existing issues [here](https://github.com/revanced/revanced-patches/labels/bug).
+
+  - type: dropdown
+    attributes:
+      label: Type
+      options:
+        - Error while patching
+        - Error at runtime
+        - Cosmetic
+        - Other
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Bug description
+      description: How did you find the bug? Any additional details that might help?
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Steps to reproduce
+      description: Add the steps to reproduce this bug including your environment.
+      placeholder: Step 1. Download some files. Step 2. ...
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks. Capture crash logs by running `logcat | grep AndroidRuntime`.
+      render: shell
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Screenshots or videos
+      description: Add screenshots or videos that show the bug here.
+      placeholder: Drag and drop the screenshots/videos into this box.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Solution
+      description: If applicable, add a possible solution.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add additional context here.
+    validations:
+      required: false
+  - type: checkboxes
+    id: acknowledgements
+    attributes:
+      label: Acknowledgements
+      description: Your issue will be closed if you haven't done these steps.
+      options:
+        - label: I have searched the existing issues and this is a new and no duplicate or related to another open issue.
+          required: true
+        - label: I have written a short but informative title.
+          required: true
+        - label: I filled out all of the requested information in this issue properly.
+          required: true

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,110 +0,0 @@
-name: 🐞 Bug report
-description: Report a bug or an issue.
-title: 'bug: '
-labels: ['Bug report']
-body:
-  - type: markdown
-    attributes:
-      value: |
-        <p align="center">
-          <picture>
-            <source
-              width="256px"
-              media="(prefers-color-scheme: dark)"
-              srcset="https://raw.githubusercontent.com/revanced/revanced-patches/main/assets/revanced-headline/revanced-headline-vertical-dark.svg"
-            >
-            <img 
-              width="256px"
-              src="https://raw.githubusercontent.com/revanced/revanced-patches/main/assets/revanced-headline/revanced-headline-vertical-light.svg"
-            >
-          </picture>
-          <br>
-          <a href="https://revanced.app/">
-             <picture>
-                 <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/revanced/revanced-patches/main/assets/revanced-logo/revanced-logo.svg" />
-                 <img height="24px" src="https://raw.githubusercontent.com/revanced/revanced-patches/main/assets/revanced-logo/revanced-logo.svg" />
-             </picture>
-           </a>&nbsp;&nbsp;&nbsp;
-           <a href="https://github.com/ReVanced">
-               <picture>
-                   <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://i.ibb.co/dMMmCrW/Git-Hub-Mark.png" />
-                   <img height="24px" src="https://i.ibb.co/9wV3HGF/Git-Hub-Mark-Light.png" />
-               </picture>
-           </a>&nbsp;&nbsp;&nbsp;
-           <a href="http://revanced.app/discord">
-               <picture>
-                   <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
-                   <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
-               </picture>
-           </a>&nbsp;&nbsp;&nbsp;
-           <a href="https://reddit.com/r/revancedapp">
-               <picture>
-                   <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
-                   <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
-               </picture>
-           </a>&nbsp;&nbsp;&nbsp;
-           <a href="https://t.me/app_revanced">
-              <picture>
-                 <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
-                 <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
-              </picture>
-           </a>&nbsp;&nbsp;&nbsp;
-           <a href="https://x.com/revancedapp">
-              <picture>
-                 <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/93124920/270180600-7c1b38bf-889b-4d68-bd5e-b9d86f91421a.png">
-                 <img height="24px" src="https://user-images.githubusercontent.com/93124920/270108715-d80743fa-b330-4809-b1e6-79fbdc60d09c.png" />
-              </picture>
-           </a>&nbsp;&nbsp;&nbsp;
-           <a href="https://www.youtube.com/@ReVanced">
-              <picture>
-                 <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
-                 <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
-             </picture>
-           </a>
-           <br>
-           <br>
-           Continuing the legacy of Vanced
-        </p>
-
-        # ReVanced Patches bug report
-
-        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).
-        - **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
-    attributes:
-      label: Bug description
-      description: |
-        - Describe your bug in detail
-        - Add steps to reproduce the bug if possible (Step 1. ... Step 2. ...)
-        - Add images and videos if possible
-        - List used patches if applicable
-    validations:
-        required: true
-  - type: textarea
-    attributes:
-      label: Error logs
-      description: Exceptions can be captured by running `logcat | grep AndroidRuntime` in a shell.
-      render: shell
-  - type: textarea
-    attributes:
-      label: Solution
-      description: If applicable, add a possible solution to the bug.
-  - type: textarea
-    attributes:
-      label: Additional context
-      description: Add additional context here.
-  - type: checkboxes
-    id: acknowledgements
-    attributes:
-      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.
-          required: true
-        - label: I have chosen an appropriate title.
-          required: true
-        - label: All requested information has been provided properly.
-          required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,8 @@
 blank_issues_enabled: false
 contact_links:
+  - name: 📃 Documentation
+    url: https://github.com/revanced/revanced-documentation/
+    about: Don't know how or where to start? Check out our documentation!
   - name: 🗨 Discussions
     url: https://github.com/revanced/revanced-suggestions/discussions
-    about: Have something unspecific to ReVanced Patches in mind? Search for or start a new discussion!
+    about: Got something you think should change or be added? Search for or start a new discussion!

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,106 +0,0 @@
-name: ⭐ Feature request
-description: Create a detailed request for a new feature.
-title: 'feat: '
-labels: ['Feature request']
-body:
-  - type: markdown
-    attributes:
-      value: |
-        <p align="center">
-          <picture>
-            <source
-              width="256px"
-              media="(prefers-color-scheme: dark)"
-              srcset="https://raw.githubusercontent.com/revanced/revanced-patches/main/assets/revanced-headline/revanced-headline-vertical-dark.svg"
-            >
-            <img 
-              width="256px"
-              src="https://raw.githubusercontent.com/revanced/revanced-patches/main/assets/revanced-headline/revanced-headline-vertical-light.svg"
-            >
-          </picture>
-          <br>
-          <a href="https://revanced.app/">
-             <picture>
-                 <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/revanced/revanced-patches/main/assets/revanced-logo/revanced-logo.svg" />
-                 <img height="24px" src="https://raw.githubusercontent.com/revanced/revanced-patches/main/assets/revanced-logo/revanced-logo.svg" />
-             </picture>
-           </a>&nbsp;&nbsp;&nbsp;
-           <a href="https://github.com/ReVanced">
-               <picture>
-                   <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://i.ibb.co/dMMmCrW/Git-Hub-Mark.png" />
-                   <img height="24px" src="https://i.ibb.co/9wV3HGF/Git-Hub-Mark-Light.png" />
-               </picture>
-           </a>&nbsp;&nbsp;&nbsp;
-           <a href="http://revanced.app/discord">
-               <picture>
-                   <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
-                   <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
-               </picture>
-           </a>&nbsp;&nbsp;&nbsp;
-           <a href="https://reddit.com/r/revancedapp">
-               <picture>
-                   <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
-                   <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
-               </picture>
-           </a>&nbsp;&nbsp;&nbsp;
-           <a href="https://t.me/app_revanced">
-              <picture>
-                 <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
-                 <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
-              </picture>
-           </a>&nbsp;&nbsp;&nbsp;
-           <a href="https://x.com/revancedapp">
-              <picture>
-                 <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/93124920/270180600-7c1b38bf-889b-4d68-bd5e-b9d86f91421a.png">
-                 <img height="24px" src="https://user-images.githubusercontent.com/93124920/270108715-d80743fa-b330-4809-b1e6-79fbdc60d09c.png" />
-              </picture>
-           </a>&nbsp;&nbsp;&nbsp;
-           <a href="https://www.youtube.com/@ReVanced">
-              <picture>
-                 <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
-                 <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
-             </picture>
-           </a>
-           <br>
-           <br>
-           Continuing the legacy of Vanced
-        </p>
-
-        # ReVanced Patches feature request
-
-        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 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:
-      label: Feature description
-      description: |
-        - Describe your feature in detail
-        - Add images, videos, links, examples, references, etc. if possible
-        - Add the target application name in case you request a new patch
-  - type: textarea
-    attributes:
-      label: Motivation
-      description: | 
-        A strong motivation is necessary for a feature request to be considered.
-        
-        - Why should this feature be implemented? 
-        - What is the explicit use case?
-        - What are the benefits?
-        - What makes this feature important?
-    validations:
-      required: true
-  - type: checkboxes
-    id: acknowledgements
-    attributes:
-      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.
-          required: true
-        - label: I have chosen an appropriate title.
-          required: true
-        - label: All requested information has been provided properly.
-          required: true

.github/ISSUE_TEMPLATE/patch-request.yml

@@ -0,0 +1,41 @@
+name: ⭐ Patch Request
+description: Create a detailed patch request.
+title: 'feat: '
+labels: [patch-request]
+body:
+  - type: textarea
+    attributes:
+      label: Application
+      description: Which application is this patch for?
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Issue
+      description: What is the issue this patch should solve?
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Patch
+      description: "Describe the patch you'd like to see in detail."
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Motivation
+      description: Why should your patch request be considered? What makes it valuable to the community?
+    validations:
+      required: true
+  - type: checkboxes
+    id: acknowledgements
+    attributes:
+      label: Acknowledgements
+      description: Your issue will be closed if you haven't done these steps.
+      options:
+        - label: I have searched the existing issues and this is a new and no duplicate or related to another open issue.
+          required: true
+        - label: I have written a short but informative title.
+          required: true
+        - label: I filled out all of the requested information in this issue properly.
+          required: true

.github/config.yml

@@ -1,2 +1,2 @@
 firstPRMergeComment: >
-  Thank you for contributing to ReVanced. Join us on [Discord](https://revanced.app/discord) to receive a role for your contribution.
+  Thank you for contributing to ReVanced. Join us on [Discord](https://revanced.app/discord) if you want to receive a contributor role.

.github/dependabot.yml

@@ -1,22 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: github-actions
-    labels: []
-    directory: /
-    target-branch: dev
-    schedule:
-      interval: monthly
-
-  - package-ecosystem: npm
-    labels: []
-    directory: /
-    target-branch: dev
-    schedule:
-      interval: monthly
-
-  - package-ecosystem: gradle
-    labels: []
-    directory: /
-    target-branch: dev
-    schedule:
-      interval: monthly

.github/workflows/build_pull_request.yml

@@ -1,25 +0,0 @@
-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/pull_request.yml

@@ -1,4 +1,4 @@
-name: Open a PR to main
+name: PR to main
 
 on:
   push:
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 env:
-  MESSAGE: Merge branch `${{ github.head_ref || github.ref_name }}` to `main`
+  MESSAGE: merge branch `${{ github.head_ref || github.ref_name }}` to `main`
 
 jobs:
   pull-request:
@@ -15,8 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
-
+        uses: actions/checkout@v3
       - name: Open pull request
         uses: repo-sync/pull-request@v2
         with:

.github/workflows/release.yml

@@ -6,6 +6,10 @@ on:
     branches:
       - main
       - dev
+  pull_request:
+    branches:
+      - main
+      - dev
 
 jobs:
   release:
@@ -13,37 +17,27 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           # Make sure the release step uses its own credentials:
           # https://github.com/cycjimmy/semantic-release-action#private-packages
           persist-credentials: false
           fetch-depth: 0
-
-      - name: Cache Gradle
-        uses: burrunan/gradle-cache-action@v1
-
-      - name: Build
+      - name: Cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            ${{ runner.home }}/.gradle/caches
+            ${{ runner.home }}/.gradle/wrapper
+            .gradle
+            node_modules
+          key: ${{ runner.os }}-gradle-npm-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', 'package-lock.json') }}
+      - name: Build with Gradle
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: ./gradlew generateMeta clean
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: "lts/*"
-          cache: 'npm'
-
-      - name: Install dependencies
+      - name: Setup semantic-release
         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: ${{ env.GPG_FINGERPRINT }}
-
       - name: Release
         env:
           GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }}

.github/workflows/sync_crowdin.yml

@@ -1,39 +0,0 @@
-name: Sync Crowdin
-
-on:
-  workflow_dispatch:
-  schedule: 
-    - cron: 0 * 1 * *
-  push:
-    paths:
-      - /src/main/resources/addresources/values/strings.xml
-
-jobs:
-  sync:
-    name: Sync translations
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Sync translations
-        uses: crowdin/github-action@v1
-        with:
-          config: crowdin.yml
-          upload_sources: true
-          upload_translations: false
-          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/update-gradle-wrapper.yml

@@ -1,18 +0,0 @@
-name: Update Gradle wrapper
-
-on:
-  schedule:
-    - cron: "0 0 1 * *"
-  workflow_dispatch:
-
-jobs:
-  update:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Update Gradle Wrapper
-        uses: gradle-update/update-gradle-wrapper-action@v1
-        with:
-          target-branch: dev

.releaserc

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

CONTRIBUTING.md

@@ -1,125 +0,0 @@
-<p align="center">
-  <picture>
-    <source
-      width="256px"
-      media="(prefers-color-scheme: dark)"
-      srcset="assets/revanced-headline/revanced-headline-vertical-dark.svg"
-    >
-    <img 
-      width="256px"
-      src="assets/revanced-headline/revanced-headline-vertical-light.svg"
-    >
-  </picture>
-  <br>
-  <a href="https://revanced.app/">
-     <picture>
-         <source height="24px" media="(prefers-color-scheme: dark)" srcset="assets/revanced-logo/revanced-logo.svg" />
-         <img height="24px" src="assets/revanced-logo/revanced-logo.svg" />
-     </picture>
-   </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://github.com/ReVanced">
-       <picture>
-           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://i.ibb.co/dMMmCrW/Git-Hub-Mark.png" />
-           <img height="24px" src="https://i.ibb.co/9wV3HGF/Git-Hub-Mark-Light.png" />
-       </picture>
-   </a>&nbsp;&nbsp;&nbsp;
-   <a href="http://revanced.app/discord">
-       <picture>
-           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
-           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
-       </picture>
-   </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://reddit.com/r/revancedapp">
-       <picture>
-           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
-           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
-       </picture>
-   </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://t.me/app_revanced">
-      <picture>
-         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
-         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
-      </picture>
-   </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://x.com/revancedapp">
-      <picture>
-         <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/93124920/270180600-7c1b38bf-889b-4d68-bd5e-b9d86f91421a.png">
-         <img height="24px" src="https://user-images.githubusercontent.com/93124920/270108715-d80743fa-b330-4809-b1e6-79fbdc60d09c.png" />
-      </picture>
-   </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://www.youtube.com/@ReVanced">
-      <picture>
-         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
-         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
-     </picture>
-   </a>
-   <br>
-   <br>
-   Continuing the legacy of Vanced
-</p>
-
-# 👋 Contribution guidelines
-
-This document describes how to contribute to ReVanced Patches.
-
-## 📖 Resources to help you get started
-
-* The [documentation](https://github.com/ReVanced/revanced-patcher/tree/docs/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+).
-
-> **Note**
-> Requests can be accepted or rejected at the discretion of maintainers of ReVanced Patches.
-> Good motivation has to be provided for a request to be accepted.
-
-## 🐞 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+).
-
-## 🧑‍⚖️ Guidelines for requesting or contributing patches
-
-To maintain a high-quality and ethical collection of patches, the following guidelines for requesting
-or contributing patches are effective as of September 14, 2023. Any patches present prior to this date 
-are unaffected by this change.
-
-> **Note**
-> We generally adhere to the guidelines outlined below. However, we may make exceptions
-> in specific cases based on our discretion. Pull requests for patches that deviate from the guidelines
-> will be evaluated individually. While a patch may not align with our general guidelines,
-> we will consider its acceptance on a case-by-case basis, taking into account its impact on user experience
-> and ethical considerations. We reserve the right to make exceptions for patches that provide significant value.
-
-✅ Examples for acceptable patches include:
-
-* Customizations: Feel free to contribute patches that allow users to personalize their experience
-* Ad-Blocking: Patches aimed at enhancing user privacy and blocking intrusive advertisements are appreciated
-* Feature additions: Patches that add new features or change behaviour to the app are welcome
-
-❌ Examples for unacceptable patches include:
-
-* 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
-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)
-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

@@ -1,105 +1,3 @@
-<p align="center">
-  <picture>
-    <source
-      width="256px"
-      media="(prefers-color-scheme: dark)"
-      srcset="assets/revanced-headline/revanced-headline-vertical-dark.svg"
-    >
-    <img 
-      width="256px"
-      src="assets/revanced-headline/revanced-headline-vertical-light.svg"
-    >
-  </picture>
-  <br>
-  <a href="https://revanced.app/">
-     <picture>
-         <source height="24px" media="(prefers-color-scheme: dark)" srcset="assets/revanced-logo/revanced-logo.svg" />
-         <img height="24px" src="assets/revanced-logo/revanced-logo.svg" />
-     </picture>
-   </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://github.com/ReVanced">
-       <picture>
-           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://i.ibb.co/dMMmCrW/Git-Hub-Mark.png" />
-           <img height="24px" src="https://i.ibb.co/9wV3HGF/Git-Hub-Mark-Light.png" />
-       </picture>
-   </a>&nbsp;&nbsp;&nbsp;
-   <a href="http://revanced.app/discord">
-       <picture>
-           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
-           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
-       </picture>
-   </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://reddit.com/r/revancedapp">
-       <picture>
-           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
-           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
-       </picture>
-   </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://t.me/app_revanced">
-      <picture>
-         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
-         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
-      </picture>
-   </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://x.com/revancedapp">
-      <picture>
-         <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/93124920/270180600-7c1b38bf-889b-4d68-bd5e-b9d86f91421a.png">
-         <img height="24px" src="https://user-images.githubusercontent.com/93124920/270108715-d80743fa-b330-4809-b1e6-79fbdc60d09c.png" />
-      </picture>
-   </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://www.youtube.com/@ReVanced">
-      <picture>
-         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
-         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
-     </picture>
-   </a>
-   <br>
-   <br>
-   Continuing the legacy of Vanced
-</p>
+## 🧩 ReVanced Patches
 
-# 🧩 ReVanced Patches
-
-![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/ReVanced/revanced-patches/release.yml)
-![GPLv3 License](https://img.shields.io/badge/License-GPL%20v3-yellow.svg)
-
-This repository contains a collection of ReVanced Patches.
-
-## ❓ About
-
-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
-
-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.
-* ✨ **And much more!**
-
-For a complete list of all available patches, visit [revanced.app/patches](https://revanced.app/patches).
-
-## 🚀 How to get started
-
-You can use [ReVanced CLI](https://github.com/ReVanced/revanced-cli) or [ReVanced Manager](https://github.com/ReVanced/revanced-manager) to use ReVanced Patches.
-
-## 📚 Everything else
-
-### 📙 Contributing
-
-Thank you for considering contributing to ReVanced Patches. You can find the contribution guidelines [here](CONTRIBUTING.md).
-
-### 🛠️ Building
-
-To build ReVanced Patches, you can follow the [ReVanced documentation](https://github.com/ReVanced/revanced-documentation).
-
-## 📜 Licence
-
-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.
+Patches for ReVanced.

assets/revanced-logo/revanced-logo.svg

@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 800 800" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"><g id="Logo"><g id="Ring"><circle id="Ring-Background" serif:id="Ring Background" cx="400" cy="400" r="400" style="fill:#1b1b1b;"/><path id="Ring1" serif:id="Ring" d="M400,0c220.766,0 400,179.234 400,400c-0,220.766 -179.234,400 -400,400c-220.766,-0 -400,-179.234 -400,-400c0,-220.766 179.234,-400 400,-400Zm-0,36c200.897,-0 364,163.103 364,364c0,200.897 -163.103,364 -364,364c-200.897,0 -364,-163.103 -364,-364c-0,-200.897 163.103,-364 364,-364Z" style="fill:url(#_Linear1);"/></g><g id="Shape"><path id="V-Shape" serif:id="V Shape" d="M538.74,269.872c1.481,-3.382 1.157,-7.283 -0.863,-10.373c-2.021,-3.091 -5.464,-4.954 -9.156,-4.954c-5.148,0 -10.435,0 -14.165,0c-3.1,0 -5.907,1.834 -7.153,4.672c-12.468,28.396 -78.273,178.273 -100.25,228.328c-1.246,2.838 -4.053,4.671 -7.154,4.671c-3.1,0 -5.907,-1.833 -7.153,-4.671c-21.977,-50.055 -87.782,-199.932 -100.25,-228.328c-1.246,-2.838 -4.053,-4.672 -7.153,-4.672c-3.73,0 -9.017,0 -14.164,0c-3.693,0 -7.135,1.863 -9.156,4.954c-2.02,3.09 -2.344,6.991 -0.863,10.373c23.557,53.766 101.872,232.519 117.871,269.034c1.743,3.979 5.674,6.549 10.018,6.549c6.293,-0 15.408,-0 21.701,-0c4.344,-0 8.275,-2.57 10.018,-6.549c15.999,-36.515 94.315,-215.268 117.872,-269.034Z" style="fill:#fff;"/><path id="Diamond" d="M408.119,395.312c-1.675,2.901 -4.77,4.688 -8.119,4.688c-3.349,-0 -6.444,-1.787 -8.119,-4.688c-16.997,-29.44 -56.156,-97.264 -73.153,-126.704c-1.675,-2.901 -1.675,-6.474 0,-9.375c1.675,-2.901 4.77,-4.688 8.119,-4.688c33.995,0 112.311,0 146.306,0c3.349,0 6.444,1.787 8.119,4.688c1.675,2.901 1.675,6.474 -0,9.375c-16.997,29.44 -56.156,97.264 -73.153,126.704Z" style="fill:url(#_Linear2);"/></g></g><defs><linearGradient id="_Linear1" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(4.89859e-14,800,-800,4.89859e-14,400.001,3.31681e-10)"><stop offset="0" style="stop-color:#f04e98;stop-opacity:1"/><stop offset="0.5" style="stop-color:#5f65d4;stop-opacity:1"/><stop offset="1" style="stop-color:#4e98f0;stop-opacity:1"/></linearGradient><linearGradient id="_Linear2" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.77155e-14,289.317,-282.535,1.73003e-14,400,254.545)"><stop offset="0" style="stop-color:#f04e98;stop-opacity:1"/><stop offset="0.5" style="stop-color:#5f65d4;stop-opacity:1"/><stop offset="1" style="stop-color:#4e98f0;stop-opacity:1"/></linearGradient></defs></svg>

build.gradle.kts

@@ -1,11 +1,5 @@
-import org.gradle.kotlin.dsl.support.listFilesOrdered
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
 plugins {
-    alias(libs.plugins.kotlin)
-    alias(libs.plugins.binary.compatibility.validator)
-    `maven-publish`
-    signing
+    kotlin("jvm") version "1.8.20"
 }
 
 group = "app.revanced"
@@ -15,139 +9,73 @@ repositories {
     mavenLocal()
     google()
     maven {
-        // A repository must be speficied for some reason. "registry" is a dummy.
-        url = uri("https://maven.pkg.github.com/revanced/registry")
+        url = uri("https://maven.pkg.github.com/revanced/revanced-patcher")
         credentials {
-            username = project.findProperty("gpr.user") as String? ?: System.getenv("GITHUB_ACTOR")
-            password = project.findProperty("gpr.key") as String? ?: System.getenv("GITHUB_TOKEN")
+            username = project.findProperty("gpr.user") as? String ?: System.getenv("GITHUB_ACTOR")
+            password = project.findProperty("gpr.key") as? String ?: System.getenv("GITHUB_TOKEN")
+        }
+    }
+    // Required for FlexVer-Java
+    maven {
+        url = uri("https://repo.sleeping.town")
+        content {
+            includeGroup("com.unascribed")
         }
     }
 }
 
 dependencies {
-    implementation(libs.revanced.patcher)
-    implementation(libs.smali)
-    // TODO: Required because build fails without it. Find a way to remove this dependency.
-    implementation(libs.guava)
+    implementation("app.revanced:revanced-patcher:14.0.0")
+    implementation("com.android.tools.smali:smali:3.0.3")
+    // Required because build fails without it.
+    // TODO: Find a way to remove this dependency.
+    implementation("com.google.guava:guava:32.1.2-jre")
     // Used in JsonGenerator.
-    implementation(libs.gson)
+    implementation("com.google.code.gson:gson:2.10.1")
+    // A dependency to the Android library unfortunately fails the build,
+    // which is why this is required for the patch change-oauth-client-id.
+    compileOnly(project("dummy"))
 }
 
 kotlin {
-    compilerOptions {
-        jvmTarget.set(JvmTarget.JVM_11)
-    }
-}
-
-java {
-    targetCompatibility = JavaVersion.VERSION_11
+    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"
-        }
-    }
-
-    register("buildDexJar") {
-        description = "Build and add a DEX to the JAR file"
-        group = "build"
-
+    register<DefaultTask>("generateBundle") {
+        description = "Generate dex files from build and bundle them in the jar file"
         dependsOn(build)
 
         doLast {
-            val d8 = File(System.getenv("ANDROID_HOME")).resolve("build-tools")
-                .listFilesOrdered().last().resolve("d8").absolutePath
-
-            val patchesJar = configurations.archives.get().allArtifacts.files.files.first().absolutePath
-            val workingDirectory = layout.buildDirectory.dir("libs").get().asFile
+            val androidHome = System.getenv("ANDROID_HOME") ?: throw GradleException("ANDROID_HOME not found")
+            val d8 = "${androidHome}/build-tools/33.0.1/d8"
+            val input = configurations.archives.get().allArtifacts.files.files.first().absolutePath
+            val work = File("${buildDir}/libs")
 
             exec {
-                workingDir = workingDirectory
-                commandLine = listOf(d8, "--release", patchesJar)
+                workingDir = work
+                commandLine = listOf(d8, input)
             }
 
             exec {
-                workingDir = workingDirectory
-                commandLine = listOf("zip", "-u", patchesJar, "classes.dex")
+                workingDir = work
+                commandLine = listOf("zip", "-u", input, "classes.dex")
             }
         }
     }
-
-    register<JavaExec>("generatePatchesFiles") {
-        description = "Generate patches files"
-
+    register<JavaExec>("generateMeta") {
+        description = "Generate metadata for this bundle"
         dependsOn(build)
 
         classpath = sourceSets["main"].runtimeClasspath
-        mainClass.set("app.revanced.generator.MainKt")
+        mainClass.set("app.revanced.meta.PatchesFileGenerator")
     }
-
-    // Needed by gradle-semantic-release-plugin.
-    // Tracking: https://github.com/KengoTODA/gradle-semantic-release-plugin/issues/435
-    publish {
-        dependsOn("buildDexJar")
-        dependsOn("generatePatchesFiles")
+    // Dummy task to fix the Gradle semantic-release plugin.
+    // Remove this if you forked it to support building only.
+    // Tracking issue: https://github.com/KengoTODA/gradle-semantic-release-plugin/issues/435
+    register<DefaultTask>("publish") {
+        group = "publish"
+        description = "Dummy task"
+        dependsOn(named("generateBundle"), named("generateMeta"))
     }
 }
-
-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"])
-
-            pom {
-                name = "ReVanced Patches"
-                description = "Patches for ReVanced."
-                url = "https://revanced.app"
-
-                licenses {
-                    license {
-                        name = "GNU General Public License v3.0"
-                        url = "https://www.gnu.org/licenses/gpl-3.0.en.html"
-                    }
-                }
-                developers {
-                    developer {
-                        id = "ReVanced"
-                        name = "ReVanced"
-                        email = "contact@revanced.app"
-                    }
-                }
-                scm {
-                    connection = "scm:git:git://github.com/revanced/revanced-patches.git"
-                    developerConnection = "scm:git:git@github.com:revanced/revanced-patches.git"
-                    url = "https://github.com/revanced/revanced-patches"
-                }
-            }
-        }
-    }
-}
-
-signing {
-    useGpgCmd()
-
-    sign(publishing.publications["revanced-patches-publication"])
-}

crowdin.yml

@@ -1,8 +0,0 @@
-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

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

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

@@ -0,0 +1,9 @@
+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.5.1-dev.1
+version = 2.188.0-dev.27

gradle/libs.versions.toml

@@ -1,17 +0,0 @@
-[versions]
-revanced-patcher = "19.3.1"
-smali = "3.0.5"
-guava = "33.0.0-jre"
-gson = "2.10.1"
-binary-compatibility-validator = "0.14.0"
-kotlin = "1.9.22"
-
-[libraries]
-revanced-patcher = { module = "app.revanced:revanced-patcher", version.ref = "revanced-patcher" }
-smali = { module = "com.android.tools.smali:smali", version.ref = "smali" }
-guava = { module = "com.google.guava:guava", version.ref = "guava" }
-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,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
-distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dist
+zipStorePath=wrapper/dists

gradlew

@@ -83,8 +83,7 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -145,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -153,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +201,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     and any embedded shellness will be escaped.
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#     treated as '${Hostname}' itself on the command line.
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

package.json

@@ -1,9 +1,9 @@
 {
   "devDependencies": {
-    "@saithodev/semantic-release-backmerge": "^4.0.1",
-    "@semantic-release/changelog": "^6.0.3",
+    "@saithodev/semantic-release-backmerge": "^3.1.0",
+    "@semantic-release/changelog": "^6.0.2",
     "@semantic-release/git": "^10.0.1",
-    "gradle-semantic-release-plugin": "^1.9.1",
-    "semantic-release": "^23.0.2"
+    "gradle-semantic-release-plugin": "^1.7.6",
+    "semantic-release": "^20.1.0"
   }
 }

settings.gradle.kts

@@ -1,7 +1,3 @@
-rootProject.name = "revanced-patches"
+include("dummy")
 
-buildCache {
-    local {
-        isEnabled = "CI" !in System.getenv()
-    }
-}
+rootProject.name = "revanced-patches"

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

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

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

@@ -1,49 +0,0 @@
-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 : PatchesFileGenerator {
-    override fun generate(patches: PatchSet) = patches.map {
-        JsonPatch(
-            it.name!!,
-            it.description,
-            it.compatiblePackages,
-            it.use,
-            it.requiresIntegrations,
-            it.options.values.map { option ->
-                JsonPatch.Option(
-                    option.key,
-                    option.default,
-                    option.values,
-                    option.title,
-                    option.description,
-                    option.required,
-                )
-            },
-        )
-    }.let {
-        File("patches.json").writeText(GsonBuilder().serializeNulls().create().toJson(it))
-    }
-
-    @Suppress("unused")
-    private class JsonPatch(
-        val name: String? = null,
-        val description: String? = null,
-        val compatiblePackages: Set<Patch.CompatiblePackage>? = null,
-        val use: Boolean = true,
-        val requiresIntegrations: Boolean = false,
-        val options: List<Option>,
-    ) {
-        class Option(
-            val key: String,
-            val default: Any?,
-            val values: Map<String, Any?>?,
-            val title: String?,
-            val description: String?,
-            val required: Boolean,
-        )
-    }
-}

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

@@ -1,12 +0,0 @@
-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

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

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

@@ -0,0 +1,67 @@
+package app.revanced.meta
+
+import app.revanced.patcher.extensions.PatchExtensions.compatiblePackages
+import app.revanced.patcher.extensions.PatchExtensions.dependencies
+import app.revanced.patcher.extensions.PatchExtensions.description
+import app.revanced.patcher.extensions.PatchExtensions.include
+import app.revanced.patcher.extensions.PatchExtensions.options
+import app.revanced.patcher.extensions.PatchExtensions.patchName
+import app.revanced.patcher.patch.PatchOption
+import com.google.gson.GsonBuilder
+import java.io.File
+
+internal class JsonGenerator : PatchesFileGenerator {
+    override fun generate(bundle: PatchBundlePatches) {
+        val patches = bundle.map {
+            JsonPatch(
+                it.patchName,
+                it.description ?: "This patch has no description.",
+                !it.include,
+                it.options?.map { option ->
+                    JsonPatch.Option(
+                        option.key,
+                        option.title,
+                        option.description,
+                        option.required,
+                        option.let { listOption ->
+                            if (listOption is PatchOption.ListOption<*>) {
+                                listOption.options.toMutableList().toTypedArray()
+                            } else null
+                        }
+                    )
+                }?.toTypedArray() ?: emptyArray(),
+                it.dependencies?.map { dep ->
+                    dep.java.patchName
+                }?.toTypedArray() ?: emptyArray(),
+                it.compatiblePackages?.map { pkg ->
+                    JsonPatch.CompatiblePackage(pkg.name, pkg.versions)
+                }?.toTypedArray() ?: emptyArray()
+            )
+        }
+
+        val json = File("patches.json")
+        json.writeText(GsonBuilder().serializeNulls().create().toJson(patches))
+    }
+
+    private class JsonPatch(
+        val name: String,
+        val description: String,
+        val excluded: Boolean,
+        val options: Array<Option>,
+        val dependencies: Array<String>,
+        val compatiblePackages: Array<CompatiblePackage>,
+    ) {
+        class CompatiblePackage(
+            val name: String,
+            val versions: Array<String>,
+        )
+
+        class Option(
+            val key: String,
+            val title: String,
+            val description: String,
+            val required: Boolean,
+            val choices: Array<*>?,
+        )
+    }
+}

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

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

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

@@ -1,42 +1,39 @@
-package app.revanced.patches.all.activity.exportall
+package app.revanced.patches.all.activity.exportall.patch
 
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotation.Patch
-
-@Patch(
-    name = "Export all activities",
-    description = "Makes all app activities exportable.",
-    use = false,
-)
-@Suppress("unused")
-object ExportAllActivitiesPatch : ResourcePatch() {
-    private const val EXPORTED_FLAG = "android:exported"
+import app.revanced.patcher.patch.annotations.Patch
 
+@Patch(false)
+@Name("Export all activities")
+@Description("Makes all app activities exportable.")
+class ExportAllActivitiesPatch : ResourcePatch {
     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)
                 }
             }
         }
     }
+
+    private companion object {
+        const val EXPORTED_FLAG = "android:exported"
+    }
 }

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

@@ -1,46 +1,29 @@
-package app.revanced.patches.all.connectivity.wifi.spoof
+package app.revanced.patches.all.connectivity.wifi.spoof.patch
 
-import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.annotations.RequiresIntegrations
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.all.misc.transformation.BaseTransformInstructionsPatch
-import app.revanced.patches.all.misc.transformation.IMethodCall
-import app.revanced.patches.all.misc.transformation.Instruction35cInfo
-import app.revanced.patches.all.misc.transformation.filterMapInstruction35c
+import app.revanced.util.patch.*
 import com.android.tools.smali.dexlib2.iface.ClassDef
 import com.android.tools.smali.dexlib2.iface.Method
 import com.android.tools.smali.dexlib2.iface.instruction.Instruction
+import java.util.*
 
-@Patch(
-    name = "Spoof Wi-Fi connection",
-    description = "Spoofs an existing Wi-Fi connection.",
-    use = false,
-    requiresIntegrations = true
-)
-@Suppress("unused")
-object SpoofWifiPatch : BaseTransformInstructionsPatch<Instruction35cInfo>() {
-    private const val INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX = "Lapp/revanced/integrations/all/connectivity/wifi/spoof/SpoofWifiPatch"
-    private const val INTEGRATIONS_CLASS_DESCRIPTOR = "$INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX;"
+@Patch(false)
+@Name("Spoof wifi connection")
+@Description("Spoofs an existing Wi-Fi connection.")
+@RequiresIntegrations
+class SpoofWifiPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
 
-    override fun filterMap(
-        classDef: ClassDef,
-        method: Method,
-        instruction: Instruction,
-        instructionIndex: Int
-    ) = filterMapInstruction35c<MethodCall>(
-        INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX,
-        classDef,
-        instruction,
-        instructionIndex
-    )
-
-    override fun transform(mutableMethod: MutableMethod, entry: Instruction35cInfo) {
-        val (methodType, instruction, instructionIndex) = entry
-        methodType.replaceInvokeVirtualWithIntegrations(INTEGRATIONS_CLASS_DESCRIPTOR, mutableMethod, instruction, instructionIndex)
+    private companion object {
+        const val INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX = "Lapp/revanced/all/connectivity/wifi/spoof/SpoofWifiPatch"
+        const val INTEGRATIONS_CLASS_DESCRIPTOR = "${INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX};"
     }
 
-
     // Information about method calls we want to replace
-    private enum class MethodCall(
+    enum class MethodCall(
         override val definedClassName: String,
         override val methodName: String,
         override val methodParams: Array<String>,
@@ -203,4 +186,21 @@ object SpoofWifiPatch : BaseTransformInstructionsPatch<Instruction35cInfo>() {
             "V",
         );
     }
+
+    override fun filterMap(
+        classDef: ClassDef,
+        method: Method,
+        instruction: Instruction,
+        instructionIndex: Int
+    ) = filterMapInstruction35c<MethodCall>(
+        INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX,
+        classDef,
+        instruction,
+        instructionIndex
+    )
+
+    override fun transform(mutableMethod: MutableMethod, entry: Instruction35cInfo) {
+        val (methodType, instruction, instructionIndex) = entry
+        methodType.replaceInvokeVirtualWithIntegrations(INTEGRATIONS_CLASS_DESCRIPTOR, mutableMethod, instruction, instructionIndex)
+    }
 }

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

@@ -1,18 +1,15 @@
-package app.revanced.patches.all.interaction.gestures
+package app.revanced.patches.all.interaction.gestures.patch
 
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotation.Patch
-
-@Patch(
-    name = "Predictive back gesture",
-    description = "Enables the predictive back gesture introduced on Android 13.",
-    use = false,
-)
-@Suppress("unused")
-object PredictiveBackGesturePatch : ResourcePatch() {
-    private const val FLAG = "android:enableOnBackInvokedCallback"
+import app.revanced.patcher.patch.annotations.Patch
 
+@Patch(false)
+@Name("Predictive back gesture")
+@Description("Enables the predictive back gesture introduced on Android 13.")
+class PredictiveBackGesturePatch : ResourcePatch {
     override fun execute(context: ResourceContext) {
         context.xmlEditor["AndroidManifest.xml"].use { editor ->
             val document = editor.file
@@ -23,7 +20,12 @@ object PredictiveBackGesturePatch : ResourcePatch() {
                 document.createAttribute(FLAG)
                     .apply { value = "true" }
                     .let(attributes::setNamedItem)
+
             }
         }
     }
+
+    private companion object {
+        const val FLAG = "android:enableOnBackInvokedCallback"
+    }
 }

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

@@ -1,28 +0,0 @@
-package app.revanced.patches.all.misc.debugging
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotation.Patch
-import org.w3c.dom.Element
-
-@Patch(
-    name = "Enable Android debugging",
-    description = "Enables Android debugging capabilities. This can slow down the app.",
-    use = false,
-)
-@Suppress("unused")
-object EnableAndroidDebuggingPatch : ResourcePatch() {
-    override fun execute(context: ResourceContext) {
-        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/debugging/patch/EnableAndroidDebuggingPatch.kt

@@ -0,0 +1,26 @@
+package app.revanced.patches.all.misc.debugging.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.*
+import app.revanced.patcher.patch.annotations.Patch
+import org.w3c.dom.Element
+
+@Patch(false)
+@Name("Enable android debugging")
+@Description("Enables Android debugging capabilities. This can slow down the app.")
+class EnableAndroidDebuggingPatch : ResourcePatch {
+    override fun execute(context: ResourceContext) {
+        context.xmlEditor["AndroidManifest.xml"].use { dom ->
+            val applicationNode = dom
+                .file
+                .getElementsByTagName("application")
+                .item(0) as Element
+
+            // set application as debuggable
+            applicationNode.setAttribute("android:debuggable", "true")
+        }
+    }
+
+}

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

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

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

@@ -1,70 +0,0 @@
-package app.revanced.patches.all.misc.packagename
-
-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.stringPatchOption
-import app.revanced.patcher.patch.options.PatchOptionException
-import org.w3c.dom.Element
-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,
-)
-@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 lateinit var context: ResourceContext
-
-    override fun execute(context: ResourceContext) {
-        this.context = context
-    }
-
-    /**
-     * Set the package name to use.
-     * If this is called multiple times, the first call will set the package name.
-     *
-     * @param fallbackPackageName The package name to use if the user has not already specified a package name.
-     * @return The package name that was set.
-     * @throws PatchOptionException.ValueValidationException If the package name is invalid.
-     */
-    fun setOrGetFallbackPackageName(fallbackPackageName: String): String {
-        val packageName = packageNameOption.value!!
-
-        return if (packageName == packageNameOption.default) {
-            fallbackPackageName.also { packageNameOption.value = it }
-        } else {
-            packageName
-        }
-    }
-
-    override fun close() =
-        context.xmlEditor["AndroidManifest.xml"].use { editor ->
-            val document = editor.file
-
-            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/packagename/patch/ChangePackageNamePatch.kt

@@ -0,0 +1,50 @@
+package app.revanced.patches.all.misc.packagename.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.*
+import app.revanced.patcher.patch.annotations.Patch
+import org.w3c.dom.Element
+
+@Patch(false)
+@Name("Change package name")
+@Description("Changes the package name. Appends \".revanced\" to the package name by default.")
+class ChangePackageNamePatch : ResourcePatch {
+    override fun execute(context: ResourceContext) {
+        val packageNameToUse = packageName ?: getDefaultPackageName(context)
+
+        val packageNameRegex = Regex("^[a-z]\\w*(\\.[a-z]\\w*)+\$")
+        if (!packageNameToUse.matches(packageNameRegex))
+            throw PatchException("Invalid package name")
+
+        val originalPackageName = getOriginalPackageName(context)
+
+        context["AndroidManifest.xml"].apply {
+            readText().replace(originalPackageName, packageNameToUse).let(::writeText)
+        }
+    }
+
+    private fun getDefaultPackageName(context: ResourceContext): String {
+        val originalPackageName = getOriginalPackageName(context)
+        return "$originalPackageName.revanced"
+    }
+
+    private fun getOriginalPackageName(context: ResourceContext): String {
+        context.xmlEditor["AndroidManifest.xml"].use { editor ->
+            val manifest = editor.file.getElementsByTagName("manifest").item(0) as Element
+            return manifest.getAttribute("package")
+        }
+    }
+
+    companion object : OptionsContainer() {
+        var packageName: String? by option(
+            PatchOption.StringOption(
+                key = "packageName",
+                default = null,
+                title = "Package name",
+                description = "The name of the package to rename the app to.",
+            )
+        )
+    }
+}

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

@@ -1,290 +0,0 @@
-package app.revanced.patches.all.misc.resources
-
-import app.revanced.patcher.PatchClass
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchException
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patcher.util.DomFileEditor
-import app.revanced.patches.all.misc.resources.AddResourcesPatch.resources
-import app.revanced.util.*
-import app.revanced.util.resource.ArrayResource
-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`.
- */
-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.
- */
-private typealias Resources = MutableMap<AppId, AppResources>
-
-/**
- * The value of a resource.
- * For example, `values` or `values-de`.
- */
-private typealias Value = String
-
-@Patch(description = "Add resources such as strings or arrays to the app.")
-object AddResourcesPatch : ResourcePatch(), MutableMap<Value, MutableSet<BaseResource>> by mutableMapOf(), Closeable {
-    private lateinit var context: ResourceContext
-
-    /**
-     * A map of all resources associated by their value staged by [execute].
-     */
-    private lateinit var resources: Map<Value, Resources>
-
-    /*
-    The strategy of this patch is to stage resources present in `/resources/addresources`.
-    These resources are organized by their respective value and patch.
-
-    On AddResourcesPatch#execute, all resources are staged in a temporary map.
-    After that, other patches that depend on AddResourcesPatch can call
-    AddResourcesPatch#invoke(PatchClass) to stage resources belonging to that patch
-    from the temporary map to AddResourcesPatch.
-
-    After all patches that depend on AddResourcesPatch have been executed,
-    AddResourcesPatch#close is finally called to add all staged resources to the app.
-     */
-    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 { editor ->
-                                val document = editor.file
-
-                                document.getElementsByTagName("app").asSequence().forEach { app ->
-                                    val appId = app.attributes.getNamedItem("id").textContent
-
-                                    getOrPut(appId, ::mutableMapOf).apply {
-                                        app.forEachChildElement { patch ->
-                                            val patchId = patch.attributes.getNamedItem("id").textContent
-
-                                            getOrPut(patchId, ::mutableSetOf).apply {
-                                                patch.forEachChildElement { resourceNode ->
-                                                    val resource = transform(resourceNode)
-
-                                                    add(resource)
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-
-                // 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)
-                    }
-                    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)
-                }
-            }
-    }
-
-    /**
-     * Adds a [BaseResource] to the map using [MutableMap.getOrPut].
-     *
-     * @param value The value of the resource. For example, `values` or `values-de`.
-     * @param resource The resource to add.
-     *
-     * @return True if the resource was added, false if it already existed.
-     */
-    operator fun invoke(
-        value: Value,
-        resource: BaseResource,
-    ) = getOrPut(value, ::mutableSetOf).add(resource)
-
-    /**
-     * Adds a list of [BaseResource]s to the map using [MutableMap.getOrPut].
-     *
-     * @param value The value of the resource. For example, `values` or `values-de`.
-     * @param resources The resources to add.
-     *
-     * @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)
-
-    /**
-     * Adds a [StringResource].
-     *
-     * @param name The name of the string resource.
-     * @param value The value of the string resource.
-     * @param formatted Whether the string resource is formatted. Defaults to `true`.
-     * @param resourceValue The value of the resource. For example, `values` or `values-de`.
-     *
-     * @return True if the resource was added, false if it already existed.
-     */
-    operator fun invoke(
-        name: String,
-        value: String,
-        formatted: Boolean = true,
-        resourceValue: Value = "values",
-    ) = invoke(resourceValue, StringResource(name, value, formatted))
-
-    /**
-     * Adds an [ArrayResource].
-     *
-     * @param name The name of the array resource.
-     * @param items The items of the array resource.
-     *
-     * @return True if the resource was added, false if it already existed.
-     */
-    operator fun invoke(
-        name: String,
-        items: List<String>,
-    ) = invoke("values", ArrayResource(name, items))
-
-    /**
-     * Puts all resources of any [Value] staged in [resources] for the given [PatchClass] to [AddResourcesPatch].
-     *
-     * @param patch The class of the patch to add resources for.
-     * @param parseIds A function that parses the [AppId] and [PatchId] from the given [PatchClass].
-     * This is used to access the resources in [resources] to stage them in [AddResourcesPatch].
-     * The default implementation assumes that the [PatchClass] qualified name has the following format:
-     * `<any>.<any>.<any>.<app id>.<patch id>`.
-     *
-     * @return True if any resources were added, false if none were added.
-     *
-     * @see AddResourcesPatch.close
-     */
-    operator fun invoke(
-        patch: PatchClass,
-        parseIds: PatchClass.() -> Pair<AppId, PatchId> = {
-            val qualifiedName = qualifiedName ?: throw PatchException("Patch qualified name is null")
-
-            // This requires qualifiedName to have the following format:
-            // `<any>.<any>.<any>.<app id>.<patch id>`
-            with(qualifiedName.split(".")) {
-                if (size < 5) throw PatchException("Patch qualified name has invalid format")
-
-                val appId = this[3]
-                val patchId = subList(4, size).joinToString(".")
-
-                appId to patchId
-            }
-        },
-    ): Boolean {
-        val (appId, patchId) = patch.parseIds()
-
-        var result = false
-
-        // 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
-            }
-        }
-
-        return result
-    }
-
-    /**
-     * Adds all resources staged in [AddResourcesPatch] to the app.
-     * This is called after all patches that depend on [AddResourcesPatch] have been executed.
-     */
-    override fun close() {
-        operator fun MutableMap<String, Pair<DomFileEditor, Node>>.invoke(
-            value: Value,
-            resource: BaseResource,
-        ) {
-            // TODO: Fix open-closed principle violation by modifying BaseResource#serialize so that it accepts
-            //  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.get("res/$value/$resourceFileName.xml").also {
-                        it.parentFile?.mkdirs()
-                        it.createNewFile()
-                    }
-
-                context.xmlEditor[targetFile.path].let { editor ->
-                    val document = editor.file
-
-                    // Save the target node here as well
-                    // 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) }
-            }
-        }
-
-        forEach { (value, resources) ->
-            // 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 documents for the current resource value.
-            val documents = mutableMapOf<String, Pair<DomFileEditor, Node>>()
-
-            resources.forEach { resource -> documents(value, resource) }
-
-            documents.values.forEach { (document, _) -> document.close() }
-        }
-    }
-}

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

@@ -1,24 +0,0 @@
-package app.revanced.patches.all.screencapture.removerestriction
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotation.Patch
-import org.w3c.dom.Element
-
-@Patch(description = "Sets allowAudioPlaybackCapture in manifest to true.")
-internal object RemoveCaptureRestrictionResourcePatch : ResourcePatch() {
-    override fun execute(context: ResourceContext) {
-        context.xmlEditor["AndroidManifest.xml"].use { editor ->
-            val document = editor.file
-
-            // get the application node
-            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/screencapture/removerestriction/bytecode/patch/RemoveCaptureRestrictionPatch.kt

@@ -1,27 +1,26 @@
-package app.revanced.patches.all.screencapture.removerestriction
+package app.revanced.patches.all.screencapture.removerestriction.bytecode.patch
 
-import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.annotations.RequiresIntegrations
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.all.misc.transformation.BaseTransformInstructionsPatch
-import app.revanced.patches.all.misc.transformation.IMethodCall
-import app.revanced.patches.all.misc.transformation.Instruction35cInfo
-import app.revanced.patches.all.misc.transformation.filterMapInstruction35c
+import app.revanced.patches.all.screencapture.removerestriction.resource.patch.RemoveCaptureRestrictionResourcePatch
+import app.revanced.util.patch.AbstractTransformInstructionsPatch
+import app.revanced.util.patch.IMethodCall
+import app.revanced.util.patch.Instruction35cInfo
+import app.revanced.util.patch.filterMapInstruction35c
 import com.android.tools.smali.dexlib2.iface.ClassDef
 import com.android.tools.smali.dexlib2.iface.Method
 import com.android.tools.smali.dexlib2.iface.instruction.Instruction
 
-@Patch(
-    name = "Remove screen capture restriction",
-    description = "Removes the restriction of capturing audio from apps that normally wouldn't allow it.",
-    dependencies = [RemoveCaptureRestrictionResourcePatch::class],
-    use = false,
-    requiresIntegrations = true
-)
-@Suppress("unused")
-object RemoveCaptureRestrictionPatch : BaseTransformInstructionsPatch<Instruction35cInfo>() {
-    private const val INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX =
-        "Lapp/revanced/integrations/all/screencapture/removerestriction/RemoveScreencaptureRestrictionPatch"
-    private const val INTEGRATIONS_CLASS_DESCRIPTOR = "$INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX;"
+@Patch(false)
+@Name("Remove screen capture restriction")
+@Description("Removes the restriction of capturing audio from apps that normally wouldn't allow it.")
+@DependsOn([RemoveCaptureRestrictionResourcePatch::class])
+@RequiresIntegrations
+class RemoveCaptureRestrictionPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
     // Information about method calls we want to replace
     enum class MethodCall(
         override val definedClassName: String,
@@ -59,4 +58,10 @@ object RemoveCaptureRestrictionPatch : BaseTransformInstructionsPatch<Instructio
         val (methodType, instruction, instructionIndex) = entry
         methodType.replaceInvokeVirtualWithIntegrations(INTEGRATIONS_CLASS_DESCRIPTOR, mutableMethod, instruction, instructionIndex)
     }
+
+    private companion object {
+        const val INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX =
+            "Lapp/revanced/all/screencapture/removerestriction/RemoveScreencaptureRestrictionPatch"
+        const val INTEGRATIONS_CLASS_DESCRIPTOR = "$INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX;"
+    }
 }

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

@@ -0,0 +1,23 @@
+package app.revanced.patches.all.screencapture.removerestriction.resource.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.ResourcePatch
+import org.w3c.dom.Element
+
+@Description("Sets allowAudioPlaybackCapture in manifest to true.")
+internal class RemoveCaptureRestrictionResourcePatch : ResourcePatch {
+    override fun execute(context: ResourceContext) {
+        // create an xml editor instance
+        context.xmlEditor["AndroidManifest.xml"].use { dom ->
+            // get the application node
+            val applicationNode = dom
+                .file
+                .getElementsByTagName("application")
+                .item(0) as Element
+
+            // set allowAudioPlaybackCapture attribute to true
+            applicationNode.setAttribute("android:allowAudioPlaybackCapture", "true")
+        }
+    }
+}

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

@@ -1,106 +0,0 @@
-package app.revanced.patches.all.screenshot.removerestriction
-
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-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.Instruction35cInfo
-import app.revanced.patches.all.misc.transformation.filterMapInstruction35c
-import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.iface.ClassDef
-import com.android.tools.smali.dexlib2.iface.Method
-import com.android.tools.smali.dexlib2.iface.instruction.Instruction
-import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction22c
-import com.android.tools.smali.dexlib2.iface.reference.FieldReference
-
-@Patch(
-    name = "Remove screenshot restriction",
-    description = "Removes the restriction of taking screenshots in apps that normally wouldn't allow it.",
-    use = false,
-    requiresIntegrations = true,
-)
-@Suppress("unused")
-object RemoveScreenshotRestrictionPatch : BaseTransformInstructionsPatch<Instruction35cInfo>() {
-    private const val INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX =
-            "Lapp/revanced/integrations/all/screenshot/removerestriction/RemoveScreenshotRestrictionPatch"
-    private const val INTEGRATIONS_CLASS_DESCRIPTOR = "$INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX;"
-
-    override fun execute(context: BytecodeContext) {
-        super.execute(context)
-        ModifyLayoutParamsFlags().execute(context)
-    }
-
-    override fun filterMap(
-        classDef: ClassDef,
-        method: Method,
-        instruction: Instruction,
-        instructionIndex: Int
-    ) = filterMapInstruction35c<MethodCall>(
-        INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX,
-        classDef,
-        instruction,
-        instructionIndex
-    )
-
-    override fun transform(mutableMethod: MutableMethod, entry: Instruction35cInfo) {
-        val (methodType, instruction, instructionIndex) = entry
-        methodType.replaceInvokeVirtualWithIntegrations(INTEGRATIONS_CLASS_DESCRIPTOR, mutableMethod, instruction, instructionIndex)
-    }
-
-    // Information about method calls we want to replace
-    enum class MethodCall(
-        override val definedClassName: String,
-        override val methodName: String,
-        override val methodParams: Array<String>,
-        override val returnType: String
-    ): IMethodCall {
-        AddFlags(
-            "Landroid/view/Window;",
-            "addFlags",
-            arrayOf("I"),
-            "V",
-        ),
-        SetFlags(
-            "Landroid/view/Window;",
-            "setFlags",
-            arrayOf("I", "I"),
-            "V",
-        );
-    }
-}
-
-private class ModifyLayoutParamsFlags : BaseTransformInstructionsPatch<Pair<Instruction22c, Int>>() {
-    override fun filterMap(
-        classDef: ClassDef,
-        method: Method,
-        instruction: Instruction,
-        instructionIndex: Int
-    ): Pair<Instruction22c, Int>? {
-        if (instruction.opcode != Opcode.IPUT) {
-            return null
-        }
-
-        val instruction22c = instruction as Instruction22c
-        val fieldReference = instruction22c.reference as FieldReference
-
-        if (fieldReference.definingClass != "Landroid/view/WindowManager\$LayoutParams;"
-            || fieldReference.name != "flags"
-            || fieldReference.type != "I") {
-            return null
-        }
-
-        return Pair(instruction22c, instructionIndex)
-    }
-
-    override fun transform(mutableMethod: MutableMethod, entry: Pair<Instruction22c, Int>) {
-        val (instruction, index) = entry
-        val register = instruction.registerA
-
-        mutableMethod.addInstructions(
-            index,
-            "and-int/lit16 v$register, v$register, -0x2001"
-        )
-    }
-}

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

@@ -0,0 +1,59 @@
+package app.revanced.patches.all.screenshot.removerestriction.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.annotations.RequiresIntegrations
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import app.revanced.util.patch.AbstractTransformInstructionsPatch
+import app.revanced.util.patch.IMethodCall
+import app.revanced.util.patch.Instruction35cInfo
+import app.revanced.util.patch.filterMapInstruction35c
+import com.android.tools.smali.dexlib2.iface.ClassDef
+import com.android.tools.smali.dexlib2.iface.Method
+import com.android.tools.smali.dexlib2.iface.instruction.Instruction
+
+@Patch(false)
+@Name("Remove screenshot restriction")
+@Description("Removes the restriction of taking screenshots in apps that normally wouldn't allow it.")
+@RequiresIntegrations
+class RemoveScreenshotRestrictionPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
+
+    private companion object {
+        const val INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX =
+            "Lapp/revanced/all/screenshot/removerestriction/RemoveScreenshotRestrictionPatch"
+        const val INTEGRATIONS_CLASS_DESCRIPTOR = "$INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX;"
+    }
+
+    // Information about method calls we want to replace
+    enum class MethodCall(
+        override val definedClassName: String,
+        override val methodName: String,
+        override val methodParams: Array<String>,
+        override val returnType: String
+    ): IMethodCall {
+        SetFlags(
+            "Landroid/view/Window;",
+            "setFlags",
+            arrayOf("I", "I"),
+            "V",
+        );
+    }
+
+    override fun filterMap(
+        classDef: ClassDef,
+        method: Method,
+        instruction: Instruction,
+        instructionIndex: Int
+    ) = filterMapInstruction35c<MethodCall>(
+        INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX,
+        classDef,
+        instruction,
+        instructionIndex
+    )
+
+    override fun transform(mutableMethod: MutableMethod, entry: Instruction35cInfo) {
+        val (methodType, instruction, instructionIndex) = entry
+        methodType.replaceInvokeVirtualWithIntegrations(INTEGRATIONS_CLASS_DESCRIPTOR, mutableMethod, instruction, instructionIndex)
+    }
+}

src/main/kotlin/app/revanced/patches/all/telephony/sim/spoof/SpoofSimCountryPatch.kt

@@ -1,113 +0,0 @@
-package app.revanced.patches.all.telephony.sim.spoof
-
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.stringPatchOption
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.all.misc.transformation.BaseTransformInstructionsPatch
-import com.android.tools.smali.dexlib2.iface.ClassDef
-import com.android.tools.smali.dexlib2.iface.Method
-import com.android.tools.smali.dexlib2.iface.instruction.Instruction
-import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
-import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
-import com.android.tools.smali.dexlib2.iface.reference.MethodReference
-import com.android.tools.smali.dexlib2.immutable.reference.ImmutableMethodReference
-import com.android.tools.smali.dexlib2.util.MethodUtil
-import java.util.*
-
-
-@Patch(
-    name = "Spoof SIM country",
-    description = "Spoofs country information returned by the SIM card provider.",
-    use = false,
-)
-@Suppress("unused")
-object SpoofSimCountryPatch : BaseTransformInstructionsPatch<Pair<Int, String>>() {
-    private val countries = Locale.getISOCountries().associateBy { Locale("", it).displayCountry }
-
-    private val networkCountryIso by isoCountryPatchOption(
-        "networkCountryIso",
-        "Network ISO Country Code",
-    )
-
-    private val simCountryIso by isoCountryPatchOption(
-        "simCountryIso",
-        "Sim ISO Country Code",
-    )
-
-    private fun isoCountryPatchOption(
-        key: String,
-        title: String,
-    ) = stringPatchOption(
-        key,
-        null,
-        countries,
-        title,
-        "ISO-3166-1 alpha-2 country code equivalent for the SIM provider's country code.",
-        false,
-        validator = { it: String? -> it == null || it.uppercase() in countries.values }
-    )
-
-    override fun filterMap(
-        classDef: ClassDef,
-        method: Method,
-        instruction: Instruction,
-        instructionIndex: Int
-    ): Pair<Int, String>? {
-        if (instruction !is ReferenceInstruction) return null
-
-        val reference = instruction.reference as? MethodReference ?: return null
-
-        val match = MethodCall.entries.firstOrNull { search ->
-            MethodUtil.methodSignaturesMatch(reference, search.reference)
-        } ?: return null
-
-        val iso = when (match) {
-            MethodCall.NetworkCountryIso -> networkCountryIso
-            MethodCall.SimCountryIso -> simCountryIso
-        }?.lowercase()
-
-        return iso?.let { instructionIndex to it }
-    }
-
-    override fun transform(
-        mutableMethod: MutableMethod,
-        entry: Pair<Int, String>
-    ) = transformMethodCall(entry, mutableMethod)
-
-    private fun transformMethodCall(
-        entry: Pair<Int, String>,
-        mutableMethod: MutableMethod
-    ) {
-        val (instructionIndex, methodCallValue) = entry
-
-        val register = mutableMethod.getInstruction<OneRegisterInstruction>(instructionIndex + 1).registerA
-
-        mutableMethod.replaceInstruction(
-            instructionIndex + 1,
-            "const-string v$register, \"$methodCallValue\""
-        )
-    }
-
-    private enum class MethodCall(
-        val reference: MethodReference
-    ) {
-        NetworkCountryIso(
-            ImmutableMethodReference(
-            "Landroid/telephony/TelephonyManager;",
-            "getNetworkCountryIso",
-            emptyList(),
-            "Ljava/lang/String;"
-            )
-        ),
-        SimCountryIso(
-            ImmutableMethodReference(
-            "Landroid/telephony/TelephonyManager;",
-            "getSimCountryIso",
-            emptyList(),
-            "Ljava/lang/String;"
-            )
-        )
-    }
-}

src/main/kotlin/app/revanced/patches/backdrops/misc/pro/annotations/ProUnlockCompatibility.kt

@@ -0,0 +1,7 @@
+package app.revanced.patches.backdrops.misc.pro.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("com.backdrops.wallpapers", arrayOf("4.52"))])
+internal annotation class ProUnlockCompatibility

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

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

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

@@ -1,22 +1,23 @@
-package app.revanced.patches.backdrops.misc.pro
+package app.revanced.patches.backdrops.misc.pro.patch
 
-import app.revanced.util.exception
+import app.revanced.extensions.exception
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotation.CompatiblePackage
-import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.backdrops.misc.pro.annotations.ProUnlockCompatibility
 import app.revanced.patches.backdrops.misc.pro.fingerprints.ProUnlockFingerprint
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 
-@Patch(
-    name = "Pro unlock",
-    compatiblePackages = [CompatiblePackage("com.backdrops.wallpapers", ["4.52"])]
-)
-@Suppress("unused")
-object ProUnlockPatch : BytecodePatch(
-    setOf(ProUnlockFingerprint)
+@Patch
+@Name("Pro unlock")
+@Description("Unlocks pro-only functions.")
+@ProUnlockCompatibility
+class ProUnlockPatch : BytecodePatch(
+    listOf(ProUnlockFingerprint)
 ) {
     override fun execute(context: BytecodeContext) {
         ProUnlockFingerprint.result?.let { result ->

src/main/kotlin/app/revanced/patches/candylinkvpn/annotations/UnlockProCompatibility.kt

@@ -0,0 +1,8 @@
+package app.revanced.patches.candylinkvpn.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("com.candylink.openvpn")])
+@Target(AnnotationTarget.CLASS)
+internal annotation class UnlockProCompatibility

src/main/kotlin/app/revanced/patches/candylinkvpn/fingerprints/IsPremiumPurchasedFingerprint.kt

@@ -1,8 +1,8 @@
 package app.revanced.patches.candylinkvpn.fingerprints
 
-import app.revanced.patcher.fingerprint.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 
-internal object IsPremiumPurchasedFingerprint : MethodFingerprint(
+object IsPremiumPurchasedFingerprint : MethodFingerprint(
     customFingerprint = { methodDef, _ ->
         methodDef.definingClass.endsWith("PreferenceProvider;") &&
                 methodDef.name == "isPremiumPurchased"

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

@@ -1,20 +1,21 @@
-package app.revanced.patches.candylinkvpn
+package app.revanced.patches.candylinkvpn.patch
 
-import app.revanced.util.exception
+import app.revanced.extensions.exception
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotation.CompatiblePackage
-import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.candylinkvpn.annotations.UnlockProCompatibility
 import app.revanced.patches.candylinkvpn.fingerprints.IsPremiumPurchasedFingerprint
 
-@Patch(
-    name = "Unlock pro",
-    compatiblePackages = [CompatiblePackage("com.candylink.openvpn")]
-)
-@Suppress("unused")
-object UnlockProPatch : BytecodePatch(
-    setOf(IsPremiumPurchasedFingerprint)
+@Patch
+@Name("Unlock pro")
+@Description("Unlocks premium features.")
+@UnlockProCompatibility
+class UnlockProPatch : BytecodePatch(
+    listOf(IsPremiumPurchasedFingerprint)
 ) {
     override fun execute(context: BytecodeContext) {
         IsPremiumPurchasedFingerprint.result?.mutableMethod?.addInstructions(

src/main/kotlin/app/revanced/patches/cieid/restrictions/root/BypassRootChecksPatch.kt

@@ -1,24 +0,0 @@
-package app.revanced.patches.cieid.restrictions.root
-
-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.cieid.restrictions.root.fingerprints.CheckRootFingerprint
-
-@Patch(
-    name = "Bypass root checks",
-    description = "Removes the restriction to use the app with root permissions or on a custom ROM.",
-    compatiblePackages = [CompatiblePackage("it.ipzs.cieid")]
-)
-@Suppress("unused")
-object BypassRootChecksPatch : BytecodePatch(
-    setOf(CheckRootFingerprint)
-) {
-    override fun execute(context: BytecodeContext) {
-        CheckRootFingerprint.result?.mutableMethod?.addInstruction(1, "return-void")
-            ?: throw CheckRootFingerprint.exception
-    }
-}

src/main/kotlin/app/revanced/patches/cieid/restrictions/root/fingerprints/CheckRootFingerprint.kt

@@ -1,9 +0,0 @@
-package app.revanced.patches.cieid.restrictions.root.fingerprints
-
-import app.revanced.patcher.fingerprint.MethodFingerprint
-
-internal object CheckRootFingerprint : MethodFingerprint(
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass == "Lit/ipzs/cieid/BaseActivity;" && methodDef.name == "onResume"
-    }
-)

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

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

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

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

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

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

src/main/kotlin/app/revanced/patches/facebook/ads/story/HideStoryAdsPatch.kt

@@ -1,26 +0,0 @@
-package app.revanced.patches.facebook.ads.story
-
-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.facebook.ads.story.fingerprints.AdsInsertionFingerprint
-import app.revanced.patches.facebook.ads.story.fingerprints.FetchMoreAdsFingerprint
-
-@Patch(
-    name = "Hide story ads",
-    description = "Hides the ads in the Facebook app stories.",
-    compatiblePackages = [CompatiblePackage("com.facebook.katana")]
-)
-@Suppress("unused")
-object HideStoryAdsPatch : BytecodePatch(
-    setOf(FetchMoreAdsFingerprint, AdsInsertionFingerprint)
-) {
-    override fun execute(context: BytecodeContext) =
-        setOf(FetchMoreAdsFingerprint, AdsInsertionFingerprint).forEach { fingerprint ->
-            fingerprint.result?.mutableMethod?.replaceInstruction(0, "return-void")
-                ?: throw fingerprint.exception
-        }
-}

src/main/kotlin/app/revanced/patches/facebook/ads/story/fingerprints/AdsInsertionFingerprint.kt

@@ -1,3 +0,0 @@
-package app.revanced.patches.facebook.ads.story.fingerprints
-
-internal object AdsInsertionFingerprint : FieldMethodFingerprint(fieldValue = "AdBucketDataSourceUtil\$attemptAdsInsertion\$1")

src/main/kotlin/app/revanced/patches/facebook/ads/story/fingerprints/FetchMoreAdsFingerprint.kt

@@ -1,3 +0,0 @@
-package app.revanced.patches.facebook.ads.story.fingerprints
-
-internal object FetchMoreAdsFingerprint : FieldMethodFingerprint(fieldValue = "AdBucketDataSourceUtil\$attemptFetchMoreAds\$1")

src/main/kotlin/app/revanced/patches/facebook/ads/story/fingerprints/FieldMethodFingerprint.kt

@@ -1,15 +0,0 @@
-package app.revanced.patches.facebook.ads.story.fingerprints
-
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import com.android.tools.smali.dexlib2.iface.value.StringEncodedValue
-
-internal abstract class FieldMethodFingerprint(fieldValue: String) : MethodFingerprint(
-    returnType = "V",
-    parameters = listOf(),
-    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 == fieldValue
-        }
-    }
-)

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

@@ -1,11 +1,11 @@
 package app.revanced.patches.finanzonline.detection.bootloader.fingerprints
 
-import app.revanced.patcher.fingerprint.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 
 // Located @ at.gv.bmf.bmf2go.taxequalization.tools.utils.AttestationHelper#isBootStateOk (3.0.1)
-internal object BootStateFingerprint : MethodFingerprint(
+object BootStateFingerprint : MethodFingerprint(
     "Z",
     accessFlags = AccessFlags.PUBLIC.value,
     opcodes = listOf(

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

@@ -1,10 +1,10 @@
 package app.revanced.patches.finanzonline.detection.bootloader.fingerprints
 
-import app.revanced.patcher.fingerprint.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 
 // Located @ at.gv.bmf.bmf2go.taxequalization.tools.utils.AttestationHelper#createKey (3.0.1)
-internal object CreateKeyFingerprint : MethodFingerprint(
+object CreateKeyFingerprint : MethodFingerprint(
     "Z",
     accessFlags = AccessFlags.PUBLIC.value,
     strings = listOf("attestation", "SHA-256", "random", "EC", "AndroidKeyStore")

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

@@ -1,23 +1,23 @@
-package app.revanced.patches.finanzonline.detection.bootloader
+package app.revanced.patches.finanzonline.detection.bootloader.patch
 
-import app.revanced.util.exception
+import app.revanced.extensions.exception
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotation.CompatiblePackage
-import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.finanzonline.detection.bootloader.fingerprints.BootStateFingerprint
 import app.revanced.patches.finanzonline.detection.bootloader.fingerprints.CreateKeyFingerprint
+import app.revanced.patches.finanzonline.detection.shared.annotations.DetectionCompatibility
 
 
-@Patch(
-    name = "Remove bootloader detection",
-    description = "Removes the check for an unlocked bootloader.",
-    compatiblePackages = [CompatiblePackage("at.gv.bmf.bmf2go")]
-)
-@Suppress("unused")
-object BootloaderDetectionPatch : BytecodePatch(
-    setOf(CreateKeyFingerprint, BootStateFingerprint)
+@Patch
+@Name("Remove bootloader detection")
+@Description("Removes the check for an unlocked bootloader.")
+@DetectionCompatibility
+class BootloaderDetectionPatch : BytecodePatch(
+    listOf(CreateKeyFingerprint, BootStateFingerprint)
 ) {
     override fun execute(context: BytecodeContext) {
         arrayOf(CreateKeyFingerprint, BootStateFingerprint).forEach { fingerprint ->

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

@@ -1,12 +1,12 @@
 package app.revanced.patches.finanzonline.detection.root.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 
 // Located @ at.gv.bmf.bmf2go.taxequalization.tools.utils.RootDetection#isRooted (3.0.1)
-internal object RootDetectionFingerprint : MethodFingerprint(
+object RootDetectionFingerprint : MethodFingerprint(
     "L",
     accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
     parameters = listOf("L"),

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

@@ -1,21 +1,21 @@
-package app.revanced.patches.finanzonline.detection.root
+package app.revanced.patches.finanzonline.detection.root.patch
 
-import app.revanced.util.exception
+import app.revanced.extensions.exception
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotation.CompatiblePackage
-import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.finanzonline.detection.root.fingerprints.RootDetectionFingerprint
+import app.revanced.patches.finanzonline.detection.shared.annotations.DetectionCompatibility
 
-@Patch(
-    name = "Remove root detection",
-    description = "Removes the check for root permissions.",
-    compatiblePackages = [CompatiblePackage("at.gv.bmf.bmf2go")]
-)
-@Suppress("unused")
-object RootDetectionPatch : BytecodePatch(
-    setOf(RootDetectionFingerprint)
+@Patch
+@Name("Remove root detection")
+@Description("Removes the check for root permissions.")
+@DetectionCompatibility
+class RootDetectionPatch : BytecodePatch(
+    listOf(RootDetectionFingerprint)
 ) {
     override fun execute(context: BytecodeContext) {
         RootDetectionFingerprint.result?.mutableMethod?.addInstructions(

src/main/kotlin/app/revanced/patches/finanzonline/detection/shared/annotations/DetectionCompatibility.kt

@@ -0,0 +1,8 @@
+package app.revanced.patches.finanzonline.detection.shared.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("at.gv.bmf.bmf2go")])
+@Target(AnnotationTarget.CLASS)
+internal annotation class DetectionCompatibility

src/main/kotlin/app/revanced/patches/googlerecorder/restrictions/fingerprints/OnApplicationCreateFingerprint.kt

@@ -1,8 +1,8 @@
 package app.revanced.patches.googlerecorder.restrictions.fingerprints
 
-import app.revanced.patcher.fingerprint.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 
-internal object OnApplicationCreateFingerprint : MethodFingerprint(
+object OnApplicationCreateFingerprint : MethodFingerprint(
     strings = listOf("com.google.android.feature.PIXEL_2017_EXPERIENCE"),
     customFingerprint = custom@{ methodDef, classDef ->
         if (methodDef.name != "onCreate") return@custom false

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

@@ -1,24 +1,25 @@
-package app.revanced.patches.googlerecorder.restrictions
+package app.revanced.patches.googlerecorder.restrictions.patch
 
-import app.revanced.util.exception
+import app.revanced.extensions.exception
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Package
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.removeInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotation.CompatiblePackage
-import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.googlerecorder.restrictions.fingerprints.OnApplicationCreateFingerprint
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 
-@Patch(
-    name = "Remove device restrictions",
-    description = "Removes restrictions from using the app on any device. Requires mounting patched app over original.",
-    compatiblePackages = [CompatiblePackage("com.google.android.apps.recorder")]
-)
-@Suppress("unused")
-object RemoveDeviceRestrictions : BytecodePatch(
-    setOf(OnApplicationCreateFingerprint)
+@Patch
+@Name("Remove device restrictions")
+@Description("Removes restrictions from using the app on any device.")
+@Compatibility([Package("com.google.android.apps.recorder")])
+class RemoveDeviceRestrictions : BytecodePatch(
+    listOf(OnApplicationCreateFingerprint)
 ) {
     override fun execute(context: BytecodeContext) {
         OnApplicationCreateFingerprint.result?.let {

src/main/kotlin/app/revanced/patches/hexeditor/ad/DisableAdsPatch.kt

@@ -1,26 +0,0 @@
-package app.revanced.patches.hexeditor.ad
-
-import app.revanced.util.exception
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotation.CompatiblePackage
-import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patches.hexeditor.ad.fingerprints.PrimaryAdsFingerprint
-
-@Patch(
-    name = "Disable ads",
-    compatiblePackages = [CompatiblePackage("com.myprog.hexedit")]
-)
-@Suppress("unused")
-object DisableAdsPatch : BytecodePatch(
-    setOf(PrimaryAdsFingerprint)
-) {
-    override fun execute(context: BytecodeContext) = PrimaryAdsFingerprint.result?.mutableMethod?.replaceInstructions(
-        0,
-        """
-            const/4 v0, 0x1
-            return v0
-        """
-    ) ?: throw PrimaryAdsFingerprint.exception
-}

src/main/kotlin/app/revanced/patches/hexeditor/ad/annotations/HexEditorAdsCompatibility.kt

@@ -0,0 +1,12 @@
+package app.revanced.patches.hexeditor.ad.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [
+        Package("com.myprog.hexedit")
+    ]
+)
+@Target(AnnotationTarget.CLASS)
+internal annotation class HexEditorAdsCompatibility

src/main/kotlin/app/revanced/patches/hexeditor/ad/fingerprints/PrimaryAdsFingerprint.kt

@@ -1,8 +1,8 @@
 package app.revanced.patches.hexeditor.ad.fingerprints
 
-import app.revanced.patcher.fingerprint.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 
-internal object PrimaryAdsFingerprint : MethodFingerprint(
+object PrimaryAdsFingerprint : MethodFingerprint(
     customFingerprint = { methodDef, _ ->
         methodDef.definingClass.endsWith("PreferencesHelper;") && methodDef.name == "isAdsDisabled"
     }

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

@@ -0,0 +1,32 @@
+package app.revanced.patches.hexeditor.ad.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstructions
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.hexeditor.ad.annotations.HexEditorAdsCompatibility
+import app.revanced.patches.hexeditor.ad.fingerprints.PrimaryAdsFingerprint
+
+@Patch
+@Name("Disable ads")
+@Description("Disables ads in HexEditor.")
+@HexEditorAdsCompatibility
+class HexEditorAdsPatch : BytecodePatch(
+    listOf(
+        PrimaryAdsFingerprint
+    )
+) {
+    override fun execute(context: BytecodeContext) {
+        val method = PrimaryAdsFingerprint.result!!.mutableMethod
+        
+        method.replaceInstructions(
+            0,
+            """
+                const/4 v0, 0x1
+                return v0
+            """
+        )
+    }
+}

src/main/kotlin/app/revanced/patches/iconpackstudio/misc/pro/annotations/UnlockProCompatibility.kt

@@ -0,0 +1,8 @@
+package app.revanced.patches.iconpackstudio.misc.pro.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("ginlemon.iconpackstudio")])
+@Target(AnnotationTarget.CLASS)
+internal annotation class UnlockProCompatibility

src/main/kotlin/app/revanced/patches/iconpackstudio/misc/pro/fingerprints/CheckProFingerprint.kt

@@ -1,8 +1,8 @@
 package app.revanced.patches.iconpackstudio.misc.pro.fingerprints
 
-import app.revanced.patcher.fingerprint.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 
-internal object CheckProFingerprint : MethodFingerprint(
+object CheckProFingerprint : MethodFingerprint(
     "Z",
     customFingerprint = { methodDef, _ -> methodDef.definingClass.endsWith("IPSPurchaseRepository;")}
 )

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

@@ -1,19 +1,22 @@
-package app.revanced.patches.iconpackstudio.misc.pro
+package app.revanced.patches.iconpackstudio.misc.pro.patch
 
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotation.CompatiblePackage
-import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.iconpackstudio.misc.pro.annotations.UnlockProCompatibility
 import app.revanced.patches.iconpackstudio.misc.pro.fingerprints.CheckProFingerprint
 
-@Patch(
-    name = "Unlock pro",
-    compatiblePackages = [CompatiblePackage("ginlemon.iconpackstudio", ["2.2 build 016"])]
-)
-@Suppress("unused")
-object UnlockProPatch : BytecodePatch(
-    setOf(CheckProFingerprint)
+@Patch
+@Name("Unlock pro")
+@Description("Unlocks all pro features.")
+@UnlockProCompatibility
+class UnlockProPatch : BytecodePatch(
+    listOf(
+        CheckProFingerprint
+    )
 ) {
     override fun execute(context: BytecodeContext) {
         val method = CheckProFingerprint.result!!.mutableMethod

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

@@ -1,26 +0,0 @@
-package app.revanced.patches.idaustria.detection.root
-
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotation.CompatiblePackage
-import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patches.idaustria.detection.root.fingerprints.AttestationSupportedCheckFingerprint
-import app.revanced.patches.idaustria.detection.root.fingerprints.BootloaderCheckFingerprint
-import app.revanced.patches.idaustria.detection.root.fingerprints.RootCheckFingerprint
-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")]
-)
-@Suppress("unused")
-object RootDetectionPatch : BytecodePatch(
-    setOf(AttestationSupportedCheckFingerprint, BootloaderCheckFingerprint, RootCheckFingerprint)
-) {
-    override fun execute(context: BytecodeContext) = listOf(
-        AttestationSupportedCheckFingerprint,
-        BootloaderCheckFingerprint,
-        RootCheckFingerprint
-    ).returnEarly(true)
-}

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

@@ -1,13 +0,0 @@
-package app.revanced.patches.idaustria.detection.root.fingerprints
-
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-
-internal object AttestationSupportedCheckFingerprint : MethodFingerprint(
-    "V",
-    accessFlags = AccessFlags.PUBLIC.value,
-    customFingerprint = { methodDef, _ ->
-        methodDef.name == "attestationSupportCheck" &&
-        methodDef.definingClass.endsWith("/DeviceIntegrityCheck;")
-    }
-)

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

@@ -1,13 +0,0 @@
-package app.revanced.patches.idaustria.detection.root.fingerprints
-
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-
-internal object BootloaderCheckFingerprint : MethodFingerprint(
-    "Z",
-    accessFlags = AccessFlags.PUBLIC.value,
-    customFingerprint = { methodDef, _ ->
-        methodDef.name == "bootloaderCheck" &&
-        methodDef.definingClass.endsWith("/DeviceIntegrityCheck;")
-    }
-)

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

@@ -1,13 +1,12 @@
 package app.revanced.patches.idaustria.detection.root.fingerprints
 
-import app.revanced.patcher.fingerprint.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 
-internal object RootCheckFingerprint : MethodFingerprint(
+object RootDetectionFingerprint : MethodFingerprint(
     "V",
     accessFlags = AccessFlags.PUBLIC.value,
     customFingerprint = { methodDef, _ ->
-        methodDef.name == "rootCheck" &&
         methodDef.definingClass.endsWith("/DeviceIntegrityCheck;")
     }
 )

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

@@ -0,0 +1,21 @@
+package app.revanced.patches.idaustria.detection.root.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.idaustria.detection.root.fingerprints.RootDetectionFingerprint
+import app.revanced.patches.idaustria.detection.shared.annotations.DetectionCompatibility
+
+@Patch
+@Name("Remove root detection")
+@Description("Removes the check for root permissions and unlocked bootloader.")
+@DetectionCompatibility
+class RootDetectionPatch : BytecodePatch(
+    listOf(RootDetectionFingerprint)
+) {
+    override fun execute(context: BytecodeContext) =
+        RootDetectionFingerprint.result!!.mutableMethod.addInstruction(0, "return-void")
+}

src/main/kotlin/app/revanced/patches/idaustria/detection/shared/annotations/DetectionCompatibility.kt

@@ -0,0 +1,8 @@
+package app.revanced.patches.idaustria.detection.shared.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("at.gv.oe.app")])
+@Target(AnnotationTarget.CLASS)
+internal annotation class DetectionCompatibility

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

@@ -1,9 +1,9 @@
 package app.revanced.patches.idaustria.detection.signature.fingerprints
 
-import app.revanced.patcher.fingerprint.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 
-internal object SpoofSignatureFingerprint : MethodFingerprint(
+object SpoofSignatureFingerprint : MethodFingerprint(
     "L",
     parameters = listOf("L"),
     accessFlags = AccessFlags.PRIVATE.value,

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

@@ -1,23 +1,23 @@
-package app.revanced.patches.idaustria.detection.signature
+package app.revanced.patches.idaustria.detection.signature.patch
 
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotation.CompatiblePackage
-import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.idaustria.detection.shared.annotations.DetectionCompatibility
 import app.revanced.patches.idaustria.detection.signature.fingerprints.SpoofSignatureFingerprint
 
-@Patch(
-    name = "Spoof signature",
-    description = "Spoofs the signature of the app.",
-    compatiblePackages = [CompatiblePackage("at.gv.oe.app")]
-)
-@Suppress("unused")
-object SpoofSignaturePatch : BytecodePatch(
-    setOf(SpoofSignatureFingerprint)
+@Patch
+@Name("Spoof signature")
+@Description("Spoofs the signature of the app.")
+@DetectionCompatibility
+class SpoofSignaturePatch : BytecodePatch(
+    listOf(SpoofSignatureFingerprint)
 ) {
-    private const val EXPECTED_SIGNATURE =
-        "OpenSSLRSAPublicKey{modulus=ac3e6fd6050aa7e0d6010ae58190404cd89a56935b44f6fee" +
+    companion object {
+        const val EXPECTED_SIGNATURE = "OpenSSLRSAPublicKey{modulus=ac3e6fd6050aa7e0d6010ae58190404cd89a56935b44f6fee" +
                 "067c149768320026e10b24799a1339e414605e448e3f264444a327b9ae292be2b62ad567dd1800dbed4a88f718a33dc6db6b" +
                 "f5178aa41aa0efff8a3409f5ca95dbfccd92c7b4298966df806ea7a0204a00f0e745f6d9f13bdf24f3df715d7b62c1600906" +
                 "15de1c8a956b9286764985a3b3c060963c435fb9481a5543aaf0671fc2dba6c5c2b17d1ef1d85137f14dc9bbdf3490288087" +
@@ -28,6 +28,7 @@ object SpoofSignaturePatch : BytecodePatch(
                 "0def55be2c1f6f9c72c92fb45d7e0a9ac571cb38f0a9a37bb33ea06f223fde8c7a92e8c47769e386f9799776e8f110c21df2" +
                 "77ef1be61b2c01ebdabddcbf53cc4b6fd9a3c445606ee77b3758162c80ad8f8137b3c6864e92db904807dcb2be9d7717dd21" +
                 "bf42c121d620ddfb7914f7a95c713d9e1c1b7bdb4a03d618e40cf7e9e235c0b5687e03b7ab3,publicExponent=10001}"
+    }
 
     override fun execute(context: BytecodeContext) {
         SpoofSignatureFingerprint.result!!.mutableMethod.addInstructions(

src/main/kotlin/app/revanced/patches/inshorts/ad/annotations/HideAdsCompatibility.kt

@@ -0,0 +1,9 @@
+package app.revanced.patches.inshorts.ad.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("com.nis.app")])
+
+@Target(AnnotationTarget.CLASS)
+internal annotation class HideAdsCompatibility

src/main/kotlin/app/revanced/patches/inshorts/ad/fingerprints/InshortsAdsFingerprint.kt

@@ -1,8 +1,8 @@
 package app.revanced.patches.inshorts.ad.fingerprints
 
-import app.revanced.patcher.fingerprint.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 
-internal object InshortsAdsFingerprint : MethodFingerprint(
+object InshortsAdsFingerprint : MethodFingerprint(
     "V",
     strings = listOf("GoogleAdLoader","exception in requestAd"),
 )

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

@@ -1,20 +1,21 @@
-package app.revanced.patches.inshorts.ad
+package app.revanced.patches.inshorts.ad.patch
 
-import app.revanced.util.exception
+import app.revanced.extensions.exception
 import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotation.CompatiblePackage
-import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.inshorts.ad.annotations.HideAdsCompatibility
 import app.revanced.patches.inshorts.ad.fingerprints.InshortsAdsFingerprint
 
-@Patch(
-    name = "Hide ads",
-    compatiblePackages = [CompatiblePackage("com.nis.app")]
-)
-@Suppress("unused")
-object HideAdsPatch : BytecodePatch(
-    setOf(InshortsAdsFingerprint)
+@Patch
+@Name("Hide ads")
+@Description("Removes ads from Inshorts.")
+@HideAdsCompatibility
+class HideAdsPatch : BytecodePatch(
+    listOf(InshortsAdsFingerprint)
 ) {
     override fun execute(context: BytecodeContext) {
         InshortsAdsFingerprint.result?.let { result ->

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

@@ -1,63 +0,0 @@
-package app.revanced.patches.instagram.patches.ads.timeline
-
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.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.IsAdCheckOneFingerprint
-import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.IsAdCheckTwoFingerprint
-import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ShowAdFingerprint
-import app.revanced.util.exception
-import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
-
-@Patch(
-    name = "Hide timeline ads",
-    compatiblePackages = [CompatiblePackage("com.instagram.android")],
-)
-@Suppress("unused")
-object HideTimelineAdsPatch : BytecodePatch(
-    setOf(
-        ShowAdFingerprint,
-        IsAdCheckOneFingerprint,
-        IsAdCheckTwoFingerprint,
-    ),
-) {
-    override fun execute(context: BytecodeContext) {
-        // 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?.let {
-            it.mutableMethod.apply {
-                // The register that holds the post object.
-                val postRegister = getInstruction<FiveRegisterInstruction>(1).registerC
-
-                // At this index the check for an ad can be performed.
-                val checkIndex = it.scanResult.patternScanResult!!.endIndex
-
-                // If either check returns true, the post is an ad and is hidden by returning false.
-                addInstructionsWithLabels(
-                    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)),
-                )
-            }
-        } ?: throw ShowAdFingerprint.exception
-    }
-}

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

@@ -1,18 +0,0 @@
-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/MediaFingerprint.kt

@@ -0,0 +1,7 @@
+package app.revanced.patches.instagram.patches.ads.timeline.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+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

@@ -1,21 +1,25 @@
 package app.revanced.patches.instagram.patches.ads.timeline.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 
-internal object ShowAdFingerprint : MethodFingerprint(
+object ShowAdFingerprint : MethodFingerprint(
     "Z",
     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,
     ),
 )