chore(release): 2.169.1-dev.3 [skip ci]

## [2.169.1-dev.3](https://github.com/revanced/revanced-patches/compare/v2.169.1-dev.2...v2.169.1-dev.3) (2023-04-23)

### Bug Fixes

* **youtube/hide-video-action-buttons:** fix hide action buttons not working for some users ([#1959](https://github.com/revanced/revanced-patches/issues/1959)) ([064557c](064557c0c8))

.github/workflows/pull_request.yml

@@ -21,5 +21,10 @@ jobs:
         with:
           destination_branch: 'main'
           pr_title: 'chore: ${{ env.MESSAGE }}'
-          pr_body: 'This pull request will ${{ env.MESSAGE }}.'
+          pr_body: |
+            This pull request will ${{ env.MESSAGE }}.
+          
+            ## Dependencies before merge
+
+            - [ ] https://github.com/revanced/revanced-integrations
           pr_draft: true

CHANGELOG.md

@@ -1,3 +1,176 @@
+## [2.169.1-dev.3](https://github.com/revanced/revanced-patches/compare/v2.169.1-dev.2...v2.169.1-dev.3) (2023-04-23)
+
+
+### Bug Fixes
+
+* **youtube/hide-video-action-buttons:** fix hide action buttons not working for some users ([#1959](https://github.com/revanced/revanced-patches/issues/1959)) ([3ff1489](https://github.com/revanced/revanced-patches/commit/3ff1489b32968e9bad3361f924b7079e7b6f29e2))
+
+## [2.169.1-dev.2](https://github.com/revanced/revanced-patches/compare/v2.169.1-dev.1...v2.169.1-dev.2) (2023-04-21)
+
+
+### Bug Fixes
+
+* **"enable-android-debugging:** don't include by default ([14b2128](https://github.com/revanced/revanced-patches/commit/14b212844f308b95ad6ed02c455716cd84c0db01))
+
+## [2.169.1-dev.1](https://github.com/revanced/revanced-patches/compare/v2.169.0...v2.169.1-dev.1) (2023-04-21)
+
+
+### Bug Fixes
+
+* **youtube/sponsorblock:** correct spelling mistake ([#1941](https://github.com/revanced/revanced-patches/issues/1941)) ([d9d0fe7](https://github.com/revanced/revanced-patches/commit/d9d0fe7e236ccce348e8b3214454d29656a853c0))
+* **youtube/sponsorblock:** use lowercase letters for URL string ([#1942](https://github.com/revanced/revanced-patches/issues/1942)) ([b58842a](https://github.com/revanced/revanced-patches/commit/b58842a5f6f3fbcf06e87821bbc1ad3be7ca2fc0))
+
+# [2.169.0](https://github.com/revanced/revanced-patches/compare/v2.168.0...v2.169.0) (2023-04-21)
+
+
+### Bug Fixes
+
+* add missing annotation to patches ([#1882](https://github.com/revanced/revanced-patches/issues/1882)) ([d86b6a4](https://github.com/revanced/revanced-patches/commit/d86b6a4a659172c3f1db8eb883f28dfee4e83e4c))
+* **youtube/hide-video-action-buttons:** change 'Hide create, clip and thanks buttons' to default off ([#1923](https://github.com/revanced/revanced-patches/issues/1923)) ([fc89c86](https://github.com/revanced/revanced-patches/commit/fc89c865f94fffd748809eaf0504cc91f6389500))
+* **youtube/hide-video-action-buttons:** fix 'hide share button' ([#1924](https://github.com/revanced/revanced-patches/issues/1924)) ([bc05e44](https://github.com/revanced/revanced-patches/commit/bc05e4494d914f944a831bfb83a150ad93bb342f))
+* **youtube/microg-support:** remove incorrect patch dependency ([3e0c45c](https://github.com/revanced/revanced-patches/commit/3e0c45c2dff9f6336e42fdd3d1b5b5de5af1b1cb))
+* **youtube/microg-support:** rename patch correctly ([091a25d](https://github.com/revanced/revanced-patches/commit/091a25d46145b1c27791245fca0933e9c8a68e9a))
+* **youtube/return-youtube-dislike:** render dislikes when scrolling into the screen ([#1873](https://github.com/revanced/revanced-patches/issues/1873)) ([85675b8](https://github.com/revanced/revanced-patches/commit/85675b800070de9752b2a4bfea3182381d4cfba4))
+* **youtube/sponsorblock:** do not depend on `remember-playback-speed` patch ([b0834fa](https://github.com/revanced/revanced-patches/commit/b0834faa69755a94f70ae5075a10cf15e8a6b857))
+* **youtube/sponsorblock:** fix autorepeat button layout ([#1868](https://github.com/revanced/revanced-patches/issues/1868)) ([5e148d9](https://github.com/revanced/revanced-patches/commit/5e148d9384e8f9f1bc8f5daa7e68a05574810329))
+* **youtube/spoof-signature-verification:** depend on `client-spoof` patch ([0d47375](https://github.com/revanced/revanced-patches/commit/0d47375092639e3e5dad8d67991004fc2f103606))
+* **youtubevanced/hide-ads:** hide more types of ads ([#1781](https://github.com/revanced/revanced-patches/issues/1781)) ([47ff447](https://github.com/revanced/revanced-patches/commit/47ff447f8ec0e5bbc174f34bd7d61b3031276641))
+* **youtubevanced/hide-ads:** remove broken ad filter ([#1881](https://github.com/revanced/revanced-patches/issues/1881)) ([5b987e1](https://github.com/revanced/revanced-patches/commit/5b987e14e81a47691883a5b5196c7ffee03941d0))
+
+
+### Features
+
+* `change-package-name` patch ([#1864](https://github.com/revanced/revanced-patches/issues/1864)) ([f9a6672](https://github.com/revanced/revanced-patches/commit/f9a6672122eb28fe06c9f5e137906ad868a491d6))
+* `enable-android-debugging` patch ([#1876](https://github.com/revanced/revanced-patches/issues/1876)) ([bd224d9](https://github.com/revanced/revanced-patches/commit/bd224d90deb838ee3e7bd0c16860023ebf113e96))
+* **facebook:** `hide-inbox-ads` patch ([#1893](https://github.com/revanced/revanced-patches/issues/1893)) ([2cfc982](https://github.com/revanced/revanced-patches/commit/2cfc9829e119884ca566d6ad90fd0542317891d7))
+* **id-austria:** bump compatibility to `2.6.0` ([#1827](https://github.com/revanced/revanced-patches/issues/1827)) ([f48e794](https://github.com/revanced/revanced-patches/commit/f48e794eebf9ea44008c4c8a3967ad039d19180a))
+* **inshorts:** `hide-ads` patch ([#1828](https://github.com/revanced/revanced-patches/issues/1828)) ([04a2acc](https://github.com/revanced/revanced-patches/commit/04a2accfe9f9254af9074ad0a309d485cedb01cb))
+* **memegenerator:** `unlock-pro` patch ([#1902](https://github.com/revanced/revanced-patches/issues/1902)) ([7d30541](https://github.com/revanced/revanced-patches/commit/7d3054178187bed294d156d3858613fa63a626ef))
+* **photomath/unlock-plus:** bump compatibility to `8.21.1` ([#1926](https://github.com/revanced/revanced-patches/issues/1926)) ([beb8d9c](https://github.com/revanced/revanced-patches/commit/beb8d9cbf254b4a2b2207a307934be65507dcf80))
+* **photomath:** bump compatibility up to `8.21.0` ([#1886](https://github.com/revanced/revanced-patches/issues/1886)) ([43464fd](https://github.com/revanced/revanced-patches/commit/43464fd6ffe6f097c574156146aeb23f8f026840))
+* **reddit:** bump compatibility to `2023.12.0` ([#1825](https://github.com/revanced/revanced-patches/issues/1825)) ([e3666e6](https://github.com/revanced/revanced-patches/commit/e3666e68ed4816c85fbb110cb098f53fddf135f1))
+* use better patch description ([32fcd25](https://github.com/revanced/revanced-patches/commit/32fcd258c6b00315265c09380550a2e98b5ec9e7))
+* **youtube-music:** `bypass-certificate-checks` patch ([#1810](https://github.com/revanced/revanced-patches/issues/1810)) ([ef8f26f](https://github.com/revanced/revanced-patches/commit/ef8f26fb976c3044039f9bff0496088763ab66cd))
+* **youtube/settings:** disable preferences and add dialog messages to preferences ([#1801](https://github.com/revanced/revanced-patches/issues/1801)) ([05023ba](https://github.com/revanced/revanced-patches/commit/05023bab1d94e04553ac274468bdba7a19ad9180))
+* **youtube/sponsorblock:** skip to video highlight ([#1874](https://github.com/revanced/revanced-patches/issues/1874)) ([83747b7](https://github.com/revanced/revanced-patches/commit/83747b7aea33d8fe4b4b9514fdf7c9081c357410))
+* **youtube:** bump compatibility to `18.08.37` ([29561ec](https://github.com/revanced/revanced-patches/commit/29561eca10e18e11f2d4a7f9bab2f12303490b6f))
+* **youtube:** change default video speed and quality inside the settings menu ([#1880](https://github.com/revanced/revanced-patches/issues/1880)) ([fbb1763](https://github.com/revanced/revanced-patches/commit/fbb17636d8ab9f2a43ead896451804b04464527c))
+* **youtube:** constrain compatibility to `18.08.37` ([7403fc8](https://github.com/revanced/revanced-patches/commit/7403fc86ae7b7d756a2939fa0a507f237aaf6edf))
+* **youtube:** sponsorblock improvements ([#1557](https://github.com/revanced/revanced-patches/issues/1557)) ([b5d712a](https://github.com/revanced/revanced-patches/commit/b5d712a3326d1e8cdb8d8642aa7bd1bee6e30ac1))
+* **youtube:** support version `18.08.37` ([4f4ceab](https://github.com/revanced/revanced-patches/commit/4f4ceab2cc32a38dd3967fd4e81f690330c08f5c))
+
+# [2.169.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.168.0...v2.169.0-dev.1) (2023-04-21)
+
+
+### Bug Fixes
+
+* add missing annotation to patches ([#1882](https://github.com/revanced/revanced-patches/issues/1882)) ([d86b6a4](https://github.com/revanced/revanced-patches/commit/d86b6a4a659172c3f1db8eb883f28dfee4e83e4c))
+* **youtube/hide-video-action-buttons:** change 'Hide create, clip and thanks buttons' to default off ([#1923](https://github.com/revanced/revanced-patches/issues/1923)) ([fc89c86](https://github.com/revanced/revanced-patches/commit/fc89c865f94fffd748809eaf0504cc91f6389500))
+* **youtube/hide-video-action-buttons:** fix 'hide share button' ([#1924](https://github.com/revanced/revanced-patches/issues/1924)) ([bc05e44](https://github.com/revanced/revanced-patches/commit/bc05e4494d914f944a831bfb83a150ad93bb342f))
+* **youtube/microg-support:** remove incorrect patch dependency ([3e0c45c](https://github.com/revanced/revanced-patches/commit/3e0c45c2dff9f6336e42fdd3d1b5b5de5af1b1cb))
+* **youtube/microg-support:** rename patch correctly ([091a25d](https://github.com/revanced/revanced-patches/commit/091a25d46145b1c27791245fca0933e9c8a68e9a))
+* **youtube/return-youtube-dislike:** render dislikes when scrolling into the screen ([#1873](https://github.com/revanced/revanced-patches/issues/1873)) ([85675b8](https://github.com/revanced/revanced-patches/commit/85675b800070de9752b2a4bfea3182381d4cfba4))
+* **youtube/sponsorblock:** do not depend on `remember-playback-speed` patch ([b0834fa](https://github.com/revanced/revanced-patches/commit/b0834faa69755a94f70ae5075a10cf15e8a6b857))
+* **youtube/sponsorblock:** fix autorepeat button layout ([#1868](https://github.com/revanced/revanced-patches/issues/1868)) ([5e148d9](https://github.com/revanced/revanced-patches/commit/5e148d9384e8f9f1bc8f5daa7e68a05574810329))
+* **youtube/spoof-signature-verification:** depend on `client-spoof` patch ([0d47375](https://github.com/revanced/revanced-patches/commit/0d47375092639e3e5dad8d67991004fc2f103606))
+* **youtubevanced/hide-ads:** hide more types of ads ([#1781](https://github.com/revanced/revanced-patches/issues/1781)) ([47ff447](https://github.com/revanced/revanced-patches/commit/47ff447f8ec0e5bbc174f34bd7d61b3031276641))
+* **youtubevanced/hide-ads:** remove broken ad filter ([#1881](https://github.com/revanced/revanced-patches/issues/1881)) ([5b987e1](https://github.com/revanced/revanced-patches/commit/5b987e14e81a47691883a5b5196c7ffee03941d0))
+
+
+### Features
+
+* `change-package-name` patch ([#1864](https://github.com/revanced/revanced-patches/issues/1864)) ([f9a6672](https://github.com/revanced/revanced-patches/commit/f9a6672122eb28fe06c9f5e137906ad868a491d6))
+* `enable-android-debugging` patch ([#1876](https://github.com/revanced/revanced-patches/issues/1876)) ([bd224d9](https://github.com/revanced/revanced-patches/commit/bd224d90deb838ee3e7bd0c16860023ebf113e96))
+* **facebook:** `hide-inbox-ads` patch ([#1893](https://github.com/revanced/revanced-patches/issues/1893)) ([2cfc982](https://github.com/revanced/revanced-patches/commit/2cfc9829e119884ca566d6ad90fd0542317891d7))
+* **id-austria:** bump compatibility to `2.6.0` ([#1827](https://github.com/revanced/revanced-patches/issues/1827)) ([f48e794](https://github.com/revanced/revanced-patches/commit/f48e794eebf9ea44008c4c8a3967ad039d19180a))
+* **inshorts:** `hide-ads` patch ([#1828](https://github.com/revanced/revanced-patches/issues/1828)) ([04a2acc](https://github.com/revanced/revanced-patches/commit/04a2accfe9f9254af9074ad0a309d485cedb01cb))
+* **memegenerator:** `unlock-pro` patch ([#1902](https://github.com/revanced/revanced-patches/issues/1902)) ([7d30541](https://github.com/revanced/revanced-patches/commit/7d3054178187bed294d156d3858613fa63a626ef))
+* **photomath/unlock-plus:** bump compatibility to `8.21.1` ([#1926](https://github.com/revanced/revanced-patches/issues/1926)) ([beb8d9c](https://github.com/revanced/revanced-patches/commit/beb8d9cbf254b4a2b2207a307934be65507dcf80))
+* **photomath:** bump compatibility up to `8.21.0` ([#1886](https://github.com/revanced/revanced-patches/issues/1886)) ([43464fd](https://github.com/revanced/revanced-patches/commit/43464fd6ffe6f097c574156146aeb23f8f026840))
+* **reddit:** bump compatibility to `2023.12.0` ([#1825](https://github.com/revanced/revanced-patches/issues/1825)) ([e3666e6](https://github.com/revanced/revanced-patches/commit/e3666e68ed4816c85fbb110cb098f53fddf135f1))
+* use better patch description ([32fcd25](https://github.com/revanced/revanced-patches/commit/32fcd258c6b00315265c09380550a2e98b5ec9e7))
+* **youtube-music:** `bypass-certificate-checks` patch ([#1810](https://github.com/revanced/revanced-patches/issues/1810)) ([ef8f26f](https://github.com/revanced/revanced-patches/commit/ef8f26fb976c3044039f9bff0496088763ab66cd))
+* **youtube/settings:** disable preferences and add dialog messages to preferences ([#1801](https://github.com/revanced/revanced-patches/issues/1801)) ([05023ba](https://github.com/revanced/revanced-patches/commit/05023bab1d94e04553ac274468bdba7a19ad9180))
+* **youtube/sponsorblock:** skip to video highlight ([#1874](https://github.com/revanced/revanced-patches/issues/1874)) ([83747b7](https://github.com/revanced/revanced-patches/commit/83747b7aea33d8fe4b4b9514fdf7c9081c357410))
+* **youtube:** bump compatibility to `18.08.37` ([29561ec](https://github.com/revanced/revanced-patches/commit/29561eca10e18e11f2d4a7f9bab2f12303490b6f))
+* **youtube:** change default video speed and quality inside the settings menu ([#1880](https://github.com/revanced/revanced-patches/issues/1880)) ([fbb1763](https://github.com/revanced/revanced-patches/commit/fbb17636d8ab9f2a43ead896451804b04464527c))
+* **youtube:** constrain compatibility to `18.08.37` ([7403fc8](https://github.com/revanced/revanced-patches/commit/7403fc86ae7b7d756a2939fa0a507f237aaf6edf))
+* **youtube:** sponsorblock improvements ([#1557](https://github.com/revanced/revanced-patches/issues/1557)) ([b5d712a](https://github.com/revanced/revanced-patches/commit/b5d712a3326d1e8cdb8d8642aa7bd1bee6e30ac1))
+* **youtube:** support version `18.08.37` ([4f4ceab](https://github.com/revanced/revanced-patches/commit/4f4ceab2cc32a38dd3967fd4e81f690330c08f5c))
+
+# [2.168.0](https://github.com/revanced/revanced-patches/compare/v2.167.1...v2.168.0) (2023-04-13)
+
+
+### Features
+
+* **youtube/spoof-signature-verification:** enable by default ([#1896](https://github.com/revanced/revanced-patches/issues/1896)) ([774e45e](https://github.com/revanced/revanced-patches/commit/774e45ed50bb15adb2b55d103ff7bfae38570056))
+
+## [2.167.1](https://github.com/revanced/revanced-patches/compare/v2.167.0...v2.167.1) (2023-04-13)
+
+
+### Bug Fixes
+
+* **youtube/spoof-signature-verification:** fixed subtitles in wrong location ([#1833](https://github.com/revanced/revanced-patches/issues/1833)) ([0dbfa62](https://github.com/revanced/revanced-patches/commit/0dbfa6247e6e7ff51e8fee86fd798f693ab05bcf))
+* **youtube/spoof-signature-verification:** spoof videos in playlists ([0a858ec](https://github.com/revanced/revanced-patches/commit/0a858ecef3f152dfd97e7f2d27501201968de4e4))
+
+# [2.167.0](https://github.com/revanced/revanced-patches/compare/v2.166.0...v2.167.0) (2023-03-29)
+
+
+### Bug Fixes
+
+* **youtube/remember-playback-speed:**  allow to not remember playback speed ([#1762](https://github.com/revanced/revanced-patches/issues/1762)) ([49ec3e8](https://github.com/revanced/revanced-patches/commit/49ec3e83f18ec4eb180d220c5a7015f8e4feb3a7))
+* **youtube/sponsorblock:** fix segments not skipping during background play ([#1765](https://github.com/revanced/revanced-patches/issues/1765)) ([7620ea1](https://github.com/revanced/revanced-patches/commit/7620ea1752406d703deb15aa0267d4572b1b171a))
+* **youtube/spoof-signature-verification:** fix audio during home feed video playback ([#1754](https://github.com/revanced/revanced-patches/issues/1754)) ([7dd067b](https://github.com/revanced/revanced-patches/commit/7dd067b0e96679fe653c9796bef31d743287b2d0))
+
+
+### Features
+
+* `export-all-activities` patch ([#1751](https://github.com/revanced/revanced-patches/issues/1751)) ([aad6e05](https://github.com/revanced/revanced-patches/commit/aad6e055380f91462d94fc96c4ec17a27e283c64))
+* **reddit:** bump compatibility to `2023.10.0` ([#1772](https://github.com/revanced/revanced-patches/issues/1772)) ([f95ab6e](https://github.com/revanced/revanced-patches/commit/f95ab6e13e70667fdffe479b7292112244e6bb9e))
+* **twitter:** remove `monochrome-icon` patch ([#1786](https://github.com/revanced/revanced-patches/issues/1786)) ([b8bf804](https://github.com/revanced/revanced-patches/commit/b8bf804835e75c9f2c8453c8ce22cfd8d17318ce))
+* **youtube/microg-support:** do not depend on `spoof-signature-verification` patch ([af4e765](https://github.com/revanced/revanced-patches/commit/af4e765ca87c6c979e95bc274b32c764a0a32a88))
+* **youtube/spoof-signature-verification:** automatic signature spoofing ([f1395f4](https://github.com/revanced/revanced-patches/commit/f1395f49fae1c0a00de074d58fa7d81f562d3009))
+
+# [2.167.0-dev.6](https://github.com/revanced/revanced-patches/compare/v2.167.0-dev.5...v2.167.0-dev.6) (2023-03-22)
+
+
+### Features
+
+* **twitter:** remove `monochrome-icon` patch ([#1786](https://github.com/revanced/revanced-patches/issues/1786)) ([b8bf804](https://github.com/revanced/revanced-patches/commit/b8bf804835e75c9f2c8453c8ce22cfd8d17318ce))
+
+# [2.167.0-dev.5](https://github.com/revanced/revanced-patches/compare/v2.167.0-dev.4...v2.167.0-dev.5) (2023-03-20)
+
+
+### Features
+
+* **reddit:** bump compatibility to `2023.10.0` ([#1772](https://github.com/revanced/revanced-patches/issues/1772)) ([f95ab6e](https://github.com/revanced/revanced-patches/commit/f95ab6e13e70667fdffe479b7292112244e6bb9e))
+
+# [2.167.0-dev.4](https://github.com/revanced/revanced-patches/compare/v2.167.0-dev.3...v2.167.0-dev.4) (2023-03-19)
+
+
+### Bug Fixes
+
+* **youtube/sponsorblock:** fix segments not skipping during background play ([#1765](https://github.com/revanced/revanced-patches/issues/1765)) ([7620ea1](https://github.com/revanced/revanced-patches/commit/7620ea1752406d703deb15aa0267d4572b1b171a))
+
+
+### Features
+
+* `export-all-activities` patch ([#1751](https://github.com/revanced/revanced-patches/issues/1751)) ([aad6e05](https://github.com/revanced/revanced-patches/commit/aad6e055380f91462d94fc96c4ec17a27e283c64))
+
+# [2.167.0-dev.3](https://github.com/revanced/revanced-patches/compare/v2.167.0-dev.2...v2.167.0-dev.3) (2023-03-19)
+
+
+### Bug Fixes
+
+* **youtube/remember-playback-speed:**  allow to not remember playback speed ([#1762](https://github.com/revanced/revanced-patches/issues/1762)) ([49ec3e8](https://github.com/revanced/revanced-patches/commit/49ec3e83f18ec4eb180d220c5a7015f8e4feb3a7))
+
+# [2.167.0-dev.2](https://github.com/revanced/revanced-patches/compare/v2.167.0-dev.1...v2.167.0-dev.2) (2023-03-19)
+
+
+### Features
+
+* **youtube/microg-support:** do not depend on `spoof-signature-verification` patch ([af4e765](https://github.com/revanced/revanced-patches/commit/af4e765ca87c6c979e95bc274b32c764a0a32a88))
+
 # [2.167.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.166.1-dev.1...v2.167.0-dev.1) (2023-03-17)
 
 

README.md

@@ -9,60 +9,60 @@ The official Patch bundle provided by ReVanced and the community.
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `always-autorepeat` | Always repeats the playing video again. | 18.05.40 |
+| `always-autorepeat` | Always repeats the playing video again. | 18.08.37 |
-| `client-spoof` | Spoofs the YouTube or Vanced client to prevent playback issues. | all |
+| `client-spoof` | Spoofs a patched client to allow playback. | all |
-| `comments` | Hides components related to comments. | 18.05.40 |
+| `comments` | Hides components related to comments. | 18.08.37 |
-| `copy-video-url` | Adds buttons in player to copy video links. | 18.05.40 |
+| `copy-video-url` | Adds buttons in player to copy video links. | 18.08.37 |
 | `custom-branding` | Changes the YouTube launcher icon and name to your choice (defaults to ReVanced). | all |
-| `custom-video-buffer` | Lets you change the buffers of videos. | 18.05.40 |
+| `custom-video-buffer` | Lets you change the buffers of videos. | 18.08.37 |
-| `custom-video-speed` | Adds more video speed options. | 18.05.40 |
+| `custom-video-speed` | Adds more video speed options. | 18.08.37 |
-| `debugging` | Adds debugging options. | all |
+| `disable-auto-captions` | Disable forced captions from being automatically enabled. | 18.08.37 |
-| `disable-auto-captions` | Disable forced captions from being automatically enabled. | 18.05.40 |
+| `disable-fullscreen-panels` | Disables video description and comments panel in fullscreen view. | 18.08.37 |
-| `disable-fullscreen-panels` | Disables video description and comments panel in fullscreen view. | 18.05.40 |
+| `disable-player-popup-panels` | Disables panels from appearing automatically when going into fullscreen (playlist or live chat). | 18.08.37 |
-| `disable-player-popup-panels` | Disables panels from appearing automatically when going into fullscreen (playlist or live chat). | 18.05.40 |
+| `disable-shorts-on-startup` | Disables playing YouTube Shorts when launching YouTube. | 18.08.37 |
-| `disable-shorts-on-startup` | Disables playing YouTube Shorts when launching YouTube. | 18.05.40 |
 | `disable-zoom-haptics` | Disables haptics when zooming. | all |
-| `downloads` | Enables downloading music and videos from YouTube. | 18.05.40 |
+| `downloads` | Enables downloading music and videos from YouTube. | 18.08.37 |
-| `enable-wide-searchbar` | Replaces the search icon with a wide search bar. This will hide the YouTube logo when active. | 18.05.40 |
+| `enable-debugging` | Adds debugging options. | all |
-| `general-ads` | Removes general ads. | 18.05.40 |
+| `enable-wide-searchbar` | Replaces the search icon with a wide search bar. This will hide the YouTube logo when active. | 18.08.37 |
-| `hdr-auto-brightness` | Makes the brightness of HDR videos follow the system default. | 18.05.40 |
+| `general-ads` | Removes general ads. | 18.08.37 |
-| `hide-album-cards` | Hides the album cards below the artist description. | 18.05.40 |
+| `hdr-auto-brightness` | Makes the brightness of HDR videos follow the system default. | 18.08.37 |
-| `hide-artist-card` | Hides the artist card below the searchbar. | 18.05.40 |
+| `hide-album-cards` | Hides the album cards below the artist description. | 18.08.37 |
-| `hide-autoplay-button` | Hides the autoplay button in the video player. | 18.05.40 |
+| `hide-artist-card` | Hides the artist card below the searchbar. | 18.08.37 |
-| `hide-breaking-news-shelf` | Hides the breaking news shelf on the homepage tab. | 18.05.40 |
+| `hide-autoplay-button` | Hides the autoplay button in the video player. | 18.08.37 |
-| `hide-captions-button` | Hides the captions button on video player. | 18.05.40 |
+| `hide-breaking-news-shelf` | Hides the breaking news shelf on the homepage tab. | 18.08.37 |
+| `hide-captions-button` | Hides the captions button on video player. | 18.08.37 |
 | `hide-cast-button` | Hides the cast button in the video player. | all |
-| `hide-create-button` | Hides the create button in the navigation bar. | 18.05.40 |
+| `hide-create-button` | Hides the create button in the navigation bar. | 18.08.37 |
-| `hide-crowdfunding-box` | Hides the crowdfunding box between the player and video description. | 18.05.40 |
+| `hide-crowdfunding-box` | Hides the crowdfunding box between the player and video description. | 18.08.37 |
-| `hide-email-address` | Hides the email address in the account switcher. | 18.05.40 |
+| `hide-email-address` | Hides the email address in the account switcher. | 18.08.37 |
-| `hide-endscreen-cards` | Hides the suggested video cards at the end of a video in fullscreen. | 18.05.40 |
+| `hide-endscreen-cards` | Hides the suggested video cards at the end of a video in fullscreen. | 18.08.37 |
-| `hide-floating-microphone-button` | Hides the floating microphone button which appears in search. | 18.05.40 |
+| `hide-floating-microphone-button` | Hides the floating microphone button which appears in search. | 18.08.37 |
-| `hide-info-cards` | Hides info cards in videos. | 18.05.40 |
+| `hide-info-cards` | Hides info cards in videos. | 18.08.37 |
-| `hide-my-mix` | Hides mix playlists. | 18.05.40 |
+| `hide-my-mix` | Hides mix playlists. | 18.08.37 |
 | `hide-player-buttons` | Adds the option to hide video player previous and next buttons. | all |
-| `hide-seekbar` | Hides the seekbar. | 18.05.40 |
+| `hide-seekbar` | Hides the seekbar. | 18.08.37 |
-| `hide-shorts-button` | Hides the shorts button on the navigation bar. | 18.05.40 |
+| `hide-shorts-button` | Hides the shorts button on the navigation bar. | 18.08.37 |
-| `hide-timestamp` | Hides timestamp in video player. | 18.05.40 |
+| `hide-timestamp` | Hides timestamp in video player. | 18.08.37 |
-| `hide-video-action-buttons` | Adds the options to hide action buttons under a video. | 18.05.40 |
+| `hide-video-action-buttons` | Adds the options to hide action buttons under a video. | 18.08.37 |
-| `hide-watch-in-vr` | Hides the option to watch in VR from the player settings flyout panel. | 18.05.40 |
+| `hide-watch-in-vr` | Hides the option to watch in VR from the player settings flyout panel. | 18.08.37 |
-| `hide-watermark` | Hides creator's watermarks on videos. | 18.05.40 |
+| `hide-watermark` | Hides creator's watermarks on videos. | 18.08.37 |
-| `microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG. | 18.05.40 |
+| `minimized-playback` | Enables minimized and background playback. | 18.08.37 |
-| `minimized-playback` | Enables minimized and background playback. | 18.05.40 |
+| `old-quality-layout` | Enables the original video quality flyout in the video player settings | 18.08.37 |
-| `old-quality-layout` | Enables the original video quality flyout in the video player settings | 18.05.40 |
+| `open-links-externally` | Open links outside of the app directly in your browser. | 18.08.37 |
-| `open-links-externally` | Open links outside of the app directly in your browser. | 18.05.40 |
 | `premium-heading` | Shows premium branding on the home screen. | all |
-| `remember-playback-rate` | Adds the ability to remember the playback rate you chose in the video playback rate flyout. | 18.05.40 |
+| `remember-playback-speed` | Adds the ability to remember the playback speed you chose in the video playback speed flyout. | 18.08.37 |
-| `remember-video-quality` | Adds the ability to remember the video quality you chose in the video quality flyout. | 18.05.40 |
+| `remember-video-quality` | Adds the ability to remember the video quality you chose in the video quality flyout. | 18.08.37 |
-| `remove-player-button-background` | Removes the background from the video player buttons. | 18.05.40 |
+| `remove-player-button-background` | Removes the background from the video player buttons. | 18.08.37 |
-| `return-youtube-dislike` | Shows the dislike count of videos using the Return YouTube Dislike API. | 18.05.40 |
+| `return-youtube-dislike` | Shows the dislike count of videos using the Return YouTube Dislike API. | 18.08.37 |
-| `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 18.05.40 |
+| `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 18.08.37 |
-| `sponsorblock` | Integrates SponsorBlock which allows skipping video segments such as sponsored content. | 18.05.40 |
+| `sponsorblock` | Integrates SponsorBlock which allows skipping video segments such as sponsored content. | 18.08.37 |
-| `spoof-app-version` | Tricks YouTube into thinking, you are running an older version of the app. One of the side effects also includes restoring the old UI. | 18.05.40 |
+| `spoof-app-version` | Tricks YouTube into thinking, you are running an older version of the app. One of the side effects also includes restoring the old UI. | 18.08.37 |
-| `spoof-signature-verification` | Spoofs the client to prevent playback issues. | 18.05.40 |
+| `spoof-signature-verification` | Spoofs a patched client to prevent playback issues. | 18.08.37 |
-| `swipe-controls` | Adds volume and brightness swipe controls. | 18.05.40 |
+| `swipe-controls` | Adds volume and brightness swipe controls. | 18.08.37 |
-| `tablet-mini-player` | Enables the tablet mini player layout. | 18.05.40 |
+| `tablet-mini-player` | Enables the tablet mini player layout. | 18.08.37 |
 | `theme` | Applies a custom theme. | all |
-| `video-ads` | Removes ads in the video player. | 18.05.40 |
+| `vanced-microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG. | 18.08.37 |
+| `video-ads` | Removes ads in the video player. | 18.08.37 |
 </details>
 
 ### [📦 `com.google.android.apps.youtube.music`](https://play.google.com/store/apps/details?id=com.google.android.apps.youtube.music)
@@ -71,6 +71,7 @@ The official Patch bundle provided by ReVanced and the community.
 | 💊 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 |
 | `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 |
@@ -136,7 +137,6 @@ The official Patch bundle provided by ReVanced and the community.
 | `hide-ads` | Hides ads. | all |
 | `hide-recommended-users` | Hides recommended users. | all |
 | `hide-views-stats` | Hides the view stats under tweets. | 9.71.0-release.0 |
-| `monochrome-icon` | Adds a monochrome icon. | all |
 </details>
 
 ### [📦 `com.spotify.music`](https://play.google.com/store/apps/details?id=com.spotify.music)
@@ -154,8 +154,8 @@ The official Patch bundle provided by ReVanced and the community.
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `general-reddit-ads` | Removes general ads from the Reddit frontpage and subreddits. | 2023.09.1 |
+| `general-reddit-ads` | Removes general ads from the Reddit frontpage and subreddits. | 2023.12.0 |
-| `hide-subreddit-banner` | Hides banner ads from comments on subreddits. | 2023.09.1 |
+| `hide-subreddit-banner` | Hides banner ads from comments on subreddits. | 2023.12.0 |
 | `premium-icon-reddit` | Unlocks premium Reddit app icons. | all |
 </details>
 
@@ -164,7 +164,7 @@ The official Patch bundle provided by ReVanced and the community.
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `client-spoof` | Spoofs the YouTube or Vanced client to prevent playback issues. | all |
+| `client-spoof` | Spoofs a patched client to allow playback. | all |
 | `hide-ads` | Removes general ads. | all |
 </details>
 
@@ -182,8 +182,8 @@ The official Patch bundle provided by ReVanced and the community.
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `remove-root-detection` | Removes the check for root permissions and unlocked bootloader. | 2.5.2 |
+| `remove-root-detection` | Removes the check for root permissions and unlocked bootloader. | 2.6.0 |
-| `spoof-signature` | Spoofs the signature of the app. | 2.5.2 |
+| `spoof-signature` | Spoofs the signature of the app. | 2.6.0 |
 </details>
 
 ### [📦 `com.myprog.hexedit`](https://play.google.com/store/apps/details?id=com.myprog.hexedit)
@@ -202,6 +202,22 @@ The official Patch bundle provided by ReVanced and the community.
 | `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.nis.app`](https://play.google.com/store/apps/details?id=com.nis.app)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `hide-ads` | Removes ads from Inshorts. | all |
+</details>
+
+### [📦 `com.facebook.orca`](https://play.google.com/store/apps/details?id=com.facebook.orca)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `hide-inbox-ads` | Hides ads in inbox. | all |
+</details>
+
 ### [📦 `com.instagram.android`](https://play.google.com/store/apps/details?id=com.instagram.android)
 <details>
 
@@ -271,7 +287,7 @@ The official Patch bundle provided by ReVanced and the community.
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `unlock-plus` | Unlocks plus features. | all |
+| `unlock-plus` | Unlocks plus features. | 8.9.0 |
 </details>
 
 ### [📦 `io.yuka.android`](https://play.google.com/store/apps/details?id=io.yuka.android)
@@ -290,15 +306,7 @@ The official Patch bundle provided by ReVanced and the community.
 | `unlock-prime` | Unlocks Nova Prime and all functions of the app. | all |
 </details>
 
-### [📦 `org.totschnig.myexpenses`](https://play.google.com/store/apps/details?id=org.totschnig.myexpenses)
+### [📦 `ginlemon.iconpackstudio`](https://play.google.com/store/apps/details?id=ginlemon.iconpackstudio)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `unlock-pro` | Unlocks all professional features. | 3.4.9 |
-</details>
-
-### [📦 `com.awedea.nyx`](https://play.google.com/store/apps/details?id=com.awedea.nyx)
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
@@ -314,14 +322,6 @@ The official Patch bundle provided by ReVanced and the community.
 | `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>
-
 ### [📦 `com.ithebk.expensemanager`](https://play.google.com/store/apps/details?id=com.ithebk.expensemanager)
 <details>
 
@@ -330,12 +330,36 @@ The official Patch bundle provided by ReVanced and the community.
 | `unlock-pro` | Unlocks 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.zombodroid.MemeGenerator`](https://play.google.com/store/apps/details?id=com.zombodroid.MemeGenerator)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `unlock-pro` | Unlocks pro features. | 4.6364 |
+</details>
+
+### [📦 `com.awedea.nyx`](https://play.google.com/store/apps/details?id=com.awedea.nyx)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `unlock-pro` | Unlocks all pro features. | all |
+</details>
+
 ### [📦 `com.ticktick.task`](https://play.google.com/store/apps/details?id=com.ticktick.task)
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `unlock-themes` | Unlocks all themes. | all |
+| `unlock-themes` | Unlocks all themes that are inaccessible until a certain level is reached. | all |
 </details>
 
 ### [📦 `net.dinglisch.android.taskerm`](https://play.google.com/store/apps/details?id=net.dinglisch.android.taskerm)

build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    kotlin("jvm") version "1.7.0"
+    kotlin("jvm") version "1.8.10"
 }
 
 group = "app.revanced"

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.167.0-dev.1
+version = 2.169.1-dev.3

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

@@ -0,0 +1,45 @@
+package app.revanced.patches.all.activity.exportAll.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.ResourcePatch
+import app.revanced.patcher.patch.annotations.Patch
+
+@Patch(false)
+@Name("export-all-activities")
+@Description("Makes all app activities exportable.")
+@Version("0.0.1")
+class ExportAllActivitiesPatch : ResourcePatch {
+    override fun execute(context: ResourceContext): PatchResult {
+        context.xmlEditor["AndroidManifest.xml"].use { editor ->
+            val document = editor.file
+            val activities = document.getElementsByTagName("activity")
+
+            for(i in 0..activities.length) {
+                activities.item(i)?.apply {
+                    val exportedAttribute = attributes.getNamedItem(EXPORTED_FLAG)
+
+                    if (exportedAttribute != null) {
+                        if (exportedAttribute.nodeValue != "true")
+                            exportedAttribute.nodeValue = "true"
+                    }
+                    // Reason why the attribute is added in the case it does not exist:
+                    // https://github.com/revanced/revanced-patches/pull/1751/files#r1141481604
+                    else document.createAttribute(EXPORTED_FLAG)
+                        .apply { value = "true" }
+                        .let(attributes::setNamedItem)
+                }
+            }
+        }
+
+        return PatchResultSuccess()
+    }
+
+    private companion object {
+        const val EXPORTED_FLAG = "android:exported"
+    }
+}

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

@@ -4,6 +4,7 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.annotations.RequiresIntegrations
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.util.patch.*
 import org.jf.dexlib2.iface.ClassDef
@@ -15,6 +16,7 @@ import java.util.*
 @Name("spoof-wifi-connection")
 @Description("Spoofs an existing Wi-Fi connection.")
 @Version("0.0.1")
+@RequiresIntegrations
 internal class SpoofWifiPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
 
     private companion object {

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

@@ -0,0 +1,43 @@
+package app.revanced.patches.all.misc.debugging.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.*
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import org.w3c.dom.Element
+
+@Patch(false)
+@Name("enable-android-debugging")
+@Description("Enables Android debugging capabilities.")
+@Version("0.0.1")
+class EnableAndroidDebuggingPatch : ResourcePatch {
+    override fun execute(context: ResourceContext): PatchResult {
+        if (debuggable == true) {
+            context.xmlEditor["AndroidManifest.xml"].use { dom ->
+                val applicationNode = dom
+                    .file
+                    .getElementsByTagName("application")
+                    .item(0) as Element
+
+                // set application as debuggable
+                applicationNode.setAttribute("android:debuggable", "true")
+            }
+        }
+
+        return PatchResultSuccess()
+    }
+
+    companion object : OptionsContainer() {
+        var debuggable: Boolean? by option(
+            PatchOption.BooleanOption(
+                key = "debuggable",
+                default = true,
+                title = "App debugging",
+                description = "Whether to make the app debuggable on Android.",
+            )
+        )
+    }
+}

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

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

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

@@ -4,6 +4,7 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.annotations.RequiresIntegrations
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.util.patch.*
 import org.jf.dexlib2.iface.ClassDef
@@ -15,6 +16,7 @@ import java.util.*
 @Name("remove-screenshot-restriction")
 @Description("Removes the restriction of taking screenshots in apps that normally wouldn't allow it.")
 @Version("0.0.1")
+@RequiresIntegrations
 internal class RemoveScreenshotRestrictionPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
 
     private companion object {

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,24 @@
+package app.revanced.patches.memegenerator.detection.license.fingerprint
+
+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 LicenseValidationFingerprint : MethodFingerprint(
+    returnType = "Z",
+    access = AccessFlags.PUBLIC or AccessFlags.STATIC,
+    parameters = listOf("Landroid/content/Context;"),
+    opcodes = listOf(
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_WIDE,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_WIDE,
+        Opcode.CMP_LONG,
+        Opcode.IF_GEZ,
+        Opcode.CONST_4,
+        Opcode.RETURN,
+        Opcode.CONST_4,
+        Opcode.RETURN
+    )
+)

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

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

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

@@ -0,0 +1,35 @@
+package app.revanced.patches.memegenerator.detection.signature.fingerprint
+
+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)
+object VerifySignatureFingerprint : MethodFingerprint(
+    returnType = "Z",
+    access = AccessFlags.PUBLIC or AccessFlags.STATIC,
+    parameters = listOf("Landroid/app/Activity;"),
+    opcodes = listOf(
+        Opcode.SGET_OBJECT,
+        Opcode.IF_NEZ,
+        Opcode.INVOKE_STATIC,
+        Opcode.CONST_4,
+        Opcode.CONST_4,
+        Opcode.SGET_OBJECT,
+        Opcode.ARRAY_LENGTH,
+        Opcode.IF_GE,
+        Opcode.AGET_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.SGET_OBJECT,
+        Opcode.IF_EQZ,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT,
+        Opcode.IF_EQZ,
+        Opcode.CONST_4,
+        Opcode.RETURN,
+        Opcode.ADD_INT_LIT8
+    ),
+)

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

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

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

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

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

@@ -0,0 +1,22 @@
+package app.revanced.patches.memegenerator.misc.pro.fingerprint
+
+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 IsFreeVersionFingerprint : MethodFingerprint(
+    returnType = "Ljava/lang/Boolean;",
+    access = AccessFlags.PUBLIC or AccessFlags.STATIC,
+    strings = listOf("free"),
+    parameters = listOf("Landroid/content/Context;"),
+    opcodes = listOf(
+        Opcode.SGET,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.CONST_STRING,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT,
+        Opcode.IF_EQZ
+    )
+)

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

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

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

@@ -0,0 +1,18 @@
+package app.revanced.patches.messenger.ads.inbox.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+
+object LoadInboxAdsFingerprint : MethodFingerprint(
+    returnType = "V",
+    strings = listOf(
+        "ads_load_begin",
+        "inbox_ads_fetch_start"
+    ),
+    access = AccessFlags.PUBLIC or AccessFlags.STATIC,
+    customFingerprint = {
+        it.definingClass == "Lcom/facebook/messaging/business/inboxads/plugins/inboxads/itemsupplier/InboxAdsItemSupplierImplementation;"
+    }
+)
+

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

@@ -0,0 +1,29 @@
+package app.revanced.patches.messenger.ads.inbox.patch
+
+import app.revanced.extensions.toErrorResult
+import app.revanced.patcher.annotation.*
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.replaceInstruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.messenger.ads.inbox.fingerprints.LoadInboxAdsFingerprint
+
+@Patch
+@Name("hide-inbox-ads")
+@Description("Hides ads in inbox.")
+@Compatibility([Package("com.facebook.orca")])
+@Version("0.0.1")
+class HideInboxAdsPatch : BytecodePatch(
+    listOf(LoadInboxAdsFingerprint)
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        LoadInboxAdsFingerprint.result?.mutableMethod?.apply {
+            this.replaceInstruction(0, "return-void")
+        } ?: return LoadInboxAdsFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
+    }
+}
+

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

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

@@ -0,0 +1,10 @@
+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",
+    strings = listOf("No match") // Unique in combination with boolean return type
+)

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

@@ -0,0 +1,41 @@
+package app.revanced.patches.music.misc.androidauto.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.addInstruction
+import app.revanced.patcher.extensions.replaceInstruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.music.misc.androidauto.annotations.BypassCertificateChecksCompatibility
+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
+@Version("0.0.1")
+class BypassCertificateChecksPatch : BytecodePatch(
+    listOf(
+        CheckCertificateFingerprint
+    )
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        CheckCertificateFingerprint.result?.let { result ->
+            val noMatchIndex = result.scanResult.stringsScanResult!!.matches.first().index
+
+            result.mutableMethod.apply {
+                val isPartnerIndex = noMatchIndex + 2
+
+                replaceInstruction(isPartnerIndex, "const/4 p1, 0x1")
+                addInstruction(isPartnerIndex + 1, "return p1")
+            }
+        } ?: return CheckCertificateFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/photomath/detection/signature/annotations/DisableSignatureDetectionCompatibility.kt

@@ -1,8 +0,0 @@
-package app.revanced.patches.photomath.detection.signature.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.microblink.photomath")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class DisableSignatureDetectionCompatibility

src/main/kotlin/app/revanced/patches/photomath/detection/signature/fingerprints/CheckSignatureFingerprint.kt

@@ -1,9 +1,18 @@
 package app.revanced.patches.photomath.detection.signature.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 CheckSignatureFingerprint : MethodFingerprint(
+    returnType = "V",
+    access = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    customFingerprint = {
+        (it.definingClass == "Lcom/microblink/photomath/main/activity/LauncherActivity;" ||
+                it.definingClass == "Lcom/microblink/photomath/PhotoMath;") &&
+                it.name == "onCreate"
+    },
     strings = listOf(
         "currentSignature"
     ),

src/main/kotlin/app/revanced/patches/photomath/detection/signature/fingerprints/MainOnCreateFingerprint.kt

@@ -1,13 +0,0 @@
-package app.revanced.patches.photomath.detection.signature.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object MainOnCreateFingerprint : MethodFingerprint(
-    returnType = "V",
-    access = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    customFingerprint = { methodDef ->
-        methodDef.definingClass == "Lcom/microblink/photomath/PhotoMath;" && methodDef.name == "onCreate"
-    }
-)

src/main/kotlin/app/revanced/patches/photomath/detection/signature/patch/SignatureDetectionPatch.kt

@@ -1,40 +1,31 @@
 package app.revanced.patches.photomath.detection.signature.patch
 
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.instruction
 import app.revanced.patcher.extensions.replaceInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patches.photomath.detection.signature.annotations.DisableSignatureDetectionCompatibility
 import app.revanced.patches.photomath.detection.signature.fingerprints.CheckSignatureFingerprint
-import app.revanced.patches.photomath.detection.signature.fingerprints.MainOnCreateFingerprint
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 
 @Description("Disables detection of incorrect signature.")
-@DisableSignatureDetectionCompatibility
+@Version("0.0.2")
-@Version("0.0.1")
 class SignatureDetectionPatch : BytecodePatch(
     listOf(
-        MainOnCreateFingerprint
+        CheckSignatureFingerprint
     )
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
-        val mainOnCreate = MainOnCreateFingerprint.result!!
+        CheckSignatureFingerprint.result?.apply {
-
+            val signatureCheckInstruction = mutableMethod.instruction(scanResult.patternScanResult!!.endIndex)
-        val patternResult = CheckSignatureFingerprint.also {
-            it.resolve(context, mainOnCreate.method, mainOnCreate.classDef)
-        }.result!!.scanResult.patternScanResult!!
-
-        mainOnCreate.mutableMethod.apply {
-            val signatureCheckInstruction = instruction(patternResult.endIndex)
             val checkRegister = (signatureCheckInstruction as OneRegisterInstruction).registerA
 
-            replaceInstruction(signatureCheckInstruction.location.index, "const/4 v$checkRegister, 0x1")
+            mutableMethod.replaceInstruction(signatureCheckInstruction.location.index, "const/4 v$checkRegister, 0x1")
-        }
+        } ?: throw CheckSignatureFingerprint.toErrorResult()
 
         return PatchResultSuccess()
     }

src/main/kotlin/app/revanced/patches/photomath/misc/unlockplus/annotations/UnlockPlusCompatibilty.kt

@@ -3,6 +3,28 @@ package app.revanced.patches.photomath.misc.unlockplus.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
-@Compatibility([Package("com.microblink.photomath")])
+@Compatibility(
+    [Package(
+        "com.microblink.photomath", arrayOf(
+            "8.6.0",
+            "8.7.0",
+            "8.8.0",
+            "8.9.0",
+            "8.10.0",
+            "8.11.0",
+            "8.12.0",
+            "8.13.0",
+            "8.14.0",
+            "8.15.0",
+            "8.16.0",
+            "8.17.0",
+            "8.18.0",
+            "8.18.1",
+            "8.19.0",
+            "8.20.0",
+            "8.21.0",
+        )
+    )]
+)
 @Target(AnnotationTarget.CLASS)
 internal annotation class UnlockPlusCompatibilty

src/main/kotlin/app/revanced/patches/reddit/ad/banner/annotations/HideBannerCompatibility.kt

@@ -12,7 +12,10 @@ import app.revanced.patcher.annotation.Package
             "2023.07.1",
             "2023.08.0",
             "2023.09.0",
-            "2023.09.1"
+            "2023.09.1",
+            "2023.10.0",
+            "2023.11.0",
+            "2023.12.0"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/reddit/ad/general/annotations/GeneralAdsCompatibility.kt

@@ -14,7 +14,10 @@ import app.revanced.patcher.annotation.Package
             "2023.07.1",
             "2023.08.0",
             "2023.09.0",
-            "2023.09.1"
+            "2023.09.1",
+            "2023.10.0",
+            "2023.11.0",
+            "2023.12.0"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/shared/misc/fix/spoof/patch/ClientSpoofPatch.kt

@@ -1,5 +1,6 @@
 package app.revanced.patches.shared.misc.fix.spoof.patch
 
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
@@ -16,22 +17,26 @@ import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
 
 @Patch
 @Name("client-spoof")
-@Description("Spoofs the YouTube or Vanced client to prevent playback issues.")
+@Description("Spoofs a patched client to allow playback.")
 @ClientSpoofCompatibility
 @Version("0.0.1")
 class ClientSpoofPatch : BytecodePatch(
     listOf(UserAgentHeaderBuilderFingerprint)
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
-        val result = UserAgentHeaderBuilderFingerprint.result!!
+        UserAgentHeaderBuilderFingerprint.result?.let { result ->
-        val method = result.mutableMethod
-
             val insertIndex = result.scanResult.patternScanResult!!.endIndex
-        val packageNameRegister = (method.instruction(insertIndex) as FiveRegisterInstruction).registerD
+           result.mutableMethod.apply {
+               val packageNameRegister = (instruction(insertIndex) as FiveRegisterInstruction).registerD
+               addInstruction(insertIndex, "const-string v$packageNameRegister, \"$ORIGINAL_PACKAGE_NAME\"")
+           }
 
-        val originalPackageName = "com.google.android.youtube"
+        } ?: return UserAgentHeaderBuilderFingerprint.toErrorResult()
-        method.addInstruction(insertIndex, "const-string v$packageNameRegister, \"$originalPackageName\"")
 
         return PatchResultSuccess()
     }
+
+    private companion object {
+        private const val ORIGINAL_PACKAGE_NAME = "com.google.android.youtube"
+    }
 }

src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/ArrayResource.kt

@@ -11,6 +11,7 @@ import org.w3c.dom.Element
  *  @param name The name of the array resource.
  *  @param items The items of the array resource.
  */
+// TODO: allow specifying an array resource file instead of using a list of StringResources
 internal data class ArrayResource(
     override val name: String,
     val items: List<StringResource>

src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/SwitchPreference.kt

@@ -1,10 +1,7 @@
 package app.revanced.patches.shared.settings.preference.impl
 
-import app.revanced.patches.shared.settings.preference.BasePreference
+import app.revanced.patches.shared.settings.preference.*
-import app.revanced.patches.shared.settings.preference.IResource
+import app.revanced.patches.shared.settings.resource.patch.AbstractSettingsResourcePatch.Companion.include
-import app.revanced.patches.shared.settings.preference.addDefault
-import app.revanced.patches.shared.settings.preference.addSummary
-import app.revanced.patches.shared.settings.preference.SummaryType
 import org.w3c.dom.Document
 import org.w3c.dom.Element
 
@@ -16,16 +13,21 @@ import org.w3c.dom.Element
  * @param default The default value of the switch.
  * @param summaryOn The summary to show when the preference is enabled.
  * @param summaryOff The summary to show when the preference is disabled.
+ * @param userDialogMessage The message to show in a dialog when the user toggles the preference.
  */
 internal class SwitchPreference(
     key: String, title: StringResource,
     val default: Boolean = false,
     val summaryOn: StringResource? = null,
-    val summaryOff: StringResource? = null
+    val summaryOff: StringResource? = null,
+    val userDialogMessage: StringResource? = null
 ) : BasePreference(key, title) {
     override val tag: String = "SwitchPreference"
 
     override fun serialize(ownerDocument: Document, resourceCallback: ((IResource) -> Unit)?): Element {
+        // dialog message is stored as a regular string and later referenced by SettingsEnum
+        userDialogMessage?.include()
+
         return super.serialize(ownerDocument, resourceCallback).apply {
             addDefault(default)
             addSummary(summaryOn?.also { resourceCallback?.invoke(it) }, SummaryType.ON)

src/main/kotlin/app/revanced/patches/ticktick/misc/themeunlock/patch/UnlockThemePatch.kt

@@ -16,7 +16,7 @@ import app.revanced.patches.ticktick.misc.themeunlock.fingerprints.SetThemeFinge
 
 @Patch
 @Name("unlock-themes")
-@Description("Unlocks all themes.")
+@Description("Unlocks all themes that are inaccessible until a certain level is reached.")
 @UnlockThemesCompatibility
 @Version("0.0.1")
 class UnlockProPatch : BytecodePatch(

src/main/kotlin/app/revanced/patches/twitter/misc/monochrome/annotations/MonochromeIconCompatibility.kt

@@ -1,8 +0,0 @@
-package app.revanced.patches.twitter.misc.monochrome.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.twitter.android")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class MonochromeIconCompatibility

src/main/kotlin/app/revanced/patches/twitter/misc/monochrome/patch/MonochromeIconPatch.kt

@@ -1,55 +0,0 @@
-package app.revanced.patches.twitter.misc.monochrome.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.twitter.misc.monochrome.annotations.MonochromeIconCompatibility
-import java.io.FileWriter
-import java.nio.file.Files
-
-@Patch
-@Name("monochrome-icon")
-@Description("Adds a monochrome icon.")
-@MonochromeIconCompatibility
-@Version("0.0.1")
-class MonochromeIconPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        val resDirectory = context["res"]
-        if (!resDirectory.isDirectory) return PatchResultError("The res folder can not be found.")
-
-        val mipmapV33Directory = resDirectory.resolve("mipmap-anydpi-v33")
-        if (!mipmapV33Directory.isDirectory) Files.createDirectories(mipmapV33Directory.toPath())
-
-        FileWriter(mipmapV33Directory.resolve("ic_launcher_twitter.xml")).use {
-            it.write(
-                "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
-                        "<adaptive-icon\n" +
-                        "  xmlns:android=\"http://schemas.android.com/apk/res/android\">\n" +
-                        "    <background android:drawable=\"@color/ic_launcher_background\" />\n" +
-                        "    <foreground android:drawable=\"@mipmap/ic_launcher_twitter_foreground\" />\n" +
-                        "    <monochrome android:drawable=\"@mipmap/ic_launcher_twitter_foreground\" />\n" +
-                        "</adaptive-icon>"
-            )
-        }
-
-        FileWriter(mipmapV33Directory.resolve("ic_launcher_twitter_round.xml")).use {
-            it.write(
-                "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
-                        "<adaptive-icon\n" +
-                        "  xmlns:android=\"http://schemas.android.com/apk/res/android\">\n" +
-                        "    <background android:drawable=\"@color/ic_launcher_background\" />\n" +
-                        "    <foreground android:drawable=\"@mipmap/ic_launcher_twitter_foreground\" />\n" +
-                        "    <monochrome android:drawable=\"@mipmap/ic_launcher_twitter_foreground\" />\n" +
-                        "</adaptive-icon>"
-            )
-        }
-
-        return PatchResultSuccess()
-    }
-}

src/main/kotlin/app/revanced/patches/youtube/ad/general/annotation/GeneralAdsCompatibility.kt

@@ -13,7 +13,8 @@ import app.revanced.patcher.annotation.Package
             "18.04.41",
             "18.05.32",
             "18.05.35",
-            "18.05.40"
+            "18.05.40",
+            "18.08.37"
         )
     )]
 )

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

@@ -13,7 +13,8 @@ import app.revanced.patcher.annotation.Package
             "18.04.41",
             "18.05.32",
             "18.05.35",
-            "18.05.40"
+            "18.05.40",
+            "18.08.37"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/annotation/CopyVideoUrlCompatibility.kt

@@ -13,7 +13,8 @@ import app.revanced.patcher.annotation.Package
             "18.04.41",
             "18.05.32",
             "18.05.35",
-            "18.05.40"
+            "18.05.40",
+            "18.08.37"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/annotation/DownloadsCompatibility.kt

@@ -13,7 +13,8 @@ import app.revanced.patcher.annotation.Package
             "18.04.41",
             "18.05.32",
             "18.05.35",
-            "18.05.40"
+            "18.05.40",
+            "18.08.37"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/annotation/SeekbarTappingCompatibility.kt

@@ -13,7 +13,8 @@ import app.revanced.patcher.annotation.Package
             "18.04.41",
             "18.05.32",
             "18.05.35",
-            "18.05.40"
+            "18.05.40",
+            "18.08.37"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/annotation/SwipeControlsCompatibility.kt

@@ -13,7 +13,8 @@ import app.revanced.patcher.annotation.Package
             "18.04.41",
             "18.05.32",
             "18.05.35",
-            "18.05.40"
+            "18.05.40",
+            "18.08.37"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/annotations/AutoCaptionsCompatibility.kt

@@ -13,7 +13,8 @@ import app.revanced.patcher.annotation.Package
             "18.04.41",
             "18.05.32",
             "18.05.35",
-            "18.05.40"
+            "18.05.40",
+            "18.08.37"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/annotations/HideButtonsCompatibility.kt

@@ -13,7 +13,8 @@ import app.revanced.patcher.annotation.Package
             "18.04.41",
             "18.05.32",
             "18.05.35",
-            "18.05.40"
+            "18.05.40",
+            "18.08.37"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/patch/HideButtonsPatch.kt

@@ -31,18 +31,11 @@ class HideButtonsPatch : ResourcePatch {
                 StringResource("revanced_hide_buttons_title", "Hide action buttons"),
                 listOf(
                     SwitchPreference(
-                        "revanced_hide_like_button",
+                        "revanced_hide_like_dislike_button",
-                        StringResource("revanced_hide_like_button_title", "Hide like button"),
+                        StringResource("revanced_hide_like_dislike_button_title", "Hide like and dislike buttons"),
                         false,
-                        StringResource("revanced_hide_like_button_summary_on", "Like button is hidden"),
+                        StringResource("revanced_hide_like_dislike_button_summary_on", "Like and dislike buttons are hidden"),
-                        StringResource("revanced_hide_like_button_summary_off", "Like button is shown")
+                        StringResource("revanced_hide_like_dislike_button_summary_off", "Like and dislike buttons are shown")
-                    ),
-                    SwitchPreference(
-                        "revanced_hide_dislike_button",
-                        StringResource("revanced_hide_dislike_button_title", "Hide dislike button"),
-                        false,
-                        StringResource("revanced_hide_dislike_button_summary_on", "Dislike button is hidden"),
-                        StringResource("revanced_hide_dislike_button_summary_off", "Dislike button is shown")
                     ),
                     SwitchPreference(
                         "revanced_hide_download_button",
@@ -59,18 +52,20 @@ class HideButtonsPatch : ResourcePatch {
                         StringResource("revanced_hide_playlist_button_summary_off", "Playlist button is shown")
                     ),
                     SwitchPreference(
-                        "revanced_hide_action_button",
+                        "revanced_hide_clip_button",
-                        StringResource("revanced_hide_action_button_title", "Hide create, clip and thanks buttons"),
+                        StringResource("revanced_hide_clip_button_title", "Hide clip button"),
-                        true,
+                        false,
-                        StringResource("revanced_hide_action_button_summary_on", "Buttons are hidden"),
+                        StringResource("revanced_hide_clip_button_summary_on", "Clip button is hidden"),
-                        StringResource("revanced_hide_action_button_summary_off", "Buttons are shown")
+                        StringResource("revanced_hide_clip_button_summary_off", "Clip button is shown"),
+                        StringResource("revanced_hide_clip_button_user_dialog_message",
+                            "Hiding the clip button might not work reliably. In the case it does not work, it can only be hidden by enabling \\'Hide all other action buttons\\'")
                     ),
                     SwitchPreference(
-                        "revanced_hide_share_button",
+                        "revanced_hide_action_buttons",
-                        StringResource("revanced_hide_share_button_title", "Hide share button"),
+                        StringResource("revanced_hide_action_buttons_title", "Hide all other action buttons"),
                         false,
-                        StringResource("revanced_hide_share_button_summary_on", "Share button is hidden"),
+                        StringResource("revanced_hide_action_buttons_summary_on", "Share, remix, thanks, shop, live chat buttons are hidden"),
-                        StringResource("revanced_hide_share_button_summaryoff", "Share button is shown")
+                        StringResource("revanced_hide_action_buttons_summary_off", "Share, remix, thanks, shop, live chat buttons are shown")
                     )
                 ),
                 StringResource("revanced_hide_buttons_summary", "Hide or show buttons under videos")

src/main/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/annotations/AutoplayButtonCompatibility.kt

@@ -13,7 +13,8 @@ import app.revanced.patcher.annotation.Package
             "18.04.41",
             "18.05.32",
             "18.05.35",
-            "18.05.40"
+            "18.05.40",
+            "18.08.37"
         )
     )]
 )

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

@@ -6,6 +6,7 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.extensions.instruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
@@ -20,6 +21,7 @@ import app.revanced.patches.youtube.layout.buttons.autoplay.fingerprints.LayoutC
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 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
@@ -66,12 +68,15 @@ class HideAutoplayButtonPatch : BytecodePatch(
 
             val jumpInstruction = layoutGenMethodInstructions[insertIndex + branchIndex] as Instruction
 
+            // can be clobbered because this register is overwritten after the injected code
+            val clobberRegister = (instruction(insertIndex) as OneRegisterInstruction).registerA
+
             addInstructions(
                 insertIndex,
                 """
                 invoke-static {}, Lapp/revanced/integrations/patches/HideAutoplayButtonPatch;->isButtonShown()Z
-                move-result v11
+                move-result v$clobberRegister
-                if-eqz v11, :hidden
+                if-eqz v$clobberRegister, :hidden
             """, listOf(ExternalLabel("hidden", jumpInstruction))
             )
         } ?: return LayoutConstructorFingerprint.toErrorResult()

src/main/kotlin/app/revanced/patches/youtube/layout/buttons/captions/annotations/HideCaptionsButtonCompatibility.kt

@@ -13,7 +13,8 @@ import app.revanced.patcher.annotation.Package
             "18.04.41",
             "18.05.32",
             "18.05.35",
-            "18.05.40"
+            "18.05.40",
+            "18.08.37"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/youtube/layout/buttons/pivotbar/shared/annotations/PivotBarCompatibility.kt

@@ -13,7 +13,8 @@ import app.revanced.patcher.annotation.Package
             "18.04.41",
             "18.05.32",
             "18.05.35",
-            "18.05.40"
+            "18.05.40",
+            "18.08.37"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/background/annotations/PlayerButtonBackgroundCompatibility.kt

@@ -12,7 +12,8 @@ import app.revanced.patcher.annotation.Package
             "18.04.41",
             "18.05.32",
             "18.05.35",
-            "18.05.40"
+            "18.05.40",
+            "18.08.37"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/annotations/AlbumCardsCompatibility.kt

@@ -13,7 +13,8 @@ import app.revanced.patcher.annotation.Package
             "18.04.41",
             "18.05.32",
             "18.05.35",
-            "18.05.40"
+            "18.05.40",
+            "18.08.37"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/youtube/layout/hide/artistcards/annotations/HideArtistCardCompatibility.kt

@@ -13,7 +13,8 @@ import app.revanced.patcher.annotation.Package
             "18.04.41",
             "18.05.32",
             "18.05.35",
-            "18.05.40"
+            "18.05.40",
+            "18.08.37"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/annotations/BreakingNewsCompatibility.kt

@@ -13,7 +13,8 @@ import app.revanced.patcher.annotation.Package
             "18.04.41",
             "18.05.32",
             "18.05.35",
-            "18.05.40"
+            "18.05.40",
+            "18.08.37"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/youtube/layout/hide/comments/annotations/CommentsCompatibility.kt

@@ -13,7 +13,8 @@ import app.revanced.patcher.annotation.Package
             "18.04.41",
             "18.05.32",
             "18.05.35",
-            "18.05.40"
+            "18.05.40",
+            "18.08.37"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/annotations/CrowdfundingBoxCompatibility.kt

@@ -13,7 +13,8 @@ import app.revanced.patcher.annotation.Package
             "18.04.41",
             "18.05.32",
             "18.05.35",
-            "18.05.40"
+            "18.05.40",
+            "18.08.37"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/bytecode/fingerprints/CrowdfundingBoxFingerprint.kt

@@ -7,12 +7,9 @@ import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
 
 object CrowdfundingBoxFingerprint : MethodFingerprint(
     opcodes = listOf(
-        Opcode.CONST_4,
-        Opcode.CONST,
         Opcode.INVOKE_VIRTUAL,
         Opcode.MOVE_RESULT_OBJECT,
         Opcode.IPUT_OBJECT,
-        Opcode.CONST,
     ),
     customFingerprint = { methodDef ->
         methodDef.implementation?.instructions?.any { instruction ->

src/main/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/bytecode/patch/CrowdfundingBoxPatch.kt

@@ -1,5 +1,6 @@
 package app.revanced.patches.youtube.layout.hide.crowdfundingbox.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
@@ -15,7 +16,7 @@ import app.revanced.patches.youtube.layout.hide.crowdfundingbox.annotations.Crow
 import app.revanced.patches.youtube.layout.hide.crowdfundingbox.bytecode.fingerprints.CrowdfundingBoxFingerprint
 import app.revanced.patches.youtube.layout.hide.crowdfundingbox.resource.patch.CrowdfundingBoxResourcePatch
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
 
 @Patch
 @DependsOn([IntegrationsPatch::class, CrowdfundingBoxResourcePatch::class])
@@ -29,18 +30,20 @@ class CrowdfundingBoxPatch : BytecodePatch(
     )
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
-        val crowdfundingBoxResult = CrowdfundingBoxFingerprint.result!!
+        CrowdfundingBoxFingerprint.result?.let {
-        val crowdfundingBoxMethod = crowdfundingBoxResult.mutableMethod
+            it.mutableMethod.apply {
+                val insertIndex = it.scanResult.patternScanResult!!.endIndex
+                val objectRegister = (instruction(insertIndex) as TwoRegisterInstruction).registerA
 
-        val moveResultObjectIndex =
+                addInstruction(insertIndex, "invoke-static {v$objectRegister}, $INTEGRATIONS_METHOD_DESCRIPTOR")
-            crowdfundingBoxResult.scanResult.patternScanResult!!.endIndex - 2
+            }
-
+        } ?: return CrowdfundingBoxFingerprint.toErrorResult()
-        crowdfundingBoxMethod.addInstruction(
-            moveResultObjectIndex + 1, """
-            invoke-static {v${(crowdfundingBoxMethod.instruction(moveResultObjectIndex) as OneRegisterInstruction).registerA}}, Lapp/revanced/integrations/patches/HideCrowdfundingBoxPatch;->hideCrowdfundingBox(Landroid/view/View;)V
-        """
-        )
 
         return PatchResultSuccess()
     }
+
+    private companion object {
+        const val INTEGRATIONS_METHOD_DESCRIPTOR =
+            "Lapp/revanced/integrations/patches/HideCrowdfundingBoxPatch;->hideCrowdfundingBox(Landroid/view/View;)V"
+    }
 }

src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/annotations/HideEndScreenCardsCompatibility.kt

@@ -13,7 +13,8 @@ import app.revanced.patcher.annotation.Package
             "18.04.41",
             "18.05.32",
             "18.05.35",
-            "18.05.40"
+            "18.05.40",
+            "18.08.37"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/youtube/layout/hide/floatingmicrophone/annotations/HideFloatingMicrophoneButtonCompatibility.kt

@@ -13,7 +13,8 @@ import app.revanced.patcher.annotation.Package
             "18.04.41",
             "18.05.32",
             "18.05.35",
-            "18.05.40"
+            "18.05.40",
+            "18.08.37"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/annotations/HideInfocardsCompatibility.kt

@@ -13,7 +13,8 @@ import app.revanced.patcher.annotation.Package
             "18.04.41",
             "18.05.32",
             "18.05.35",
-            "18.05.40"
+            "18.05.40",
+            "18.08.37"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/youtube/layout/hide/mixplaylists/annotations/MixPlaylistsPatchCompatibility.kt

@@ -13,7 +13,8 @@ import app.revanced.patcher.annotation.Package
             "18.04.41",
             "18.05.32",
             "18.05.35",
-            "18.05.40"
+            "18.05.40",
+            "18.08.37"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/youtube/layout/hide/personalinformation/annotations/HideEmailAddressCompatibility.kt

@@ -13,7 +13,8 @@ import app.revanced.patcher.annotation.Package
             "18.04.41",
             "18.05.32",
             "18.05.35",
-            "18.05.40"
+            "18.05.40",
+            "18.08.37"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/youtube/layout/hide/seekbar/annotations/HideSeekbarCompatibility.kt

@@ -13,7 +13,8 @@ import app.revanced.patcher.annotation.Package
             "18.04.41",
             "18.05.32",
             "18.05.35",
-            "18.05.40"
+            "18.05.40",
+            "18.08.37"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/youtube/layout/hide/time/annotations/HideTimeCompatibility.kt

@@ -13,7 +13,8 @@ import app.revanced.patcher.annotation.Package
             "18.04.41",
             "18.05.32",
             "18.05.35",
-            "18.05.40"
+            "18.05.40",
+            "18.08.37"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/youtube/layout/hide/watchinvr/annotations/WatchinVRCompatibility.kt

@@ -13,7 +13,8 @@ import app.revanced.patcher.annotation.Package
             "18.04.41",
             "18.05.32",
             "18.05.35",
-            "18.05.40"
+            "18.05.40",
+            "18.08.37"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/youtube/layout/hide/watermark/annotations/HideWaterwarkCompatibility.kt

@@ -13,7 +13,8 @@ import app.revanced.patcher.annotation.Package
             "18.04.41",
             "18.05.32",
             "18.05.35",
-            "18.05.40"
+            "18.05.40",
+            "18.08.37"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/youtube/layout/hidetimeandseekbar/annotations/HideTimeAndSeekbarCompatibility.kt

@@ -1,22 +0,0 @@
-package app.revanced.patches.youtube.layout.hidetimeandseekbar.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [Package(
-        "com.google.android.youtube", arrayOf(
-            "17.49.37", 
-            "18.03.36",
-            "18.03.42",
-            "18.04.35",
-            "18.04.41",
-            "18.05.32",
-            "18.05.35",
-            "18.05.40"
-        )
-    )]
-)
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
-internal annotation class HideTimeAndSeekbarCompatibility

src/main/kotlin/app/revanced/patches/youtube/layout/oldqualitylayout/annotations/OldQualityLayoutCompatibility.kt

@@ -13,7 +13,8 @@ import app.revanced.patcher.annotation.Package
             "18.04.41",
             "18.05.32",
             "18.05.35",
-            "18.05.40"
+            "18.05.40",
+            "18.08.37"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/youtube/layout/panels/fullscreen/remove/annotations/FullscreenPanelsCompatibility.kt

@@ -13,7 +13,8 @@ import app.revanced.patcher.annotation.Package
             "18.04.41",
             "18.05.32",
             "18.05.35",
-            "18.05.40"
+            "18.05.40",
+            "18.08.37"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/youtube/layout/panels/popup/annotations/PlayerPopupPanelsCompatibility.kt

@@ -13,7 +13,8 @@ import app.revanced.patcher.annotation.Package
             "18.04.41",
             "18.05.32",
             "18.05.35",
-            "18.05.40"
+            "18.05.40",
+            "18.08.37"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/annotations/ReturnYouTubeDislikeCompatibility.kt

@@ -3,19 +3,6 @@ package app.revanced.patches.youtube.layout.returnyoutubedislike.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
-@Compatibility(
+@Compatibility([Package("com.google.android.youtube", arrayOf("18.08.37"))])
-    [Package(
-        "com.google.android.youtube", arrayOf(
-            "17.49.37", 
-            "18.03.36",
-            "18.03.42",
-            "18.04.35",
-            "18.04.41",
-            "18.05.32",
-            "18.05.35",
-            "18.05.40"
-        )
-    )]
-)
 @Target(AnnotationTarget.CLASS)
 internal annotation class ReturnYouTubeDislikeCompatibility

src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/DislikeFingerprint.kt

@@ -1,11 +1,8 @@
 package app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints
 
-import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
 
 object DislikeFingerprint : MethodFingerprint(
     "V",
-    AccessFlags.PROTECTED or AccessFlags.CONSTRUCTOR,
     strings = listOf("like/dislike")
 )

src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/LikeFingerprint.kt

@@ -1,14 +1,11 @@
 package app.revanced.patches.youtube.layout.returnyoutubedislike.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
 
 
 @FuzzyPatternScanMethod(2)
 object LikeFingerprint : MethodFingerprint(
     "V",
-    AccessFlags.PROTECTED or AccessFlags.CONSTRUCTOR,
      strings = listOf("like/like")
 )

src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/RemoveLikeFingerprint.kt

@@ -1,11 +1,8 @@
 package app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints
 
-import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
 
 object RemoveLikeFingerprint : MethodFingerprint(
     "V",
-    AccessFlags.PROTECTED or AccessFlags.CONSTRUCTOR,
     strings = listOf("like/removelike")
 )

src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/ShortsTextComponentParentFingerprint.kt

@@ -10,11 +10,12 @@ object ShortsTextComponentParentFingerprint : MethodFingerprint(
     access = AccessFlags.PROTECTED or AccessFlags.FINAL,
     parameters = listOf("L", "L"),
     opcodes = listOf(
-        Opcode.IF_EQZ,
+        Opcode.INVOKE_STATIC,
-        Opcode.CONST_4,
+        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IF_EQ,
+        Opcode.GOTO,
-        Opcode.CONST_4,
+        Opcode.INVOKE_STATIC,
-        Opcode.IF_EQ,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
         Opcode.RETURN_VOID,
         Opcode.IGET_OBJECT,
         Opcode.CHECK_CAST,

src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/TextComponentAtomicReferenceFingerprint.kt

@@ -0,0 +1,34 @@
+package app.revanced.patches.youtube.layout.returnyoutubedislike.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
+
+/**
+ * Resolves against the same method that [TextComponentContextFingerprint] resolves to.
+ */
+object TextComponentAtomicReferenceFingerprint : MethodFingerprint(
+    returnType = "L",
+    access = AccessFlags.PROTECTED or AccessFlags.FINAL,
+    parameters = listOf("L"),
+    opcodes = listOf(
+        Opcode.MOVE_OBJECT, // available unused register
+        Opcode.MOVE_OBJECT_FROM16,
+        Opcode.MOVE_OBJECT_FROM16,
+        Opcode.MOVE_FROM16,
+        Opcode.INVOKE_VIRTUAL, // CharSequence atomic reference
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.CHECK_CAST,
+        Opcode.MOVE_OBJECT, // CharSequence reference, and control flow label. Insert code here.
+        Opcode.INVOKE_VIRTUAL_RANGE,
+        Opcode.MOVE_RESULT,
+        Opcode.IF_EQZ,
+        Opcode.INVOKE_VIRTUAL_RANGE,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.GOTO,
+        Opcode.CONST_4,
+        Opcode.INVOKE_VIRTUAL_RANGE,
+        Opcode.MOVE_RESULT_OBJECT,
+    )
+)

src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/TextComponentConstructorFingerprint.kt

@@ -0,0 +1,11 @@
+package app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints
+
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+
+object TextComponentConstructorFingerprint : MethodFingerprint(
+    access = AccessFlags.CONSTRUCTOR or AccessFlags.PRIVATE,
+    strings = listOf("TextComponent")
+)

src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/TextComponentContextFingerprint.kt

@@ -0,0 +1,24 @@
+package app.revanced.patches.youtube.layout.returnyoutubedislike.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
+
+/**
+ * Resolves against the same method that [TextComponentContextFingerprint] resolves to.
+ */
+object TextComponentContextFingerprint : MethodFingerprint(
+    returnType = "L",
+    access = AccessFlags.PROTECTED or AccessFlags.FINAL,
+    parameters = listOf("L"),
+    opcodes = listOf(
+        Opcode.IGET_OBJECT, // conversion context field name
+        Opcode.IGET_OBJECT,
+        Opcode.IGET_OBJECT,
+        Opcode.IGET_BOOLEAN,
+        Opcode.IGET,
+        Opcode.IGET,
+        Opcode.IGET,
+    )
+)

src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/TextComponentFingerprint.kt

@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints
-
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object TextComponentFingerprint : MethodFingerprint(
-    strings = listOf("com.google.android.apps.youtube.music")
-)

src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/TextComponentSpecParentFingerprint.kt

@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints
-
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object TextComponentSpecParentFingerprint : MethodFingerprint(
-    strings = listOf("TextComponentSpec: No converter for extension: ")
-)

src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/patch/ReturnYouTubeDislikePatch.kt

@@ -9,6 +9,7 @@ import app.revanced.patcher.data.toMethodWalker
 import app.revanced.patcher.extensions.MethodFingerprintExtensions.name
 import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.extensions.instruction
+import app.revanced.patcher.extensions.replaceInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
@@ -26,6 +27,8 @@ import app.revanced.patches.youtube.misc.playertype.patch.PlayerTypeHookPatch
 import app.revanced.patches.youtube.misc.video.videoid.patch.VideoIdPatch
 import org.jf.dexlib2.builder.instruction.BuilderInstruction35c
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
 
 @Patch
 @DependsOn(
@@ -42,7 +45,7 @@ import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 @Version("0.0.1")
 class ReturnYouTubeDislikePatch : BytecodePatch(
     listOf(
-        TextComponentSpecParentFingerprint,
+        TextComponentConstructorFingerprint,
         ShortsTextComponentParentFingerprint,
         LikeFingerprint,
         DislikeFingerprint,
@@ -50,13 +53,13 @@ class ReturnYouTubeDislikePatch : BytecodePatch(
     )
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
-        // region Inject newVideoLoaded event handler
+        // region Inject newVideoLoaded event handler to update dislikes when a new video is loaded.
 
         VideoIdPatch.injectCall("$INTEGRATIONS_PATCH_CLASS_DESCRIPTOR->newVideoLoaded(Ljava/lang/String;)V")
 
         // endregion
 
-        // region Hook interaction
+        // region Hook like/dislike/remove like button clicks to send votes to the API.
 
         listOf(
             LikeFingerprint.toPatch(Vote.LIKE),
@@ -76,29 +79,56 @@ class ReturnYouTubeDislikePatch : BytecodePatch(
 
         // endregion
 
-        // region Hook components
+        // region Hook creation of Spans and the cached lookup of them.
 
-        TextComponentFingerprint.also { it.resolve(context, TextComponentSpecParentFingerprint.result!!.classDef) }
+        // Alternatively the hook can be made at the creation of Spans in TextComponentSpec,
-            .result?.let {
+        // And it works in all situations except it fails to update the Span when the user dislikes,
-                with(it.mutableMethod) {
+        // since the underlying (likes only) text did not change.
-                    val createComponentMethod = this
+        // This hook handles all situations, as it's where the created Spans are stored and later reused.
+        TextComponentContextFingerprint.also {
+            it.resolve(
+                context,
+                TextComponentConstructorFingerprint.result!!.classDef
+            )
+        }.result?.also { result ->
+            if (!TextComponentAtomicReferenceFingerprint.resolve(context, result.method, result.classDef))
+                throw TextComponentAtomicReferenceFingerprint.toErrorResult()
+        }?.let { textComponentContextFingerprintResult ->
+            val conversionContextIndex = textComponentContextFingerprintResult
+                .scanResult.patternScanResult!!.startIndex
+            val atomicReferenceStartIndex = TextComponentAtomicReferenceFingerprint.result!!
+                .scanResult.patternScanResult!!.startIndex
 
-                    val conversionContextParam = 5
+            textComponentContextFingerprintResult.mutableMethod.apply {
-                    val textRefParam = createComponentMethod.parameters.size - 2
+                // Get the conversion context obfuscated field name, and the registers for the AtomicReference and CharSequence
-                    // Insert index must be 0, otherwise UI does not updated correctly in some situations
+                val conversionContextFieldName =
-                    // such as switching from full screen or when using previous/next overlay buttons.
+                    (instruction(conversionContextIndex) as ReferenceInstruction).reference.toString()
-                    val insertIndex = 0
+                val contextRegister = // any free register
+                    (instruction(atomicReferenceStartIndex) as TwoRegisterInstruction).registerB
+                val atomicReferenceRegister =
+                    (instruction(atomicReferenceStartIndex + 4) as BuilderInstruction35c).registerC
 
-                    createComponentMethod.addInstructions(
+                val insertIndex = atomicReferenceStartIndex + 7
-                        insertIndex,
+                val moveCharSequenceInstruction = instruction(insertIndex) as TwoRegisterInstruction
-                        """
+                val charSequenceRegister = moveCharSequenceInstruction.registerB
-                            move-object/from16 v7, p$conversionContextParam
+
-                            move-object/from16 v8, p$textRefParam
+                // Insert as first instructions at the control flow label.
-                            invoke-static {v7, v8}, $INTEGRATIONS_PATCH_CLASS_DESCRIPTOR->onComponentCreated(Ljava/lang/Object;Ljava/util/concurrent/atomic/AtomicReference;)V
+                // Must replace the existing instruction to preserve the label, and then insert the remaining instructions.
+                replaceInstruction(insertIndex, "move-object/from16 v$contextRegister, p0")
+                addInstructions(
+                    insertIndex + 1, """
+                        iget-object v$contextRegister, v$contextRegister, $conversionContextFieldName  # copy obfuscated context field into free register
+                        invoke-static {v$contextRegister, v$atomicReferenceRegister, v$charSequenceRegister}, $INTEGRATIONS_PATCH_CLASS_DESCRIPTOR->onLithoTextLoaded(Ljava/lang/Object;Ljava/util/concurrent/atomic/AtomicReference;Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+                        move-result-object v$charSequenceRegister
+                        move-object v${moveCharSequenceInstruction.registerA}, v${moveCharSequenceInstruction.registerB}  # original instruction at the insertion point
                     """
                 )
             }
-            } ?: return TextComponentFingerprint.toErrorResult()
+        } ?: return TextComponentContextFingerprint.toErrorResult()
+
+        // endregion
+
+        // region Hook for Short videos.
 
         ShortsTextComponentParentFingerprint.result?.let {
             context
@@ -111,22 +141,23 @@ class ReturnYouTubeDislikePatch : BytecodePatch(
                             return PatchResultError("Method signature did not match: $this $parameterTypes")
 
                         val insertIndex = implementation!!.instructions.size - 1
-
                         val spannedParameterRegister = (instruction(insertIndex) as OneRegisterInstruction).registerA
                         val parameter = (instruction(insertIndex - 2) as BuilderInstruction35c).reference
 
                         if (!parameter.toString().endsWith("Landroid/text/Spanned;"))
                             return PatchResultError("Method signature parameter did not match: $parameter")
 
-                        addInstructions(
+                        insertShorts(insertIndex, spannedParameterRegister)
-                            insertIndex,
-                            """
-                                invoke-static {v$spannedParameterRegister}, $INTEGRATIONS_PATCH_CLASS_DESCRIPTOR->onShortsComponentCreated(Landroid/text/Spanned;)Landroid/text/Spanned;
-                                move-result-object v$spannedParameterRegister
-                            """
-                        )
                     }
                 }
+
+            // Additional hook, called after user dislikes.
+            with(it.mutableMethod) {
+                val insertIndex = it.scanResult.patternScanResult!!.startIndex + 2
+                val overwriteRegister = (implementation!!.instructions.elementAt(insertIndex - 1)
+                        as OneRegisterInstruction).registerA
+                insertShorts(insertIndex, overwriteRegister)
+            }
         } ?: return ShortsTextComponentParentFingerprint.toErrorResult()
 
         // endregion
@@ -139,13 +170,20 @@ class ReturnYouTubeDislikePatch : BytecodePatch(
             "Lapp/revanced/integrations/patches/ReturnYouTubeDislikePatch;"
 
         private fun MethodFingerprint.toPatch(voteKind: Vote) = VotePatch(this, voteKind)
-    }
-
         private data class VotePatch(val fingerprint: MethodFingerprint, val voteKind: Vote)
-
         private enum class Vote(val value: Int) {
             LIKE(1),
             DISLIKE(-1),
             REMOVE_LIKE(0)
         }
+
+        private fun MutableMethod.insertShorts(index: Int, register: Int) {
+            addInstructions(
+                index, """
+                invoke-static {v$register}, $INTEGRATIONS_PATCH_CLASS_DESCRIPTOR->onShortsComponentCreated(Landroid/text/Spanned;)Landroid/text/Spanned;
+                move-result-object v$register
+            """
+            )
+        }
+    }
 }

src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/annotations/WideSearchbarCompatibility.kt

@@ -13,7 +13,8 @@ import app.revanced.patcher.annotation.Package
             "18.04.41",
             "18.05.32",
             "18.05.35",
-            "18.05.40"
+            "18.05.40",
+            "18.08.37"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/annotations/SponsorBlockCompatibility.kt

@@ -4,18 +4,7 @@ import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
 @Compatibility(
-    [Package(
+    [Package("com.google.android.youtube", arrayOf("18.08.37"))]
-        "com.google.android.youtube", arrayOf(
-            "17.49.37", 
-            "18.03.36",
-            "18.03.42",
-            "18.04.35",
-            "18.04.41",
-            "18.05.32",
-            "18.05.35",
-            "18.05.40"
-        )
-    )]
 )
 @Target(AnnotationTarget.CLASS)
 internal annotation class SponsorBlockCompatibility

src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/NextGenWatchLayoutFingerprint.kt

@@ -1,10 +0,0 @@
-package app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints
-
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.util.MethodUtil
-
-object NextGenWatchLayoutFingerprint : MethodFingerprint(
-    "V", // constructors return void, in favour of speed of matching, this fingerprint has been added
-    customFingerprint =  { methodDef -> MethodUtil.isConstructor(methodDef) && methodDef.parameterTypes.size == 3 && methodDef.definingClass.endsWith("NextGenWatchLayout;") }
-)

src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/patch/SponsorBlockBytecodePatch.kt

@@ -1,5 +1,6 @@
 package app.revanced.patches.youtube.layout.sponsorblock.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
@@ -22,6 +23,8 @@ import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
 import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlockCompatibility
 import app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints.*
 import app.revanced.patches.youtube.layout.sponsorblock.resource.patch.SponsorBlockResourcePatch
+import app.revanced.patches.youtube.misc.autorepeat.fingerprints.AutoRepeatFingerprint
+import app.revanced.patches.youtube.misc.autorepeat.fingerprints.AutoRepeatParentFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.playercontrols.bytecode.patch.PlayerControlsBytecodePatch
 import app.revanced.patches.youtube.misc.playertype.patch.PlayerTypeHookPatch
@@ -37,12 +40,14 @@ import org.jf.dexlib2.iface.reference.StringReference
 @Patch
 @DependsOn(
     dependencies = [
-        VideoInformationPatch::class, // updates video information and adds method to seek in video
-        PlayerControlsBytecodePatch::class,
-        PlayerTypeHookPatch::class,
         IntegrationsPatch::class,
+        VideoIdPatch::class,
+        // Required to skip segments on time.
+        VideoInformationPatch::class,
+        // Used to prevent SponsorBlock from running on Shorts because SponsorBlock does not yet support Shorts.
+        PlayerTypeHookPatch::class,
+        PlayerControlsBytecodePatch::class,
         SponsorBlockResourcePatch::class,
-        VideoIdPatch::class
     ]
 )
 @Name("sponsorblock")
@@ -52,39 +57,41 @@ import org.jf.dexlib2.iface.reference.StringReference
 class SponsorBlockBytecodePatch : BytecodePatch(
     listOf(
         SeekbarFingerprint,
-        NextGenWatchLayoutFingerprint,
         AppendTimeFingerprint,
         PlayerOverlaysLayoutInitFingerprint,
+        AutoRepeatParentFingerprint,
     )
 ) {
 
     private companion object {
-        const val INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR =
+        const val INTEGRATIONS_SEGMENT_PLAYBACK_CONTROLLER_CLASS_DESCRIPTOR =
-            "Lapp/revanced/integrations/sponsorblock/PlayerController;"
+            "Lapp/revanced/integrations/sponsorblock/SegmentPlaybackController;"
+        const val INTEGRATIONS_CREATE_SEGMENT_BUTTON_CONTROLLER_CLASS_DESCRIPTOR =
+            "Lapp/revanced/integrations/sponsorblock/ui/CreateSegmentButtonController;"
+        const val INTEGRATIONS_VOTING_BUTTON_CONTROLLER_CLASS_DESCRIPTOR =
+            "Lapp/revanced/integrations/sponsorblock/ui/VotingButtonController;"
+        const val INTEGRATIONS_SPONSORBLOCK_VIEW_CONTROLLER_CLASS_DESCRIPTOR =
+            "Lapp/revanced/integrations/sponsorblock/ui/SponsorBlockViewController;"
     }
 
     override fun execute(context: BytecodeContext): PatchResult {
         /*
-        Hook the video time methods
+         * Hook the video time methods
          */
         with(VideoInformationPatch) {
             videoTimeHook(
-                INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR,
+                INTEGRATIONS_SEGMENT_PLAYBACK_CONTROLLER_CLASS_DESCRIPTOR,
                 "setVideoTime"
             )
-            highPrecisionTimeHook(
-                INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR,
-                "setHighPrecisionVideoTime"
-            )
         }
 
         /*
-         Set current video id
+         * Set current video id
          */
-        VideoIdPatch.injectCall("$INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR->setCurrentVideoId(Ljava/lang/String;)V")
+        VideoIdPatch.injectCallBackgroundPlay("$INTEGRATIONS_SEGMENT_PLAYBACK_CONTROLLER_CLASS_DESCRIPTOR->setCurrentVideoId(Ljava/lang/String;)V")
 
         /*
-         Seekbar drawing
+         * Seekbar drawing
          */
         val seekbarSignatureResult = SeekbarFingerprint.result!!.let {
             SeekbarOnDrawFingerprint.apply { resolve(context, it.mutableClass) }
@@ -93,13 +100,13 @@ class SponsorBlockBytecodePatch : BytecodePatch(
         val seekbarMethodInstructions = seekbarMethod.implementation!!.instructions
 
         /*
-         Get the instance of the seekbar rectangle
+         * Get the instance of the seekbar rectangle
          */
         for ((index, instruction) in seekbarMethodInstructions.withIndex()) {
             if (instruction.opcode != Opcode.MOVE_OBJECT_FROM16) continue
             seekbarMethod.addInstruction(
                 index + 1,
-                "invoke-static/range {p0 .. p0}, $INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR->setSponsorBarRect(Ljava/lang/Object;)V"
+                "invoke-static/range {p0 .. p0}, $INTEGRATIONS_SEGMENT_PLAYBACK_CONTROLLER_CLASS_DESCRIPTOR->setSponsorBarRect(Ljava/lang/Object;)V"
             )
             break
         }
@@ -115,13 +122,13 @@ class SponsorBlockBytecodePatch : BytecodePatch(
             // set the thickness of the segment
             seekbarMethod.addInstruction(
                 insertIndex,
-                "invoke-static {v${invokeInstruction.registerC}}, $INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR->setSponsorBarThickness(I)V"
+                "invoke-static {v${invokeInstruction.registerC}}, $INTEGRATIONS_SEGMENT_PLAYBACK_CONTROLLER_CLASS_DESCRIPTOR->setSponsorBarThickness(I)V"
             )
             break
         }
 
         /*
-        Set rectangle absolute left and right positions
+         * Set rectangle absolute left and right positions
          */
         val drawRectangleInstructions = seekbarMethodInstructions.withIndex().filter { (_, instruction) ->
             instruction is ReferenceInstruction && (instruction.reference as? MethodReference)?.name == "drawRect"
@@ -136,15 +143,15 @@ class SponsorBlockBytecodePatch : BytecodePatch(
         // the reason for that is that we get the index, add instructions and then the offset would be wrong
         seekbarMethod.addInstruction(
             indexLeft + 1,
-            "invoke-static {v$rectangleLeftRegister}, $INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR->setSponsorBarAbsoluteLeft(Landroid/graphics/Rect;)V"
+            "invoke-static {v$rectangleLeftRegister}, $INTEGRATIONS_SEGMENT_PLAYBACK_CONTROLLER_CLASS_DESCRIPTOR->setSponsorBarAbsoluteLeft(Landroid/graphics/Rect;)V"
         )
         seekbarMethod.addInstruction(
             indexRight + 1,
-            "invoke-static {v$rectangleRightRegister}, $INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR->setSponsorBarAbsoluteRight(Landroid/graphics/Rect;)V"
+            "invoke-static {v$rectangleRightRegister}, $INTEGRATIONS_SEGMENT_PLAYBACK_CONTROLLER_CLASS_DESCRIPTOR->setSponsorBarAbsoluteRight(Landroid/graphics/Rect;)V"
         )
 
         /*
-        Draw segment
+         * Draw segment
          */
         val drawSegmentInstructionInsertIndex = (seekbarMethodInstructions.size - 1 - 2)
         val (canvasInstance, centerY) = (seekbarMethodInstructions[drawSegmentInstructionInsertIndex] as FiveRegisterInstruction).let {
@@ -152,11 +159,11 @@ class SponsorBlockBytecodePatch : BytecodePatch(
         }
         seekbarMethod.addInstruction(
             drawSegmentInstructionInsertIndex,
-            "invoke-static {v$canvasInstance, v$centerY}, $INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR->drawSponsorTimeBars(Landroid/graphics/Canvas;F)V"
+            "invoke-static {v$canvasInstance, v$centerY}, $INTEGRATIONS_SEGMENT_PLAYBACK_CONTROLLER_CLASS_DESCRIPTOR->drawSponsorTimeBars(Landroid/graphics/Canvas;F)V"
         )
 
         /*
-        Voting & Shield button
+         * Voting & Shield button
          */
         val controlsMethodResult = PlayerControlsBytecodePatch.showPlayerControlsFingerprintResult
 
@@ -181,8 +188,8 @@ class SponsorBlockBytecodePatch : BytecodePatch(
                         method.addInstructions(
                             moveResultInstructionIndex + 1, // insert right after moving the view to the register and use that register
                             """
-                                invoke-static {v$inflatedViewRegister}, Lapp/revanced/integrations/sponsorblock/ShieldButton;->initialize(Ljava/lang/Object;)V
+                                invoke-static {v$inflatedViewRegister}, $INTEGRATIONS_CREATE_SEGMENT_BUTTON_CONTROLLER_CLASS_DESCRIPTOR->initialize(Ljava/lang/Object;)V
-                                invoke-static {v$inflatedViewRegister}, Lapp/revanced/integrations/sponsorblock/VotingButton;->initialize(Ljava/lang/Object;)V
+                                invoke-static {v$inflatedViewRegister}, $INTEGRATIONS_VOTING_BUTTON_CONTROLLER_CLASS_DESCRIPTOR->initialize(Ljava/lang/Object;)V
                             """
                         )
                     }
@@ -193,8 +200,8 @@ class SponsorBlockBytecodePatch : BytecodePatch(
                         // change visibility of the buttons
                         invertVisibilityMethod.addInstructions(
                             0, """
-                                invoke-static {p1}, Lapp/revanced/integrations/sponsorblock/ShieldButton;->changeVisibilityNegatedImmediate(Z)V
+                                invoke-static {p1}, $INTEGRATIONS_CREATE_SEGMENT_BUTTON_CONTROLLER_CLASS_DESCRIPTOR->changeVisibilityNegatedImmediate(Z)V
-                                invoke-static {p1}, Lapp/revanced/integrations/sponsorblock/VotingButton;->changeVisibilityNegatedImmediate(Z)V
+                                invoke-static {p1}, $INTEGRATIONS_VOTING_BUTTON_CONTROLLER_CLASS_DESCRIPTOR->changeVisibilityNegatedImmediate(Z)V
                             """.trimIndent()
                         )
                     }
@@ -203,15 +210,8 @@ class SponsorBlockBytecodePatch : BytecodePatch(
         }
 
         // change visibility of the buttons
-        PlayerControlsBytecodePatch.injectVisibilityCheckCall("Lapp/revanced/integrations/sponsorblock/ShieldButton;->changeVisibility(Z)V")
+        PlayerControlsBytecodePatch.injectVisibilityCheckCall("$INTEGRATIONS_CREATE_SEGMENT_BUTTON_CONTROLLER_CLASS_DESCRIPTOR->changeVisibility(Z)V")
-        PlayerControlsBytecodePatch.injectVisibilityCheckCall("Lapp/revanced/integrations/sponsorblock/VotingButton;->changeVisibility(Z)V")
+        PlayerControlsBytecodePatch.injectVisibilityCheckCall("$INTEGRATIONS_VOTING_BUTTON_CONTROLLER_CLASS_DESCRIPTOR->changeVisibility(Z)V")
-
-        // set SegmentHelperLayout.context to the player layout instance
-        val instanceRegister = 0
-        NextGenWatchLayoutFingerprint.result!!.mutableMethod.addInstruction(
-            3, // after super call
-            "invoke-static/range {p$instanceRegister}, $INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR->addSkipSponsorView15(Landroid/view/View;)V"
-        )
 
         // append the new time to the player layout
         val appendTimeFingerprintResult = AppendTimeFingerprint.result!!
@@ -221,18 +221,18 @@ class SponsorBlockBytecodePatch : BytecodePatch(
 
         appendTimeFingerprintResult.mutableMethod.addInstructions(
             appendTimePatternScanStartIndex + 2, """
-                    invoke-static {v$targetRegister}, Lapp/revanced/integrations/sponsorblock/SponsorBlockUtils;->appendTimeWithoutSegments(Ljava/lang/String;)Ljava/lang/String;
+                    invoke-static {v$targetRegister}, $INTEGRATIONS_SEGMENT_PLAYBACK_CONTROLLER_CLASS_DESCRIPTOR->appendTimeWithoutSegments(Ljava/lang/String;)Ljava/lang/String;
                     move-result-object v$targetRegister
             """
         )
 
         // initialize the player controller
-        VideoInformationPatch.onCreateHook(INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR, "initialize")
+        VideoInformationPatch.onCreateHook(INTEGRATIONS_SEGMENT_PLAYBACK_CONTROLLER_CLASS_DESCRIPTOR, "initialize")
 
         // initialize the sponsorblock view
         PlayerOverlaysLayoutInitFingerprint.result!!.mutableMethod.addInstruction(
             6, // after inflating the view
-            "invoke-static {p0}, Lapp/revanced/integrations/sponsorblock/player/ui/SponsorBlockView;->initialize(Ljava/lang/Object;)V"
+            "invoke-static {p0}, $INTEGRATIONS_SPONSORBLOCK_VIEW_CONTROLLER_CLASS_DESCRIPTOR->initialize(Ljava/lang/Object;)V"
         )
 
         // get rectangle field name
@@ -244,7 +244,7 @@ class SponsorBlockBytecodePatch : BytecodePatch(
 
         // replace the "replaceMeWith*" strings
         context
-            .proxy(context.classes.first { it.type.endsWith("PlayerController;") })
+            .proxy(context.classes.first { it.type.endsWith("SegmentPlaybackController;") })
             .mutableClass
             .methods
             .find { it.name == "setSponsorBarRect" }
@@ -268,6 +268,18 @@ class SponsorBlockBytecodePatch : BytecodePatch(
                 }
             } ?: return PatchResultError("Could not find the method which contains the replaceMeWith* strings")
 
+
+        // The vote and create segment buttons automatically change their visibility when appropriate,
+        // but if buttons are showing when the end of the video is reached then they will not automatically hide.
+        // Add a hook to forcefully hide when the end of the video is reached.
+        AutoRepeatParentFingerprint.result ?: return AutoRepeatParentFingerprint.toErrorResult()
+        AutoRepeatFingerprint.also {
+            it.resolve(context, AutoRepeatParentFingerprint.result!!.classDef)
+        }.result?.mutableMethod?.addInstruction(
+            0,
+            "invoke-static {}, $INTEGRATIONS_SPONSORBLOCK_VIEW_CONTROLLER_CLASS_DESCRIPTOR->endOfVideoReached()V"
+        ) ?: return AutoRepeatFingerprint.toErrorResult()
+
         // TODO: isSBChannelWhitelisting implementation
 
         return PatchResultSuccess()

src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/resource/patch/SponsorBlockResourcePatch.kt

@@ -95,7 +95,7 @@ class SponsorBlockResourcePatch : ResourcePatch {
                 if (!(view.hasAttributes() && view.attributes.getNamedItem("android:id").nodeValue.endsWith("live_chat_overlay_button"))) continue
 
                 // voting button id from the voting button view from the youtube_controls_layout.xml host file
-                val votingButtonId = "@+id/voting_button"
+                val votingButtonId = "@+id/sb_voting_button"
 
                 view.attributes.getNamedItem("android:layout_toStartOf").nodeValue = votingButtonId
 

src/main/kotlin/app/revanced/patches/youtube/layout/spoofappversion/annotations/SpoofAppVersionCompatibility.kt

@@ -13,7 +13,8 @@ import app.revanced.patcher.annotation.Package
             "18.04.41",
             "18.05.32",
             "18.05.35",
-            "18.05.40"
+            "18.05.40",
+            "18.08.37"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/youtube/layout/spoofappversion/bytecode/patch/SpoofAppVersionPatch.kt

@@ -30,18 +30,17 @@ class SpoofAppVersionPatch : BytecodePatch(
         SpoofAppVersionFingerprint
     )
 ) {
-    companion object {
-        const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/SpoofAppVersionPatch"
-    }
-
     override fun execute(context: BytecodeContext): PatchResult {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
                 "revanced_spoof_app_version",
                 StringResource("revanced_spoof_app_version_title", "Spoof app version"),
                 false,
-                StringResource("revanced_spoof_app_version_summary_on", "Version spoofed to 17.30.34. If switched off, the old UI layout may remain until logging out or clearing app data"),
+                StringResource("revanced_spoof_app_version_summary_on", "Version spoofed to 17.30.34"),
-                StringResource("revanced_spoof_app_version_summary_off", "Version not spoofed")
+                StringResource("revanced_spoof_app_version_summary_off", "Version not spoofed"),
+                StringResource("revanced_spoof_app_version_user_dialog_message",
+                "App version will be spoofed to 17.30.34. This will give the old UI layout, but unknown side effects may occur."
+                        + " If later turned off, the old UI layout may remain until you log out or clear the app data.")
             )
         )
 
@@ -61,4 +60,8 @@ class SpoofAppVersionPatch : BytecodePatch(
 
         return PatchResultSuccess()
     }
+
+    private companion object {
+        const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/SpoofAppVersionPatch"
+    }
 }

src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/annotations/StartupShortsResetCompatibility.kt

@@ -13,7 +13,8 @@ import app.revanced.patcher.annotation.Package
             "18.04.41",
             "18.05.32",
             "18.05.35",
-            "18.05.40"
+            "18.05.40",
+            "18.08.37"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/annotations/TabletMiniPlayerCompatibility.kt

@@ -3,19 +3,6 @@ package app.revanced.patches.youtube.layout.tabletminiplayer.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
-@Compatibility(
+@Compatibility([Package("com.google.android.youtube", arrayOf("18.08.37"))])
-    [Package(
-        "com.google.android.youtube", arrayOf(
-            "17.49.37", 
-            "18.03.36",
-            "18.03.42",
-            "18.04.35",
-            "18.04.41",
-            "18.05.32",
-            "18.05.35",
-            "18.05.40"
-        )
-    )]
-)
 @Target(AnnotationTarget.CLASS)
 internal annotation class TabletMiniPlayerCompatibility

src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerDimensionsCalculatorFingerprint.kt

@@ -7,7 +7,7 @@ import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
 
-@FuzzyPatternScanMethod(2) // TODO: Find a good threshold value
+@FuzzyPatternScanMethod(2)
 object MiniPlayerDimensionsCalculatorFingerprint : MethodFingerprint(
     "V",
     AccessFlags.PUBLIC or AccessFlags.FINAL,

src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerOverrideParentFingerprint.kt

@@ -0,0 +1,13 @@
+package app.revanced.patches.youtube.layout.tabletminiplayer.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+
+
+object MiniPlayerOverrideParentFingerprint : MethodFingerprint(
+    returnType = "L",
+    access = AccessFlags.PUBLIC or AccessFlags.STATIC,
+    parameters = listOf("L"),
+    strings = listOf("VIDEO_QUALITIES_QUICK_MENU_BOTTOM_SHEET_FRAGMENT")
+)

src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/patch/TabletMiniPlayerPatch.kt

@@ -1,5 +1,6 @@
 package app.revanced.patches.youtube.layout.tabletminiplayer.patch
 
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
@@ -16,10 +17,7 @@ import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.shared.settings.preference.impl.StringResource
 import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
 import app.revanced.patches.youtube.layout.tabletminiplayer.annotations.TabletMiniPlayerCompatibility
-import app.revanced.patches.youtube.layout.tabletminiplayer.fingerprints.MiniPlayerDimensionsCalculatorFingerprint
+import app.revanced.patches.youtube.layout.tabletminiplayer.fingerprints.*
-import app.revanced.patches.youtube.layout.tabletminiplayer.fingerprints.MiniPlayerOverrideFingerprint
-import app.revanced.patches.youtube.layout.tabletminiplayer.fingerprints.MiniPlayerOverrideNoContextFingerprint
-import app.revanced.patches.youtube.layout.tabletminiplayer.fingerprints.MiniPlayerResponseModelSizeCheckFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
@@ -33,7 +31,8 @@ import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 class TabletMiniPlayerPatch : BytecodePatch(
     listOf(
         MiniPlayerDimensionsCalculatorFingerprint,
-        MiniPlayerResponseModelSizeCheckFingerprint
+        MiniPlayerResponseModelSizeCheckFingerprint,
+        MiniPlayerOverrideParentFingerprint
     )
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
@@ -47,33 +46,42 @@ class TabletMiniPlayerPatch : BytecodePatch(
             )
         )
 
-        // first resolve the fingerprints via the parent fingerprint
+        // First resolve the fingerprints via the parent fingerprint.
         val miniPlayerClass = MiniPlayerDimensionsCalculatorFingerprint.result!!.classDef
 
         /*
-         * no context parameter method
+         * No context parameter method.
          */
         MiniPlayerOverrideNoContextFingerprint.resolve(context, miniPlayerClass)
         val (method, _, parameterRegister) = MiniPlayerOverrideNoContextFingerprint.addProxyCall()
-        // - 1 means to insert before the return instruction
+
+        // Insert right before the return instruction.
         val secondInsertIndex = method.implementation!!.instructions.size - 1
-        method.insertOverride(secondInsertIndex, parameterRegister /** same register used to return **/)
+        method.insertOverride(
+            secondInsertIndex, parameterRegister
+            /** same register used to return **/
+        )
 
         /*
-         * method with context parameter
+         * Method with context parameter.
          */
-        MiniPlayerOverrideFingerprint.resolve(context, miniPlayerClass)
+        MiniPlayerOverrideParentFingerprint.result?.let {
-        val (_, _, _) = MiniPlayerOverrideFingerprint.addProxyCall()
+            if (!MiniPlayerOverrideFingerprint.resolve(context, it.classDef))
+                return MiniPlayerOverrideFingerprint.toErrorResult()
+
+            MiniPlayerOverrideFingerprint.addProxyCall()
+
+        } ?: return MiniPlayerOverrideParentFingerprint.toErrorResult()
 
         /*
-         * size check return value override
+         * Size check return value override.
          */
-        val (_, _, _) = MiniPlayerResponseModelSizeCheckFingerprint.addProxyCall()
+        MiniPlayerResponseModelSizeCheckFingerprint.addProxyCall()
 
         return PatchResultSuccess()
     }
 
-    // helper methods
+    // Helper methods.
     private companion object {
         fun MethodFingerprint.addProxyCall(): Triple<MutableMethod, Int, Int> {
             val (method, scanIndex, parameterRegister) = this.unwrap()

src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/annotations/WideSearchbarCompatibility.kt

@@ -1,22 +0,0 @@
-package app.revanced.patches.youtube.layout.widesearchbar.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [Package(
-        "com.google.android.youtube", arrayOf(
-            "17.49.37", 
-            "18.03.36",
-            "18.03.42",
-            "18.04.35",
-            "18.04.41",
-            "18.05.32",
-            "18.05.35",
-            "18.05.40"
-        )
-    )]
-)
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
-internal annotation class WideSearchbarCompatibility

src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/annotations/AutoRepeatCompatibility.kt

@@ -13,7 +13,8 @@ import app.revanced.patcher.annotation.Package
             "18.04.41",
             "18.05.32",
             "18.05.35",
-            "18.05.40"
+            "18.05.40",
+            "18.08.37"
         )
     )]
 )

src/main/kotlin/app/revanced/patches/youtube/misc/debugging/patch/DebuggingPatch.kt

@@ -11,15 +11,16 @@ import app.revanced.patches.shared.settings.preference.impl.StringResource
 import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
 import app.revanced.patches.youtube.misc.debugging.annotations.DebuggingCompatibility
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.all.misc.debugging.patch.EnableAndroidDebuggingPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import org.w3c.dom.Element
 
 @Patch
-@Name("debugging")
+@Name("enable-debugging")
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
+@DependsOn([IntegrationsPatch::class, SettingsPatch::class, EnableAndroidDebuggingPatch::class])
 @Description("Adds debugging options.")
 @DebuggingCompatibility
-@Version("0.0.1")
+@Version("0.0.2")
 class DebuggingPatch : ResourcePatch {
     override fun execute(context: ResourceContext): PatchResult {
         SettingsPatch.PreferenceScreen.MISC.addPreferences(
@@ -52,36 +53,18 @@ class DebuggingPatch : ResourcePatch {
                         ),
                         true,
                         StringResource("revanced_debug_toast_on_error_summary_on", "Toast shown if error occurs"),
-                        StringResource("revanced_debug_toast_on_error_summary_off", "Toast not shown if error occurs")
+                        StringResource("revanced_debug_toast_on_error_summary_off", "Toast not shown if error occurs"),
+                        StringResource("revanced_debug_toast_on_error_user_dialog_message",
+                            "Turning off error toasts hides all ReVanced error notifications." +
+                                    " This includes hiding normal network connection timeouts, " +
+                                    "but also hides notification of any unexpected and more serious errors."
+                        )
                     ),
                 ),
                 StringResource("revanced_debug_summary", "Enable or disable debugging options")
             )
         )
 
-        if (debuggable == true) {
-            context.xmlEditor["AndroidManifest.xml"].use { dom ->
-                val applicationNode = dom
-                    .file
-                    .getElementsByTagName("application")
-                    .item(0) as Element
-
-                // set application as debuggable
-                applicationNode.setAttribute("android:debuggable", "true")
-            }
-        }
-
         return PatchResultSuccess()
     }
-
-    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.",
-            )
-        )
-    }
 }