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

# [4.8.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v4.8.0-dev.4...v4.8.0-dev.5) (2024-04-23)

### Bug Fixes

* **YouTube - Hide Shorts components:** Rename option title to make it consistent ([0d63b13](0d63b137aa))

.editorconfig

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

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -71,7 +71,7 @@ body:
         Before creating a new feature request, please keep the following in mind:
 
         - **Do not submit a duplicate feature request**: You can review existing feature requests [here](https://github.com/ReVanced/revanced-patches/labels/Feature%20request).
-        - **Review the contribution guidelines**: Make sure your bug report adheres to it. You can find the guidelines [here](https://github.com/ReVanced/revanced-patches/blob/main/CONTRIBUTING.md).
+        - **Review the contribution guidelines**: Make sure your feature request adheres to it. You can find the guidelines [here](https://github.com/ReVanced/revanced-patches/blob/main/CONTRIBUTING.md).
         - **Do not use the issue page for support**: If you need help or have questions, check out other platforms on [revanced.app](https://revanced.app).
   - type: textarea
     attributes:

.github/dependabot.yml

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

.github/workflows/build_pull_request.yml

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

.github/workflows/pull_strings.yml

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

.github/workflows/push_strings.yml

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

.github/workflows/release.yml

@@ -6,10 +6,6 @@ on:
     branches:
       - main
       - dev
-  pull_request:
-    branches:
-      - main
-      - dev
 
 jobs:
   release:
@@ -24,24 +20,30 @@ jobs:
           persist-credentials: false
           fetch-depth: 0
 
-      - name: Cache Node modules
-        uses: actions/cache@v3
-        with:
-          path: |
-            node_modules
-          key: npm-${{ hashFiles('package-lock.json') }}
-
       - name: Cache Gradle
         uses: burrunan/gradle-cache-action@v1
 
-      - name: Build with Gradle
+      - name: Build
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: ./gradlew generateMeta clean
 
-      - name: Setup semantic-release
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "lts/*"
+          cache: 'npm'
+
+      - name: Install dependencies
         run: npm install
 
+      - name: Import GPG key
+        uses: crazy-max/ghaction-import-gpg@v6
+        with:
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.GPG_PASSPHRASE }}
+          fingerprint: ${{ env.GPG_FINGERPRINT }}
+
       - name: Release
         env:
           GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }}

.github/workflows/update-gradle-wrapper.yml

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

.releaserc

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

CONTRIBUTING.md

@@ -64,15 +64,15 @@ This document describes how to contribute to ReVanced Patches.
 
 ## 📖 Resources to help you get started
 
