chore(release): 2.196.0-dev.1 [skip ci]

# [2.196.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v2.195.1-dev.2...v2.196.0-dev.1) (2023-10-20)

### Bug Fixes

* **YouTube - Announcements:** Do not end descriptions with punctuation ([124380f](124380f738))

### Features

* **YouTube - Announcements:** Clarify announcements origin ([9564fd2](9564fd2b7c))

.github/ISSUE_TEMPLATE/bug-issue.yml

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

@@ -0,0 +1,49 @@
+name: 🐞 Bug report
+description: Report a bug or an issue.
+title: 'bug: '
+labels: ['Bug report']
+body:
+  - type: markdown
+    attributes:
+      value: |
+        # ReVanced Patches bug report
+
+        Please check for existing bug reports
+        [here](https://github.com/ReVanced/revanced-patches/labels/Bug%20report)
+        before creating a new one.
+
+  - 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 issue will be closed if you don't follow the checklist below.
+      options:
+        - label: This request is not a duplicate of an existing issue.
+          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,8 +1,5 @@
 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: Got something you think should change or be added? Search for or start a new discussion!
+    about: Have something unspecific to ReVanced Patches in mind? Search for or start a new discussion!

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -0,0 +1,44 @@
+name: ⭐ Feature request
+description: Create a detailed request for a new feature.
+title: 'feat: '
+labels: ['Feature request']
+body:
+  - type: markdown
+    attributes:
+      value: |
+        # ReVanced Patches feature request
+        
+        Please check for existing feature requests
+        [here](https://github.com/ReVanced/revanced-patches/labels/Feature%20request)
+        before creating a new one.
+  - 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 issue will be closed if you don't follow the checklist below.
+      options:
+        - label: This request is not a duplicate of an existing issue.
+          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

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

@@ -1,4 +1,4 @@
-name: PR to main
+name: Open a 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,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Open pull request
         uses: repo-sync/pull-request@v2
         with:

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           # Make sure the release step uses its own credentials:
           # https://github.com/cycjimmy/semantic-release-action#private-packages
@@ -30,13 +30,12 @@ jobs:
             ${{ runner.home }}/.gradle/caches
             ${{ runner.home }}/.gradle/wrapper
             .gradle
-            build
             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 --no-daemon
+        run: ./gradlew generateMeta clean
       - name: Setup semantic-release
         run: npm install
       - name: Release

.releaserc

@@ -10,7 +10,7 @@
     [
       "@semantic-release/commit-analyzer", {
         "releaseRules": [
-          { "type": "build", "scope": "revanced-patcher", "release": "patch" }
+          { "type": "build", "scope": "Needs bump", "release": "patch" }
         ]
       }
     ],

CONTRIBUTING.md

@@ -0,0 +1,109 @@
+<p align="center">
+  <picture>
+    <source
+      width="256px"
+      media="(prefers-color-scheme: dark)"
+      srcset="assets/revanced-headline/revanced-headline-vertical-dark.svg"
+    >
+    <img 
+      src="assets/revanced-headline/revanced-headline-vertical-light.svg"
+    >
+  </picture>
+  <br>
+  <a href="https://revanced.app/">
+       <img height="24px" src="assets/revanced-logo/revanced-logo-round.svg" />
+   </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">
+       <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://reddit.com/r/revancedapp">
+       <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://t.me/app_revanced">
+       <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+   </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">
+       <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+   </a>
+   <br>
+   <br>
+   Continuing the legacy of Vanced
+</p>
+
+# 📙 ReVanced Patches contribution guidelines
+
+This document describes how to contribute to ReVanced Patches.
+
+## 📖 Resources to help you get started
+
+* The [documentation](https://github.com/ReVanced/revanced-patches/tree/docs/docs) provides the fundamentals of patches 
+and everything necessary to create your own patch from scratch
+* [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,3 +1,93 @@
-## 🧩 ReVanced Patches
+<p align="center">
+  <picture>
+    <source
+      width="256px"
+      media="(prefers-color-scheme: dark)"
+      srcset="assets/revanced-headline/revanced-headline-vertical-dark.svg"
+    >
+    <img 
+      src="assets/revanced-headline/revanced-headline-vertical-light.svg"
+    >
+  </picture>
+  <br>
+  <a href="https://revanced.app/">
+       <img height="24px" src="assets/revanced-logo/revanced-logo-round.svg" />
+   </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">
+       <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://reddit.com/r/revancedapp">
+       <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://t.me/app_revanced">
+       <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+   </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">
+       <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+   </a>
+   <br>
+   <br>
+   Continuing the legacy of Vanced
+</p>
 
-Patches for ReVanced.
+# 🧩 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 behaviour 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 full 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).
+
+### 📃 Documentation
+
+The documentation provides the fundamentals of patches and everything necessary to create your own patch from scratch.
+You can find it [here](https://github.com/ReVanced/revanced-patches/tree/docs/docs).
+
+### 🛠️ Building
+
+In order to build ReVanced Patches, you can follow the [ReVanced documentation](https://github.com/ReVanced/revanced-documentation).
+
+## 📜 Licence
+
+ReVanced Patches is licensed under the GPLv3 licence. Please see the [licence file](LICENSE) for more information.
+[tl;dr](https://www.tldrlegal.com/license/gnu-general-public-license-v3-gpl-3) you may copy, distribute and modify ReVanced patches as long as you track changes/dates in source files.
+Any modifications to ReVanced Patches must also be made available under the GPL along with build & install instructions.

assets/revanced-logo/revanced-logo-round.svg

@@ -0,0 +1 @@
+<?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,22 +1,18 @@
+import org.gradle.kotlin.dsl.support.listFilesOrdered
+
 plugins {
     kotlin("jvm") version "1.8.20"
+    alias(libs.plugins.ksp)
+    `maven-publish`
 }
 
 group = "app.revanced"
 
-val githubUsername: String = project.findProperty("gpr.user") as? String ?: System.getenv("GITHUB_ACTOR")
-val githubPassword: String = project.findProperty("gpr.key") as? String ?: System.getenv("GITHUB_TOKEN")
-
 repositories {
     mavenCentral()
     mavenLocal()
-    maven {
-        url = uri("https://maven.pkg.github.com/revanced/revanced-patcher")
-        credentials {
-            username = githubUsername
-            password = githubPassword
-        }
-    }
+    google()
+    maven { url = uri("https://jitpack.io") }
     // Required for FlexVer-Java
     maven {
         url = uri("https://repo.sleeping.town")
@@ -27,16 +23,18 @@ repositories {
 }
 
 dependencies {
-    implementation("app.revanced:revanced-patcher:11.0.3")
-    implementation("app.revanced:multidexlib2:2.5.3-a3836654")
-    // Required for meta
-    implementation("com.google.code.gson:gson:2.10.1")
-    // Required for FlexVer-Java
-    implementation("com.unascribed:flexver-java:1.0.2")
+    implementation(libs.revanced.patcher)
+    implementation(libs.smali)
+    implementation(libs.revanced.patch.annotation.processor)
+    // TODO: Required because build fails without it. Find a way to remove this dependency.
+    implementation(libs.guava)
+    // Used in JsonGenerator.
+    implementation(libs.gson)
 
-    // A dependency to the Android library unfortunately fails the build,
-    // which is why this is required for the patch change-oauth-client-id
+    // A dependency to the Android library unfortunately fails the build, which is why this is required.
     compileOnly(project("dummy"))
+
+    ksp(libs.revanced.patch.annotation.processor)
 }
 
 kotlin {
@@ -46,38 +44,74 @@ kotlin {
 tasks {
     register<DefaultTask>("generateBundle") {
         description = "Generate dex files from build and bundle them in the jar file"
+
         dependsOn(build)
 
         doLast {
-            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")
+            val d8 = File(System.getenv("ANDROID_HOME")).resolve("build-tools")
+                .listFilesOrdered().last().resolve("d8").absolutePath
+
+            val artifacts = configurations.archives.get().allArtifacts.files.files.first().absolutePath
+            val workingDirectory = layout.buildDirectory.dir("libs").get().asFile
 
             exec {
-                workingDir = work
-                commandLine = listOf(d8, input)
+                workingDir = workingDirectory
+                commandLine = listOf(d8, artifacts)
             }
 
             exec {
-                workingDir = work
-                commandLine = listOf("zip", "-u", input, "classes.dex")
+                workingDir = workingDirectory
+                commandLine = listOf("zip", "-u", artifacts, "classes.dex")
             }
         }
     }
+
     register<JavaExec>("generateMeta") {
         description = "Generate metadata for this bundle"
+
         dependsOn(build)
 
         classpath = sourceSets["main"].runtimeClasspath
         mainClass.set("app.revanced.meta.PatchesFileGenerator")
     }
-    // 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"))
+
+    // Required to run tasks because Gradle semantic-release plugin runs the publish task.
+    // Tracking: https://github.com/KengoTODA/gradle-semantic-release-plugin/issues/435
+    named("publish") {
+        dependsOn("generateBundle")
+        dependsOn("generateMeta")
     }
 }
+
+publishing {
+    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"
+                }
+            }
+        }
+    }
+}

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 2.185.0-dev.2
+version = 2.196.0-dev.1

gradle/libs.versions.toml

@@ -0,0 +1,17 @@
+[versions]
+revanced-patcher = "17.0.0"
+revanced-patch-annotation-processor = "17.0.0"
+ksp = "1.9.0-1.0.11"
+smali = "3.0.3"
+guava = "32.1.2-jre"
+gson = "2.10.1"
+
+[libraries]
+revanced-patcher = { module = "app.revanced.revanced-patcher:revanced-patcher", version.ref = "revanced-patcher" }
+revanced-patch-annotation-processor = { module = "app.revanced.revanced-patcher:revanced-patch-annotation-processor", version.ref = "revanced-patch-annotation-processor" }
+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]
+ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

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

@@ -1,25 +1,24 @@
 package app.revanced.extensions
 
-import app.revanced.patcher.extensions.MethodFingerprintExtensions.name
+import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.Method
-import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
-import org.jf.dexlib2.util.MethodUtil
+import app.revanced.patches.shared.mapping.misc.ResourceMappingPatch
+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
 
-// TODO: populate this to all patches
 /**
- * Convert a [MethodFingerprint] to a [PatchResultError].
+ * The [PatchException] of failing to resolve a [MethodFingerprint].
  *
- * @return A [PatchResultError] for the [MethodFingerprint].
+ * @return The [PatchException].
  */
-internal fun MethodFingerprint.toErrorResult() = PatchResultError("Failed to resolve $name")
+val MethodFingerprint.exception
+    get() = PatchException("Failed to resolve ${this.javaClass.simpleName}")
 
 /**
  * Find the [MutableMethod] from a given [Method] in a [MutableClass].
@@ -27,27 +26,27 @@ internal fun MethodFingerprint.toErrorResult() = PatchResultError("Failed to res
  * @param method The [Method] to find.
  * @return The [MutableMethod].
  */
-internal fun MutableClass.findMutableMethodOf(method: Method) = this.methods.first {
+fun MutableClass.findMutableMethodOf(method: Method) = this.methods.first {
     MethodUtil.methodSignaturesMatch(it, method)
 }
 
 /**
- * apply a transform to all methods of the class
+ * apply a transform to all methods of the class.
  *
- * @param transform the transformation function. original method goes in, transformed method goes out
+ * @param transform the transformation function. original method goes in, transformed method goes out.
  */
-internal fun MutableClass.transformMethods(transform: MutableMethod.() -> MutableMethod) {
+fun MutableClass.transformMethods(transform: MutableMethod.() -> MutableMethod) {
     val transformedMethods = methods.map { it.transform() }
     methods.clear()
     methods.addAll(transformedMethods)
 }
 
-internal fun Node.doRecursively(action: (Node) -> Unit) {
+fun Node.doRecursively(action: (Node) -> Unit) {
     action(this)
     for (i in 0 until this.childNodes.length) this.childNodes.item(i).doRecursively(action)
 }
 
-internal fun MutableMethod.injectHideViewCall(
+fun MutableMethod.injectHideViewCall(
     insertIndex: Int,
     viewRegister: Int,
     classDescriptor: String,
@@ -57,28 +56,50 @@ internal fun MutableMethod.injectHideViewCall(
     "invoke-static { v$viewRegister }, $classDescriptor->$targetMethod(Landroid/view/View;)V"
 )
 
-internal fun Method.findIndexForIdResource(resourceName: String): Int {
+/**
+ * Find the index of the first 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 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))
+    return indexOfFirstWideLiteralInstructionValue(getIdResourceId(resourceName))
 }
 
 /**
- * @return the first constant instruction with the value, or -1 if not found.
+ * Find the index of the first wide literal instruction with the given value.
+ *
+ * @return the first literal 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
-}
+fun Method.indexOfFirstWideLiteralInstructionValue(literal: Long) = implementation?.let {
+    it.instructions.indexOfFirst { instruction ->
+        (instruction as? WideLiteralInstruction)?.wideLiteral == literal
+    }
+} ?: -1
+
 
 /**
- * @return if the method contains a constant with the given value.
+ * Check if the method contains a literal with the given value.
+ *
+ * @return if the method contains a literal with the given value.
  */
-fun Method.containsConstantInstructionValue(constantValue: Long): Boolean {
-    return indexOfFirstConstantInstructionValue(constantValue) >= 0
-}
+fun Method.containsWideLiteralInstructionValue(literal: Long) =
+    indexOfFirstWideLiteralInstructionValue(literal) >= 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/meta/JsonGenerator.kt

@@ -1,70 +1,41 @@
 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.extensions.PatchExtensions.version
-import app.revanced.patcher.patch.PatchOption
+import app.revanced.patcher.PatchSet
+import app.revanced.patcher.patch.Patch
 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.version ?: "0.0.0",
-                !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))
+    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.value, option.title, option.description, option.required)
+            }
+        )
+    }.let {
+        File("patches.json").writeText(GsonBuilder().serializeNulls().create().toJson(it))
     }
 
+    @Suppress("unused")
     private class JsonPatch(
-        val name: String,
-        val description: String,
-        val version: String,
-        val excluded: Boolean,
-        val options: Array<Option>,
-        val dependencies: Array<String>,
-        val compatiblePackages: Array<CompatiblePackage>,
+        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 CompatiblePackage(
-            val name: String,
-            val versions: Array<String>,
-        )
-
         class Option(
             val key: String,
-            val title: String,
-            val description: String,
+            val default: Any?,
+            val title: String?,
+            val description: String?,
             val required: Boolean,
-            val choices: Array<*>?,
         )
     }
 }

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

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

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

@@ -1,20 +1,18 @@
-package app.revanced.patches.all.activity.exportAll.patch
+package app.revanced.patches.all.activity.exportall
 
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.annotation.Patch
 
-@Patch(false)
-@Name("Export all activities")
-@Description("Makes all app activities exportable.")
-@Version("0.0.1")
-class ExportAllActivitiesPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+@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"
+    override fun execute(context: ResourceContext) {
         context.xmlEditor["AndroidManifest.xml"].use { editor ->
             val document = editor.file
             val activities = document.getElementsByTagName("activity")
@@ -35,11 +33,5 @@ class ExportAllActivitiesPatch : ResourcePatch {
                 }
             }
         }
-
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        const val EXPORTED_FLAG = "android:exported"
     }
 }

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

@@ -1,29 +1,44 @@
-package app.revanced.patches.all.connectivity.wifi.spoof.patch
+package app.revanced.patches.all.connectivity.wifi.spoof
 
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.annotations.RequiresIntegrations
+import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.util.patch.*
-import org.jf.dexlib2.iface.ClassDef
-import org.jf.dexlib2.iface.Method
-import org.jf.dexlib2.iface.instruction.Instruction
-import java.util.*
+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("Spoof wifi connection")
-@Description("Spoofs an existing Wi-Fi connection.")
-@Version("0.0.1")
-@RequiresIntegrations
-internal class SpoofWifiPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
+@Patch(
+    name = "Spoof Wi-Fi connection",
+    description = "Spoofs an existing Wi-Fi connection.",
+    use = false,
+    requiresIntegrations = true
+)
+@Suppress("unused")
+object SpoofWifiPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
+    private const val INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX = "Lapp/revanced/all/connectivity/wifi/spoof/SpoofWifiPatch"
+    private const val INTEGRATIONS_CLASS_DESCRIPTOR = "$INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX;"
 
-    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};"
+    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,
@@ -188,21 +203,4 @@ internal class SpoofWifiPatch : AbstractTransformInstructionsPatch<Instruction35
             "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/PredictiveBackGesturePatch.kt

@@ -0,0 +1,29 @@
+package app.revanced.patches.all.interaction.gestures
+
+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"
+
+    override fun execute(context: ResourceContext) {
+        context.xmlEditor["AndroidManifest.xml"].use { editor ->
+            val document = editor.file
+
+            with(document.getElementsByTagName("application").item(0)) {
+                if (attributes.getNamedItem(FLAG) != null) return@with
+
+                document.createAttribute(FLAG)
+                    .apply { value = "true" }
+                    .let(attributes::setNamedItem)
+            }
+        }
+    }
+}

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

@@ -1,37 +0,0 @@
-package app.revanced.patches.all.interaction.gestures.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.Patch
-
-@Patch(false)
-@Name("Predictive back gesture")
-@Description("Enables the predictive back gesture introduced on Android 13.")
-@Version("0.0.1")
-class PredictiveBackGesturePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        context.xmlEditor["AndroidManifest.xml"].use { editor ->
-            val document = editor.file
-
-            with(document.getElementsByTagName("application").item(0)) {
-                if (attributes.getNamedItem(FLAG) != null) return@with
-
-                document.createAttribute(FLAG)
-                    .apply { value = "true" }
-                    .let(attributes::setNamedItem)
-
-            }
-        }
-
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        const val FLAG = "android:enableOnBackInvokedCallback"
-    }
-}

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

