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

# [2.180.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.179.0...v2.180.0-dev.1) (2023-07-01)

### Features

* use clearer descriptions for patches ([7814e46](7814e464e1))

.idea/misc.xml

@@ -4,5 +4,5 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="azul-17" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="azul-17" project-jdk-type="JavaSDK" />
 </project>

CHANGELOG.md

@@ -1,3 +1,188 @@
+# [2.180.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.179.0...v2.180.0-dev.1) (2023-07-01)
+
+
+### Features
+
+* use clearer descriptions for patches ([ff3ca30](https://github.com/revanced/revanced-patches/commit/ff3ca30e31f4d603b80d35e150f49d996acf9988))
+
+# [2.179.0](https://github.com/revanced/revanced-patches/compare/v2.178.0...v2.179.0) (2023-07-01)
+
+
+### Bug Fixes
+
+* **enable-android-debugging:** remove json options ([#2497](https://github.com/revanced/revanced-patches/issues/2497)) ([3e25f5f](https://github.com/revanced/revanced-patches/commit/3e25f5f8df24a585dc1097aa16877841f0c6b74a))
+* **relayforreddit/change-oauth-client-id:** change client id instead of developer key ([#2508](https://github.com/revanced/revanced-patches/issues/2508)) ([4befb44](https://github.com/revanced/revanced-patches/commit/4befb4414638c5936f99d8d63d73c729efc773a5))
+* **syncforreddit/change-oauth-client-id:** add dev edition ([#2516](https://github.com/revanced/revanced-patches/issues/2516)) ([7c7294b](https://github.com/revanced/revanced-patches/commit/7c7294b750f54390dd2308de63cc09545010b17f))
+* **syncforreddit:** use correct overriding method signature ([#2483](https://github.com/revanced/revanced-patches/issues/2483)) ([f9770cf](https://github.com/revanced/revanced-patches/commit/f9770cf1babce61cd32f6ca9140103419d8d094d))
+* **youtube/client-spoof:** update settings text for known side effects of spoof signature ([#2476](https://github.com/revanced/revanced-patches/issues/2476)) ([6756f80](https://github.com/revanced/revanced-patches/commit/6756f80e3e0c09376a1fd613d28644bdaa24da57))
+* **youtube:** improve patching speed ([#2514](https://github.com/revanced/revanced-patches/issues/2514)) ([77bb761](https://github.com/revanced/revanced-patches/commit/77bb761b0bb38613ad9d5017c881396afa471558))
+
+
+### Features
+
+* **baconreader:** add `change-oauth-client-id` patch ([#2535](https://github.com/revanced/revanced-patches/issues/2535)) ([6f5e007](https://github.com/revanced/revanced-patches/commit/6f5e007a78dc5e1ed3935a3436ac1de7eb719ea1))
+* **infinityforreddit:** add `change-oauth-client-id` patch ([#2452](https://github.com/revanced/revanced-patches/issues/2452)) ([9efd790](https://github.com/revanced/revanced-patches/commit/9efd7904acc6dc70f45c6c0f835c839473d9205f))
+* **reddit:** add `disable-screenshot-popup` patch ([#2387](https://github.com/revanced/revanced-patches/issues/2387)) ([473e051](https://github.com/revanced/revanced-patches/commit/473e0512314dfa9790cf83b4cfcc7505058d3a51))
+* **redditisfun/change-oauth-client-id:** add compatibility for paid versions ([#2536](https://github.com/revanced/revanced-patches/issues/2536)) ([e739d2f](https://github.com/revanced/revanced-patches/commit/e739d2fa16bbd0125db82c0758928addbd9950c9))
+* **redditisfun:** add `change-oauth-client-id` patch ([14809cd](https://github.com/revanced/revanced-patches/commit/14809cd4510ad9514b4a4820187a81681669374c))
+* **relayforreddit:** add `change-oauth-client-id` patch ([#2491](https://github.com/revanced/revanced-patches/issues/2491)) ([fe66f40](https://github.com/revanced/revanced-patches/commit/fe66f4089d6365564c8097d3c7a1bc842c343194))
+
+# [2.179.0-dev.12](https://github.com/revanced/revanced-patches/compare/v2.179.0-dev.11...v2.179.0-dev.12) (2023-07-01)
+
+
+### Features
+
+* **baconreader:** add `change-oauth-client-id` patch ([#2535](https://github.com/revanced/revanced-patches/issues/2535)) ([6f5e007](https://github.com/revanced/revanced-patches/commit/6f5e007a78dc5e1ed3935a3436ac1de7eb719ea1))
+
+# [2.179.0-dev.11](https://github.com/revanced/revanced-patches/compare/v2.179.0-dev.10...v2.179.0-dev.11) (2023-07-01)
+
+# [2.179.0-dev.10](https://github.com/revanced/revanced-patches/compare/v2.179.0-dev.9...v2.179.0-dev.10) (2023-06-30)
+
+
+### Features
+
+* **redditisfun/change-oauth-client-id:** add compatibility for paid versions ([#2536](https://github.com/revanced/revanced-patches/issues/2536)) ([e739d2f](https://github.com/revanced/revanced-patches/commit/e739d2fa16bbd0125db82c0758928addbd9950c9))
+
+# [2.179.0-dev.9](https://github.com/revanced/revanced-patches/compare/v2.179.0-dev.8...v2.179.0-dev.9) (2023-06-30)
+
+
+### Features
+
+* **redditisfun:** add `change-oauth-client-id` patch ([14809cd](https://github.com/revanced/revanced-patches/commit/14809cd4510ad9514b4a4820187a81681669374c))
+
+# [2.179.0-dev.8](https://github.com/revanced/revanced-patches/compare/v2.179.0-dev.7...v2.179.0-dev.8) (2023-06-29)
+
+
+### Features
+
+* **reddit:** add `disable-screenshot-popup` patch ([#2387](https://github.com/revanced/revanced-patches/issues/2387)) ([473e051](https://github.com/revanced/revanced-patches/commit/473e0512314dfa9790cf83b4cfcc7505058d3a51))
+
+# [2.179.0-dev.7](https://github.com/revanced/revanced-patches/compare/v2.179.0-dev.6...v2.179.0-dev.7) (2023-06-28)
+
+
+### Bug Fixes
+
+* **youtube:** improve patching speed ([#2514](https://github.com/revanced/revanced-patches/issues/2514)) ([77bb761](https://github.com/revanced/revanced-patches/commit/77bb761b0bb38613ad9d5017c881396afa471558))
+
+# [2.179.0-dev.6](https://github.com/revanced/revanced-patches/compare/v2.179.0-dev.5...v2.179.0-dev.6) (2023-06-27)
+
+
+### Bug Fixes
+
+* **syncforreddit/change-oauth-client-id:** add dev edition ([#2516](https://github.com/revanced/revanced-patches/issues/2516)) ([7c7294b](https://github.com/revanced/revanced-patches/commit/7c7294b750f54390dd2308de63cc09545010b17f))
+
+# [2.179.0-dev.5](https://github.com/revanced/revanced-patches/compare/v2.179.0-dev.4...v2.179.0-dev.5) (2023-06-27)
+
+
+### Bug Fixes
+
+* **relayforreddit/change-oauth-client-id:** change client id instead of developer key ([#2508](https://github.com/revanced/revanced-patches/issues/2508)) ([4befb44](https://github.com/revanced/revanced-patches/commit/4befb4414638c5936f99d8d63d73c729efc773a5))
+
+# [2.179.0-dev.4](https://github.com/revanced/revanced-patches/compare/v2.179.0-dev.3...v2.179.0-dev.4) (2023-06-27)
+
+# [2.179.0-dev.3](https://github.com/revanced/revanced-patches/compare/v2.179.0-dev.2...v2.179.0-dev.3) (2023-06-26)
+
+
+### Bug Fixes
+
+* **enable-android-debugging:** remove json options ([#2497](https://github.com/revanced/revanced-patches/issues/2497)) ([3e25f5f](https://github.com/revanced/revanced-patches/commit/3e25f5f8df24a585dc1097aa16877841f0c6b74a))
+
+# [2.179.0-dev.2](https://github.com/revanced/revanced-patches/compare/v2.179.0-dev.1...v2.179.0-dev.2) (2023-06-25)
+
+
+### Features
+
+* **relayforreddit:** add `change-oauth-client-id` patch ([#2491](https://github.com/revanced/revanced-patches/issues/2491)) ([fe66f40](https://github.com/revanced/revanced-patches/commit/fe66f4089d6365564c8097d3c7a1bc842c343194))
+
+# [2.179.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.178.1-dev.1...v2.179.0-dev.1) (2023-06-24)
+
+
+### Bug Fixes
+
+* **syncforreddit:** use correct overriding method signature ([#2483](https://github.com/revanced/revanced-patches/issues/2483)) ([f9770cf](https://github.com/revanced/revanced-patches/commit/f9770cf1babce61cd32f6ca9140103419d8d094d))
+
+
+### Features
+
+* **infinityforreddit:** add `change-oauth-client-id` patch ([#2452](https://github.com/revanced/revanced-patches/issues/2452)) ([9efd790](https://github.com/revanced/revanced-patches/commit/9efd7904acc6dc70f45c6c0f835c839473d9205f))
+
+## [2.178.1-dev.1](https://github.com/revanced/revanced-patches/compare/v2.178.0...v2.178.1-dev.1) (2023-06-23)
+
+
+### Bug Fixes
+
+* **youtube/client-spoof:** update settings text for known side effects of spoof signature ([#2476](https://github.com/revanced/revanced-patches/issues/2476)) ([6756f80](https://github.com/revanced/revanced-patches/commit/6756f80e3e0c09376a1fd613d28644bdaa24da57))
+
+# [2.178.0](https://github.com/revanced/revanced-patches/compare/v2.177.0...v2.178.0) (2023-06-21)
+
+
+### Bug Fixes
+
+* **boostforreddit:** use correct options ([ec39732](https://github.com/revanced/revanced-patches/commit/ec39732a05f7c4c3360b8ba42fe50fd60952e6ac))
+* don't include all Litho patches, when not included ([fc69491](https://github.com/revanced/revanced-patches/commit/fc69491dfe4b119d46dd3da27b556e55fe0cecfb))
+* **googlerecorder/remove-device-restrictions:** add missing app constraint ([#2438](https://github.com/revanced/revanced-patches/issues/2438)) ([d5efe26](https://github.com/revanced/revanced-patches/commit/d5efe26f8959cde75dd3865ec3c2df4b05210e4a))
+* **youtube/comments:** add missing filter ([#2423](https://github.com/revanced/revanced-patches/issues/2423)) ([cab04b3](https://github.com/revanced/revanced-patches/commit/cab04b3a56cfc5bf00b7c6fcf6f86ab75aa5d4fd))
+* **youtube/hide-album-cards:** call correct integrations method ([0dbffaa](https://github.com/revanced/revanced-patches/commit/0dbffaae7d6dcb7050a9ea6e3c771839bcfdfbe1))
+* **youtube:** separate `hide-ads` to `hide-layout-components` patch ([7e0417f](https://github.com/revanced/revanced-patches/commit/7e0417f6728fa7b79a9d8cbcfd3ccba484a5567d))
+
+
+### Features
+
+* **boostforreddit:** add `change-oauth-client-id` patch ([3dbc4bd](https://github.com/revanced/revanced-patches/commit/3dbc4bd49df1656893ef69c68550a2deb6a92cb7))
+* **google-recorder:** add `remove-device-restrictions` patch ([ef96ed1](https://github.com/revanced/revanced-patches/commit/ef96ed124e12091dde34124eabd8be9f2bb9280c))
+* **twitch:** 15.4.1 support ([#2462](https://github.com/revanced/revanced-patches/issues/2462)) ([826ed49](https://github.com/revanced/revanced-patches/commit/826ed49c7ca5a00e383b743f88f75dbfc00adb43))
+* **youtube-music:** remove version compatibility constraints ([276af14](https://github.com/revanced/revanced-patches/commit/276af1415a4d354c62fe6259b6559bca1fa84f08))
+* **youtube/hide-layout-components:** separate hiding expandable chips and chapters ([3fb1ce9](https://github.com/revanced/revanced-patches/commit/3fb1ce9f9af150b784e42aaf5b419bb123c08375))
+
+# [2.178.0-dev.9](https://github.com/revanced/revanced-patches/compare/v2.178.0-dev.8...v2.178.0-dev.9) (2023-06-21)
+
+
+### Features
+
+* **twitch:** 15.4.1 support ([#2462](https://github.com/revanced/revanced-patches/issues/2462)) ([826ed49](https://github.com/revanced/revanced-patches/commit/826ed49c7ca5a00e383b743f88f75dbfc00adb43))
+
+# [2.178.0-dev.8](https://github.com/revanced/revanced-patches/compare/v2.178.0-dev.7...v2.178.0-dev.8) (2023-06-20)
+
+
+### Bug Fixes
+
+* **boostforreddit:** use correct options ([ec39732](https://github.com/revanced/revanced-patches/commit/ec39732a05f7c4c3360b8ba42fe50fd60952e6ac))
+
+# [2.178.0-dev.7](https://github.com/revanced/revanced-patches/compare/v2.178.0-dev.6...v2.178.0-dev.7) (2023-06-19)
+
+
+### Features
+
+* **youtube-music:** remove version compatibility constraints ([276af14](https://github.com/revanced/revanced-patches/commit/276af1415a4d354c62fe6259b6559bca1fa84f08))
+
+# [2.178.0-dev.6](https://github.com/revanced/revanced-patches/compare/v2.178.0-dev.5...v2.178.0-dev.6) (2023-06-18)
+
+
+### Bug Fixes
+
+* **youtube/hide-album-cards:** call correct integrations method ([0dbffaa](https://github.com/revanced/revanced-patches/commit/0dbffaae7d6dcb7050a9ea6e3c771839bcfdfbe1))
+
+# [2.178.0-dev.5](https://github.com/revanced/revanced-patches/compare/v2.178.0-dev.4...v2.178.0-dev.5) (2023-06-18)
+
+
+### Features
+
+* **youtube/hide-layout-components:** separate hiding expandable chips and chapters ([3fb1ce9](https://github.com/revanced/revanced-patches/commit/3fb1ce9f9af150b784e42aaf5b419bb123c08375))
+
+# [2.178.0-dev.4](https://github.com/revanced/revanced-patches/compare/v2.178.0-dev.3...v2.178.0-dev.4) (2023-06-18)
+
+
+### Features
+
+* **boostforreddit:** add `change-oauth-client-id` patch ([3dbc4bd](https://github.com/revanced/revanced-patches/commit/3dbc4bd49df1656893ef69c68550a2deb6a92cb7))
+
+# [2.178.0-dev.3](https://github.com/revanced/revanced-patches/compare/v2.178.0-dev.2...v2.178.0-dev.3) (2023-06-17)
+
+
+### Bug Fixes
+
+* **youtube/comments:** add missing filter ([#2423](https://github.com/revanced/revanced-patches/issues/2423)) ([cab04b3](https://github.com/revanced/revanced-patches/commit/cab04b3a56cfc5bf00b7c6fcf6f86ab75aa5d4fd))
+
 # [2.178.0-dev.2](https://github.com/revanced/revanced-patches/compare/v2.178.0-dev.1...v2.178.0-dev.2) (2023-06-16)
 
 

README.md

@@ -71,16 +71,15 @@ The official ReVanced Patches.
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
 | `background-play` | Enables playing music in the background. | all |
-| `bypass-certificate-checks` | Bypasses certificate checks which prevent YouTube Music from working on Android Auto. | 5.39.52 |
+| `bypass-certificate-checks` | Bypasses certificate checks which prevent YouTube Music from working on Android Auto. | all |
 | `codecs-unlock` | Adds more audio codec options. The new audio codecs usually result in better audio quality. | all |
 | `compact-header` | Hides the music category bar at the top of the homepage. | all |
 | `exclusive-audio-playback` | Enables the option to play music without video. | all |
-| `hide-get-premium` | Removes all "Get Premium" evidences from the avatar menu. | 5.39.52 |
+| `hide-get-premium` | Removes all "Get Premium" evidences from the avatar menu. | all |
 | `minimized-playback-music` | Enables minimized playback on Kids music. | all |
-| `music-microg-support` | Allows YouTube Music ReVanced to run without root and under a different package name. | all |
 | `music-video-ads` | Removes ads in the music player. | all |
-| `tasteBuilder-remover` | Removes the "Tell us which artists you like" card from the home screen. | all |
 | `upgrade-button-remover` | Removes the upgrade tab from the pivot bar. | all |
+| `vanced-microg-support` | Allows YouTube Music ReVanced to run without root and under a different package name. | all |
 </details>
 
 ### [📦 `com.ss.android.ugc.trill`](https://play.google.com/store/apps/details?id=com.ss.android.ugc.trill)
@@ -120,13 +119,24 @@ The official ReVanced Patches.
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `auto-claim-channel-points` | Automatically claim Channel Points. | all |
+| `auto-claim-channel-points` | Automatically claim Channel Points. | 15.4.1 |
-| `block-audio-ads` | Blocks audio ads in streams and VODs. | 14.6.1 |
+| `block-audio-ads` | Blocks audio ads in streams and VODs. | 15.4.1 |
-| `block-embedded-ads` | Blocks embedded stream ads using services like TTV.lol or PurpleAdBlocker. | 14.6.1 |
+| `block-embedded-ads` | Blocks embedded stream ads using services like TTV.lol or PurpleAdBlocker. | 15.4.1 |
-| `block-video-ads` | Blocks video ads in streams and VODs. | 14.6.1 |
+| `block-video-ads` | Blocks video ads in streams and VODs. | 15.4.1 |
 | `debug-mode` | Enables Twitch's internal debugging mode. | all |
 | `settings` | Adds settings menu to Twitch. | all |
-| `show-deleted-messages` | Shows deleted chat messages behind a clickable spoiler. | all |
+| `show-deleted-messages` | Shows deleted chat messages behind a clickable spoiler. | 15.4.1 |
+</details>
+
+### [📦 `com.reddit.frontpage`](https://play.google.com/store/apps/details?id=com.reddit.frontpage)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `disable-screenshot-popup` | Disables the popup that shows up when taking a screenshot. | all |
+| `hide-ads` | Removes ads from the Reddit. | all |
+| `premium-icon-reddit` | Unlocks premium Reddit app icons. | all |
+| `sanitize-sharing-links` | Removes (tracking) query parameters from the URLs when sharing links. | all |
 </details>
 
 ### [📦 `com.twitter.android`](https://play.google.com/store/apps/details?id=com.twitter.android)
@@ -150,22 +160,12 @@ The official ReVanced Patches.
 | `hide-inbox-ads` | Hides ads in inbox. | all |
 </details>
 
-### [📦 `com.reddit.frontpage`](https://play.google.com/store/apps/details?id=com.reddit.frontpage)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `hide-ads` | Removes ads from the Reddit. | all |
-| `premium-icon-reddit` | Unlocks premium Reddit app icons. | all |
-| `sanitize-sharing-links` | Removes (tracking) query parameters from the URLs when sharing links. | all |
-</details>
-
 ### [📦 `com.laurencedawson.reddit_sync`](https://play.google.com/store/apps/details?id=com.laurencedawson.reddit_sync)
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `change-oauth-client-id` | Changes the OAuth client ID. | all |
+| `change-oauth-client-id` | Changes the OAuth client ID. The OAuth application type has to be "Installed app" and the redirect URI has to be set to "http://redditsync/auth". | all |
 | `disable-ads` | Disables ads. | all |
 </details>
 
@@ -205,12 +205,68 @@ The official ReVanced Patches.
 | `spoof-signature` | Spoofs the signature of the app. | all |
 </details>
 
+### [📦 `ml.docilealligator.infinityforreddit`](https://play.google.com/store/apps/details?id=ml.docilealligator.infinityforreddit)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `change-oauth-client-id` | Changes the OAuth client ID. The OAuth application type has to be "Installed app" and the redirect URI has to be set to "infinity://localhost". | all |
+</details>
+
+### [📦 `free.reddit.news`](https://play.google.com/store/apps/details?id=free.reddit.news)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `change-oauth-client-id` | Changes the OAuth client ID. The OAuth application type has to be "Installed app" and the redirect URI has to be set to "dbrady://relay". | all |
+</details>
+
+### [📦 `reddit.news`](https://play.google.com/store/apps/details?id=reddit.news)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `change-oauth-client-id` | Changes the OAuth client ID. The OAuth application type has to be "Installed app" and the redirect URI has to be set to "dbrady://relay". | all |
+</details>
+
+### [📦 `com.rubenmayayo.reddit`](https://play.google.com/store/apps/details?id=com.rubenmayayo.reddit)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `change-oauth-client-id` | Changes the OAuth client ID. The OAuth application type has to be "Installed app" and the redirect URI has to be set to "http://rubenmayayo.com". | all |
+</details>
+
+### [📦 `com.andrewshu.android.reddit`](https://play.google.com/store/apps/details?id=com.andrewshu.android.reddit)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `change-oauth-client-id` | Changes the OAuth client ID. The OAuth application type has to be "Installed app" and the redirect URI has to be set to "redditisfun://auth". | all |
+</details>
+
+### [📦 `com.andrewshu.android.redditdonation`](https://play.google.com/store/apps/details?id=com.andrewshu.android.redditdonation)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `change-oauth-client-id` | Changes the OAuth client ID. The OAuth application type has to be "Installed app" and the redirect URI has to be set to "redditisfun://auth". | all |
+</details>
+
 ### [📦 `com.laurencedawson.reddit_sync.pro`](https://play.google.com/store/apps/details?id=com.laurencedawson.reddit_sync.pro)
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `change-oauth-client-id` | Changes the OAuth client ID. | all |
+| `change-oauth-client-id` | Changes the OAuth client ID. The OAuth application type has to be "Installed app" and the redirect URI has to be set to "http://redditsync/auth". | all |
+</details>
+
+### [📦 `com.laurencedawson.reddit_sync.dev`](https://play.google.com/store/apps/details?id=com.laurencedawson.reddit_sync.dev)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `change-oauth-client-id` | Changes the OAuth client ID. The OAuth application type has to be "Installed app" and the redirect URI has to be set to "http://redditsync/auth". | all |
 </details>
 
 ### [📦 `com.myprog.hexedit`](https://play.google.com/store/apps/details?id=com.myprog.hexedit)
@@ -229,14 +285,6 @@ The official ReVanced Patches.
 | `enable-on-demand` | Enables listening to songs on-demand, allowing to play any song from playlists, albums or artists without limitations. This does not remove ads. | all |
 </details>
 
-### [📦 `com.vanced.android.youtube`](https://play.google.com/store/apps/details?id=com.vanced.android.youtube)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `hide-ads` | Removes general ads. | all |
-</details>
-
 ### [📦 `com.nis.app`](https://play.google.com/store/apps/details?id=com.nis.app)
 <details>
 
@@ -245,6 +293,14 @@ The official ReVanced Patches.
 | `hide-ads` | Removes ads from Inshorts. | all |
 </details>
 
+### [📦 `com.vanced.android.youtube`](https://play.google.com/store/apps/details?id=com.vanced.android.youtube)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `hide-ads` | Removes general ads. | all |
+</details>
+
 ### [📦 `com.instagram.android`](https://play.google.com/store/apps/details?id=com.instagram.android)
 <details>
 
@@ -333,12 +389,20 @@ The official ReVanced Patches.
 | `unlock-prime` | Unlocks Nova Prime and all functions of the app. | all |
 </details>
 
-### [📦 `tv.trakt.trakt`](https://play.google.com/store/apps/details?id=tv.trakt.trakt)
+### [📦 `org.totschnig.myexpenses`](https://play.google.com/store/apps/details?id=org.totschnig.myexpenses)
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `unlock-pro` | Unlocks pro features. | all |
+| `unlock-pro` | Unlocks all professional features. | 3.4.9 |
+</details>
+
+### [📦 `ginlemon.iconpackstudio`](https://play.google.com/store/apps/details?id=ginlemon.iconpackstudio)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `unlock-pro` | Unlocks all pro features. | all |
 </details>
 
 ### [📦 `com.zombodroid.MemeGenerator`](https://play.google.com/store/apps/details?id=com.zombodroid.MemeGenerator)
@@ -349,6 +413,30 @@ The official ReVanced Patches.
 | `unlock-pro` | Unlocks pro features. | 4.6377 |
 </details>
 
+### [📦 `co.windyapp.android`](https://play.google.com/store/apps/details?id=co.windyapp.android)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `unlock-pro` | Unlocks all pro features. | all |
+</details>
+
+### [📦 `com.vsco.cam`](https://play.google.com/store/apps/details?id=com.vsco.cam)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `unlock-pro` | Unlocks pro features. | all |
+</details>
+
+### [📦 `com.wakdev.apps.nfctools.se`](https://play.google.com/store/apps/details?id=com.wakdev.apps.nfctools.se)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `unlock-pro` | Unlocks all pro features. | all |
+</details>
+
 ### [📦 `com.ithebk.expensemanager`](https://play.google.com/store/apps/details?id=com.ithebk.expensemanager)
 <details>
 
@@ -357,7 +445,15 @@ The official ReVanced Patches.
 | `unlock-pro` | Unlocks pro features. | all |
 </details>
 
-### [📦 `com.vsco.cam`](https://play.google.com/store/apps/details?id=com.vsco.cam)
+### [📦 `com.candylink.openvpn`](https://play.google.com/store/apps/details?id=com.candylink.openvpn)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `unlock-pro` | Unlocks premium features. | all |
+</details>
+
+### [📦 `tv.trakt.trakt`](https://play.google.com/store/apps/details?id=tv.trakt.trakt)
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
@@ -373,46 +469,6 @@ The official ReVanced Patches.
 | `unlock-pro` | Unlocks all pro features. | all |
 </details>
 
-### [📦 `ginlemon.iconpackstudio`](https://play.google.com/store/apps/details?id=ginlemon.iconpackstudio)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `unlock-pro` | Unlocks all pro features. | all |
-</details>
-
-### [📦 `org.totschnig.myexpenses`](https://play.google.com/store/apps/details?id=org.totschnig.myexpenses)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `unlock-pro` | Unlocks all professional features. | 3.4.9 |
-</details>
-
-### [📦 `com.wakdev.apps.nfctools.se`](https://play.google.com/store/apps/details?id=com.wakdev.apps.nfctools.se)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `unlock-pro` | Unlocks all pro features. | all |
-</details>
-
-### [📦 `co.windyapp.android`](https://play.google.com/store/apps/details?id=co.windyapp.android)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `unlock-pro` | Unlocks all pro features. | all |
-</details>
-
-### [📦 `com.candylink.openvpn`](https://play.google.com/store/apps/details?id=com.candylink.openvpn)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `unlock-pro` | Unlocks premium features. | all |
-</details>
-
 ### [📦 `com.ticktick.task`](https://play.google.com/store/apps/details?id=com.ticktick.task)
 <details>
 

build.gradle.kts

@@ -27,7 +27,7 @@ repositories {
 }
 
 dependencies {
-    implementation("app.revanced:revanced-patcher:11.0.0")
+    implementation("app.revanced:revanced-patcher:11.0.3")
     implementation("app.revanced:multidexlib2:2.5.3-a3836654")
     // Required for meta
     implementation("com.google.code.gson:gson:2.10.1")

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.178.0-dev.2
+version = 2.180.0-dev.1

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

@@ -57,17 +57,28 @@ internal fun MutableMethod.injectHideViewCall(
     "invoke-static { v$viewRegister }, $classDescriptor->$targetMethod(Landroid/view/View;)V"
 )
 
-internal fun MutableMethod.findIndexForIdResource(resourceName: String): Int {
+internal fun Method.findIndexForIdResource(resourceName: String): Int {
     fun getIdResourceId(resourceName: String) = ResourceMappingPatch.resourceMappings.single {
         it.type == "id" && it.name == resourceName
     }.id
 
-    val resourceId = getIdResourceId(resourceName)
+    return indexOfFirstConstantInstructionValue(getIdResourceId(resourceName))
-    return implementation!!.instructions.indexOfFirst {
+}
-        if (it.opcode != Opcode.CONST) return@indexOfFirst false
 
-        val literal = (it as WideLiteralInstruction).wideLiteral
+/**
+ * @return the first constant instruction with the value, or -1 if not found.
+ */
+fun Method.indexOfFirstConstantInstructionValue(constantValue: Long): Int {
+    return implementation?.let {
+        it.instructions.indexOfFirst { instruction ->
+            instruction.opcode == Opcode.CONST && (instruction as WideLiteralInstruction).wideLiteral == constantValue
+        }
+    } ?: -1
+}
 
-        return@indexOfFirst resourceId == literal
+/**
-    }
+ * @return if the method contains a constant with the given value.
-}
+ */
+fun Method.containsConstantInstructionValue(constantValue: Long): Boolean {
+    return indexOfFirstConstantInstructionValue(constantValue) >= 0
+}

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

@@ -14,29 +14,17 @@ import org.w3c.dom.Element
 @Version("0.0.1")
 class EnableAndroidDebuggingPatch : ResourcePatch {
     override fun execute(context: ResourceContext): PatchResult {
-        if (debuggable == true) {
+        context.xmlEditor["AndroidManifest.xml"].use { dom ->
-            context.xmlEditor["AndroidManifest.xml"].use { dom ->
+            val applicationNode = dom
-                val applicationNode = dom
+                .file
-                    .file
+                .getElementsByTagName("application")
-                    .getElementsByTagName("application")
+                .item(0) as Element
-                    .item(0) as Element
 
-                // set application as debuggable
+            // set application as debuggable
-                applicationNode.setAttribute("android:debuggable", "true")
+            applicationNode.setAttribute("android:debuggable", "true")
-            }
         }
 
         return PatchResultSuccess()
     }
 
-    companion object : OptionsContainer() {
-        var debuggable: Boolean? by option(
-            PatchOption.BooleanOption(
-                key = "debuggable",
-                default = false,
-                title = "App debugging",
-                description = "Whether to make the app debuggable on Android.",
-            )
-        )
-    }
 }

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

@@ -10,19 +10,17 @@ import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.music.ad.video.annotations.MusicVideoAdsCompatibility
 import app.revanced.patches.music.ad.video.fingerprints.ShowMusicVideoAdsConstructorFingerprint
 import app.revanced.patches.music.ad.video.fingerprints.ShowMusicVideoAdsFingerprint
+import app.revanced.patches.music.annotations.MusicCompatibility
 
 @Patch
 @Name("music-video-ads")
 @Description("Removes ads in the music player.")
-@MusicVideoAdsCompatibility
+@MusicCompatibility
 @Version("0.0.1")
 class MusicVideoAdsPatch : BytecodePatch(
-    listOf(
+    listOf(ShowMusicVideoAdsConstructorFingerprint)
-        ShowMusicVideoAdsConstructorFingerprint
-    )
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
         ShowMusicVideoAdsFingerprint.resolve(context, ShowMusicVideoAdsConstructorFingerprint.result!!.classDef)

src/main/kotlin/app/revanced/patches/music/annotations/MusicCompatibility.kt

@@ -1,8 +1,8 @@
-package app.revanced.patches.music.ad.video.annotations
+package app.revanced.patches.music.annotations
 
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("com.google.android.apps.youtube.music")])
 @Target(AnnotationTarget.CLASS)
-internal annotation class MusicVideoAdsCompatibility
+internal annotation class MusicCompatibility

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

@@ -1,8 +0,0 @@
-package app.revanced.patches.music.audio.codecs.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.apps.youtube.music")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class CodecsUnlockCompatibility

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

@@ -10,7 +10,7 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.toInstruction
-import app.revanced.patches.music.audio.codecs.annotations.CodecsUnlockCompatibility
+import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.audio.codecs.fingerprints.AllCodecsReferenceFingerprint
 import app.revanced.patches.music.audio.codecs.fingerprints.CodecsLockFingerprint
 import org.jf.dexlib2.Opcode
@@ -18,7 +18,7 @@ import org.jf.dexlib2.Opcode
 @Patch
 @Name("codecs-unlock")
 @Description("Adds more audio codec options. The new audio codecs usually result in better audio quality.")
-@CodecsUnlockCompatibility
+@MusicCompatibility
 @Version("0.0.1")
 class CodecsUnlockPatch : BytecodePatch(
     listOf(

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

@@ -1,8 +0,0 @@
-package app.revanced.patches.music.audio.exclusiveaudio.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.apps.youtube.music")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class ExclusiveAudioCompatibility

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

@@ -10,18 +10,16 @@ import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.music.audio.exclusiveaudio.annotations.ExclusiveAudioCompatibility
+import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.audio.exclusiveaudio.fingerprints.AudioOnlyEnablerFingerprint
 
 @Patch
 @Name("exclusive-audio-playback")
 @Description("Enables the option to play music without video.")
-@ExclusiveAudioCompatibility
+@MusicCompatibility
 @Version("0.0.1")
 class ExclusiveAudioPatch : BytecodePatch(
-    listOf(
+    listOf(AudioOnlyEnablerFingerprint)
-        AudioOnlyEnablerFingerprint
-    )
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
         val method = AudioOnlyEnablerFingerprint.result!!.mutableMethod

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

@@ -1,8 +0,0 @@
-package app.revanced.patches.music.layout.compactheader.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.apps.youtube.music")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class CompactHeaderCompatibility

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

@@ -9,19 +9,17 @@ import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.music.layout.compactheader.annotations.CompactHeaderCompatibility
+import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.layout.compactheader.fingerprints.CompactHeaderConstructorFingerprint
 import org.jf.dexlib2.builder.instruction.BuilderInstruction11x
 
 @Patch(false)
 @Name("compact-header")
 @Description("Hides the music category bar at the top of the homepage.")
-@CompactHeaderCompatibility
+@MusicCompatibility
 @Version("0.0.1")
 class CompactHeaderPatch : BytecodePatch(
-    listOf(
+    listOf(CompactHeaderConstructorFingerprint)
-        CompactHeaderConstructorFingerprint
-    )
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
         val result = CompactHeaderConstructorFingerprint.result!!

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

@@ -1,8 +0,0 @@
-package app.revanced.patches.music.layout.minimizedplayback.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.apps.youtube.music")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class MinimizedPlaybackCompatibility

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

@@ -9,18 +9,16 @@ import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.music.layout.minimizedplayback.annotations.MinimizedPlaybackCompatibility
+import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.layout.minimizedplayback.fingerprints.MinimizedPlaybackManagerFingerprint
 
 @Patch
 @Name("minimized-playback-music")
 @Description("Enables minimized playback on Kids music.")
-@MinimizedPlaybackCompatibility
+@MusicCompatibility
 @Version("0.0.1")
 class MinimizedPlaybackPatch : BytecodePatch(
-    listOf(
+    listOf(MinimizedPlaybackManagerFingerprint)
-        MinimizedPlaybackManagerFingerprint
-    )
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
         MinimizedPlaybackManagerFingerprint.result!!.mutableMethod.addInstruction(

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

@@ -1,31 +0,0 @@
-package app.revanced.patches.music.layout.premium.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [Package(
-        "com.google.android.apps.youtube.music",
-        arrayOf(
-            "5.14.53",
-            "5.16.51",
-            "5.17.51",
-            "5.21.52",
-            "5.22.54",
-            "5.23.50",
-            "5.25.51",
-            "5.25.52",
-            "5.26.52",
-            "5.27.51",
-            "5.28.52",
-            "5.29.52",
-            "5.31.50",
-            "5.34.51",
-            "5.36.51",
-            "5.38.53",
-            "5.39.52"
-        )
-    )]
-)
-@Target(AnnotationTarget.CLASS)
-internal annotation class HideGetPremiumCompatibility

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

@@ -11,19 +11,17 @@ import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.music.layout.premium.annotations.HideGetPremiumCompatibility
+import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.layout.premium.fingerprints.HideGetPremiumFingerprint
 import app.revanced.patches.music.layout.premium.fingerprints.HideGetPremiumParentFingerprint
 
 @Patch
 @Name("hide-get-premium")
 @Description("Removes all \"Get Premium\" evidences from the avatar menu.")
-@HideGetPremiumCompatibility
+@MusicCompatibility
 @Version("0.0.1")
 class HideGetPremiumPatch : BytecodePatch(
-    listOf(
+    listOf(HideGetPremiumParentFingerprint)
-        HideGetPremiumParentFingerprint
-    )
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
         val parentResult = HideGetPremiumParentFingerprint.result!!
@@ -33,9 +31,10 @@ class HideGetPremiumPatch : BytecodePatch(
 
         val parentMethod = parentResult.mutableMethod
         parentMethod.replaceInstruction(
-            startIndex, """
+            startIndex,
-            const/4 v1, 0x0
+            """
-        """
+                const/4 v1, 0x0
+            """
         )
 
         val result = HideGetPremiumFingerprint.result!!

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

@@ -1,13 +0,0 @@
-package app.revanced.patches.music.layout.tastebuilder.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-/**
- * -- Note 2022-08-05 --
- * Since 5.17.xx the tastebuilder component is dismissible, so this patch is less useful
- * also it is partly litho now
- */
-@Compatibility([Package("com.google.android.apps.youtube.music")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class RemoveTasteBuilderCompatibility

src/main/kotlin/app/revanced/patches/music/layout/tastebuilder/fingerprints/TasteBuilderConstructorFingerprint.kt

@@ -1,34 +0,0 @@
-package app.revanced.patches.music.layout.tastebuilder.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-
-@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-object TasteBuilderConstructorFingerprint : MethodFingerprint(
-    "V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, listOf("L", "L", "L"), listOf(
-        Opcode.INVOKE_DIRECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.NEW_INSTANCE,
-        Opcode.INVOKE_DIRECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CONST,
-        Opcode.CONST_4,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.CONST,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.NEW_INSTANCE,
-        Opcode.INVOKE_DIRECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.CONST
-    )
-)

src/main/kotlin/app/revanced/patches/music/layout/tastebuilder/patch/RemoveTasteBuilderPatch.kt

@@ -1,42 +0,0 @@
-package app.revanced.patches.music.layout.tastebuilder.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.music.layout.tastebuilder.annotations.RemoveTasteBuilderCompatibility
-import app.revanced.patches.music.layout.tastebuilder.fingerprints.TasteBuilderConstructorFingerprint
-import org.jf.dexlib2.iface.instruction.formats.Instruction22c
-
-@Patch
-@Name("tasteBuilder-remover")
-@Description("Removes the \"Tell us which artists you like\" card from the home screen.")
-@RemoveTasteBuilderCompatibility
-@Version("0.0.1")
-class RemoveTasteBuilderPatch : BytecodePatch(
-    listOf(
-        TasteBuilderConstructorFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        val result = TasteBuilderConstructorFingerprint.result!!
-        val method = result.mutableMethod
-
-        val insertIndex = result.scanResult.patternScanResult!!.endIndex - 8
-        val register = (method.implementation!!.instructions[insertIndex] as Instruction22c).registerA
-        method.addInstructions(
-            insertIndex,
-            """
-                const/16 v1, 0x8
-                invoke-virtual {v${register}, v1}, Landroid/view/View;->setVisibility(I)V
-            """
-        )
-
-        return PatchResultSuccess()
-    }
-}

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

@@ -1,8 +0,0 @@
-package app.revanced.patches.music.layout.upgradebutton.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.apps.youtube.music")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class RemoveUpgradeButtonCompatibility

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

@@ -10,7 +10,7 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.toInstructions
-import app.revanced.patches.music.layout.upgradebutton.annotations.RemoveUpgradeButtonCompatibility
+import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.layout.upgradebutton.fingerprints.PivotBarConstructorFingerprint
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.builder.instruction.BuilderInstruction22t
@@ -21,12 +21,10 @@ import org.jf.dexlib2.iface.instruction.formats.Instruction35c
 @Patch
 @Name("upgrade-button-remover")
 @Description("Removes the upgrade tab from the pivot bar.")
-@RemoveUpgradeButtonCompatibility
+@MusicCompatibility
 @Version("0.0.1")
 class RemoveUpgradeButtonPatch : BytecodePatch(
-    listOf(
+    listOf(PivotBarConstructorFingerprint)
-        PivotBarConstructorFingerprint
-    )
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
         val result = PivotBarConstructorFingerprint.result!!

src/main/kotlin/app/revanced/patches/music/misc/androidauto/annotations/BypassCertificateChecksCompatibility.kt

@@ -1,35 +0,0 @@
-package app.revanced.patches.music.misc.androidauto.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [Package(
-        "com.google.android.apps.youtube.music",
-        arrayOf(
-            "5.14.53",
-            "5.16.51",
-            "5.17.51",
-            "5.21.52",
-            "5.22.54",
-            "5.23.50",
-            "5.25.51",
-            "5.25.52",
-            "5.26.52",
-            "5.27.51",
-            "5.28.52",
-            "5.29.52",
-            "5.31.50",
-            "5.34.51",
-            "5.36.51",
-            "5.38.53",
-            "5.39.52",
-            "5.40.51",
-            "5.41.50",
-            "5.48.52"
-        )
-    )]
-)
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
-internal annotation class BypassCertificateChecksCompatibility

src/main/kotlin/app/revanced/patches/music/misc/androidauto/fingerprints/CheckCertificateFingerprint.kt

@@ -1,10 +1,9 @@
 package app.revanced.patches.music.misc.androidauto.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.music.misc.androidauto.patch.BypassCertificateChecksPatch
-
 
 object CheckCertificateFingerprint : MethodFingerprint(
-    "Z",
+    returnType = "Z",
-    strings = listOf("No match") // Unique in combination with boolean return type
+    parameters = listOf("Ljava/lang/String;"),
+    strings = listOf("X509", "Failed to get public key.", "Failed to get certificate.")
 )

src/main/kotlin/app/revanced/patches/music/misc/androidauto/patch/BypassCertificateChecksPatch.kt

@@ -11,18 +11,16 @@ import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.music.misc.androidauto.annotations.BypassCertificateChecksCompatibility
+import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.misc.androidauto.fingerprints.CheckCertificateFingerprint
 
 @Patch
 @Name("bypass-certificate-checks")
 @Description("Bypasses certificate checks which prevent YouTube Music from working on Android Auto.")
-@BypassCertificateChecksCompatibility
+@MusicCompatibility
 @Version("0.0.1")
 class BypassCertificateChecksPatch : BytecodePatch(
-    listOf(
+    listOf(CheckCertificateFingerprint)
-        CheckCertificateFingerprint
-    )
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
         CheckCertificateFingerprint.result?.let { result ->

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

@@ -1,8 +0,0 @@
-package app.revanced.patches.music.misc.microg.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.apps.youtube.music")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class MusicMicroGPatchCompatibility

src/main/kotlin/app/revanced/patches/music/misc/microg/patch/bytecode/MicroGBytecodePatch.kt

@@ -1,65 +1,65 @@
-package app.revanced.patches.music.misc.microg.patch.bytecode
+package app.revanced.patches.music.misc.microg.patch.bytecode
-
+
-import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.music.misc.microg.annotations.MusicMicroGPatchCompatibility
+import app.revanced.patches.music.annotations.MusicCompatibility
-import app.revanced.patches.music.misc.microg.fingerprints.*
+import app.revanced.patches.music.misc.microg.fingerprints.*
-import app.revanced.patches.music.misc.microg.patch.resource.MusicMicroGResourcePatch
+import app.revanced.patches.music.misc.microg.patch.resource.MicroGResourcePatch
-import app.revanced.patches.music.misc.microg.shared.Constants.MUSIC_PACKAGE_NAME
+import app.revanced.patches.music.misc.microg.shared.Constants.MUSIC_PACKAGE_NAME
-import app.revanced.patches.music.misc.microg.shared.Constants.REVANCED_MUSIC_PACKAGE_NAME
+import app.revanced.patches.music.misc.microg.shared.Constants.REVANCED_MUSIC_PACKAGE_NAME
-import app.revanced.patches.youtube.misc.microg.shared.Constants
+import app.revanced.patches.youtube.misc.microg.shared.Constants
-import app.revanced.util.microg.MicroGBytecodeHelper
+import app.revanced.util.microg.MicroGBytecodeHelper
-
+
-@Patch
+@Patch
-@DependsOn([MusicMicroGResourcePatch::class])
+@DependsOn([MicroGResourcePatch::class])
-@Name("music-microg-support")
+@Name("vanced-microg-support")
-@Description("Allows YouTube Music ReVanced to run without root and under a different package name.")
+@Description("Allows YouTube Music ReVanced to run without root and under a different package name.")
-@MusicMicroGPatchCompatibility
+@MusicCompatibility
-@Version("0.0.2")
+@Version("0.0.2")
-class MusicMicroGBytecodePatch : BytecodePatch(
+class MicroGBytecodePatch : BytecodePatch(
-    listOf(
+    listOf(
-        ServiceCheckFingerprint,
+        ServiceCheckFingerprint,
-        GooglePlayUtilityFingerprint,
+        GooglePlayUtilityFingerprint,
-        CastDynamiteModuleFingerprint,
+        CastDynamiteModuleFingerprint,
-        CastDynamiteModuleV2Fingerprint,
+        CastDynamiteModuleV2Fingerprint,
-        CastContextFetchFingerprint,
+        CastContextFetchFingerprint,
-        PrimeFingerprint,
+        PrimeFingerprint,
-    )
+    )
-) {
+) {
-    // NOTE: the previous patch also replaced the following strings, but it seems like they are not needed:
+    // NOTE: the previous patch also replaced the following strings, but it seems like they are not needed:
-    // - "com.google.android.gms.chimera.GmsIntentOperationService",
+    // - "com.google.android.gms.chimera.GmsIntentOperationService",
-    // - "com.google.android.gms.phenotype.internal.IPhenotypeCallbacks",
+    // - "com.google.android.gms.phenotype.internal.IPhenotypeCallbacks",
-    // - "com.google.android.gms.phenotype.internal.IPhenotypeService",
+    // - "com.google.android.gms.phenotype.internal.IPhenotypeService",
-    // - "com.google.android.gms.phenotype.PACKAGE_NAME",
+    // - "com.google.android.gms.phenotype.PACKAGE_NAME",
-    // - "com.google.android.gms.phenotype.UPDATE",
+    // - "com.google.android.gms.phenotype.UPDATE",
-    // - "com.google.android.gms.phenotype",
+    // - "com.google.android.gms.phenotype",
-    override fun execute(context: BytecodeContext) =
+    override fun execute(context: BytecodeContext) =
-        // apply common microG patch
+        // apply common microG patch
-        MicroGBytecodeHelper.patchBytecode(
+        MicroGBytecodeHelper.patchBytecode(
-            context,
+            context,
-            arrayOf(
+            arrayOf(
-                MicroGBytecodeHelper.packageNameTransform(
+                MicroGBytecodeHelper.packageNameTransform(
-                    Constants.PACKAGE_NAME,
+                    Constants.PACKAGE_NAME,
-                    Constants.REVANCED_PACKAGE_NAME
+                    Constants.REVANCED_PACKAGE_NAME
-                )
+                )
-            ),
+            ),
-            MicroGBytecodeHelper.PrimeMethodTransformationData(
+            MicroGBytecodeHelper.PrimeMethodTransformationData(
-                PrimeFingerprint,
+                PrimeFingerprint,
-                MUSIC_PACKAGE_NAME,
+                MUSIC_PACKAGE_NAME,
-                REVANCED_MUSIC_PACKAGE_NAME
+                REVANCED_MUSIC_PACKAGE_NAME
-            ),
+            ),
-            listOf(
+            listOf(
-                ServiceCheckFingerprint,
+                ServiceCheckFingerprint,
-                GooglePlayUtilityFingerprint,
+                GooglePlayUtilityFingerprint,
-                CastDynamiteModuleFingerprint,
+                CastDynamiteModuleFingerprint,
-                CastDynamiteModuleV2Fingerprint,
+                CastDynamiteModuleV2Fingerprint,
-                CastContextFetchFingerprint
+                CastContextFetchFingerprint
-            )
+            )
-        ).let { PatchResultSuccess() }
+        ).let { PatchResultSuccess() }
-}
+}

src/main/kotlin/app/revanced/patches/music/misc/microg/patch/resource/MicroGResourcePatch.kt

@@ -7,7 +7,7 @@ import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patches.music.misc.microg.annotations.MusicMicroGPatchCompatibility
+import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.misc.microg.shared.Constants.MUSIC_PACKAGE_NAME
 import app.revanced.patches.music.misc.microg.shared.Constants.REVANCED_MUSIC_APP_NAME
 import app.revanced.patches.music.misc.microg.shared.Constants.REVANCED_MUSIC_PACKAGE_NAME
@@ -16,11 +16,11 @@ import app.revanced.patches.music.misc.microg.shared.Constants.SPOOFED_PACKAGE_S
 import app.revanced.util.microg.MicroGManifestHelper
 import app.revanced.util.microg.MicroGResourceHelper
 
-@Name("music-microg-resource-patch")
+@Name("microg-resource-patch")
 @Description("Resource patch to allow YouTube Music ReVanced to run without root and under a different package name.")
-@MusicMicroGPatchCompatibility
+@MusicCompatibility
 @Version("0.0.2")
-class MusicMicroGResourcePatch : ResourcePatch {
+class MicroGResourcePatch : ResourcePatch {
     override fun execute(context: ResourceContext): PatchResult {
         // update manifest
         MicroGResourceHelper.patchManifest(

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

@@ -1,8 +0,0 @@
-package app.revanced.patches.music.premium.backgroundplay.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.apps.youtube.music")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class BackgroundPlayCompatibility

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

@@ -9,18 +9,16 @@ import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.music.premium.backgroundplay.annotations.BackgroundPlayCompatibility
+import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.premium.backgroundplay.fingerprints.BackgroundPlaybackDisableFingerprint
 
 @Patch
 @Name("background-play")
 @Description("Enables playing music in the background.")
-@BackgroundPlayCompatibility
+@MusicCompatibility
 @Version("0.0.1")
 class BackgroundPlayPatch : BytecodePatch(
-    listOf(
+    listOf(BackgroundPlaybackDisableFingerprint)
-        BackgroundPlaybackDisableFingerprint
-    )
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
         BackgroundPlaybackDisableFingerprint.result!!.mutableMethod.addInstructions(

src/main/kotlin/app/revanced/patches/reddit/customclients/AbstractChangeOAuthClientIdPatch.kt

@@ -0,0 +1,58 @@
+package app.revanced.patches.reddit.customclients
+
+import android.os.Environment
+import app.revanced.extensions.toErrorResult
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
+import app.revanced.patcher.patch.*
+import java.io.File
+
+abstract class AbstractChangeOAuthClientIdPatch(
+    private val redirectUri: String,
+    private val options: ChangeOAuthClientIdOptionsContainer,
+    private val fingerprints: List<MethodFingerprint>
+) : BytecodePatch(fingerprints) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        if (options.clientId == null) {
+            // Ensure device runs Android.
+            try {
+                Class.forName("android.os.Environment")
+            } catch (e: ClassNotFoundException) {
+                return PatchResultError("No client ID provided")
+            }
+
+            File(Environment.getExternalStorageDirectory(), "reddit_client_id_revanced.txt").also {
+                if (it.exists()) return@also
+
+                val error = """
+                    In order to use this patch, you need to provide a client ID.
+                    You can do this by creating a file at ${it.absolutePath} with the client ID as its content.
+                    Alternatively, you can provide the client ID using patch options.
+                    
+                    You can get your client ID from https://www.reddit.com/prefs/apps.
+                    The application type has to be "Installed app" and the redirect URI has to be set to "$redirectUri".
+                """.trimIndent()
+
+                return PatchResultError(error)
+            }.let { options.clientId = it.readText().trim() }
+        }
+
+        return fingerprints.map { it.result ?: throw it.toErrorResult() }.patch(context)
+    }
+
+    abstract fun List<MethodFingerprintResult>.patch(context: BytecodeContext): PatchResult
+
+    companion object Options {
+        open class ChangeOAuthClientIdOptionsContainer : OptionsContainer() {
+            var clientId by option(
+                PatchOption.StringOption(
+                    "client-id",
+                    null,
+                    "OAuth client ID",
+                    "The Reddit OAuth client ID."
+                )
+            )
+        }
+    }
+}

src/main/kotlin/app/revanced/patches/reddit/customclients/ChangeOAuthClientIdPatchAnnotation.kt

@@ -0,0 +1,10 @@
+package app.revanced.patches.reddit.customclients
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.patch.annotations.Patch
+
+@Target(AnnotationTarget.CLASS)
+@Patch
+@Name("change-oauth-client-id")
+annotation class ChangeOAuthClientIdPatchAnnotation

src/main/kotlin/app/revanced/patches/reddit/customclients/baconreader/api/fingerprints/GetAuthorizationUrlFingerprint.kt

@@ -0,0 +1,7 @@
+package app.revanced.patches.reddit.customclients.baconreader.api.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object GetAuthorizationUrlFingerprint: MethodFingerprint(
+    strings = listOf("client_id=zACVn0dSFGdWqQ"),
+)

src/main/kotlin/app/revanced/patches/reddit/customclients/baconreader/api/fingerprints/GetClientIdFingerprint.kt

@@ -0,0 +1,12 @@
+package app.revanced.patches.reddit.customclients.baconreader.api.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object GetClientIdFingerprint : MethodFingerprint(
+    strings = listOf("client_id=zACVn0dSFGdWqQ"),
+    customFingerprint = custom@{ methodDef, classDef ->
+        if (!classDef.type.endsWith("RedditOAuth;")) return@custom false
+
+        methodDef.name == "getAuthorizeUrl"
+    }
+)

src/main/kotlin/app/revanced/patches/reddit/customclients/baconreader/api/fingerprints/RequestTokenFingerprint.kt

@@ -0,0 +1,7 @@
+package app.revanced.patches.reddit.customclients.baconreader.api.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object RequestTokenFingerprint : MethodFingerprint(
+    strings = listOf("zACVn0dSFGdWqQ", "kDm2tYpu9DqyWFFyPlNcXGEni4k"), // App ID and secret.
+)

src/main/kotlin/app/revanced/patches/reddit/customclients/baconreader/api/patch/ChangeOAuthClientIdPatch.kt

@@ -0,0 +1,51 @@
+package app.revanced.patches.reddit.customclients.baconreader.api.patch
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Package
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patches.reddit.customclients.AbstractChangeOAuthClientIdPatch
+import app.revanced.patches.reddit.customclients.ChangeOAuthClientIdPatchAnnotation
+import app.revanced.patches.reddit.customclients.baconreader.api.fingerprints.GetAuthorizationUrlFingerprint
+import app.revanced.patches.reddit.customclients.baconreader.api.fingerprints.RequestTokenFingerprint
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+
+
+@ChangeOAuthClientIdPatchAnnotation
+@Description("Changes the OAuth client ID. " +
+        "The OAuth application type has to be \"Installed app\" " +
+        "and the redirect URI has to be set to \"http://baconreader.com/auth\".")
+@Compatibility([Package("com.onelouder.baconreader")])
+class ChangeOAuthClientIdPatch : AbstractChangeOAuthClientIdPatch(
+    "http://baconreader.com/auth", Options, listOf(GetAuthorizationUrlFingerprint, RequestTokenFingerprint)
+) {
+
+    override fun List<MethodFingerprintResult>.patch(context: BytecodeContext): PatchResult {
+        fun MethodFingerprintResult.patch(replacementString: String) {
+            val clientIdIndex = scanResult.stringsScanResult!!.matches.first().index
+
+            mutableMethod.apply {
+                val clientIdRegister = getInstruction<OneRegisterInstruction>(clientIdIndex).registerA
+                replaceInstruction(
+                    clientIdIndex,
+                    "const-string v$clientIdRegister, \"$replacementString\""
+                )
+            }
+        }
+
+        // Patch client id in authorization url.
+        first().patch("client_id=$clientId")
+
+        // Patch client id for access token request.
+        last().patch(clientId!!)
+
+        return PatchResultSuccess()
+    }
+
+    companion object Options : AbstractChangeOAuthClientIdPatch.Options.ChangeOAuthClientIdOptionsContainer()
+}

src/main/kotlin/app/revanced/patches/reddit/customclients/boostforreddit/api/fingerprints/GetClientIdFingerprint.kt

@@ -0,0 +1,11 @@
+package app.revanced.patches.reddit.customclients.boostforreddit.api.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object GetClientIdFingerprint : MethodFingerprint(
+    customFingerprint = custom@{ methodDef, classDef ->
+        if (!classDef.type.endsWith("Credentials;")) return@custom false
+
+        methodDef.name == "getClientId"
+    }
+)

src/main/kotlin/app/revanced/patches/reddit/customclients/boostforreddit/api/patch/ChangeOAuthClientIdPatch.kt

@@ -0,0 +1,36 @@
+package app.revanced.patches.reddit.customclients.boostforreddit.api.patch
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Package
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patches.reddit.customclients.AbstractChangeOAuthClientIdPatch
+import app.revanced.patches.reddit.customclients.ChangeOAuthClientIdPatchAnnotation
+import app.revanced.patches.reddit.customclients.boostforreddit.api.fingerprints.GetClientIdFingerprint
+
+@ChangeOAuthClientIdPatchAnnotation
+@Description("Changes the OAuth client ID. " +
+        "The OAuth application type has to be \"Installed app\" " +
+        "and the redirect URI has to be set to \"http://rubenmayayo.com\".")
+@Compatibility([Package("com.rubenmayayo.reddit")])
+class ChangeOAuthClientIdPatch : AbstractChangeOAuthClientIdPatch(
+    "http://rubenmayayo.com", Options, listOf(GetClientIdFingerprint)
+) {
+    override fun List<MethodFingerprintResult>.patch(context: BytecodeContext): PatchResult {
+        first().mutableMethod.addInstructions(
+            0,
+    """
+                     const-string v0, "$clientId"
+                     return-object v0
+                """
+        )
+
+        return PatchResultSuccess()
+    }
+
+    companion object Options : AbstractChangeOAuthClientIdPatch.Options.ChangeOAuthClientIdOptionsContainer()
+}

src/main/kotlin/app/revanced/patches/reddit/customclients/infinityforreddit/api/fingerprints/AbstractClientIdFingerprint.kt

@@ -0,0 +1,12 @@
+package app.revanced.patches.reddit.customclients.infinityforreddit.api.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+abstract class AbstractClientIdFingerprint(classTypeSuffix: String, methodName: String) : MethodFingerprint(
+    strings = listOf("NOe2iKrPPzwscA"),
+    customFingerprint = custom@{ methodDef, classDef ->
+        if (!classDef.type.endsWith(classTypeSuffix)) return@custom false
+
+        methodDef.name == methodName
+    }
+)

src/main/kotlin/app/revanced/patches/reddit/customclients/infinityforreddit/api/fingerprints/GetHTTPBasicAuthHeaderFingerprint.kt

@@ -0,0 +1,6 @@
+package app.revanced.patches.reddit.customclients.infinityforreddit.api.fingerprints
+
+object GetHTTPBasicAuthHeaderFingerprint : AbstractClientIdFingerprint(
+    "APIUtils;",
+    "getHTTPBasicAuthHeader"
+)

src/main/kotlin/app/revanced/patches/reddit/customclients/infinityforreddit/api/fingerprints/LoginActivityOnCreateFingerprint.kt

@@ -0,0 +1,6 @@
+package app.revanced.patches.reddit.customclients.infinityforreddit.api.fingerprints
+
+object LoginActivityOnCreateFingerprint : AbstractClientIdFingerprint(
+    "LoginActivity;",
+    "onCreate"
+)

src/main/kotlin/app/revanced/patches/reddit/customclients/infinityforreddit/api/patch/ChangeOAuthClientIdPatch.kt

@@ -0,0 +1,45 @@
+package app.revanced.patches.reddit.customclients.infinityforreddit.api.patch
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Package
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patches.reddit.customclients.AbstractChangeOAuthClientIdPatch
+import app.revanced.patches.reddit.customclients.ChangeOAuthClientIdPatchAnnotation
+import app.revanced.patches.reddit.customclients.infinityforreddit.api.fingerprints.GetHTTPBasicAuthHeaderFingerprint
+import app.revanced.patches.reddit.customclients.infinityforreddit.api.fingerprints.LoginActivityOnCreateFingerprint
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+
+@ChangeOAuthClientIdPatchAnnotation
+@Description("Changes the OAuth client ID. " +
+        "The OAuth application type has to be \"Installed app\" " +
+        "and the redirect URI has to be set to \"infinity://localhost\".")
+@Compatibility([Package("ml.docilealligator.infinityforreddit")])
+class ChangeOAuthClientIdPatch : AbstractChangeOAuthClientIdPatch(
+    "infinity://localhost",
+    Options,
+    listOf(GetHTTPBasicAuthHeaderFingerprint, LoginActivityOnCreateFingerprint)
+) {
+    override fun List<MethodFingerprintResult>.patch(context: BytecodeContext): PatchResult {
+        forEach {
+            val clientIdIndex = it.scanResult.stringsScanResult!!.matches.first().index
+            it.mutableMethod.apply {
+                val oAuthClientIdRegister = getInstruction<OneRegisterInstruction>(clientIdIndex).registerA
+
+                replaceInstruction(
+                    clientIdIndex,
+                    "const-string v$oAuthClientIdRegister, \"$clientId\""
+                )
+            }
+        }
+
+        return PatchResultSuccess()
+    }
+
+    companion object Options : AbstractChangeOAuthClientIdPatch.Options.ChangeOAuthClientIdOptionsContainer()
+}

src/main/kotlin/app/revanced/patches/reddit/customclients/redditisfun/api/fingerprints/AbstractClientIdFingerprint.kt

@@ -0,0 +1,7 @@
+package app.revanced.patches.reddit.customclients.redditisfun.api.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+abstract class AbstractClientIdFingerprint(string: String) : MethodFingerprint(
+    strings = listOfNotNull("yyOCBp.RHJhDKd", string),
+)

src/main/kotlin/app/revanced/patches/reddit/customclients/redditisfun/api/fingerprints/BasicAuthorizationFingerprint.kt

@@ -0,0 +1,5 @@
+package app.revanced.patches.reddit.customclients.redditisfun.api.fingerprints
+
+object BasicAuthorizationFingerprint : AbstractClientIdFingerprint(
+    string = "fJOxVwBUyo*=f:<OoejWs:AqmIJ", // Encrypted basic authorization string.
+)

src/main/kotlin/app/revanced/patches/reddit/customclients/redditisfun/api/fingerprints/BuildAuthorizationStringFingerprint.kt

@@ -0,0 +1,5 @@
+package app.revanced.patches.reddit.customclients.redditisfun.api.fingerprints
+
+object BuildAuthorizationStringFingerprint : AbstractClientIdFingerprint(
+    string = "client_id"
+)

src/main/kotlin/app/revanced/patches/reddit/customclients/redditisfun/api/patch/ChangeOAuthClientIdPatch.kt

@@ -0,0 +1,61 @@
+package app.revanced.patches.reddit.customclients.redditisfun.api.patch
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Package
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult.MethodFingerprintScanResult.StringsScanResult.StringMatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patches.reddit.customclients.AbstractChangeOAuthClientIdPatch
+import app.revanced.patches.reddit.customclients.ChangeOAuthClientIdPatchAnnotation
+import app.revanced.patches.reddit.customclients.redditisfun.api.fingerprints.BasicAuthorizationFingerprint
+import app.revanced.patches.reddit.customclients.redditisfun.api.fingerprints.BuildAuthorizationStringFingerprint
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+
+@ChangeOAuthClientIdPatchAnnotation
+@Description("Changes the OAuth client ID. " +
+        "The OAuth application type has to be \"Installed app\" " +
+        "and the redirect URI has to be set to \"redditisfun://auth\".")
+@Compatibility([Package("com.andrewshu.android.reddit"), Package("com.andrewshu.android.redditdonation")])
+class ChangeOAuthClientIdPatch : AbstractChangeOAuthClientIdPatch(
+    "redditisfun://auth",
+    Options,
+    listOf(
+        BuildAuthorizationStringFingerprint,
+        BasicAuthorizationFingerprint,
+    )
+) {
+    override fun List<MethodFingerprintResult>.patch(context: BytecodeContext): PatchResult {
+        /**
+         * Replaces a one register instruction with a const-string instruction
+         * at the index returned by [getReplacementIndex].
+         *
+         * @param string The string to replace the instruction with.
+         * @param getReplacementIndex A function that returns the index of the instruction to replace
+         * using the [StringMatch] list from the [MethodFingerprintResult].
+         */
+        fun MethodFingerprintResult.replaceWith(
+            string: String,
+            getReplacementIndex: List<StringMatch>.() -> Int,
+        ) = mutableMethod.apply {
+            val replacementIndex = scanResult.stringsScanResult!!.matches.getReplacementIndex()
+            val clientIdRegister = getInstruction<OneRegisterInstruction>(replacementIndex).registerA
+
+            replaceInstruction(replacementIndex, "const-string v$clientIdRegister, \"$string\"")
+        }
+
+        // Patch OAuth authorization.
+        first().replaceWith(clientId!!) { first().index + 4 }
+
+        // Path basic authorization.
+        last().replaceWith("$clientId:") { last().index + 7 }
+
+        return PatchResultSuccess()
+    }
+
+    companion object Options : AbstractChangeOAuthClientIdPatch.Options.ChangeOAuthClientIdOptionsContainer()
+}

src/main/kotlin/app/revanced/patches/reddit/customclients/relayforreddit/api/fingerprints/AbstractClientIdFingerprint.kt

@@ -0,0 +1,7 @@
+package app.revanced.patches.reddit.customclients.relayforreddit.api.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+abstract class AbstractClientIdFingerprint(string: String) : MethodFingerprint(
+    strings = listOfNotNull("dj-xCIZQYiLbEg", string),
+)

src/main/kotlin/app/revanced/patches/reddit/customclients/relayforreddit/api/fingerprints/GetLoggedInBearerTokenFingerprint.kt

@@ -0,0 +1,3 @@
+package app.revanced.patches.reddit.customclients.relayforreddit.api.fingerprints
+
+object GetLoggedInBearerTokenFingerprint : AbstractClientIdFingerprint("authorization_code")

src/main/kotlin/app/revanced/patches/reddit/customclients/relayforreddit/api/fingerprints/GetLoggedOutBearerTokenFingerprint.kt

@@ -0,0 +1,3 @@
+package app.revanced.patches.reddit.customclients.relayforreddit.api.fingerprints
+
+object GetLoggedOutBearerTokenFingerprint : AbstractClientIdFingerprint("https://oauth.reddit.com/grants/installed_client")

src/main/kotlin/app/revanced/patches/reddit/customclients/relayforreddit/api/fingerprints/GetRefreshTokenFingerprint.kt

@@ -0,0 +1,3 @@
+package app.revanced.patches.reddit.customclients.relayforreddit.api.fingerprints
+
+object GetRefreshTokenFingerprint : AbstractClientIdFingerprint("refresh_token")

src/main/kotlin/app/revanced/patches/reddit/customclients/relayforreddit/api/fingerprints/LoginActivityClientIdFingerprint.kt

@@ -0,0 +1,3 @@
+package app.revanced.patches.reddit.customclients.relayforreddit.api.fingerprints
+
+object LoginActivityClientIdFingerprint : AbstractClientIdFingerprint("&duration=permanent")

src/main/kotlin/app/revanced/patches/reddit/customclients/relayforreddit/api/patch/ChangeOAuthClientIdPatch.kt

@@ -0,0 +1,52 @@
+package app.revanced.patches.reddit.customclients.relayforreddit.api.patch
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Package
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patches.reddit.customclients.AbstractChangeOAuthClientIdPatch
+import app.revanced.patches.reddit.customclients.ChangeOAuthClientIdPatchAnnotation
+import app.revanced.patches.reddit.customclients.relayforreddit.api.fingerprints.GetLoggedInBearerTokenFingerprint
+import app.revanced.patches.reddit.customclients.relayforreddit.api.fingerprints.GetLoggedOutBearerTokenFingerprint
+import app.revanced.patches.reddit.customclients.relayforreddit.api.fingerprints.GetRefreshTokenFingerprint
+import app.revanced.patches.reddit.customclients.relayforreddit.api.fingerprints.LoginActivityClientIdFingerprint
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+
+@ChangeOAuthClientIdPatchAnnotation
+@Description("Changes the OAuth client ID. " +
+        "The OAuth application type has to be \"Installed app\" " +
+        "and the redirect URI has to be set to \"dbrady://relay\".")
+@Compatibility([Package("free.reddit.news"), Package("reddit.news")])
+class ChangeOAuthClientIdPatch : AbstractChangeOAuthClientIdPatch(
+    "dbrady://relay",
+    Options,
+    listOf(
+        LoginActivityClientIdFingerprint,
+        GetLoggedInBearerTokenFingerprint,
+        GetLoggedOutBearerTokenFingerprint,
+        GetRefreshTokenFingerprint
+    )
+) {
+    override fun List<MethodFingerprintResult>.patch(context: BytecodeContext): PatchResult {
+        forEach {
+            val clientIdIndex = it.scanResult.stringsScanResult!!.matches.first().index
+            it.mutableMethod.apply {
+                val clientIdRegister = getInstruction<OneRegisterInstruction>(clientIdIndex).registerA
+
+                it.mutableMethod.replaceInstruction(
+                    clientIdIndex,
+                    "const-string v$clientIdRegister, \"$clientId\""
+                )
+            }
+        }
+
+        return PatchResultSuccess()
+    }
+
+    companion object Options : AbstractChangeOAuthClientIdPatch.Options.ChangeOAuthClientIdOptionsContainer()
+}

src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/ads/fingerprints/IsAdsEnabledFingerprint.kt

@@ -1,4 +1,4 @@
-package app.revanced.patches.syncforreddit.ads.fingerprints
+package app.revanced.patches.reddit.customclients.syncforreddit.ads.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint

src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/ads/patch/DisableAdsPatch.kt

@@ -1,4 +1,4 @@
-package app.revanced.patches.syncforreddit.ads.patch
+package app.revanced.patches.reddit.customclients.syncforreddit.ads.patch
 
 import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.*
@@ -9,8 +9,8 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.syncforreddit.ads.fingerprints.IsAdsEnabledFingerprint
+import app.revanced.patches.reddit.customclients.syncforreddit.ads.fingerprints.IsAdsEnabledFingerprint
-import app.revanced.patches.syncforreddit.detection.piracy.patch.DisablePiracyDetectionPatch
+import app.revanced.patches.reddit.customclients.syncforreddit.detection.piracy.patch.DisablePiracyDetectionPatch
 
 @Patch
 @Name("disable-ads")

src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/api/fingerprints/GetAuthorizationStringFingerprint.kt

@@ -1,4 +1,4 @@
-package app.revanced.patches.syncforreddit.api.fingerprints
+package app.revanced.patches.reddit.customclients.syncforreddit.api.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 

src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/api/fingerprints/GetBearerTokenFingerprint.kt

@@ -1,4 +1,4 @@
-package app.revanced.patches.syncforreddit.api.fingerprints
+package app.revanced.patches.reddit.customclients.syncforreddit.api.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 

src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/api/patch/ChangeOAuthClientIdPatch.kt

@@ -0,0 +1,76 @@
+package app.revanced.patches.reddit.customclients.syncforreddit.api.patch
+
+import app.revanced.extensions.toErrorResult
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Package
+import app.revanced.patcher.data.BytecodeContext
+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.fingerprint.method.impl.MethodFingerprint.Companion.resolve
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patches.reddit.customclients.AbstractChangeOAuthClientIdPatch
+import app.revanced.patches.reddit.customclients.ChangeOAuthClientIdPatchAnnotation
+import app.revanced.patches.reddit.customclients.syncforreddit.api.fingerprints.GetAuthorizationStringFingerprint
+import app.revanced.patches.reddit.customclients.syncforreddit.api.fingerprints.GetBearerTokenFingerprint
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.reference.StringReference
+import java.util.*
+
+@ChangeOAuthClientIdPatchAnnotation
+@Description("Changes the OAuth client ID. " +
+        "The OAuth application type has to be \"Installed app\" " +
+        "and the redirect URI has to be set to \"http://redditsync/auth\".")
+@Compatibility(
+    [
+        Package("com.laurencedawson.reddit_sync"),
+        Package("com.laurencedawson.reddit_sync.pro"),
+        Package("com.laurencedawson.reddit_sync.dev")
+    ]
+)
+class ChangeOAuthClientIdPatch : AbstractChangeOAuthClientIdPatch(
+    "http://redditsync/auth", Options, listOf(GetAuthorizationStringFingerprint)
+) {
+    override fun List<MethodFingerprintResult>.patch(context: BytecodeContext): PatchResult {
+        forEach { fingerprintResult ->
+            fingerprintResult.also { result ->
+                GetBearerTokenFingerprint.also { it.resolve(context, result.classDef) }.result?.mutableMethod?.apply {
+                    val auth = Base64.getEncoder().encodeToString("$clientId:".toByteArray(Charsets.UTF_8))
+                    addInstructions(
+                        0,
+                        """
+                         const-string v0, "Basic $auth"
+                         return-object v0
+                    """
+                    )
+                } ?: return GetBearerTokenFingerprint.toErrorResult()
+            }.let {
+                val occurrenceIndex = it.scanResult.stringsScanResult!!.matches.first().index
+
+                it.mutableMethod.apply {
+                    val authorizationStringInstruction = getInstruction<ReferenceInstruction>(occurrenceIndex)
+                    val targetRegister = (authorizationStringInstruction as OneRegisterInstruction).registerA
+                    val reference = authorizationStringInstruction.reference as StringReference
+
+                    val newAuthorizationUrl = reference.string.replace(
+                        "client_id=.*?&".toRegex(),
+                        "client_id=$clientId&"
+                    )
+
+                    replaceInstruction(
+                        occurrenceIndex,
+                        "const-string v$targetRegister, \"$newAuthorizationUrl\""
+                    )
+                }
+            }
+        }
+
+        return PatchResultSuccess()
+    }
+
+    companion object Options : AbstractChangeOAuthClientIdPatch.Options.ChangeOAuthClientIdOptionsContainer()
+}

src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/detection/piracy/patch/DisablePiracyDetectionPatch.kt

@@ -1,4 +1,4 @@
-package app.revanced.patches.syncforreddit.detection.piracy.patch
+package app.revanced.patches.reddit.customclients.syncforreddit.detection.piracy.patch
 
 import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description

src/main/kotlin/app/revanced/patches/reddit/layout/disablescreenshotpopup/annotations/DisableScreenshotPopupCompatibility.kt

@@ -0,0 +1,8 @@
+package app.revanced.patches.reddit.layout.disablescreenshotpopup.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("com.reddit.frontpage")])
+@Target(AnnotationTarget.CLASS)
+internal annotation class DisableScreenshotPopupCompatibility

src/main/kotlin/app/revanced/patches/reddit/layout/disablescreenshotpopup/fingerprints/DisableScreenshotPopupFingerprint.kt

@@ -0,0 +1,14 @@
+package app.revanced.patches.reddit.layout.disablescreenshotpopup.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object DisableScreenshotPopupFingerprint : MethodFingerprint(
+    "V",
+    parameters = listOf("Landroidx/compose/runtime/", "I"),
+    customFingerprint = custom@{ methodDef, classDef ->
+        if (!classDef.type.endsWith("\$ScreenshotTakenBannerKt\$lambda-1\$1;"))
+                return@custom false
+
+        methodDef.name == "invoke"
+    }
+)

src/main/kotlin/app/revanced/patches/reddit/layout/disablescreenshotpopup/patch/DisableScreenshotPopupPatch.kt

@@ -0,0 +1,30 @@
+package app.revanced.patches.reddit.layout.disablescreenshotpopup.patch
+
+import app.revanced.extensions.toErrorResult
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.reddit.layout.disablescreenshotpopup.annotations.DisableScreenshotPopupCompatibility
+import app.revanced.patches.reddit.layout.disablescreenshotpopup.fingerprints.DisableScreenshotPopupFingerprint
+
+@Patch
+@Name("disable-screenshot-popup")
+@Description("Disables the popup that shows up when taking a screenshot.")
+@DisableScreenshotPopupCompatibility
+@Version("0.0.1")
+class DisableScreenshotPopupPatch : BytecodePatch(
+    listOf(DisableScreenshotPopupFingerprint)
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        DisableScreenshotPopupFingerprint.result?.mutableMethod?.addInstruction(0, "return-void")
+            ?: return DisableScreenshotPopupFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/scbeasy/detection/debugging/patch/RemoveDebuggingDetectionPatch.kt

@@ -4,7 +4,7 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
@@ -21,7 +21,7 @@ class RemoveDebuggingDetectionPatch : BytecodePatch(
     listOf(DebuggingDetectionFingerprint)
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
-        DebuggingDetectionFingerprint.result!!.mutableMethod.addInstructionsWithLabels(
+        DebuggingDetectionFingerprint.result!!.mutableMethod.addInstructions(
             0,
             """
                 const/4 v0, 0x0

src/main/kotlin/app/revanced/patches/shared/fingerprints/WatchWhileActivityFingerprint.kt

@@ -1,10 +1,13 @@
 package app.revanced.patches.shared.fingerprints
 
-
+import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
 
 object WatchWhileActivityFingerprint : MethodFingerprint(
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
+    parameters = listOf(),
     customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("WatchWhileActivity;") && methodDef.name == "<init>"
+        methodDef.definingClass.endsWith("WatchWhileActivity;")
     }
 )

src/main/kotlin/app/revanced/patches/shared/misc/fix/verticalscroll/fingerprints/CanScrollVerticallyFingerprint.kt

@@ -1,11 +1,14 @@
 package app.revanced.patches.shared.misc.fix.verticalscroll.fingerprints
 
 
+import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
 object CanScrollVerticallyFingerprint : MethodFingerprint(
-    "Z",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    returnType = "Z",
     parameters = emptyList(),
     opcodes = listOf(
         Opcode.MOVE_RESULT,

src/main/kotlin/app/revanced/patches/shared/settings/resource/patch/AbstractSettingsResourcePatch.kt

@@ -14,6 +14,7 @@ import app.revanced.patches.shared.settings.preference.impl.StringResource
 import app.revanced.util.resources.ResourceUtils
 import app.revanced.util.resources.ResourceUtils.copyResources
 import org.w3c.dom.Node
+import java.io.Closeable
 
 /**
  * Abstract settings resource patch
@@ -24,7 +25,7 @@ import org.w3c.dom.Node
 abstract class AbstractSettingsResourcePatch(
     private val preferenceFileName: String,
     private val sourceDirectory: String,
-) : ResourcePatch {
+) : ResourcePatch, Closeable {
     override fun execute(context: ResourceContext): PatchResult {
         /*
          * used for self-restart

src/main/kotlin/app/revanced/patches/syncforreddit/api/patch/ChangeOAuthClientIdPatch.kt

@@ -1,101 +0,0 @@
-package app.revanced.patches.syncforreddit.api.patch
-
-import android.os.Environment
-import app.revanced.patcher.annotation.*
-import app.revanced.patcher.data.BytecodeContext
-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.fingerprint.method.impl.MethodFingerprint.Companion.resolve
-import app.revanced.patcher.patch.*
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.syncforreddit.api.fingerprints.GetAuthorizationStringFingerprint
-import app.revanced.patches.syncforreddit.api.fingerprints.GetBearerTokenFingerprint
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.reference.StringReference
-import java.io.File
-import java.util.*
-
-@Patch
-@Name("change-oauth-client-id")
-@Description("Changes the OAuth client ID.")
-@Compatibility(
-    [
-        Package("com.laurencedawson.reddit_sync"),
-        Package("com.laurencedawson.reddit_sync.pro")
-    ]
-)
-@Version("0.0.1")
-class ChangeOAuthClientIdPatch : BytecodePatch(
-    listOf(GetAuthorizationStringFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        if (clientId == null) {
-            // Test if on Android
-            try {
-                Class.forName("android.os.Environment")
-            } catch (e: ClassNotFoundException) {
-                return PatchResultError("No client ID provided")
-            }
-
-            File(Environment.getExternalStorageDirectory(), "reddit_client_id_revanced.txt").also {
-                if (it.exists()) return@also
-
-                val error = """
-                    In order to use this patch, you need to provide a client ID.
-                    You can do this by creating a file at ${it.absolutePath} with the client ID as its content.
-                    Alternatively, you can provide the client ID using patch options.
-                    
-                    You can get your client ID from https://www.reddit.com/prefs/apps.
-                    The application type has to be "installed app" and the redirect URI has to be set to "http://redditsync/auth"
-                """.trimIndent()
-
-                return PatchResultError(error)
-            }.let { clientId = it.readText().trim() }
-        }
-
-        GetAuthorizationStringFingerprint.result?.also { result ->
-            GetBearerTokenFingerprint.also { it.resolve(context, result.classDef) }.result?.mutableMethod?.apply {
-                val auth = Base64.getEncoder().encodeToString("$clientId:".toByteArray(Charsets.UTF_8))
-                addInstructions(
-                    0,
-                    """
-                         const-string v0, "Basic $auth"
-                         return-object v0
-                    """
-                )
-            } ?: return PatchResultError("Could not find required method to patch.")
-        }?.let {
-            val occurrenceIndex = it.scanResult.stringsScanResult!!.matches.first().index
-
-            it.mutableMethod.apply {
-                val authorizationStringInstruction = getInstruction<ReferenceInstruction>(occurrenceIndex)
-                val targetRegister = (authorizationStringInstruction as OneRegisterInstruction).registerA
-                val reference = authorizationStringInstruction.reference as StringReference
-
-                val newAuthorizationUrl = reference.string.replace(
-                    "client_id=.*?&".toRegex(),
-                    "client_id=${clientId!!}&"
-                )
-
-                replaceInstruction(
-                    occurrenceIndex,
-                    "const-string v$targetRegister, \"$newAuthorizationUrl\""
-                )
-            }
-        } ?: return PatchResultError("Could not find required method to patch.")
-        return PatchResultSuccess()
-    }
-
-    companion object : OptionsContainer() {
-        var clientId by option(
-            PatchOption.StringOption(
-                "client-id",
-                null,
-                "OAuth client ID",
-                "The client ID to use for OAuth."
-            )
-        )
-    }
-}

src/main/kotlin/app/revanced/patches/tiktok/misc/settings/patch/SettingsPatch.kt

@@ -53,6 +53,7 @@ class SettingsPatch : BytecodePatch(
             } - 6
 
 
+            // fixme: instead use Method.indexOfFirstConstantInstructionValue()
             val copyrightPolicyIndex = instructions.indexOfFirst {
                 (it as? WideLiteralInstruction)?.wideLiteral == copyrightPolicyLabelId
             } + 2

src/main/kotlin/app/revanced/patches/twitch/ad/audio/annotations/AudioAdsCompatibility.kt

@@ -3,20 +3,7 @@ package app.revanced.patches.twitch.ad.audio.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
-@Compatibility(
+@Compatibility([Package("tv.twitch.android.app", arrayOf("15.4.1"))])
-    [
-        Package(
-            "tv.twitch.android.app", arrayOf(
-                "14.3.3",
-                "14.4.0",
-                "14.5.0", 
-                "14.5.2",
-                "14.6.0",
-                "14.6.1"
-            )
-        )
-    ]
-)
 @Target(AnnotationTarget.CLASS)
 internal annotation class AudioAdsCompatibility
 

src/main/kotlin/app/revanced/patches/twitch/ad/embedded/annotations/EmbeddedAdsCompatibility.kt

@@ -3,20 +3,7 @@ package app.revanced.patches.twitch.ad.embedded.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
-@Compatibility(
+@Compatibility([Package("tv.twitch.android.app", arrayOf("15.4.1"))])
-    [
-        Package(
-            "tv.twitch.android.app", arrayOf(
-                "14.3.3",
-                "14.4.0",
-                "14.5.0", 
-                "14.5.2",
-                "14.6.0",
-                "14.6.1"
-            )
-        )
-    ]
-)
 @Target(AnnotationTarget.CLASS)
 internal annotation class EmbeddedAdsCompatibility
 

src/main/kotlin/app/revanced/patches/twitch/ad/video/annotations/VideoAdsCompatibility.kt

@@ -3,20 +3,7 @@ package app.revanced.patches.twitch.ad.video.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
-@Compatibility(
+@Compatibility([Package("tv.twitch.android.app", arrayOf("15.4.1"))])
-    [
-        Package(
-            "tv.twitch.android.app", arrayOf(
-                "14.3.3",
-                "14.4.0",
-                "14.5.0", 
-                "14.5.2",
-                "14.6.0",
-                "14.6.1"
-            )
-        )
-    ]
-)
 @Target(AnnotationTarget.CLASS)
 internal annotation class VideoAdsCompatibility
 

src/main/kotlin/app/revanced/patches/twitch/ad/video/fingerprints/CheckAdEligibilityLambdaFingerprint.kt

@@ -1,15 +1,12 @@
 package app.revanced.patches.twitch.ad.video.fingerprints
 
-import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
 
 object CheckAdEligibilityLambdaFingerprint : MethodFingerprint(
-    "L",
+    returnType = "Lio/reactivex/Single;",
-    AccessFlags.PRIVATE or AccessFlags.FINAL or AccessFlags.STATIC,
+    parameters = listOf("L"),
-    listOf("L", "L", "L"),
     customFingerprint = { method, _ ->
-        method.definingClass.endsWith("AdEligibilityFetcher;") &&
+        method.definingClass.endsWith("/AdEligibilityFetcher;")
-                method.name.contains("shouldRequestAd")
+                && method.name == "shouldRequestAd"
     }
 )

src/main/kotlin/app/revanced/patches/twitch/ad/video/fingerprints/ContentConfigShowAdsFingerprint.kt

@@ -1,10 +1,11 @@
 package app.revanced.patches.twitch.ad.video.fingerprints
 
-
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 
 object ContentConfigShowAdsFingerprint : MethodFingerprint(
+    returnType = "Z",
+    parameters = listOf(),
     customFingerprint = { method, _ ->
-        method.definingClass.endsWith("ContentConfigData;") && method.name == "getShowAds"
+        method.definingClass.endsWith("/ContentConfigData;") && method.name == "getShowAds"
     }
 )

src/main/kotlin/app/revanced/patches/twitch/ad/video/fingerprints/GetReadyToShowAdFingerprint.kt

@@ -3,6 +3,8 @@ package app.revanced.patches.twitch.ad.video.fingerprints
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 
 object GetReadyToShowAdFingerprint : MethodFingerprint(
+    returnType = "Ltv/twitch/android/core/mvp/presenter/StateAndAction;",
+    parameters = listOf("L", "L"),
     customFingerprint = { method, _ ->
         method.definingClass.endsWith("/StreamDisplayAdsPresenter;") && method.name == "getReadyToShowAdOrAbort"
     }

src/main/kotlin/app/revanced/patches/twitch/ad/video/patch/VideoAdsPatch.kt

@@ -1,5 +1,6 @@
 package app.revanced.patches.twitch.ad.video.patch
 
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
@@ -86,7 +87,7 @@ class VideoAdsPatch : AbstractAdPatch(
         )
 
         // Pretend our player is ineligible for all ads
-        with(CheckAdEligibilityLambdaFingerprint.result!!) {
+        CheckAdEligibilityLambdaFingerprint.result?.apply {
             mutableMethod.addInstructionsWithLabels(
                 0,
                 """
@@ -98,9 +99,9 @@ class VideoAdsPatch : AbstractAdPatch(
                 """,
                 ExternalLabel(skipLabelName, mutableMethod.getInstruction(0))
             )
-        }
+        } ?: return CheckAdEligibilityLambdaFingerprint.toErrorResult()
 
-        with(GetReadyToShowAdFingerprint.result!!) {
+        GetReadyToShowAdFingerprint.result?.apply {
             val adFormatDeclined = "Ltv/twitch/android/shared/display/ads/theatre/StreamDisplayAdsPresenter\$Action\$AdFormatDeclined;"
             mutableMethod.addInstructionsWithLabels(
                 0,
@@ -113,10 +114,10 @@ class VideoAdsPatch : AbstractAdPatch(
                 """,
                 ExternalLabel(skipLabelName, mutableMethod.getInstruction(0))
             )
-        }
+        } ?: return GetReadyToShowAdFingerprint.toErrorResult()
 
         // Spoof showAds JSON field
-        with(ContentConfigShowAdsFingerprint.result!!) {
+        ContentConfigShowAdsFingerprint.result?.apply {
             mutableMethod.addInstructions(0, """
                     ${createConditionInstructions()}
                     const/4 v0, 0
@@ -124,7 +125,7 @@ class VideoAdsPatch : AbstractAdPatch(
                     return v0
                 """
             )
-        }
+        }  ?: return ContentConfigShowAdsFingerprint.toErrorResult()
 
         SettingsPatch.PreferenceScreen.ADS.CLIENT_SIDE.addPreferences(
             SwitchPreference(

src/main/kotlin/app/revanced/patches/twitch/chat/antidelete/annotations/ShowDeletedMessagesCompatibility.kt

@@ -3,7 +3,7 @@ package app.revanced.patches.twitch.chat.antidelete.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
-@Compatibility([Package("tv.twitch.android.app")])
+@Compatibility([Package("tv.twitch.android.app", arrayOf("15.4.1"))])
 @Target(AnnotationTarget.CLASS)
 internal annotation class ShowDeletedMessagesCompatibility
 

src/main/kotlin/app/revanced/patches/twitch/chat/antidelete/patch/ShowDeletedMessagesPatch.kt

@@ -1,5 +1,6 @@
 package app.revanced.patches.twitch.chat.antidelete.patch
 
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
@@ -44,7 +45,7 @@ class ShowDeletedMessagesPatch : BytecodePatch(
 
     override fun execute(context: BytecodeContext): PatchResult {
         // Spoiler mode: Force set hasModAccess member to true in constructor
-        DeletedMessageClickableSpanCtorFingerprint.result!!.mutableMethod.apply {
+        DeletedMessageClickableSpanCtorFingerprint.result?.mutableMethod?.apply {
             addInstructionsWithLabels(
                 implementation!!.instructions.lastIndex, /* place in front of return-void */
                 """
@@ -54,14 +55,14 @@ class ShowDeletedMessagesPatch : BytecodePatch(
                 """,
                 ExternalLabel("no_spoiler", getInstruction(implementation!!.instructions.lastIndex))
             )
-        }
+        } ?: return DeletedMessageClickableSpanCtorFingerprint.toErrorResult()
 
         // Spoiler mode: Disable setHasModAccess setter
-        SetHasModAccessFingerprint.result!!.mutableMethod.addInstruction(0, "return-void")
+        SetHasModAccessFingerprint.result?.mutableMethod?.addInstruction(0, "return-void")
-
+            ?: return SetHasModAccessFingerprint.toErrorResult()
 
         // Cross-out mode: Reformat span of deleted message
-        ChatUtilCreateDeletedSpanFingerprint.result!!.mutableMethod.apply {
+        ChatUtilCreateDeletedSpanFingerprint.result?.mutableMethod?.apply {
             addInstructionsWithLabels(
                 0,
                 """
@@ -72,7 +73,7 @@ class ShowDeletedMessagesPatch : BytecodePatch(
                 """,
                 ExternalLabel("no_reformat", getInstruction(0))
             )
-        }
+        }  ?: return ChatUtilCreateDeletedSpanFingerprint.toErrorResult()
 
         SettingsPatch.PreferenceScreen.CHAT.GENERAL.addPreferences(
             ListPreference(

src/main/kotlin/app/revanced/patches/twitch/chat/autoclaim/annotations/AutoClaimChannelPointsCompatibility.kt

@@ -3,6 +3,6 @@ package app.revanced.patches.twitch.chat.autoclaim.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
-@Compatibility([Package("tv.twitch.android.app")])
+@Compatibility([Package("tv.twitch.android.app", arrayOf("15.4.1"))])
 @Target(AnnotationTarget.CLASS)
 internal annotation class AutoClaimChannelPointsCompatibility

src/main/kotlin/app/revanced/patches/twitch/chat/autoclaim/patch/AutoClaimChannelPointsPatch.kt

@@ -65,6 +65,7 @@ class AutoClaimChannelPointPatch : BytecodePatch(
                 ExternalLabel("auto_claim", getInstruction(lastIndex))
             )
         } ?: return CommunityPointsButtonViewDelegateFingerprint.toErrorResult()
+
         return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/twitch/debug/fingerprints/IsDebugConfigEnabledFingerprint.kt

@@ -1,10 +1,9 @@
 package app.revanced.patches.twitch.debug.fingerprints
 
-
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 
 object IsDebugConfigEnabledFingerprint : MethodFingerprint(
     customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("BuildConfigUtil;") && methodDef.name == "isDebugConfigEnabled"
+        methodDef.definingClass.endsWith("/BuildConfigUtil;") && methodDef.name == "isDebugConfigEnabled"
     }
 )

src/main/kotlin/app/revanced/patches/twitch/debug/fingerprints/IsOmVerificationEnabledFingerprint.kt

@@ -1,10 +1,9 @@
 package app.revanced.patches.twitch.debug.fingerprints
 
-
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 
 object IsOmVerificationEnabledFingerprint : MethodFingerprint(
     customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("BuildConfigUtil;") && methodDef.name == "isOmVerificationEnabled"
+        methodDef.definingClass.endsWith("/BuildConfigUtil;") && methodDef.name == "isOmVerificationEnabled"
     }
 )

src/main/kotlin/app/revanced/patches/twitch/debug/fingerprints/ShouldShowDebugOptionsFingerprint.kt

@@ -1,10 +1,9 @@
 package app.revanced.patches.twitch.debug.fingerprints
 
-
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 
 object ShouldShowDebugOptionsFingerprint : MethodFingerprint(
     customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("BuildConfigUtil;") && methodDef.name == "shouldShowDebugOptions"
+        methodDef.definingClass.endsWith("/BuildConfigUtil;") && methodDef.name == "shouldShowDebugOptions"
     }
 )

src/main/kotlin/app/revanced/patches/twitch/debug/patch/DebugModePatch.kt

@@ -1,5 +1,6 @@
 package app.revanced.patches.twitch.debug.patch
 
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
@@ -38,18 +39,16 @@ class DebugModePatch : BytecodePatch(
             IsOmVerificationEnabledFingerprint,
             ShouldShowDebugOptionsFingerprint
         ).forEach {
-            with(it.result!!) {
+            it.result?.mutableMethod?.apply {
-                with(mutableMethod) {
+                addInstructions(
-                    addInstructions(
+                    0,
-                        0,
+                    """
-                        """
+                         invoke-static {}, Lapp/revanced/twitch/patches/DebugModePatch;->isDebugModeEnabled()Z
-                             invoke-static {}, Lapp/revanced/twitch/patches/DebugModePatch;->isDebugModeEnabled()Z
+                         move-result v0
-                             move-result v0
+                         return v0
-                             return v0
+                      """
-                          """
+                )
-                    )
+            } ?: return it.toErrorResult()
-                }
-            }
         }
 
         SettingsPatch.PreferenceScreen.MISC.OTHER.addPreferences(

src/main/kotlin/app/revanced/patches/twitch/misc/settings/bytecode/patch/SettingsPatch.kt

@@ -1,5 +1,6 @@
 package app.revanced.patches.twitch.misc.settings.bytecode.patch
 
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
@@ -28,6 +29,7 @@ import app.revanced.patches.twitch.misc.settings.fingerprints.SettingsMenuItemEn
 import app.revanced.patches.twitch.misc.settings.resource.patch.SettingsResourcePatch
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.immutable.ImmutableField
+import java.io.Closeable
 
 @Patch
 @DependsOn([IntegrationsPatch::class, SettingsResourcePatch::class])
@@ -42,10 +44,10 @@ class SettingsPatch : BytecodePatch(
         MenuGroupsUpdatedFingerprint,
         MenuGroupsOnClickFingerprint
     )
-) {
+), Closeable {
     override fun execute(context: BytecodeContext): PatchResult {
         // Hook onCreate to handle fragment creation
-        with(SettingsActivityOnCreateFingerprint.result!!) {
+        SettingsActivityOnCreateFingerprint.result?.apply {
             val insertIndex = mutableMethod.implementation!!.instructions.size - 2
             mutableMethod.addInstructionsWithLabels(
                 insertIndex,
@@ -57,20 +59,20 @@ class SettingsPatch : BytecodePatch(
                 """,
                 ExternalLabel("no_rv_settings_init", mutableMethod.getInstruction(insertIndex))
             )
-        }
+        } ?: return SettingsActivityOnCreateFingerprint.toErrorResult()
 
         // Create new menu item for settings menu
-        with(SettingsMenuItemEnumFingerprint.result!!) {
+        SettingsMenuItemEnumFingerprint.result?.apply {
             injectMenuItem(
                 REVANCED_SETTINGS_MENU_ITEM_NAME,
                 REVANCED_SETTINGS_MENU_ITEM_ID,
                 REVANCED_SETTINGS_MENU_ITEM_TITLE_RES,
                 REVANCED_SETTINGS_MENU_ITEM_ICON_RES
             )
-        }
+        } ?: return SettingsMenuItemEnumFingerprint.toErrorResult()
 
         // Intercept settings menu creation and add new menu item
-        with(MenuGroupsUpdatedFingerprint.result!!) {
+        MenuGroupsUpdatedFingerprint.result?.apply {
             mutableMethod.addInstructions(
                 0,
                 """
@@ -79,10 +81,10 @@ class SettingsPatch : BytecodePatch(
                     move-result-object      p1
                 """
             )
-        }
+        } ?: return MenuGroupsUpdatedFingerprint.toErrorResult()
 
         // Intercept onclick events for the settings menu
-        with(MenuGroupsOnClickFingerprint.result!!) {
+        MenuGroupsOnClickFingerprint.result?.apply {
             val insertIndex = 0
             mutableMethod.addInstructionsWithLabels(
                 insertIndex,
@@ -96,7 +98,7 @@ class SettingsPatch : BytecodePatch(
                 """,
                 ExternalLabel("no_rv_settings_onclick", mutableMethod.getInstruction(insertIndex))
             )
-        }
+        }  ?: return MenuGroupsOnClickFingerprint.toErrorResult()
 
         addString("revanced_settings", "ReVanced Settings", false)
         addString("revanced_reboot_message", "Twitch needs to restart to apply your changes. Restart now?", false)

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

@@ -3,7 +3,7 @@ package app.revanced.patches.vsco.misc.pro.patch
 import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.*
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
@@ -22,7 +22,7 @@ class UnlockProPatch : BytecodePatch(
     override fun execute(context: BytecodeContext): PatchResult {
         RevCatSubscriptionFingerprint.result?.mutableMethod?.apply {
             // Set isSubscribed to true.
-            addInstructionsWithLabels(
+            addInstruction(
                 0,
                 """
                     const p1, 0x1

src/main/kotlin/app/revanced/patches/youtube/ad/getpremium/bytecode/fingerprints/GetPremiumViewFingerprint.kt

@@ -1,9 +1,14 @@
 package app.revanced.patches.youtube.ad.getpremium.bytecode.fingerprints
 
+import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
 object GetPremiumViewFingerprint : MethodFingerprint(
+    accessFlags = AccessFlags.PROTECTED or AccessFlags.FINAL,
+    returnType = "V",
+    parameters = listOf("I", "I"),
     opcodes = listOf(
         Opcode.ADD_INT_2ADDR,
         Opcode.ADD_INT_2ADDR,

src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/fingerprints/AccessibilityPlayerProgressTimeFingerprint.kt

@@ -1,23 +1,12 @@
 package app.revanced.patches.youtube.interaction.seekbar.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.interaction.seekbar.patch.EnableSeekbarTappingResourcePatch
+import app.revanced.util.patch.LiteralValueFingerprint
 import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
 
-
+object AccessibilityPlayerProgressTimeFingerprint : LiteralValueFingerprint(
-object AccessibilityPlayerProgressTimeFingerprint : MethodFingerprint(
     returnType = "L",
     accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    customFingerprint = { methodDef, _ ->
+    literal = EnableSeekbarTappingResourcePatch.accessibilityPlayerProgressTime
-        methodDef.implementation?.instructions?.any { instruction ->
-            if (instruction.opcode != Opcode.CONST) return@any false
-
-            val wideLiteral = (instruction as WideLiteralInstruction).wideLiteral
-
-            EnableSeekbarTappingResourcePatch.accessibilityPlayerProgressTime == wideLiteral
-        } ?: false
-    }
 )

src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/fingerprints/SwipeControlsHostActivityFingerprint.kt

@@ -1,10 +1,13 @@
 package app.revanced.patches.youtube.interaction.swipecontrols.fingerprints
 
-
+import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
 
 object SwipeControlsHostActivityFingerprint : MethodFingerprint(
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
+    parameters = listOf(),
     customFingerprint = { methodDef, _ ->
-        methodDef.definingClass == "Lapp/revanced/integrations/swipecontrols/SwipeControlsHostActivity;" && methodDef.name == "<init>"
+        methodDef.definingClass == "Lapp/revanced/integrations/swipecontrols/SwipeControlsHostActivity;"
     }
 )

src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/fingerprints/StartVideoInformerFingerprint.kt

@@ -1,13 +1,10 @@
 package app.revanced.patches.youtube.layout.autocaptions.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
-
-@FuzzyPatternScanMethod(3)
 object StartVideoInformerFingerprint : MethodFingerprint(
     "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L", "L", "L", "L"), listOf(
         Opcode.INVOKE_STATIC,

src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/fingerprints/SubtitleButtonControllerFingerprint.kt

@@ -6,7 +6,10 @@ import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
 object SubtitleButtonControllerFingerprint : MethodFingerprint(
-    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L"), listOf(
+    returnType = "V",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    parameters = listOf("Lcom/google/android/libraries/youtube/player/subtitles/model/SubtitleTrack;"),
+    opcodes = listOf(
         Opcode.IGET_OBJECT,
         Opcode.IF_NEZ,
         Opcode.RETURN_VOID,
@@ -16,5 +19,8 @@ object SubtitleButtonControllerFingerprint : MethodFingerprint(
         Opcode.CONST,
         Opcode.INVOKE_VIRTUAL,
         Opcode.IGET_OBJECT,
-    )
+    ),
+    customFingerprint = { methodDef, _ ->
+        methodDef.definingClass.endsWith("SubtitleButtonController;")
+    }
 )

src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/fingerprints/SubtitleTrackFingerprint.kt

@@ -14,5 +14,8 @@ object SubtitleTrackFingerprint : MethodFingerprint(
         Opcode.MOVE_RESULT,
         Opcode.RETURN,
     ),
-    strings = listOf("DISABLE_CAPTIONS_OPTION")
+    strings = listOf("DISABLE_CAPTIONS_OPTION"),
+    customFingerprint = { methodDef, _ ->
+        methodDef.definingClass.endsWith("SubtitleTrack;")
+    }
 )

src/main/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/patch/HideAutoplayButtonPatch.kt

@@ -1,5 +1,6 @@
 package app.revanced.patches.youtube.layout.buttons.autoplay.patch
 
+import app.revanced.extensions.findIndexForIdResource
 import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
@@ -23,7 +24,6 @@ import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import org.jf.dexlib2.iface.instruction.Instruction
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
 import org.jf.dexlib2.iface.reference.MethodReference
 
 @Patch
@@ -48,15 +48,8 @@ class HideAutoplayButtonPatch : BytecodePatch(
         LayoutConstructorFingerprint.result?.mutableMethod?.apply {
             val layoutGenMethodInstructions = implementation!!.instructions
 
-            // resolve the offsets such as ...
+            // resolve the offsets of where to insert the branch instructions and ...
-            val autoNavPreviewStubId = ResourceMappingPatch.resourceMappings.single {
+            val insertIndex = findIndexForIdResource("autonav_preview_stub")
-                it.name == "autonav_preview_stub"
-            }.id
-
-            // where to insert the branch instructions and ...
-            val insertIndex = layoutGenMethodInstructions.indexOfFirst {
-                (it as? WideLiteralInstruction)?.wideLiteral == autoNavPreviewStubId
-            }
 
             // where to branch away
             val branchIndex =

src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/fingerprints/InitializeButtonsFingerprint.kt

@@ -1,15 +1,13 @@
 package app.revanced.patches.youtube.layout.buttons.navigation.fingerprints
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.extensions.or
 import app.revanced.patches.youtube.layout.buttons.navigation.patch.ResolvePivotBarFingerprintsPatch
-import org.jf.dexlib2.Opcode
+import app.revanced.util.patch.LiteralValueFingerprint
-import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
+import org.jf.dexlib2.AccessFlags
 
-object InitializeButtonsFingerprint : MethodFingerprint(
+object InitializeButtonsFingerprint : LiteralValueFingerprint(
-    customFingerprint = { methodDef, _ ->
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-        methodDef.implementation?.instructions?.any {
+    returnType = "V",
-            it.opcode == Opcode.CONST && (it as WideLiteralInstruction).wideLiteral ==
+    parameters = listOf(),
-                    ResolvePivotBarFingerprintsPatch.imageOnlyTabResourceId
+    literal = ResolvePivotBarFingerprintsPatch.imageOnlyTabResourceId
-        } == true
-    }
 )

src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/fingerprints/PlayerControlsVisibilityModelFingerprint.kt

@@ -5,5 +5,5 @@ import org.jf.dexlib2.Opcode
 
 object PlayerControlsVisibilityModelFingerprint : MethodFingerprint(
     opcodes = listOf(Opcode.INVOKE_DIRECT_RANGE),
-    strings = listOf("hasNext", "hasPrevious", "Missing required properties:")
+    strings = listOf("Missing required properties:", "hasNext", "hasPrevious")
 )

src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/bytecode/fingerprints/AlbumCardsFingerprint.kt

@@ -1,11 +1,13 @@
 package app.revanced.patches.youtube.layout.hide.albumcards.bytecode.fingerprints
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.extensions.or
 import app.revanced.patches.youtube.layout.hide.albumcards.resource.patch.AlbumCardsResourcePatch
+import app.revanced.util.patch.LiteralValueFingerprint
+import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
 
-object AlbumCardsFingerprint : MethodFingerprint(
+object AlbumCardsFingerprint : LiteralValueFingerprint(
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
     opcodes = listOf(
         Opcode.MOVE_RESULT_OBJECT,
         Opcode.CONST,
@@ -14,10 +16,5 @@ object AlbumCardsFingerprint : MethodFingerprint(
         Opcode.MOVE_RESULT_OBJECT,
         Opcode.CHECK_CAST,
     ),
-    customFingerprint = { methodDef, _ ->
+    literal = AlbumCardsResourcePatch.albumCardId
-        methodDef.implementation?.instructions?.any { instruction ->
-            instruction.opcode.ordinal == Opcode.CONST.ordinal &&
-            (instruction as? WideLiteralInstruction)?.wideLiteral == AlbumCardsResourcePatch.albumCardId
-        } == true
-    }
 )

src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/bytecode/patch/AlbumCardsPatch.kt

@@ -42,7 +42,7 @@ class AlbumCardsPatch : BytecodePatch(
                     "invoke-static {v$albumCardViewRegister}, " +
                             "Lapp/revanced/integrations/patches/HideAlbumCardsPatch;" +
                             "->" +
-                            "hideAlbumCards(Landroid/view/View;)V"
+                            "hideAlbumCard(Landroid/view/View;)V"
                 )
             }
         } ?: return AlbumCardsFingerprint.toErrorResult()

src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/bytecode/fingerprints/BreakingNewsFingerprint.kt

@@ -1,11 +1,13 @@
 package app.revanced.patches.youtube.layout.hide.breakingnews.bytecode.fingerprints
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.extensions.or
 import app.revanced.patches.youtube.layout.hide.breakingnews.resource.patch.BreakingNewsResourcePatch
+import app.revanced.util.patch.LiteralValueFingerprint
+import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
 
-object BreakingNewsFingerprint : MethodFingerprint(
+object BreakingNewsFingerprint : LiteralValueFingerprint(
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
     opcodes = listOf(
         Opcode.CONST,
         Opcode.CONST_4,
@@ -14,10 +16,5 @@ object BreakingNewsFingerprint : MethodFingerprint(
         Opcode.CHECK_CAST,
         Opcode.IPUT_OBJECT,
     ),
-    customFingerprint = { methodDef, _ ->
+    literal = BreakingNewsResourcePatch.horizontalCardListId
-        methodDef.implementation?.instructions?.any { instruction ->
-            instruction.opcode.ordinal == Opcode.CONST.ordinal &&
-            (instruction as? WideLiteralInstruction)?.wideLiteral == BreakingNewsResourcePatch.horizontalCardListId
-        } == true
-    }
 )