-* The [documentation](https://github.com/ReVanced/revanced-patches/tree/docs/docs) provides the fundamentals of patches 
+* The [documentation](https://github.com/ReVanced/revanced-patcher/tree/docs/docs) contains the fundamentals
-and everything necessary to create your own patch from scratch
+of ReVanced Patcher and how to use ReVanced Patcher to create patches
 * [Our backlog](https://github.com/orgs/ReVanced/projects/12) is where we keep track of what we're working on
 * [Issues](https://github.com/ReVanced/revanced-patches/issues) are where we keep track of bugs and feature requests
 
 ## 🙏 Submitting a feature request
 
 Features can be requested by opening an issue using the
-[Feature request issue template](https://github.com/ReVanced/revanced-patches/issues/new?assignees=&labels=Feature+request&projects=&template=feature-request.yml&title=feat%3A+).
+[Feature request issue template](https://github.com/ReVanced/revanced-patches/issues/new?assignees=&labels=Feature+request&projects=&template=feature_request.yml&title=feat%3A+).
 
 > **Note**
 > Requests can be accepted or rejected at the discretion of maintainers of ReVanced Patches.
@@ -81,7 +81,7 @@ Features can be requested by opening an issue using the
 ## 🐞 Submitting a bug report
 
 If you encounter a bug while using ReVanced Patches, open an issue using the
-[Bug report issue template](https://github.com/ReVanced/revanced-patches/issues/new?assignees=&labels=Bug+report&projects=&template=bug-report.yml&title=bug%3A+).
+[Bug report issue template](https://github.com/ReVanced/revanced-patches/issues/new?assignees=&labels=Bug+report&projects=&template=bug_report.yml&title=bug%3A+).
 
 ## 🧑‍⚖️ Guidelines for requesting or contributing patches
 
@@ -110,7 +110,7 @@ are unaffected by this change.
 
 ## 📝 How to contribute
 
-1. Before contributing, it is recommended to open an issue to discuss your change 
+1. Before contributing, it is recommended to open an issue to discuss your change
 with the maintainers of ReVanced Patches. This will help you determine whether your change is acceptable
 and whether it is worth your time to implement it
 2. Development happens on the `dev` branch. Fork the repository and create your branch from `dev`

README.md

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

build.gradle.kts

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

crowdin.yml

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

dummy/build.gradle.kts

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

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

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

gradle.properties

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

gradle/libs.versions.toml

@@ -1,9 +1,10 @@
 [versions]
-revanced-patcher = "19.1.0"
+revanced-patcher = "19.3.1"
-smali = "3.0.3"
+smali = "3.0.5"
-guava = "32.1.2-jre"
+guava = "33.0.0-jre"
 gson = "2.10.1"
-binary-compatibility-validator = "0.13.2"
+binary-compatibility-validator = "0.14.0"
+kotlin = "1.9.22"
 
 [libraries]
 revanced-patcher = { module = "app.revanced:revanced-patcher", version.ref = "revanced-patcher" }
@@ -13,3 +14,4 @@ gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
 
 [plugins]
 binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binary-compatibility-validator" }
+kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
-distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
+distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dist

gradlew

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

package.json

@@ -1,9 +1,9 @@
 {
   "devDependencies": {
-    "@saithodev/semantic-release-backmerge": "^3.2.1",
+    "@saithodev/semantic-release-backmerge": "^4.0.1",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
-    "gradle-semantic-release-plugin": "^1.8.0",
+    "gradle-semantic-release-plugin": "^1.9.1",
-    "semantic-release": "^22.0.8"
+    "semantic-release": "^23.0.2"
   }
 }

settings.gradle.kts

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

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

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

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

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

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

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

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

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

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

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

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

@@ -2,7 +2,7 @@ package app.revanced.patches.all.connectivity.wifi.spoof
 
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.all.misc.transformation.AbstractTransformInstructionsPatch
+import app.revanced.patches.all.misc.transformation.BaseTransformInstructionsPatch
 import app.revanced.patches.all.misc.transformation.IMethodCall
 import app.revanced.patches.all.misc.transformation.Instruction35cInfo
 import app.revanced.patches.all.misc.transformation.filterMapInstruction35c
@@ -17,8 +17,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.Instruction
     requiresIntegrations = true
 )
 @Suppress("unused")
-object SpoofWifiPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
+object SpoofWifiPatch : BaseTransformInstructionsPatch<Instruction35cInfo>() {
-    private const val INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX = "Lapp/revanced/all/connectivity/wifi/spoof/SpoofWifiPatch"
+    private const val INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX = "Lapp/revanced/integrations/all/connectivity/wifi/spoof/SpoofWifiPatch"
     private const val INTEGRATIONS_CLASS_DESCRIPTOR = "$INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX;"
 
     override fun filterMap(

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,290 @@
+package app.revanced.patches.all.misc.resources
+
+import app.revanced.patcher.PatchClass
+import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.PatchException
+import app.revanced.patcher.patch.ResourcePatch
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.util.DomFileEditor
+import app.revanced.patches.all.misc.resources.AddResourcesPatch.resources
+import app.revanced.util.*
+import app.revanced.util.resource.ArrayResource
+import app.revanced.util.resource.BaseResource
+import app.revanced.util.resource.StringResource
+import org.w3c.dom.Node
+import java.io.Closeable
+import java.util.*
+
+/**
+ * An identifier of an app. For example, `youtube`.
+ */
+private typealias AppId = String
+
+/**
+ * An identifier of a patch. For example, `ad.general.HideAdsPatch`.
+ */
+private typealias PatchId = String
+
+/**
+ * A set of resources of a patch.
+ */
+private typealias PatchResources = MutableSet<BaseResource>
+
+/**
+ * A map of resources belonging to a patch.
+ */
+private typealias AppResources = MutableMap<PatchId, PatchResources>
+
+/**
+ * A map of resources belonging to an app.
+ */
+private typealias Resources = MutableMap<AppId, AppResources>
+
+/**
+ * The value of a resource.
+ * For example, `values` or `values-de`.
+ */
+private typealias Value = String
+
+@Patch(description = "Add resources such as strings or arrays to the app.")
+object AddResourcesPatch : ResourcePatch(), MutableMap<Value, MutableSet<BaseResource>> by mutableMapOf(), Closeable {
+    private lateinit var context: ResourceContext
+
+    /**
+     * A map of all resources associated by their value staged by [execute].
+     */
+    private lateinit var resources: Map<Value, Resources>
+
+    /*
+    The strategy of this patch is to stage resources present in `/resources/addresources`.
+    These resources are organized by their respective value and patch.
+
+    On AddResourcesPatch#execute, all resources are staged in a temporary map.
+    After that, other patches that depend on AddResourcesPatch can call
+    AddResourcesPatch#invoke(PatchClass) to stage resources belonging to that patch
+    from the temporary map to AddResourcesPatch.
+
+    After all patches that depend on AddResourcesPatch have been executed,
+    AddResourcesPatch#close is finally called to add all staged resources to the app.
+     */
+    override fun execute(context: ResourceContext) {
+        this.context = context
+
+        resources =
+            buildMap {
+                /**
+                 * Puts resources under `/resources/addresources/<value>/<resourceKind>.xml` into the map.
+                 *
+                 * @param value The value of the resource. For example, `values` or `values-de`.
+                 * @param resourceKind The kind of the resource. For example, `strings` or `arrays`.
+                 * @param transform A function that transforms the [Node]s from the XML files to a [BaseResource].
+                 */
+                fun addResources(
+                    value: Value,
+                    resourceKind: String,
+                    transform: (Node) -> BaseResource,
+                ) {
+                    inputStreamFromBundledResource(
+                        "addresources",
+                        "$value/$resourceKind.xml",
+                    )?.let { stream ->
+                        // Add the resources associated with the given value to the map,
+                        // instead of overwriting it.
+                        // This covers the example case such as adding strings and arrays of the same value.
+                        getOrPut(value, ::mutableMapOf).apply {
+                            context.xmlEditor[stream].use { editor ->
+                                val document = editor.file
+
+                                document.getElementsByTagName("app").asSequence().forEach { app ->
+                                    val appId = app.attributes.getNamedItem("id").textContent
+
+                                    getOrPut(appId, ::mutableMapOf).apply {
+                                        app.forEachChildElement { patch ->
+                                            val patchId = patch.attributes.getNamedItem("id").textContent
+
+                                            getOrPut(patchId, ::mutableSetOf).apply {
+                                                patch.forEachChildElement { resourceNode ->
+                                                    val resource = transform(resourceNode)
+
+                                                    add(resource)
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+
+                // Stage all resources to a temporary map.
+                // Staged resources consumed by AddResourcesPatch#invoke(PatchClass)
+                // are later used in AddResourcesPatch#close.
+                try {
+                    val addStringResources = { value: Value ->
+                        addResources(value, "strings", StringResource::fromNode)
+                    }
+                    Locale.getISOLanguages().asSequence().map { "values-$it" }.forEach { addStringResources(it) }
+                    addStringResources("values")
+
+                    addResources("values", "arrays", ArrayResource::fromNode)
+                } catch (e: Exception) {
+                    throw PatchException("Failed to read resources", e)
+                }
+            }
+    }
+
+    /**
+     * Adds a [BaseResource] to the map using [MutableMap.getOrPut].
+     *
+     * @param value The value of the resource. For example, `values` or `values-de`.
+     * @param resource The resource to add.
+     *
+     * @return True if the resource was added, false if it already existed.
+     */
+    operator fun invoke(
+        value: Value,
+        resource: BaseResource,
+    ) = getOrPut(value, ::mutableSetOf).add(resource)
+
+    /**
+     * Adds a list of [BaseResource]s to the map using [MutableMap.getOrPut].
+     *
+     * @param value The value of the resource. For example, `values` or `values-de`.
+     * @param resources The resources to add.
+     *
+     * @return True if the resources were added, false if they already existed.
+     */
+    operator fun invoke(
+        value: Value,
+        resources: Iterable<BaseResource>,
+    ) = getOrPut(value, ::mutableSetOf).addAll(resources)
+
+    /**
+     * Adds a [StringResource].
+     *
+     * @param name The name of the string resource.
+     * @param value The value of the string resource.
+     * @param formatted Whether the string resource is formatted. Defaults to `true`.
+     * @param resourceValue The value of the resource. For example, `values` or `values-de`.
+     *
+     * @return True if the resource was added, false if it already existed.
+     */
+    operator fun invoke(
+        name: String,
+        value: String,
+        formatted: Boolean = true,
+        resourceValue: Value = "values",
+    ) = invoke(resourceValue, StringResource(name, value, formatted))
+
+    /**
+     * Adds an [ArrayResource].
+     *
+     * @param name The name of the array resource.
+     * @param items The items of the array resource.
+     *
+     * @return True if the resource was added, false if it already existed.
+     */
+    operator fun invoke(
+        name: String,
+        items: List<String>,
+    ) = invoke("values", ArrayResource(name, items))
+
+    /**
+     * Puts all resources of any [Value] staged in [resources] for the given [PatchClass] to [AddResourcesPatch].
+     *
+     * @param patch The class of the patch to add resources for.
+     * @param parseIds A function that parses the [AppId] and [PatchId] from the given [PatchClass].
+     * This is used to access the resources in [resources] to stage them in [AddResourcesPatch].
+     * The default implementation assumes that the [PatchClass] qualified name has the following format:
+     * `<any>.<any>.<any>.<app id>.<patch id>`.
+     *
+     * @return True if any resources were added, false if none were added.
+     *
+     * @see AddResourcesPatch.close
+     */
+    operator fun invoke(
+        patch: PatchClass,
+        parseIds: PatchClass.() -> Pair<AppId, PatchId> = {
+            val qualifiedName = qualifiedName ?: throw PatchException("Patch qualified name is null")
+
+            // This requires qualifiedName to have the following format:
+            // `<any>.<any>.<any>.<app id>.<patch id>`
+            with(qualifiedName.split(".")) {
+                if (size < 5) throw PatchException("Patch qualified name has invalid format")
+
+                val appId = this[3]
+                val patchId = subList(4, size).joinToString(".")
+
+                appId to patchId
+            }
+        },
+    ): Boolean {
+        val (appId, patchId) = patch.parseIds()
+
+        var result = false
+
+        // Stage resources for the given patch to AddResourcesPatch associated with their value.
+        resources.forEach { (value, resources) ->
+            resources[appId]?.get(patchId)?.let { patchResources ->
+                if (invoke(value, patchResources)) result = true
+            }
+        }
+
+        return result
+    }
+
+    /**
+     * Adds all resources staged in [AddResourcesPatch] to the app.
+     * This is called after all patches that depend on [AddResourcesPatch] have been executed.
+     */
+    override fun close() {
+        operator fun MutableMap<String, Pair<DomFileEditor, Node>>.invoke(
+            value: Value,
+            resource: BaseResource,
+        ) {
+            // TODO: Fix open-closed principle violation by modifying BaseResource#serialize so that it accepts
+            //  a Value and the map of documents. It will then get or put the document suitable for its resource type
+            //  to serialize itself to it.
+            val resourceFileName =
+                when (resource) {
+                    is StringResource -> "strings"
+                    is ArrayResource -> "arrays"
+                    else -> throw NotImplementedError("Unsupported resource type")
+                }
+
+            getOrPut(resourceFileName) {
+                val targetFile =
+                    context.get("res/$value/$resourceFileName.xml").also {
+                        it.parentFile?.mkdirs()
+                        it.createNewFile()
+                    }
+
+                context.xmlEditor[targetFile.path].let { editor ->
+                    val document = editor.file
+
+                    // Save the target node here as well
+                    // in order to avoid having to call document.getNode("resources")
+                    // but also save the document so that it can be closed later.
+                    editor to document.getNode("resources")
+                }
+            }.let { (_, targetNode) ->
+                targetNode.addResource(resource) { invoke(value, it) }
+            }
+        }
+
+        forEach { (value, resources) ->
+            // A map of document associated by their kind (e.g. strings, arrays).
+            // Each document is accompanied by the target node to which resources are added.
+            // A map is used because Map#getOrPut allows opening a new document for the duration of a resource value.
+            // This is done to prevent having to open the files for every resource that is added.
+            // Instead, it is cached once and reused for resources of the same value.
+            // This map is later accessed to close all documents for the current resource value.
+            val documents = mutableMapOf<String, Pair<DomFileEditor, Node>>()
+
+            resources.forEach { resource -> documents(value, resource) }
+
+            documents.values.forEach { (document, _) -> document.close() }
+        }
+    }
+}

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

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

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

@@ -2,7 +2,7 @@ package app.revanced.patches.all.screencapture.removerestriction
 
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.all.misc.transformation.AbstractTransformInstructionsPatch
+import app.revanced.patches.all.misc.transformation.BaseTransformInstructionsPatch
 import app.revanced.patches.all.misc.transformation.IMethodCall
 import app.revanced.patches.all.misc.transformation.Instruction35cInfo
 import app.revanced.patches.all.misc.transformation.filterMapInstruction35c
@@ -18,9 +18,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.Instruction
     requiresIntegrations = true
 )
 @Suppress("unused")
-object RemoveCaptureRestrictionPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
+object RemoveCaptureRestrictionPatch : BaseTransformInstructionsPatch<Instruction35cInfo>() {
     private const val INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX =
-        "Lapp/revanced/all/screencapture/removerestriction/RemoveScreencaptureRestrictionPatch"
+        "Lapp/revanced/integrations/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(

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

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

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

@@ -4,7 +4,7 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.all.misc.transformation.AbstractTransformInstructionsPatch
+import app.revanced.patches.all.misc.transformation.BaseTransformInstructionsPatch
 import app.revanced.patches.all.misc.transformation.IMethodCall
 import app.revanced.patches.all.misc.transformation.Instruction35cInfo
 import app.revanced.patches.all.misc.transformation.filterMapInstruction35c
@@ -22,9 +22,9 @@ import com.android.tools.smali.dexlib2.iface.reference.FieldReference
     requiresIntegrations = true,
 )
 @Suppress("unused")
-object RemoveScreenshotRestrictionPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
+object RemoveScreenshotRestrictionPatch : BaseTransformInstructionsPatch<Instruction35cInfo>() {
     private const val INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX =
-            "Lapp/revanced/all/screenshot/removerestriction/RemoveScreenshotRestrictionPatch"
+            "Lapp/revanced/integrations/all/screenshot/removerestriction/RemoveScreenshotRestrictionPatch"
     private const val INTEGRATIONS_CLASS_DESCRIPTOR = "$INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX;"
 
     override fun execute(context: BytecodeContext) {
@@ -71,7 +71,7 @@ object RemoveScreenshotRestrictionPatch : AbstractTransformInstructionsPatch<Ins
     }
 }
 
-private class ModifyLayoutParamsFlags : AbstractTransformInstructionsPatch<Pair<Instruction22c, Int>>() {
+private class ModifyLayoutParamsFlags : BaseTransformInstructionsPatch<Pair<Instruction22c, Int>>() {
     override fun filterMap(
         classDef: ClassDef,
         method: Method,

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

@@ -3,10 +3,9 @@ package app.revanced.patches.all.telephony.sim.spoof
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patcher.patch.options.PatchOption
 import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.stringPatchOption
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.all.misc.transformation.AbstractTransformInstructionsPatch
+import app.revanced.patches.all.misc.transformation.BaseTransformInstructionsPatch
 import com.android.tools.smali.dexlib2.iface.ClassDef
 import com.android.tools.smali.dexlib2.iface.Method
 import com.android.tools.smali.dexlib2.iface.instruction.Instruction
@@ -24,27 +23,30 @@ import java.util.*
     use = false,
 )
 @Suppress("unused")
-object SpoofSimCountryPatch : AbstractTransformInstructionsPatch<Pair<Int, String>>() {
+object SpoofSimCountryPatch : BaseTransformInstructionsPatch<Pair<Int, String>>() {
-    private val isoValidator: PatchOption<String>.(String?) -> Boolean =
+    private val countries = Locale.getISOCountries().associateBy { Locale("", it).displayCountry }
-        { it: String? -> it?.uppercase() in Locale.getISOCountries() || it == null }
 
-    private val networkCountryIso by stringPatchOption(
+    private val networkCountryIso by isoCountryPatchOption(
         "networkCountryIso",
-        null,
-        null,
         "Network ISO Country Code",
-        "ISO-3166-1 alpha-2 country code equivalent of the MCC (Mobile Country Code) " +
-                "of the current registered operator or the cell nearby.",
-        validator = isoValidator
     )
 
-    private val simCountryIso by stringPatchOption(
+    private val simCountryIso by isoCountryPatchOption(
         "simCountryIso",
-        null,
-        null,
         "Sim ISO Country Code",
+    )
+
+    private fun isoCountryPatchOption(
+        key: String,
+        title: String,
+    ) = stringPatchOption(
+        key,
+        null,
+        countries,
+        title,
         "ISO-3166-1 alpha-2 country code equivalent for the SIM provider's country code.",
-        validator = isoValidator
+        false,
+        validator = { it: String? -> it == null || it.uppercase() in countries.values }
     )
 
     override fun filterMap(

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

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

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

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

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

@@ -9,7 +9,7 @@ import app.revanced.patches.iconpackstudio.misc.pro.fingerprints.CheckProFingerp
 
 @Patch(
     name = "Unlock pro",
-    compatiblePackages = [CompatiblePackage("ginlemon.iconpackstudio")]
+    compatiblePackages = [CompatiblePackage("ginlemon.iconpackstudio", ["2.2 build 016"])]
 )
 @Suppress("unused")
 object UnlockProPatch : BytecodePatch(

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

@@ -12,7 +12,7 @@ import app.revanced.util.returnEarly
 @Patch(
     name = "Remove root detection",
     description = "Removes the check for root permissions and unlocked bootloader.",
-    compatiblePackages = [CompatiblePackage("at.gv.oe.app", ["3.0.2"])]
+    compatiblePackages = [CompatiblePackage("at.gv.oe.app")]
 )
 @Suppress("unused")
 object RootDetectionPatch : BytecodePatch(

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

@@ -10,7 +10,7 @@ import app.revanced.patches.idaustria.detection.signature.fingerprints.SpoofSign
 @Patch(
     name = "Spoof signature",
     description = "Spoofs the signature of the app.",
-    compatiblePackages = [CompatiblePackage("at.gv.oe.app", ["3.0.2"])]
+    compatiblePackages = [CompatiblePackage("at.gv.oe.app")]
 )
 @Suppress("unused")
 object SpoofSignaturePatch : BytecodePatch(

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,29 +0,0 @@
-package app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads
-
-import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
-import com.android.tools.smali.dexlib2.iface.reference.MethodReference
-
-internal object PaidPartnershipAdFingerprint : MediaAdFingerprint(
-    "V",
-    null,
-    listOf("L", "L"),
-    listOf(
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IPUT_BOOLEAN,
-        Opcode.IPUT_BOOLEAN
-    ),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("ClipsEditMetadataController;")
-    }
-) {
-    override fun toString() = result!!.let {
-        val adCheckIndex = it.scanResult.patternScanResult!!.startIndex
-        val adCheckInstruction = it.method.implementation!!.instructions.elementAt(adCheckIndex)
-
-        val adCheckMethod = (adCheckInstruction as ReferenceInstruction).reference as MethodReference
-
-        adCheckMethod.toString()
-    }
-}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,26 +1,39 @@
 package app.revanced.patches.music.layout.minimizedplayback
 
-import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patches.music.layout.minimizedplayback.fingerprints.MinimizedPlaybackManagerFingerprint
+import app.revanced.patches.music.layout.minimizedplayback.fingerprints.BackgroundPlaybackDisableFingerprint
-
+import app.revanced.patches.music.layout.minimizedplayback.fingerprints.KidsMinimizedPlaybackPolicyControllerFingerprint
+import app.revanced.util.exception
 
 @Patch(
-    name = "Minimized playback music",
+    name = "Minimized playback",
-    description = "Enables minimized playback on Kids music.",
+    description = "Unlocks options for picture-in-picture and background playback.",
-    compatiblePackages = [CompatiblePackage("com.google.android.apps.youtube.music")]
+    compatiblePackages = [CompatiblePackage("com.google.android.apps.youtube.music")],
 )
 @Suppress("unused")
-object MinimizedPlaybackPatch : BytecodePatch(setOf(MinimizedPlaybackManagerFingerprint)) {
+object MinimizedPlaybackPatch : BytecodePatch(
-    override fun execute(context: BytecodeContext) =
+    setOf(
-        MinimizedPlaybackManagerFingerprint.result?.mutableMethod?.addInstruction(
+        KidsMinimizedPlaybackPolicyControllerFingerprint,
+        BackgroundPlaybackDisableFingerprint,
+    ),
+) {
+    override fun execute(context: BytecodeContext) {
+        KidsMinimizedPlaybackPolicyControllerFingerprint.result?.mutableMethod?.addInstruction(
+            0,
+            "return-void",
+        ) ?: throw KidsMinimizedPlaybackPolicyControllerFingerprint.exception
+
+        BackgroundPlaybackDisableFingerprint.result?.mutableMethod?.addInstructions(
             0,
             """
-                return-void
+                const/4 v0, 0x1
-            """
+                return v0
-        ) ?: throw MinimizedPlaybackManagerFingerprint.exception
+            """,
+        ) ?: throw BackgroundPlaybackDisableFingerprint.exception
+    }
 }

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

@@ -0,0 +1,23 @@
+package app.revanced.patches.music.layout.minimizedplayback.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+
+internal object BackgroundPlaybackDisableFingerprint : MethodFingerprint(
+    "Z",
+    AccessFlags.PUBLIC or AccessFlags.STATIC,
+    listOf("L"),
+    listOf(
+        Opcode.CONST_4,
+        Opcode.IF_EQZ,
+        Opcode.IGET,
+        Opcode.AND_INT_LIT16,
+        Opcode.IF_EQZ,
+        Opcode.IGET_OBJECT,
+        Opcode.IF_NEZ,
+        Opcode.SGET_OBJECT,
+        Opcode.IGET,
+    ),
+)

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

@@ -5,7 +5,7 @@ import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 
-internal object MinimizedPlaybackManagerFingerprint : MethodFingerprint(
+internal object KidsMinimizedPlaybackPolicyControllerFingerprint : MethodFingerprint(
     "V",
     AccessFlags.PUBLIC or AccessFlags.FINAL,
     listOf("I", "L", "Z"),
@@ -22,5 +22,5 @@ internal object MinimizedPlaybackManagerFingerprint : MethodFingerprint(
         Opcode.CONST_4,
         Opcode.IF_NE,
         Opcode.IPUT_BOOLEAN,
-    )
+    ),
 )

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

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

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

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

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

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

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

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

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

@@ -1,62 +1,20 @@
 package app.revanced.patches.music.layout.upgradebutton.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 
-
-@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
 internal object PivotBarConstructorFingerprint : MethodFingerprint(
     "V",
     AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
     listOf("L", "Z"),
     listOf(
-        Opcode.INVOKE_DIRECT,
-        Opcode.CONST_4,
-        Opcode.IPUT_OBJECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.IPUT_BOOLEAN,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_NEZ,
-        Opcode.GOTO,
-        Opcode.NEW_INSTANCE,
-        Opcode.INVOKE_DIRECT,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_EQZ,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.IGET,
-        Opcode.CONST,
-        Opcode.IF_NE,
-        Opcode.IGET_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.GOTO,
-        Opcode.SGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_EQZ,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.IGET,
-        Opcode.CONST,
-        Opcode.IF_NE,
-        Opcode.IGET_OBJECT,
         Opcode.CHECK_CAST,
         Opcode.INVOKE_INTERFACE,
         Opcode.GOTO,
         Opcode.NOP,
         Opcode.IPUT_OBJECT,
-        Opcode.RETURN_VOID
+        Opcode.RETURN_VOID,
-    )
+    ),
-)
+)

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

@@ -2,15 +2,16 @@ package app.revanced.patches.music.misc.gms
 
 import app.revanced.patches.music.misc.gms.Constants.MUSIC_PACKAGE_NAME
 import app.revanced.patches.music.misc.gms.Constants.REVANCED_MUSIC_PACKAGE_NAME
-import app.revanced.patches.music.misc.gms.GmsCoreSupportResourcePatch.gmsCoreVendorOption
+import app.revanced.patches.music.misc.gms.GmsCoreSupportResourcePatch.gmsCoreVendorGroupIdOption
 import app.revanced.patches.music.misc.gms.fingerprints.*
-import app.revanced.patches.shared.misc.gms.AbstractGmsCoreSupportPatch
+import app.revanced.patches.music.misc.integrations.IntegrationsPatch
-import app.revanced.patches.youtube.misc.gms.fingerprints.CastContextFetchFingerprint
+import app.revanced.patches.shared.fingerprints.CastContextFetchFingerprint
+import app.revanced.patches.shared.misc.gms.BaseGmsCoreSupportPatch
 
 @Suppress("unused")
-object GmsCoreSupportPatch : AbstractGmsCoreSupportPatch(
+object GmsCoreSupportPatch : BaseGmsCoreSupportPatch(
-    fromPackageName = REVANCED_MUSIC_PACKAGE_NAME,
+    fromPackageName = MUSIC_PACKAGE_NAME,
-    toPackageName = MUSIC_PACKAGE_NAME,
+    toPackageName = REVANCED_MUSIC_PACKAGE_NAME,
     primeMethodFingerprint = PrimeMethodFingerprint,
     earlyReturnFingerprints = setOf(
         ServiceCheckFingerprint,
@@ -19,7 +20,9 @@ object GmsCoreSupportPatch : AbstractGmsCoreSupportPatch(
         CastDynamiteModuleV2Fingerprint,
         CastContextFetchFingerprint,
     ),
-    abstractGmsCoreSupportResourcePatch = GmsCoreSupportResourcePatch,
+    mainActivityOnCreateFingerprint = MusicActivityOnCreateFingerprint,
+    integrationsPatchDependency = IntegrationsPatch::class,
+    gmsCoreSupportResourcePatch = GmsCoreSupportResourcePatch,
     compatiblePackages = setOf(CompatiblePackage("com.google.android.apps.youtube.music")),
     fingerprints = setOf(
         ServiceCheckFingerprint,
@@ -28,7 +31,7 @@ object GmsCoreSupportPatch : AbstractGmsCoreSupportPatch(
         CastDynamiteModuleV2Fingerprint,
         CastContextFetchFingerprint,
         PrimeMethodFingerprint,
-    )
+    ),
 ) {
-    override val gmsCoreVendor by gmsCoreVendorOption
+    override val gmsCoreVendorGroupId by gmsCoreVendorGroupIdOption
 }

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

@@ -2,10 +2,10 @@ package app.revanced.patches.music.misc.gms
 
 import app.revanced.patches.music.misc.gms.Constants.MUSIC_PACKAGE_NAME
 import app.revanced.patches.music.misc.gms.Constants.REVANCED_MUSIC_PACKAGE_NAME
-import app.revanced.patches.shared.misc.gms.AbstractGmsCoreSupportResourcePatch
+import app.revanced.patches.shared.misc.gms.BaseGmsCoreSupportResourcePatch
 
-object GmsCoreSupportResourcePatch : AbstractGmsCoreSupportResourcePatch(
+object GmsCoreSupportResourcePatch : BaseGmsCoreSupportResourcePatch(
     fromPackageName = MUSIC_PACKAGE_NAME,
     toPackageName = REVANCED_MUSIC_PACKAGE_NAME,
     spoofedPackageSignature = "afb0fed5eeaebdd86f56a97742f4b6b33ef59875"
-)
+)

src/main/kotlin/app/revanced/patches/music/misc/gms/fingerprints/MusicActivityOnCreateFingerprint.kt

@@ -0,0 +1,11 @@
+package app.revanced.patches.music.misc.gms.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+
+internal object MusicActivityOnCreateFingerprint : MethodFingerprint(
+    returnType = "V",
+    parameters = listOf("Landroid/os/Bundle;"),
+    customFingerprint = { methodDef, classDef ->
+        methodDef.name == "onCreate" && classDef.type.endsWith("/MusicActivity;")
+    }
+)

src/main/kotlin/app/revanced/patches/music/misc/gms/fingerprints/ServiceCheckFingerprint.kt

@@ -1,14 +1,12 @@
 package app.revanced.patches.music.misc.gms.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 
-
 internal object ServiceCheckFingerprint : MethodFingerprint(
     "V",
     AccessFlags.PUBLIC or AccessFlags.STATIC,
     listOf("L", "I"),
-    strings = listOf("Google Play Services not available")
+    strings = listOf("Google Play Services not available"),
 )

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

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

src/main/kotlin/app/revanced/patches/music/misc/integrations/fingerprints/ApplicationInitFingerprint.kt

@@ -0,0 +1,19 @@
+package app.revanced.patches.music.misc.integrations.fingerprints
+
+import app.revanced.patches.shared.misc.integrations.BaseIntegrationsPatch.IntegrationsFingerprint
+import com.android.tools.smali.dexlib2.Opcode
+
+internal object ApplicationInitFingerprint : IntegrationsFingerprint(
+    returnType = "V",
+    parameters = emptyList(),
+    opcodes = listOf(
+        Opcode.NEW_INSTANCE,
+        Opcode.INVOKE_DIRECT,
+        Opcode.INVOKE_STATIC,
+        Opcode.NEW_INSTANCE,
+        Opcode.INVOKE_DIRECT,
+        Opcode.INVOKE_VIRTUAL
+    ),
+    strings = listOf("activity"),
+    customFingerprint = { methodDef, _ -> methodDef.name == "onCreate" },
+)

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

@@ -1,26 +1,12 @@
 package app.revanced.patches.music.premium.backgroundplay
 
-import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patches.music.layout.minimizedplayback.MinimizedPlaybackPatch
-import app.revanced.patcher.patch.annotation.Patch
+@Deprecated("This patch has been merged into MinimizedPlaybackPatch.")
-import app.revanced.patches.music.premium.backgroundplay.fingerprints.BackgroundPlaybackDisableFingerprint
+object BackgroundPlayPatch : BytecodePatch(
-
+    dependencies = setOf(MinimizedPlaybackPatch::class),
-
+) {
-@Patch(
+    override fun execute(context: BytecodeContext) {
-    name = "Background play",
+    }
-    description = "Enables playing music in the background.",
+}
-    compatiblePackages = [CompatiblePackage("com.google.android.apps.youtube.music")]
-)
-@Suppress("unused")
-object BackgroundPlayPatch : BytecodePatch(setOf(BackgroundPlaybackDisableFingerprint)) {
-    override fun execute(context: BytecodeContext) =
-        BackgroundPlaybackDisableFingerprint.result?.mutableMethod?.addInstructions(
-            0, """
-                const/4 v0, 0x1
-                return v0
-            """
-        ) ?: throw BackgroundPlaybackDisableFingerprint.exception
-}

src/main/kotlin/app/revanced/patches/music/premium/backgroundplay/fingerprints/BackgroundPlaybackDisableFingerprint.kt

@@ -1,43 +0,0 @@
-package app.revanced.patches.music.premium.backgroundplay.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-
-@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-internal object BackgroundPlaybackDisableFingerprint : MethodFingerprint(
-    "Z", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L"), listOf(
-        Opcode.CONST_4,
-        Opcode.IF_EQZ,
-        Opcode.IGET,
-        Opcode.AND_INT_LIT16,
-        Opcode.IF_EQZ,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_NEZ,
-        Opcode.SGET_OBJECT,
-        Opcode.IGET,
-        Opcode.CONST,
-        Opcode.IF_NE,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_NEZ,
-        Opcode.SGET_OBJECT,
-        Opcode.IGET,
-        Opcode.IF_NE,
-        Opcode.IGET_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.GOTO,
-        Opcode.SGET_OBJECT,
-        Opcode.GOTO,
-        Opcode.CONST_4,
-        Opcode.IF_EQZ,
-        Opcode.IGET_BOOLEAN,
-        Opcode.IF_EQZ,
-        Opcode.CONST_4,
-        Opcode.RETURN,
-        Opcode.RETURN,
-        Opcode.RETURN
-    )
-)

src/main/kotlin/app/revanced/patches/myfitnesspal/ads/HideAdsPatch.kt

@@ -0,0 +1,38 @@
+package app.revanced.patches.myfitnesspal.ads
+
+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.myfitnesspal.ads.fingerprints.IsPremiumUseCaseImplFingerprint
+import app.revanced.patches.myfitnesspal.ads.fingerprints.MainActivityNavigateToNativePremiumUpsellFingerprint
+import app.revanced.util.exception
+
+@Patch(
+    name = "Hide ads",
+    description = "Hides most of the ads across the app.",
+    compatiblePackages = [CompatiblePackage("com.myfitnesspal.android")]
+)
+@Suppress("unused")
+object HideAdsPatch : BytecodePatch(
+    setOf(IsPremiumUseCaseImplFingerprint, MainActivityNavigateToNativePremiumUpsellFingerprint)
+) {
+    override fun execute(context: BytecodeContext) {
+        // Overwrite the premium status specifically for ads.
+        IsPremiumUseCaseImplFingerprint.result?.mutableMethod?.replaceInstructions(
+            0,
+            """
+                sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+                return-object v0
+            """
+        ) ?: throw IsPremiumUseCaseImplFingerprint.exception
+
+        // Prevent the premium upsell dialog from showing when the main activity is launched.
+        // In other places that are premium-only the dialog will still show.
+        MainActivityNavigateToNativePremiumUpsellFingerprint.result?.mutableMethod?.replaceInstructions(
+            0,
+            "return-void"
+        ) ?: throw MainActivityNavigateToNativePremiumUpsellFingerprint.exception
+    }
+}

src/main/kotlin/app/revanced/patches/myfitnesspal/ads/fingerprints/IsPremiumUseCaseImplFingerprint.kt

@@ -0,0 +1,11 @@
+package app.revanced.patches.myfitnesspal.ads.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+object IsPremiumUseCaseImplFingerprint : MethodFingerprint(
+    accessFlags = AccessFlags.PUBLIC.value,
+    customFingerprint = { methodDef, classDef ->
+        classDef.type.endsWith("IsPremiumUseCaseImpl;") && methodDef.name == "doWork"
+    }
+)

src/main/kotlin/app/revanced/patches/myfitnesspal/ads/fingerprints/MainActivityNavigateToNativePremiumUpsellFingerprint.kt

@@ -0,0 +1,13 @@
+package app.revanced.patches.myfitnesspal.ads.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+object MainActivityNavigateToNativePremiumUpsellFingerprint : MethodFingerprint(
+    returnType = "V",
+    accessFlags = AccessFlags.PRIVATE or AccessFlags.FINAL,
+    customFingerprint = { methodDef, classDef ->
+        classDef.type.endsWith("MainActivity;") && methodDef.name == "navigateToNativePremiumUpsell"
+    }
+)

src/main/kotlin/app/revanced/patches/netguard/broadcasts/removerestriction/RemoveBroadcastsRestrictionPatch.kt

@@ -6,23 +6,24 @@ import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import org.w3c.dom.Element
 
-
 @Patch(
     name = "Remove broadcasts restriction",
     description = "Enables starting/stopping NetGuard via broadcasts.",
     compatiblePackages = [CompatiblePackage("eu.faircode.netguard")],
-    use = false
+    use = false,
 )
 @Suppress("unused")
 object RemoveBroadcastsRestrictionPatch : ResourcePatch() {
     override fun execute(context: ResourceContext) {
-        context.xmlEditor["AndroidManifest.xml"].use { dom ->
+        context.xmlEditor["AndroidManifest.xml"].use { editor ->
-            val applicationNode = dom
+            val document = editor.file
-                .file
-                .getElementsByTagName("application")
-                .item(0) as Element
 
-            applicationNode.getElementsByTagName("receiver").also {  list ->
+            val applicationNode =
+                document
+                    .getElementsByTagName("application")
+                    .item(0) as Element
+
+            applicationNode.getElementsByTagName("receiver").also { list ->
                 for (i in 0 until list.length) {
                     val element = list.item(i) as? Element ?: continue
                     if (element.getAttribute("android:name") == "eu.faircode.netguard.WidgetAdmin") {

src/main/kotlin/app/revanced/patches/openinghours/misc/fix/crash/FixCrashPatch.kt

@@ -0,0 +1,115 @@
+package app.revanced.patches.openinghours.misc.fix.crash
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.getInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patcher.extensions.newLabel
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.openinghours.misc.fix.crash.fingerprints.SetPlaceFingerprint
+import app.revanced.util.exception
+import app.revanced.util.getReference
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction21t
+import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.Instruction
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+
+@Patch(
+    name = "Fix crash",
+    compatiblePackages = [CompatiblePackage("de.simon.openinghours", ["1.0"])],
+)
+@Suppress("unused")
+object FixCrashPatch : BytecodePatch(
+    setOf(SetPlaceFingerprint),
+) {
+
+    override fun execute(context: BytecodeContext) {
+        SetPlaceFingerprint.result?.let {
+            val indexedInstructions = it.mutableMethod.getInstructions().withIndex().toList()
+
+            /**
+             * This function replaces all `checkNotNull` instructions in the integer interval
+             * from [startIndex] to [endIndex], both inclusive. In place of the `checkNotNull`
+             * instruction an if-null check is inserted. If the if-null check yields that
+             * the value is indeed null, we jump to a newly created label at `endIndex + 1`.
+             */
+            fun avoidNullPointerException(startIndex: Int, endIndex: Int) {
+                val continueLabel = it.mutableMethod.newLabel(endIndex + 1)
+
+                for (index in startIndex..endIndex) {
+                    val instruction = indexedInstructions[index].value
+
+                    if (!instruction.isCheckNotNullInstruction) {
+                        continue
+                    }
+
+                    val checkNotNullInstruction = instruction as FiveRegisterInstruction
+                    val originalRegister = checkNotNullInstruction.registerC
+
+                    it.mutableMethod.replaceInstruction(
+                        index,
+                        BuilderInstruction21t(
+                            Opcode.IF_EQZ,
+                            originalRegister,
+                            continueLabel,
+                        ),
+                    )
+                }
+            }
+
+            val getOpeningHoursIndex = getIndicesOfInvoke(
+                indexedInstructions,
+                "Lde/simon/openinghours/models/Place;",
+                "getOpeningHours",
+            )
+
+            val setWeekDayTextIndex = getIndexOfInvoke(
+                indexedInstructions,
+                "Lde/simon/openinghours/views/custom/PlaceCard;",
+                "setWeekDayText",
+            )
+
+            val startCalculateStatusIndex = getIndexOfInvoke(
+                indexedInstructions,
+                "Lde/simon/openinghours/views/custom/PlaceCard;",
+                "startCalculateStatus",
+            )
+
+            // Replace the Intrinsics;->checkNotNull instructions with a null check
+            // and jump to our newly created label if it returns true.
+            // This avoids the NullPointerExceptions.
+            avoidNullPointerException(getOpeningHoursIndex[1], startCalculateStatusIndex)
+            avoidNullPointerException(getOpeningHoursIndex[0], setWeekDayTextIndex)
+        } ?: throw SetPlaceFingerprint.exception
+    }
+
+    private fun isInvokeInstruction(instruction: Instruction, className: String, methodName: String): Boolean {
+        val methodRef = instruction.getReference<MethodReference>() ?: return false
+        return methodRef.definingClass == className && methodRef.name == methodName
+    }
+
+    private fun getIndicesOfInvoke(
+        instructions: List<IndexedValue<Instruction>>,
+        className: String,
+        methodName: String,
+    ): List<Int> = instructions.mapNotNull { (index, instruction) ->
+        if (isInvokeInstruction(instruction, className, methodName)) {
+            index
+        } else {
+            null
+        }
+    }
+
+    private fun getIndexOfInvoke(
+        instructions: List<IndexedValue<Instruction>>,
+        className: String,
+        methodName: String,
+    ): Int = instructions.first { (_, instruction) ->
+        isInvokeInstruction(instruction, className, methodName)
+    }.index
+
+    private val Instruction.isCheckNotNullInstruction
+        get() = isInvokeInstruction(this, "Lkotlin/jvm/internal/Intrinsics;", "checkNotNull")
+}

src/main/kotlin/app/revanced/patches/openinghours/misc/fix/crash/fingerprints/SetPlaceFingerprint.kt

@@ -0,0 +1,12 @@
+package app.revanced.patches.openinghours.misc.fix.crash.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+
+internal object SetPlaceFingerprint : MethodFingerprint(
+    "V",
+    parameters = listOf("Lde/simon/openinghours/models/Place;"),
+    customFingerprint = { methodDef, _ ->
+        methodDef.definingClass == "Lde/simon/openinghours/views/custom/PlaceCard;" &&
+            methodDef.name == "setPlace"
+    },
+)

src/main/kotlin/app/revanced/patches/photomath/detection/deviceid/SpoofDeviceIdPatch.kt

@@ -14,7 +14,7 @@ import kotlin.random.Random
     name = "Spoof device ID",
     description = "Spoofs device ID to mitigate manual bans by developers.",
     dependencies = [SignatureDetectionPatch::class],
-    compatiblePackages = [CompatiblePackage("com.microblink.photomath")]
+    compatiblePackages = [CompatiblePackage("com.microblink.photomath", ["8.32.0"])]
 )
 @Suppress("unused")
 object SpoofDeviceIdPatch : BytecodePatch(

src/main/kotlin/app/revanced/patches/photomath/misc/annoyances/HideUpdatePopupPatch.kt

@@ -0,0 +1,26 @@
+package app.revanced.patches.photomath.misc.annoyances
+
+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.photomath.detection.signature.SignatureDetectionPatch
+import app.revanced.patches.photomath.misc.annoyances.fingerprints.HideUpdatePopupFingerprint
+import app.revanced.util.exception
+
+@Patch(
+    name = "Hide update popup",
+    description = "Prevents the update popup from showing up.",
+    dependencies = [SignatureDetectionPatch::class],
+    compatiblePackages = [CompatiblePackage("com.microblink.photomath", ["8.32.0"])]
+)
+@Suppress("unused")
+object HideUpdatePopupPatch : BytecodePatch(
+    setOf(HideUpdatePopupFingerprint)
+) {
+    override fun execute(context: BytecodeContext) = HideUpdatePopupFingerprint.result?.mutableMethod?.addInstructions(
+        2, // Insert after the null check.
+        "return-void"
+    ) ?: throw HideUpdatePopupFingerprint.exception
+}

src/main/kotlin/app/revanced/patches/photomath/misc/annoyances/fingerprints/HideUpdatePopupFingerprint.kt

@@ -0,0 +1,22 @@
+package app.revanced.patches.photomath.misc.annoyances.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+
+internal object HideUpdatePopupFingerprint : MethodFingerprint(
+    customFingerprint = { _, classDef ->
+        // The popup is shown only in the main activity
+        classDef.type == "Lcom/microblink/photomath/main/activity/MainActivity;"
+    },
+    opcodes = listOf(
+        Opcode.CONST_HIGH16,
+        Opcode.INVOKE_VIRTUAL, // ViewPropertyAnimator.alpha(1.0f)
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.CONST_WIDE_16,
+        Opcode.INVOKE_VIRTUAL, // ViewPropertyAnimator.setDuration(1000L)
+    ),
+    accessFlags = AccessFlags.FINAL or AccessFlags.PUBLIC,
+    returnType = "V",
+)

src/main/kotlin/app/revanced/patches/photomath/misc/unlock/bookpoint/EnableBookpointPatch.kt

@@ -1,11 +1,11 @@
-package app.revanced.patches.photomath.misc.bookpoint
+package app.revanced.patches.photomath.misc.unlock.bookpoint
 
 import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstructions
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patches.photomath.misc.bookpoint.fingerprints.IsBookpointEnabledFingerprint
+import app.revanced.patches.photomath.misc.unlock.bookpoint.fingerprints.IsBookpointEnabledFingerprint
 
 @Patch(description = "Enables textbook access")
 internal object EnableBookpointPatch : BytecodePatch(