@@ -0,0 +1,26 @@
+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 { 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/debugging/patch/EnableAndroidDebuggingPatch.kt

@@ -1,30 +0,0 @@
-package app.revanced.patches.all.misc.debugging.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.*
-import app.revanced.patcher.patch.annotations.Patch
-import org.w3c.dom.Element
-
-@Patch(false)
-@Name("Enable android debugging")
-@Description("Enables Android debugging capabilities.")
-@Version("0.0.1")
-class EnableAndroidDebuggingPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        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")
-        }
-
-        return PatchResultSuccess()
-    }
-
-}

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

@@ -0,0 +1,75 @@
+package app.revanced.patches.all.misc.network
+
+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 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() {
+    override fun execute(context: ResourceContext) {
+        val resXmlDirectory = context["res/xml"]
+
+        // Add android:networkSecurityConfig="@xml/network_security_config" and the "networkSecurityConfig" attribute if it does not exist.
+        context.xmlEditor["AndroidManifest.xml"].use { editor ->
+            val document = editor.file
+            val applicationNode = document.getElementsByTagName("application").item(0) as Element
+
+            if (!applicationNode.hasAttribute("networkSecurityConfig")) {
+                document.createAttribute("android:networkSecurityConfig")
+                    .apply { value = "@xml/network_security_config" }.let(applicationNode.attributes::setNamedItem)
+            }
+        }
+
+        // In case the file does not exist create the "network_security_config.xml" file.
+        File(resXmlDirectory, "network_security_config.xml").apply {
+            if (!exists()) {
+                createNewFile()
+                writeText(
+                    """
+                    <?xml version="1.0" encoding="utf-8"?>
+                    <network-security-config>
+                        <base-config cleartextTrafficPermitted="true">
+                            <trust-anchors>
+                                <certificates src="system" />
+                                <certificates
+                                    src="user"
+                                    overridePins="true" />
+                            </trust-anchors>
+                        </base-config>
+                        <debug-overrides>
+                            <trust-anchors>
+                                <certificates src="system" />
+                                <certificates
+                                    src="user"
+                                    overridePins="true" />
+                            </trust-anchors>
+                        </debug-overrides>
+                    </network-security-config>
+                    """
+                )
+            } else {
+                // If the file already exists.
+                readText().let { text ->
+                    if (!text.contains("<certificates src=\"user\" />")) {
+                        writeText(
+                            text.replace(
+                                "<trust-anchors>",
+                                "<trust-anchors>\n<certificates src=\"user\" overridePins=\"true\" />\n<certificates src=\"system\" />"
+                            )
+                        )
+                    }
+                }
+
+            }
+        }
+    }
+}

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

@@ -0,0 +1,49 @@
+package app.revanced.patches.all.misc.packagename
+
+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.patch.options.types.StringPatchOption.Companion.stringPatchOption
+import org.w3c.dom.Element
+
+@Patch(
+    name = "Change package name",
+    description = "Appends \".revanced\" to the package name by default.",
+    use = false
+)
+@Suppress("unused")
+object ChangePackageNamePatch : ResourcePatch() {
+    private var packageName by stringPatchOption(
+        key = "packageName",
+        default = null,
+        title = "Package name",
+        description = "The name of the package to rename the app to.",
+    )
+
+    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")
+        }
+    }
+}

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

@@ -1,50 +0,0 @@
-package app.revanced.patches.all.misc.packagename.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.*
-import app.revanced.patcher.patch.annotations.Patch
-import org.w3c.dom.Element
-
-@Patch(false)
-@Name("Change package name")
-@Description("Changes the package name.")
-@Version("0.0.1")
-class ChangePackageNamePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        packageName?.let { packageName ->
-            val packageNameRegex = Regex("^[a-z]\\w*(\\.[a-z]\\w*)+\$")
-            if (!packageName.matches(packageNameRegex))
-                return PatchResultError("Invalid package name")
-
-            var originalPackageName: String
-            context.xmlEditor["AndroidManifest.xml"].use { editor ->
-                val manifest = editor.file.getElementsByTagName("manifest").item(0) as Element
-                originalPackageName = manifest.getAttribute("package")
-            }
-
-            if (!originalPackageName.matches(packageNameRegex))
-                return PatchResultError("Failed to get the original package name")
-
-            context["AndroidManifest.xml"].apply {
-                readText().replace(originalPackageName, packageName).let(::writeText)
-            }
-
-        } ?: return PatchResultError("No package name provided")
-
-        return PatchResultSuccess()
-    }
-
-    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 of the app.",
-            )
-        )
-    }
-}

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

@@ -1,25 +1,27 @@
-package app.revanced.patches.all.screencapture.removerestriction.bytecode.patch
+package app.revanced.patches.all.screencapture.removerestriction
 
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-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.patch.annotation.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.all.screencapture.removerestriction.resource.patch.RemoveCaptureRestrictionResourcePatch
-import app.revanced.util.patch.*
-import org.jf.dexlib2.iface.ClassDef
-import org.jf.dexlib2.iface.Method
-import org.jf.dexlib2.iface.instruction.Instruction
+import 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 screen capture restriction")
-@Description("Removes the restriction of capturing audio from apps that normally wouldn't allow it.")
-@Version("0.0.1")
-@DependsOn([RemoveCaptureRestrictionResourcePatch::class])
-@RequiresIntegrations
-internal class RemoveCaptureRestrictionPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
+@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 : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
+    private const val INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX =
+        "Lapp/revanced/all/screencapture/removerestriction/RemoveScreencaptureRestrictionPatch"
+    private const val INTEGRATIONS_CLASS_DESCRIPTOR = "$INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX;"
     // Information about method calls we want to replace
     enum class MethodCall(
         override val definedClassName: String,
@@ -57,10 +59,4 @@ internal class RemoveCaptureRestrictionPatch : AbstractTransformInstructionsPatc
         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/RemoveCaptureRestrictionResourcePatch.kt

@@ -1,15 +1,13 @@
-package app.revanced.patches.all.screencapture.removerestriction.resource.patch
+package app.revanced.patches.all.screencapture.removerestriction
 
-import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
+import app.revanced.patcher.patch.annotation.Patch
 import org.w3c.dom.Element
 
-@Description("Sets allowAudioPlaybackCapture in manifest to true.")
-internal class RemoveCaptureRestrictionResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+@Patch(description = "Sets allowAudioPlaybackCapture in manifest to true.")
+internal object RemoveCaptureRestrictionResourcePatch : ResourcePatch() {
+    override fun execute(context: ResourceContext) {
         // create an xml editor instance
         context.xmlEditor["AndroidManifest.xml"].use { dom ->
             // get the application node
@@ -21,7 +19,5 @@ internal class RemoveCaptureRestrictionResourcePatch : ResourcePatch {
             // set allowAudioPlaybackCapture attribute to true
             applicationNode.setAttribute("android:allowAudioPlaybackCapture", "true")
         }
-
-        return PatchResultSuccess()
     }
 }

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

@@ -1,44 +1,26 @@
-package app.revanced.patches.all.screenshot.removerestriction.patch
+package app.revanced.patches.all.screenshot.removerestriction
 
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.annotations.RequiresIntegrations
+import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.util.patch.*
-import org.jf.dexlib2.iface.ClassDef
-import org.jf.dexlib2.iface.Method
-import org.jf.dexlib2.iface.instruction.Instruction
-import java.util.*
+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.")
-@Version("0.0.1")
-@RequiresIntegrations
-internal class RemoveScreenshotRestrictionPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
-
-    private companion object {
-        const val INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX =
+@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 : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
+    private 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",
-        );
-    }
+    private const val INTEGRATIONS_CLASS_DESCRIPTOR = "$INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX;"
 
     override fun filterMap(
         classDef: ClassDef,
@@ -56,4 +38,19 @@ internal class RemoveScreenshotRestrictionPatch : AbstractTransformInstructionsP
         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 {
+        SetFlags(
+            "Landroid/view/Window;",
+            "setFlags",
+            arrayOf("I", "I"),
+            "V",
+        );
+    }
 }

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

@@ -0,0 +1,37 @@
+package app.revanced.patches.backdrops.misc.pro
+
+import app.revanced.extensions.exception
+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.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)
+) {
+    override fun execute(context: BytecodeContext) {
+        ProUnlockFingerprint.result?.let { result ->
+            val registerIndex = result.scanResult.patternScanResult!!.endIndex - 1
+
+            result.mutableMethod.apply {
+                val register = getInstruction<OneRegisterInstruction>(registerIndex).registerA
+                addInstruction(
+                    result.scanResult.patternScanResult!!.endIndex,
+                    """
+                        const/4 v$register, 0x1
+                    """
+                )
+            }
+
+        } ?: throw ProUnlockFingerprint.exception
+    }
+}

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

@@ -1,7 +0,0 @@
-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,7 +1,7 @@
 package app.revanced.patches.backdrops.misc.pro.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.Opcode
 
 object ProUnlockFingerprint : MethodFingerprint(
     opcodes = listOf(

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

@@ -1,44 +0,0 @@
-package app.revanced.patches.backdrops.misc.pro.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.backdrops.misc.pro.annotations.ProUnlockCompatibility
-import app.revanced.patches.backdrops.misc.pro.fingerprints.ProUnlockFingerprint
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-
-@Patch
-@Name("Pro unlock")
-@Description("Unlocks pro-only functions.")
-@ProUnlockCompatibility
-@Version("0.0.1")
-class ProUnlockPatch : BytecodePatch(
-    listOf(ProUnlockFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        ProUnlockFingerprint.result?.let { result ->
-            val registerIndex = result.scanResult.patternScanResult!!.endIndex - 1
-
-            result.mutableMethod.apply {
-                val register = getInstruction<OneRegisterInstruction>(registerIndex).registerA
-                addInstruction(
-                    result.scanResult.patternScanResult!!.endIndex,
-                    """
-                        const/4 v$register, 0x1
-                    """
-                )
-            }
-
-        } ?: return ProUnlockFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}

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

@@ -0,0 +1,28 @@
+package app.revanced.patches.candylinkvpn
+
+import app.revanced.extensions.exception
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.candylinkvpn.fingerprints.IsPremiumPurchasedFingerprint
+
+@Patch(
+    name = "Unlock pro",
+    compatiblePackages = [CompatiblePackage("com.candylink.openvpn")]
+)
+@Suppress("unused")
+object UnlockProPatch : BytecodePatch(
+    setOf(IsPremiumPurchasedFingerprint)
+) {
+    override fun execute(context: BytecodeContext) {
+        IsPremiumPurchasedFingerprint.result?.mutableMethod?.addInstructions(
+            0,
+            """
+               const/4 v0, 0x1
+               return v0
+            """
+        ) ?: throw IsPremiumPurchasedFingerprint.exception
+    }
+}

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

@@ -1,8 +0,0 @@
-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,4 +1,4 @@
-package app.revanced.patches.candylinkvpn.fingereprints
+package app.revanced.patches.candylinkvpn.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 
@@ -7,5 +7,4 @@ object IsPremiumPurchasedFingerprint : MethodFingerprint(
         methodDef.definingClass.endsWith("PreferenceProvider;") &&
                 methodDef.name == "isPremiumPurchased"
     }
-) {
-}
+)

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

@@ -1,35 +0,0 @@
-package app.revanced.patches.candylinkvpn.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.candylinkvpn.annotations.UnlockProCompatibility
-import app.revanced.patches.candylinkvpn.fingereprints.IsPremiumPurchasedFingerprint
-
-@Patch
-@Name("Unlock pro")
-@Description("Unlocks premium features.")
-@UnlockProCompatibility
-@Version("0.0.1")
-class UnlockProPatch : BytecodePatch(
-    listOf(IsPremiumPurchasedFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        IsPremiumPurchasedFingerprint.result?.mutableMethod?.addInstructions(
-            0,
-            """
-               const/4 v0, 0x1
-               return v0
-            """
-        ) ?: return IsPremiumPurchasedFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}

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

@@ -0,0 +1,24 @@
+package app.revanced.patches.cieid.restrictions.root
+
+import app.revanced.extensions.exception
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.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

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

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

@@ -0,0 +1,33 @@
+package app.revanced.patches.finanzonline.detection.bootloader
+
+import app.revanced.extensions.exception
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.finanzonline.detection.bootloader.fingerprints.BootStateFingerprint
+import app.revanced.patches.finanzonline.detection.bootloader.fingerprints.CreateKeyFingerprint
+
+
+@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)
+) {
+    override fun execute(context: BytecodeContext) {
+        arrayOf(CreateKeyFingerprint, BootStateFingerprint).forEach { fingerprint ->
+            fingerprint.result?.mutableMethod?.addInstructions(
+                0,
+                """
+                        const/4 v0, 0x1
+                        return v0
+                """
+            ) ?: throw fingerprint.exception
+        }
+    }
+}

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

@@ -1,8 +1,8 @@
 package app.revanced.patches.finanzonline.detection.bootloader.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+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)
 object BootStateFingerprint : MethodFingerprint(

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

@@ -1,7 +1,7 @@
 package app.revanced.patches.finanzonline.detection.bootloader.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.AccessFlags
 
 // Located @ at.gv.bmf.bmf2go.taxequalization.tools.utils.AttestationHelper#createKey (3.0.1)
 object CreateKeyFingerprint : MethodFingerprint(

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

@@ -1,39 +0,0 @@
-package app.revanced.patches.finanzonline.detection.bootloader.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.finanzonline.detection.bootloader.fingerprints.BootStateFingerprint
-import app.revanced.patches.finanzonline.detection.bootloader.fingerprints.CreateKeyFingerprint
-import app.revanced.patches.finanzonline.detection.shared.annotations.DetectionCompatibility
-
-
-@Patch
-@Name("Remove bootloader detection")
-@Description("Removes the check for an unlocked bootloader.")
-@DetectionCompatibility
-@Version("0.0.1")
-class BootloaderDetectionPatch : BytecodePatch(
-    listOf(CreateKeyFingerprint, BootStateFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        arrayOf(CreateKeyFingerprint, BootStateFingerprint).forEach { fingerprint ->
-            fingerprint.result?.mutableMethod?.addInstructions(
-                0,
-                """
-                        const/4 v0, 0x1
-                        return v0
-                """
-            ) ?: return fingerprint.toErrorResult()
-        }
-
-        return PatchResultSuccess()
-    }
-}

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

@@ -0,0 +1,29 @@
+package app.revanced.patches.finanzonline.detection.root
+
+import app.revanced.extensions.exception
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.finanzonline.detection.root.fingerprints.RootDetectionFingerprint
+
+@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)
+) {
+    override fun execute(context: BytecodeContext) {
+        RootDetectionFingerprint.result?.mutableMethod?.addInstructions(
+            0,
+            """
+                sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+                return-object v0
+            """
+        ) ?: throw RootDetectionFingerprint.exception
+    }
+}

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

@@ -2,8 +2,8 @@ package app.revanced.patches.finanzonline.detection.root.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+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)
 object RootDetectionFingerprint : MethodFingerprint(

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

@@ -1,35 +0,0 @@
-package app.revanced.patches.finanzonline.detection.root.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.finanzonline.detection.root.fingerprints.RootDetectionFingerprint
-import app.revanced.patches.finanzonline.detection.shared.annotations.DetectionCompatibility
-
-@Patch
-@Name("Remove root detection")
-@Description("Removes the check for root permissions.")
-@DetectionCompatibility
-@Version("0.0.1")
-class RootDetectionPatch : BytecodePatch(
-    listOf(RootDetectionFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        RootDetectionFingerprint.result?.mutableMethod?.addInstructions(
-            0,
-            """
-                sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
-                return-object v0
-            """
-        ) ?: return RootDetectionFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}

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

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

@@ -0,0 +1,38 @@
+package app.revanced.patches.googlerecorder.restrictions
+
+import app.revanced.extensions.exception
+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.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)
+) {
+    override fun execute(context: BytecodeContext) {
+        OnApplicationCreateFingerprint.result?.let {
+            val featureStringIndex = it.scanResult.stringsScanResult!!.matches.first().index
+
+            it.mutableMethod.apply {
+                // Remove check for device restrictions.
+                removeInstructions(featureStringIndex - 2, 5)
+
+                val featureAvailableRegister = getInstruction<OneRegisterInstruction>(featureStringIndex).registerA
+
+                // Override "isPixelDevice()" to return true.
+                addInstruction(featureStringIndex, "const/4 v$featureAvailableRegister, 0x1")
+            }
+        } ?: throw OnApplicationCreateFingerprint.exception
+    }
+}

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

@@ -1,4 +1,4 @@
-package app.revanced.patches.googlerecorder.restrictions.fingereprints
+package app.revanced.patches.googlerecorder.restrictions.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 

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

@@ -1,45 +0,0 @@
-package app.revanced.patches.googlerecorder.restrictions.patch
-
-import app.revanced.extensions.toErrorResult
-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.annotation.Version
-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.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.googlerecorder.restrictions.fingereprints.OnApplicationCreateFingerprint
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-
-@Patch
-@Name("Remove device restrictions")
-@Description("Removes restrictions from using the app on any device.")
-@Compatibility([Package("com.google.android.apps.recorder")])
-@Version("0.0.1")
-class RemoveDeviceRestrictions : BytecodePatch(
-    listOf(OnApplicationCreateFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        OnApplicationCreateFingerprint.result?.let {
-            val featureStringIndex = it.scanResult.stringsScanResult!!.matches.first().index
-
-            it.mutableMethod.apply {
-                // Remove check for device restrictions.
-                removeInstructions(featureStringIndex - 2, 5)
-
-                val featureAvailableRegister = getInstruction<OneRegisterInstruction>(featureStringIndex).registerA
-
-                // Override "isPixelDevice()" to return true.
-                addInstruction(featureStringIndex, "const/4 v$featureAvailableRegister, 0x1")
-            }
-        } ?: return OnApplicationCreateFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}

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

@@ -0,0 +1,26 @@
+package app.revanced.patches.hexeditor.ad
+
+import app.revanced.extensions.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

@@ -1,12 +0,0 @@
-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/patch/HexEditorAdsPatch.kt

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

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

@@ -0,0 +1,28 @@
+package app.revanced.patches.iconpackstudio.misc.pro
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.iconpackstudio.misc.pro.fingerprints.CheckProFingerprint
+
+@Patch(
+    name = "Unlock pro",
+    compatiblePackages = [CompatiblePackage("ginlemon.iconpackstudio")]
+)
+@Suppress("unused")
+object UnlockProPatch : BytecodePatch(
+    setOf(CheckProFingerprint)
+) {
+    override fun execute(context: BytecodeContext) {
+        val method = CheckProFingerprint.result!!.mutableMethod
+        method.addInstructions(
+            0,
+            """
+                const/4 v0, 0x1
+                return v0
+            """
+        )
+    }
+}

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

@@ -1,8 +0,0 @@
-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/patch/UnlockProPatch.kt

@@ -1,37 +0,0 @@
-package app.revanced.patches.iconpackstudio.misc.pro.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.iconpackstudio.misc.pro.annotations.UnlockProCompatibility
-import app.revanced.patches.iconpackstudio.misc.pro.fingerprints.CheckProFingerprint
-
-@Patch
-@Name("Unlock pro")
-@Description("Unlocks all pro features.")
-@UnlockProCompatibility
-@Version("0.0.1")
-class UnlockProPatch : BytecodePatch(
-    listOf(
-        CheckProFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        val method = CheckProFingerprint.result!!.mutableMethod
-        method.addInstructions(
-            0,
-            """
-                const/4 v0, 0x1
-                return v0
-            """
-        )
-        
-        return PatchResultSuccess()
-    }
-}

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

@@ -0,0 +1,21 @@
+package app.revanced.patches.idaustria.detection.root
+
+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.idaustria.detection.root.fingerprints.RootDetectionFingerprint
+
+@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(RootDetectionFingerprint)
+) {
+    override fun execute(context: BytecodeContext) =
+        RootDetectionFingerprint.result!!.mutableMethod.addInstruction(0, "return-void")
+}

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

@@ -1,7 +1,7 @@
 package app.revanced.patches.idaustria.detection.root.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.AccessFlags
 
 object RootDetectionFingerprint : MethodFingerprint(
     "V",

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

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

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

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

@@ -1,27 +1,23 @@
-package app.revanced.patches.idaustria.detection.signature.patch
+package app.revanced.patches.idaustria.detection.signature
 
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.idaustria.detection.shared.annotations.DetectionCompatibility
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.idaustria.detection.signature.fingerprints.SpoofSignatureFingerprint
 
-@Patch
-@Name("Spoof signature")
-@Description("Spoofs the signature of the app.")
-@DetectionCompatibility
-@Version("0.0.1")
-class SpoofSignaturePatch : BytecodePatch(
-    listOf(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)
 ) {
-    companion object {
-        const val EXPECTED_SIGNATURE = "OpenSSLRSAPublicKey{modulus=ac3e6fd6050aa7e0d6010ae58190404cd89a56935b44f6fee" +
+    private const val EXPECTED_SIGNATURE =
+        "OpenSSLRSAPublicKey{modulus=ac3e6fd6050aa7e0d6010ae58190404cd89a56935b44f6fee" +
                 "067c149768320026e10b24799a1339e414605e448e3f264444a327b9ae292be2b62ad567dd1800dbed4a88f718a33dc6db6b" +
                 "f5178aa41aa0efff8a3409f5ca95dbfccd92c7b4298966df806ea7a0204a00f0e745f6d9f13bdf24f3df715d7b62c1600906" +
                 "15de1c8a956b9286764985a3b3c060963c435fb9481a5543aaf0671fc2dba6c5c2b17d1ef1d85137f14dc9bbdf3490288087" +
@@ -32,9 +28,8 @@ class SpoofSignaturePatch : BytecodePatch(
                 "0def55be2c1f6f9c72c92fb45d7e0a9ac571cb38f0a9a37bb33ea06f223fde8c7a92e8c47769e386f9799776e8f110c21df2" +
                 "77ef1be61b2c01ebdabddcbf53cc4b6fd9a3c445606ee77b3758162c80ad8f8137b3c6864e92db904807dcb2be9d7717dd21" +
                 "bf42c121d620ddfb7914f7a95c713d9e1c1b7bdb4a03d618e40cf7e9e235c0b5687e03b7ab3,publicExponent=10001}"
-    }
 
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         SpoofSignatureFingerprint.result!!.mutableMethod.addInstructions(
             0,
             """
@@ -42,6 +37,5 @@ class SpoofSignaturePatch : BytecodePatch(
                 return-object v0 
             """
         )
-        return PatchResultSuccess()
     }
 }

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

@@ -1,7 +1,7 @@
 package app.revanced.patches.idaustria.detection.signature.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.AccessFlags
 
 object SpoofSignatureFingerprint : MethodFingerprint(
     "L",

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

@@ -0,0 +1,31 @@
+package app.revanced.patches.inshorts.ad
+
+import app.revanced.extensions.exception
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.inshorts.ad.fingerprints.InshortsAdsFingerprint
+
+@Patch(
+    name = "Hide ads",
+    compatiblePackages = [CompatiblePackage("com.nis.app")]
+)
+@Suppress("unused")
+object HideAdsPatch : BytecodePatch(
+    setOf(InshortsAdsFingerprint)
+) {
+    override fun execute(context: BytecodeContext) {
+        InshortsAdsFingerprint.result?.let { result ->
+            result.apply {
+                mutableMethod.addInstruction(
+                    0,
+                    """
+                        return-void
+                    """
+                )
+            }
+        } ?: throw InshortsAdsFingerprint.exception
+    }
+}

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

@@ -1,9 +0,0 @@
-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/patch/InshortsAdsPatch.kt

@@ -1,38 +0,0 @@
-package app.revanced.patches.inshorts.ad.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.inshorts.ad.annotations.HideAdsCompatibility
-import app.revanced.patches.inshorts.ad.fingerprints.InshortsAdsFingerprint
-
-@Patch
-@Name("Hide ads")
-@Description("Removes ads from Inshorts.")
-@HideAdsCompatibility
-@Version("0.0.1")
-class HideAdsPatch : BytecodePatch(
-    listOf(InshortsAdsFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        InshortsAdsFingerprint.result?.let { result ->
-            result.apply {
-                mutableMethod.addInstruction(
-                    0,
-                    """
-                        return-void
-                    """
-                )
-            }
-        } ?: return InshortsAdsFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}

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

@@ -1,16 +1,14 @@
-package app.revanced.patches.instagram.patches.ads.timeline.patch
+package app.revanced.patches.instagram.patches.ads.timeline
 
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.*
+import app.revanced.extensions.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.MediaFingerprint
 import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ShowAdFingerprint
@@ -18,34 +16,35 @@ import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads.Gene
 import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads.MediaAdFingerprint
 import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads.PaidPartnershipAdFingerprint
 import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads.ShoppingAdFingerprint
-import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 
-@Patch
-@Name("Hide timeline ads")
-@Description("Removes ads from the timeline.")
-@Compatibility([Package("com.instagram.android", arrayOf("275.0.0.27.98"))])
-@Version("0.0.1")
-class HideTimelineAdsPatch : BytecodePatch(
-    listOf(
+@Patch(
+    name = "Hide timeline ads",
+    description = "Removes ads from the timeline.",
+    compatiblePackages = [CompatiblePackage("com.instagram.android", ["275.0.0.27.98"])]
+)
+@Suppress("unused")
+object HideTimelineAdsPatch : BytecodePatch(
+    setOf(
         ShowAdFingerprint,
         MediaFingerprint,
         PaidPartnershipAdFingerprint // Unlike the other ads this one is resolved from all classes.
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         // region Resolve required methods to check for ads.
 
-        ShowAdFingerprint.result ?: return ShowAdFingerprint.toErrorResult()
+        ShowAdFingerprint.result ?: throw ShowAdFingerprint.exception
 
-        PaidPartnershipAdFingerprint.result ?: return PaidPartnershipAdFingerprint.toErrorResult()
+        PaidPartnershipAdFingerprint.result ?: throw PaidPartnershipAdFingerprint.exception
 
         MediaFingerprint.result?.let {
             GenericMediaAdFingerprint.resolve(context, it.classDef)
             ShoppingAdFingerprint.resolve(context, it.classDef)
 
             return@let
-        } ?: return MediaFingerprint.toErrorResult()
+        } ?: throw MediaFingerprint.exception
 
         // endregion
 
@@ -100,7 +99,5 @@ class HideTimelineAdsPatch : BytecodePatch(
 
             // endregion
         }
-
-        return PatchResultSuccess()
     }
 }

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

@@ -2,8 +2,8 @@ package app.revanced.patches.instagram.patches.ads.timeline.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
 
 object ShowAdFingerprint : MethodFingerprint(
     "Z",

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

@@ -1,6 +1,6 @@
 package app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads
 
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.Opcode
 
 object GenericMediaAdFingerprint : MediaAdFingerprint(
     opcodes = listOf(

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

@@ -2,10 +2,10 @@ package app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.ClassDef
-import org.jf.dexlib2.iface.Method
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.ClassDef
+import com.android.tools.smali.dexlib2.iface.Method
 
 abstract class MediaAdFingerprint(
     returnType: String? = "Z",

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

@@ -1,8 +1,8 @@
 package app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads
 
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.reference.MethodReference
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 
 object PaidPartnershipAdFingerprint : MediaAdFingerprint(
     "V",

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

@@ -1,6 +1,6 @@
 package app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads
 
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.Opcode
 
 object ShoppingAdFingerprint : MediaAdFingerprint(
     opcodes = listOf(

src/main/kotlin/app/revanced/patches/irplus/ad/RemoveAdsPatch.kt

@@ -0,0 +1,26 @@
+package app.revanced.patches.irplus.ad
+
+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.irplus.ad.fingerprints.IrplusAdsFingerprint
+
+
+@Patch(
+    name = "Remove ads",
+    compatiblePackages = [CompatiblePackage("net.binarymode.android.irplus")]
+)
+@Suppress("unused")
+object RemoveAdsPatch : BytecodePatch(
+    setOf(IrplusAdsFingerprint)
+) {
+    override fun execute(context: BytecodeContext) {
+        val method = IrplusAdsFingerprint.result!!.mutableMethod
+
+        // By overwriting the second parameter of the method,
+        // the view which holds the advertisement is removed.
+        method.addInstruction(0, "const/4 p2, 0x0")
+    }
+}

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

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

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

@@ -2,7 +2,7 @@ package app.revanced.patches.irplus.ad.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.AccessFlags
 
 object IrplusAdsFingerprint : MethodFingerprint(
     "V",

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

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

src/main/kotlin/app/revanced/patches/lightroom/misc/login/DisableMandatoryLoginPatch.kt

@@ -0,0 +1,26 @@
+package app.revanced.patches.lightroom.misc.login
+
+import app.revanced.extensions.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.lightroom.misc.login.fingerprints.IsLoggedInFingerprint
+
+@Patch(
+    name = "Disable mandatory login",
+    compatiblePackages = [CompatiblePackage("com.adobe.lrmobile")]
+)
+@Suppress("unused")
+object DisableMandatoryLoginPatch : BytecodePatch(
+    setOf(IsLoggedInFingerprint)
+) {
+    override fun execute(context: BytecodeContext) {
+        IsLoggedInFingerprint.result?.mutableMethod?.apply {
+            val index = implementation!!.instructions.lastIndex - 1
+            // Set isLoggedIn = true.
+            replaceInstruction(index, "const/4 v0, 0x1")
+        } ?: throw IsLoggedInFingerprint.exception
+    }
+}

src/main/kotlin/app/revanced/patches/lightroom/misc/login/fingerprints/IsLoggedInFingerprint.kt

@@ -0,0 +1,19 @@
+package app.revanced.patches.lightroom.misc.login.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 IsLoggedInFingerprint : MethodFingerprint(
+    returnType = "Z",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC or AccessFlags.FINAL,
+    opcodes = listOf(
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.SGET_OBJECT,
+        Opcode.IF_NE,
+        Opcode.CONST_4,
+        Opcode.GOTO
+    )
+)

src/main/kotlin/app/revanced/patches/lightroom/misc/premium/UnlockPremiumPatch.kt

@@ -0,0 +1,24 @@
+package app.revanced.patches.lightroom.misc.premium
+
+import app.revanced.extensions.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.lightroom.misc.premium.fingerprints.HasPurchasedFingerprint
+
+@Patch(
+    name = "Unlock premium",
+    compatiblePackages = [CompatiblePackage("com.adobe.lrmobile")]
+)
+@Suppress("unused")
+object UnlockPremiumPatch : BytecodePatch(
+    setOf(HasPurchasedFingerprint)
+){
+    override fun execute(context: BytecodeContext) {
+         // Set hasPremium = true.
+        HasPurchasedFingerprint.result?.mutableMethod?.replaceInstruction(2, "const/4 v2, 0x1")
+            ?: throw HasPurchasedFingerprint.exception
+    }
+}

src/main/kotlin/app/revanced/patches/lightroom/misc/premium/fingerprints/HasPurchasedFingerprint.kt

@@ -0,0 +1,18 @@
+package app.revanced.patches.lightroom.misc.premium.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+
+object HasPurchasedFingerprint : MethodFingerprint(
+    returnType = "Z",
+    accessFlags = AccessFlags.PRIVATE or AccessFlags.FINAL,
+    strings = listOf("isPurchaseDoneRecently = true, access platform profile present? = "),
+    opcodes = listOf(
+        Opcode.SGET_OBJECT,
+        Opcode.CONST_4,
+        Opcode.CONST_4,
+        Opcode.CONST_4,
+    )
+)

src/main/kotlin/app/revanced/patches/memegenerator/detection/license/LicenseValidationPatch.kt

@@ -0,0 +1,25 @@
+package app.revanced.patches.memegenerator.detection.license
+
+import app.revanced.extensions.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.Patch
+import app.revanced.patches.memegenerator.detection.license.fingerprints.LicenseValidationFingerprint
+
+@Patch(description = "Disables Firebase license validation.")
+object LicenseValidationPatch : BytecodePatch(
+    setOf(LicenseValidationFingerprint)
+) {
+    override fun execute(context: BytecodeContext) {
+        LicenseValidationFingerprint.result?.apply {
+            mutableMethod.replaceInstructions(
+                0,
+                """
+                    const/4 p0, 0x1
+                    return  p0
+                """
+            )
+        } ?: throw LicenseValidationFingerprint.exception
+    }
+}

src/main/kotlin/app/revanced/patches/memegenerator/detection/license/fingerprints/LicenseValidationFingerprint.kt

@@ -1,9 +1,9 @@
-package app.revanced.patches.memegenerator.detection.license.fingerprint
+package app.revanced.patches.memegenerator.detection.license.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
 
 object LicenseValidationFingerprint : MethodFingerprint(
     returnType = "Z",

src/main/kotlin/app/revanced/patches/memegenerator/detection/license/patch/LicenseValidationPatch.kt

@@ -1,31 +0,0 @@
-package app.revanced.patches.memegenerator.detection.license.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patches.memegenerator.detection.license.fingerprint.LicenseValidationFingerprint
-
-@Description("Disables Firebase license validation.")
-@Version("0.0.1")
-class LicenseValidationPatch : BytecodePatch(
-    listOf(LicenseValidationFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        LicenseValidationFingerprint.result?.apply {
-            mutableMethod.replaceInstructions(
-                0,
-                """
-                    const/4 p0, 0x1
-                    return  p0
-                """
-            )
-        } ?: throw LicenseValidationFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}

src/main/kotlin/app/revanced/patches/memegenerator/detection/signature/SignatureVerificationPatch.kt

@@ -0,0 +1,25 @@
+package app.revanced.patches.memegenerator.detection.signature
+
+import app.revanced.extensions.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.Patch
+import app.revanced.patches.memegenerator.detection.signature.fingerprints.VerifySignatureFingerprint
+
+@Patch(description = "Disables detection of incorrect signature.")
+object SignatureVerificationPatch : BytecodePatch(
+    setOf(VerifySignatureFingerprint)
+) {
+    override fun execute(context: BytecodeContext) {
+        VerifySignatureFingerprint.result?.apply {
+            mutableMethod.replaceInstructions(
+                0,
+                """
+                    const/4 p0, 0x1
+                    return  p0
+                """
+            )
+        } ?: throw VerifySignatureFingerprint.exception
+    }
+}

src/main/kotlin/app/revanced/patches/memegenerator/detection/signature/fingerprints/VerifySignatureFingerprint.kt

@@ -1,10 +1,10 @@
-package app.revanced.patches.memegenerator.detection.signature.fingerprint
+package app.revanced.patches.memegenerator.detection.signature.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
 
 @FuzzyPatternScanMethod(2)
 object VerifySignatureFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/memegenerator/detection/signature/patch/SignatureVerificationPatch.kt

@@ -1,31 +0,0 @@
-package app.revanced.patches.memegenerator.detection.signature.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patches.memegenerator.detection.signature.fingerprint.VerifySignatureFingerprint
-
-@Description("Disables detection of incorrect signature.")
-@Version("0.0.1")
-class SignatureVerificationPatch : BytecodePatch(
-    listOf(VerifySignatureFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        VerifySignatureFingerprint.result?.apply {
-            mutableMethod.replaceInstructions(
-                0,
-                """
-                    const/4 p0, 0x1
-                    return  p0
-                """
-            )
-        } ?: throw VerifySignatureFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}

src/main/kotlin/app/revanced/patches/memegenerator/misc/pro/UnlockProVersionPatch.kt

@@ -0,0 +1,44 @@
+package app.revanced.patches.memegenerator.misc.pro
+
+import app.revanced.extensions.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.memegenerator.detection.license.LicenseValidationPatch
+import app.revanced.patches.memegenerator.detection.signature.SignatureVerificationPatch
+import app.revanced.patches.memegenerator.misc.pro.fingerprints.IsFreeVersionFingerprint
+
+@Patch(
+    name = "Unlock pro",
+    dependencies = [
+        SignatureVerificationPatch::class,
+        LicenseValidationPatch::class
+    ],
+    compatiblePackages = [
+        CompatiblePackage(
+            "com.zombodroid.MemeGenerator", [
+                "4.6364",
+                "4.6370",
+                "4.6375",
+                "4.6377"
+            ]
+        )
+    ]
+)
+@Suppress("unused")
+object UnlockProVersionPatch : BytecodePatch(
+    setOf(IsFreeVersionFingerprint)
+) {
+    override fun execute(context: BytecodeContext) {
+        IsFreeVersionFingerprint.result?.apply {
+            mutableMethod.replaceInstructions(0,
+                """
+                    sget-object p0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+                    return-object p0
+                """
+            )
+        } ?: throw IsFreeVersionFingerprint.exception
+    }
+}

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

@@ -1,17 +0,0 @@
-package app.revanced.patches.memegenerator.misc.pro.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [Package(
-        "com.zombodroid.MemeGenerator", arrayOf(
-            "4.6364",
-            "4.6370",
-            "4.6375",
-            "4.6377",
-        )
-    )]
-)
-@Target(AnnotationTarget.CLASS)
-internal annotation class UnlockProCompatibility

src/main/kotlin/app/revanced/patches/memegenerator/misc/pro/fingerprints/IsFreeVersionFingerprint.kt

@@ -1,9 +1,9 @@
-package app.revanced.patches.memegenerator.misc.pro.fingerprint
+package app.revanced.patches.memegenerator.misc.pro.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
 
 object IsFreeVersionFingerprint : MethodFingerprint(
     returnType = "Ljava/lang/Boolean;",

src/main/kotlin/app/revanced/patches/memegenerator/misc/pro/patch/UnlockProVersionPatch.kt

@@ -1,45 +0,0 @@
-package app.revanced.patches.memegenerator.misc.pro.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.memegenerator.detection.license.patch.LicenseValidationPatch
-import app.revanced.patches.memegenerator.detection.signature.patch.SignatureVerificationPatch
-import app.revanced.patches.memegenerator.misc.pro.annotations.UnlockProCompatibility
-import app.revanced.patches.memegenerator.misc.pro.fingerprint.IsFreeVersionFingerprint
-
-@Patch
-@Name("Unlock pro")
-@Description("Unlocks pro features.")
-@DependsOn([
-    SignatureVerificationPatch::class,
-    LicenseValidationPatch::class
-])
-@UnlockProCompatibility
-@Version("0.0.1")
-class UnlockProVersionPatch : BytecodePatch(
-    listOf(
-        IsFreeVersionFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        IsFreeVersionFingerprint.result?.apply {
-            mutableMethod.replaceInstructions(0,
-                """
-                    sget-object p0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
-                    return-object p0
-                """
-            )
-        } ?: throw IsFreeVersionFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}

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

@@ -2,7 +2,7 @@ package app.revanced.patches.messenger.ads.inbox.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.AccessFlags
 
 object LoadInboxAdsFingerprint : MethodFingerprint(
     returnType = "V",

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

@@ -1,29 +1,26 @@
 package app.revanced.patches.messenger.ads.inbox.patch
 
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.*
+import app.revanced.extensions.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.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.messenger.ads.inbox.fingerprints.LoadInboxAdsFingerprint
 
-@Patch
-@Name("Hide inbox ads")
-@Description("Hides ads in inbox.")
-@Compatibility([Package("com.facebook.orca")])
-@Version("0.0.1")
-class HideInboxAdsPatch : BytecodePatch(
-    listOf(LoadInboxAdsFingerprint)
+@Patch(
+    name = "Hide inbox ads",
+    description = "Hides ads in inbox.",
+    compatiblePackages = [CompatiblePackage("com.facebook.orca")]
+)
+@Suppress("unused")
+object HideInboxAdsPatch : BytecodePatch(
+    setOf(LoadInboxAdsFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         LoadInboxAdsFingerprint.result?.mutableMethod?.apply {
             this.replaceInstruction(0, "return-void")
-        } ?: return LoadInboxAdsFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw LoadInboxAdsFingerprint.exception
     }
 }
 

src/main/kotlin/app/revanced/patches/messenger/inputfield/fingerprints/SendTypingIndicatorFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.messenger.inputfield.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.dexbacked.value.DexBackedStringEncodedValue
+import com.android.tools.smali.dexlib2.dexbacked.value.DexBackedStringEncodedValue
 
 object SendTypingIndicatorFingerprint : MethodFingerprint(
     returnType = "V",

src/main/kotlin/app/revanced/patches/messenger/inputfield/fingerprints/SwitchMessangeInputEmojiButtonFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.messenger.inputfield.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.Opcode
 
 object SwitchMessangeInputEmojiButtonFingerprint : MethodFingerprint(
     returnType = "V",

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

@@ -1,24 +1,25 @@
 package app.revanced.patches.messenger.inputfield.patch
 
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.*
+import app.revanced.extensions.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.messenger.inputfield.fingerprints.SwitchMessangeInputEmojiButtonFingerprint
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 
-@Patch
-@Name("Disable switching emoji to sticker in message input field")
-@Description("Disables switching from emoji to sticker search mode in message input field")
-@Compatibility([Package("com.facebook.orca")])
-@Version("0.0.1")
-class DisableSwitchingEmojiToStickerInMessageInputField : BytecodePatch(listOf(SwitchMessangeInputEmojiButtonFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
+@Patch(
+    name = "Disable switching emoji to sticker",
+    description = "Disables switching from emoji to sticker search mode in message input field.",
+    compatiblePackages = [CompatiblePackage("com.facebook.orca")]
+)
+@Suppress("unused")
+object DisableSwitchingEmojiToStickerPatch : BytecodePatch(
+    setOf(SwitchMessangeInputEmojiButtonFingerprint)
+) {
+    override fun execute(context: BytecodeContext) {
         SwitchMessangeInputEmojiButtonFingerprint.result?.let {
             val setStringIndex = it.scanResult.patternScanResult!!.startIndex + 2
 
@@ -30,8 +31,6 @@ class DisableSwitchingEmojiToStickerInMessageInputField : BytecodePatch(listOf(S
                     "const-string v$targetRegister, \"expression\""
                 )
             }
-        } ?: throw SwitchMessangeInputEmojiButtonFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw SwitchMessangeInputEmojiButtonFingerprint.exception
     }
 }

src/main/kotlin/app/revanced/patches/messenger/inputfield/patch/DisableTypingIndicator.kt

@@ -1,29 +0,0 @@
-package app.revanced.patches.messenger.inputfield.patch
-
-import app.revanced.extensions.toErrorResult
-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.annotation.Version
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.messenger.inputfield.fingerprints.SendTypingIndicatorFingerprint
-
-@Patch
-@Name("Disable typing indicator")
-@Description("Disables the indicator while typing a message")
-@Compatibility([Package("com.facebook.orca")])
-@Version("0.0.1")
-class DisableTypingIndicator : BytecodePatch(listOf(SendTypingIndicatorFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        SendTypingIndicatorFingerprint.result?.mutableMethod?.replaceInstruction(0, "return-void")
-            ?: throw SendTypingIndicatorFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}