chore(release): 4.14.2-dev.2 [skip ci]

## [4.14.2-dev.2](https://github.com/ReVanced/revanced-patches/compare/v4.14.2-dev.1...v4.14.2-dev.2) (2024-09-21)

### Bug Fixes

* **YouTube - Spoof video streams:** Change default client type to Android VR ([a104eea](a104eeaf68))
* **YouTube - Spoof video streams:** Change default client type to Android VR ([#3672](https://github.com/ReVanced/revanced-patches/issues/3672)) ([e8cb6ee](e8cb6ee028))

CHANGELOG.md

@@ -1,3 +1,369 @@
+## [4.14.2-dev.2](https://github.com/ReVanced/revanced-patches/compare/v4.14.2-dev.1...v4.14.2-dev.2) (2024-09-21)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof video streams:** Change default client type to Android VR ([74c8637](https://github.com/ReVanced/revanced-patches/commit/74c8637943347078955f51325bc6af92a35d4463))
+* **YouTube - Spoof video streams:** Change default client type to Android VR ([#3672](https://github.com/ReVanced/revanced-patches/issues/3672)) ([a3306f6](https://github.com/ReVanced/revanced-patches/commit/a3306f6717a09b734354f00363a96abad0ae14e7))
+
+## [4.14.2-dev.1](https://github.com/ReVanced/revanced-patches/compare/v4.14.1...v4.14.2-dev.1) (2024-09-21)
+
+
+### Bug Fixes
+
+* **TikTok - Playback speed:** Prevent crash by fixing invalid patch ([82d53cb](https://github.com/ReVanced/revanced-patches/commit/82d53cbc3bbfa585ba4337fdfaec9f0f19c802e6))
+* **TikTok - Settings:** Prevent crash by fixing invalid patch ([8074032](https://github.com/ReVanced/revanced-patches/commit/8074032fad3eff1c03296a882d2e2820da99b592))
+* **Twitter - Open links with app chooser:** Constrain patch to last working version `10.48.0-release` ([b9955d5](https://github.com/ReVanced/revanced-patches/commit/b9955d5ff6e456593b01f0f25d80ff660d02082a))
+
+## [4.14.1](https://github.com/ReVanced/revanced-patches/compare/v4.14.0...v4.14.1) (2024-09-18)
+
+
+### Bug Fixes
+
+* **YouTube - Check environment:** Only use fields available since Android 8 ([#3655](https://github.com/ReVanced/revanced-patches/issues/3655)) ([4413533](https://github.com/ReVanced/revanced-patches/commit/441353306572340131030e1c4fee1ab6acb63cd9))
+
+## [4.14.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v4.14.0...v4.14.1-dev.1) (2024-09-18)
+
+
+### Bug Fixes
+
+* **YouTube - Check environment:** Only use fields available since Android 8 ([#3655](https://github.com/ReVanced/revanced-patches/issues/3655)) ([4413533](https://github.com/ReVanced/revanced-patches/commit/441353306572340131030e1c4fee1ab6acb63cd9))
+
+# [4.14.0](https://github.com/ReVanced/revanced-patches/compare/v4.13.3...v4.14.0) (2024-09-18)
+
+
+### Bug Fixes
+
+* **Pixiv - Hide ads:** Fix for latest version ([#3616](https://github.com/ReVanced/revanced-patches/issues/3616)) ([98956e8](https://github.com/ReVanced/revanced-patches/commit/98956e8f1a41347bb435720bbf984969469a7110))
+* **Soundcloud - Hide ads:** Support latest version ([#3628](https://github.com/ReVanced/revanced-patches/issues/3628)) ([66e7e33](https://github.com/ReVanced/revanced-patches/commit/66e7e33efce9b702fdfcc2b9803e9da8491c1f08))
+* **SwissID:** Rename `Remove Google Play Integrity Integrity check` to `Remove Google Play Integrity check` ([#3558](https://github.com/ReVanced/revanced-patches/issues/3558)) ([0f5a771](https://github.com/ReVanced/revanced-patches/commit/0f5a771a5cff5684b4a8fd317f4938fe2cf3cbbe))
+* **YouTube - ReturnYouTubeDislike:** Show estimated like count for videos with hidden likes ([#3601](https://github.com/ReVanced/revanced-patches/issues/3601)) ([005be82](https://github.com/ReVanced/revanced-patches/commit/005be82d71b2a42387b1b57035930b20f4663794))
+* **YouTube - SponsorBlock:** Add summary text to 'view my segments' button ([df80b9f](https://github.com/ReVanced/revanced-patches/commit/df80b9f92f0d981b9a40b7756d74f8ccc3dcb1e9))
+* **YouTube - SponsorBlock:** Handle if the user enters an invalid number into any SB settings ([37b3dd1](https://github.com/ReVanced/revanced-patches/commit/37b3dd1e789f8bb16fa1b9dd582e39c89dbe730c))
+* **YouTube:** Fix issues related to playback by replace streaming data ([#3582](https://github.com/ReVanced/revanced-patches/issues/3582)) ([dfa94d7](https://github.com/ReVanced/revanced-patches/commit/dfa94d70f65150d6ef24ea6378b8e6a317055186))
+
+
+### Features
+
+* Add `Change data directory location` patch ([#3602](https://github.com/ReVanced/revanced-patches/issues/3602)) ([5998029](https://github.com/ReVanced/revanced-patches/commit/59980292809cc0626bf49a160eeb05a1523c4eda))
+* Add `Check environment` patch ([#3610](https://github.com/ReVanced/revanced-patches/issues/3610)) ([fbcbdaf](https://github.com/ReVanced/revanced-patches/commit/fbcbdafa4938a35b5fdec46aae7b250a84b9c139))
+* **Duolingo:** Add `Disable ads` and `Enable debug menu` patch ([#3422](https://github.com/ReVanced/revanced-patches/issues/3422)) ([d0a8599](https://github.com/ReVanced/revanced-patches/commit/d0a8599f76ce653e5d7c98069ad3c58b9ab9c5eb))
+* **Sync for Reddit:** Add `Fix /user/ endpoint` patch ([46d11f3](https://github.com/ReVanced/revanced-patches/commit/46d11f3530fcdae9ed08b7e93aac235638a92dff))
+* **Sync for Reddit:** Rename patch to `Use /user/ endpoint` ([98ead49](https://github.com/ReVanced/revanced-patches/commit/98ead493380932cb105530f4ba992673fd364d82))
+* **YouTube - Hide Shorts components:** Hide 'Use this sound' button ([#3647](https://github.com/ReVanced/revanced-patches/issues/3647)) ([33fc090](https://github.com/ReVanced/revanced-patches/commit/33fc09061431d4aa457d743c09a0de31ec566df1))
+* **YouTube - Keyword filter:** Add syntax to match whole keywords and not substrings ([#3592](https://github.com/ReVanced/revanced-patches/issues/3592)) ([f5fb351](https://github.com/ReVanced/revanced-patches/commit/f5fb3512cfafe214ba6a6d25ba0825ae1884a0ff))
+* **YouTube - Spoof client:** Allow forcing AVC codec with iOS ([#3570](https://github.com/ReVanced/revanced-patches/issues/3570)) ([1a49d1f](https://github.com/ReVanced/revanced-patches/commit/1a49d1f3c2a343d05d0abc07c143add486246fd0))
+* **YouTube Music:** Make working patches compatible with latest versions ([#3556](https://github.com/ReVanced/revanced-patches/issues/3556)) ([12f6f19](https://github.com/ReVanced/revanced-patches/commit/12f6f1966ad04631451940f7b64d785c3ef481a0))
+* **YouTube:** Add donation link to settings about screen ([#3626](https://github.com/ReVanced/revanced-patches/issues/3626)) ([0684ab5](https://github.com/ReVanced/revanced-patches/commit/0684ab5f183631de5720352049cfd293daa58eb0))
+
+# [4.14.0-dev.15](https://github.com/ReVanced/revanced-patches/compare/v4.14.0-dev.14...v4.14.0-dev.15) (2024-09-17)
+
+
+### Bug Fixes
+
+* **YouTube:** Fix issues related to playback by replace streaming data ([#3582](https://github.com/ReVanced/revanced-patches/issues/3582)) ([dfa94d7](https://github.com/ReVanced/revanced-patches/commit/dfa94d70f65150d6ef24ea6378b8e6a317055186))
+
+# [4.14.0-dev.14](https://github.com/ReVanced/revanced-patches/compare/v4.14.0-dev.13...v4.14.0-dev.14) (2024-09-17)
+
+
+### Features
+
+* **YouTube Music:** Make working patches compatible with latest versions ([#3556](https://github.com/ReVanced/revanced-patches/issues/3556)) ([12f6f19](https://github.com/ReVanced/revanced-patches/commit/12f6f1966ad04631451940f7b64d785c3ef481a0))
+
+# [4.14.0-dev.13](https://github.com/ReVanced/revanced-patches/compare/v4.14.0-dev.12...v4.14.0-dev.13) (2024-09-17)
+
+
+### Features
+
+* **YouTube - Hide Shorts components:** Hide 'Use this sound' button ([#3647](https://github.com/ReVanced/revanced-patches/issues/3647)) ([33fc090](https://github.com/ReVanced/revanced-patches/commit/33fc09061431d4aa457d743c09a0de31ec566df1))
+
+# [4.14.0-dev.12](https://github.com/ReVanced/revanced-patches/compare/v4.14.0-dev.11...v4.14.0-dev.12) (2024-09-14)
+
+
+### Bug Fixes
+
+* **Soundcloud - Hide ads:** Support latest version ([#3628](https://github.com/ReVanced/revanced-patches/issues/3628)) ([66e7e33](https://github.com/ReVanced/revanced-patches/commit/66e7e33efce9b702fdfcc2b9803e9da8491c1f08))
+
+# [4.14.0-dev.11](https://github.com/ReVanced/revanced-patches/compare/v4.14.0-dev.10...v4.14.0-dev.11) (2024-09-12)
+
+
+### Features
+
+* **Sync for Reddit:** Rename patch to `Use /user/ endpoint` ([98ead49](https://github.com/ReVanced/revanced-patches/commit/98ead493380932cb105530f4ba992673fd364d82))
+
+# [4.14.0-dev.10](https://github.com/ReVanced/revanced-patches/compare/v4.14.0-dev.9...v4.14.0-dev.10) (2024-09-12)
+
+
+### Features
+
+* **Sync for Reddit:** Add `Fix /user/ endpoint` patch ([46d11f3](https://github.com/ReVanced/revanced-patches/commit/46d11f3530fcdae9ed08b7e93aac235638a92dff))
+
+# [4.14.0-dev.9](https://github.com/ReVanced/revanced-patches/compare/v4.14.0-dev.8...v4.14.0-dev.9) (2024-09-09)
+
+
+### Features
+
+* **YouTube:** Add donation link to settings about screen ([#3626](https://github.com/ReVanced/revanced-patches/issues/3626)) ([0684ab5](https://github.com/ReVanced/revanced-patches/commit/0684ab5f183631de5720352049cfd293daa58eb0))
+
+# [4.14.0-dev.8](https://github.com/ReVanced/revanced-patches/compare/v4.14.0-dev.7...v4.14.0-dev.8) (2024-09-09)
+
+
+### Bug Fixes
+
+* **YouTube - SponsorBlock:** Add summary text to 'view my segments' button ([df80b9f](https://github.com/ReVanced/revanced-patches/commit/df80b9f92f0d981b9a40b7756d74f8ccc3dcb1e9))
+
+# [4.14.0-dev.7](https://github.com/ReVanced/revanced-patches/compare/v4.14.0-dev.6...v4.14.0-dev.7) (2024-09-06)
+
+
+### Features
+
+* Add `Check environment` patch ([#3610](https://github.com/ReVanced/revanced-patches/issues/3610)) ([fbcbdaf](https://github.com/ReVanced/revanced-patches/commit/fbcbdafa4938a35b5fdec46aae7b250a84b9c139))
+
+# [4.14.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v4.14.0-dev.5...v4.14.0-dev.6) (2024-09-06)
+
+
+### Features
+
+* Add `Change data directory location` patch ([#3602](https://github.com/ReVanced/revanced-patches/issues/3602)) ([5998029](https://github.com/ReVanced/revanced-patches/commit/59980292809cc0626bf49a160eeb05a1523c4eda))
+
+# [4.14.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v4.14.0-dev.4...v4.14.0-dev.5) (2024-09-06)
+
+
+### Bug Fixes
+
+* **Pixiv - Hide ads:** Fix for latest version ([#3616](https://github.com/ReVanced/revanced-patches/issues/3616)) ([98956e8](https://github.com/ReVanced/revanced-patches/commit/98956e8f1a41347bb435720bbf984969469a7110))
+
+# [4.14.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v4.14.0-dev.3...v4.14.0-dev.4) (2024-09-01)
+
+
+### Bug Fixes
+
+* **YouTube - ReturnYouTubeDislike:** Show estimated like count for videos with hidden likes ([#3601](https://github.com/ReVanced/revanced-patches/issues/3601)) ([005be82](https://github.com/ReVanced/revanced-patches/commit/005be82d71b2a42387b1b57035930b20f4663794))
+
+# [4.14.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v4.14.0-dev.2...v4.14.0-dev.3) (2024-08-30)
+
+
+### Features
+
+* **YouTube - Keyword filter:** Add syntax to match whole keywords and not substrings ([#3592](https://github.com/ReVanced/revanced-patches/issues/3592)) ([f5fb351](https://github.com/ReVanced/revanced-patches/commit/f5fb3512cfafe214ba6a6d25ba0825ae1884a0ff))
+
+# [4.14.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v4.14.0-dev.1...v4.14.0-dev.2) (2024-08-24)
+
+
+### Features
+
+* **Duolingo:** Add `Disable ads` and `Enable debug menu` patch ([#3422](https://github.com/ReVanced/revanced-patches/issues/3422)) ([d0a8599](https://github.com/ReVanced/revanced-patches/commit/d0a8599f76ce653e5d7c98069ad3c58b9ab9c5eb))
+
+# [4.14.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v4.13.4-dev.2...v4.14.0-dev.1) (2024-08-22)
+
+
+### Features
+
+* **YouTube - Spoof client:** Allow forcing AVC codec with iOS ([#3570](https://github.com/ReVanced/revanced-patches/issues/3570)) ([1a49d1f](https://github.com/ReVanced/revanced-patches/commit/1a49d1f3c2a343d05d0abc07c143add486246fd0))
+
+## [4.13.4-dev.2](https://github.com/ReVanced/revanced-patches/compare/v4.13.4-dev.1...v4.13.4-dev.2) (2024-08-20)
+
+
+### Bug Fixes
+
+* **YouTube - SponsorBlock:** Handle if the user enters an invalid number into any SB settings ([37b3dd1](https://github.com/ReVanced/revanced-patches/commit/37b3dd1e789f8bb16fa1b9dd582e39c89dbe730c))
+
+## [4.13.4-dev.1](https://github.com/ReVanced/revanced-patches/compare/v4.13.3...v4.13.4-dev.1) (2024-08-18)
+
+
+### Bug Fixes
+
+* **SwissID:** Rename `Remove Google Play Integrity Integrity check` to `Remove Google Play Integrity check` ([#3558](https://github.com/ReVanced/revanced-patches/issues/3558)) ([0f5a771](https://github.com/ReVanced/revanced-patches/commit/0f5a771a5cff5684b4a8fd317f4938fe2cf3cbbe))
+
+## [4.13.3](https://github.com/ReVanced/revanced-patches/compare/v4.13.2...v4.13.3) (2024-08-15)
+
+
+### Bug Fixes
+
+* **YouTube:** Remove translated string that breaks patching ([a48c2db](https://github.com/ReVanced/revanced-patches/commit/a48c2db53d84767c8fd5d569f9ce1c46c2bfd9a1))
+
+## [4.13.3-dev.1](https://github.com/ReVanced/revanced-patches/compare/v4.13.2...v4.13.3-dev.1) (2024-08-15)
+
+
+### Bug Fixes
+
+* **YouTube:** Remove translated string that breaks patching ([a48c2db](https://github.com/ReVanced/revanced-patches/commit/a48c2db53d84767c8fd5d569f9ce1c46c2bfd9a1))
+
+## [4.13.2](https://github.com/ReVanced/revanced-patches/compare/v4.13.1...v4.13.2) (2024-08-15)
+
+
+### Bug Fixes
+
+* **YouTube - GmsCore Support:** Fix patch exception by using correct patch offset ([#3543](https://github.com/ReVanced/revanced-patches/issues/3543)) ([b2b8454](https://github.com/ReVanced/revanced-patches/commit/b2b8454aa992bcb217fb03eb4de5532e0a9bd354))
+
+## [4.13.2-dev.1](https://github.com/ReVanced/revanced-patches/compare/v4.13.1...v4.13.2-dev.1) (2024-08-15)
+
+
+### Bug Fixes
+
+* **YouTube - GmsCore Support:** Fix patch exception by using correct patch offset ([#3543](https://github.com/ReVanced/revanced-patches/issues/3543)) ([b2b8454](https://github.com/ReVanced/revanced-patches/commit/b2b8454aa992bcb217fb03eb4de5532e0a9bd354))
+
+## [4.13.1](https://github.com/ReVanced/revanced-patches/compare/v4.13.0...v4.13.1) (2024-08-15)
+
+
+### Bug Fixes
+
+* **YouTube - Check watch history domain name resolution:** Add compatibility field ([6c598f0](https://github.com/ReVanced/revanced-patches/commit/6c598f084ed90ee1318e4c66d8c1751c797b8e3b))
+
+## [4.13.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v4.13.0...v4.13.1-dev.1) (2024-08-15)
+
+
+### Bug Fixes
+
+* **YouTube - Check watch history domain name resolution:** Add compatibility field ([6c598f0](https://github.com/ReVanced/revanced-patches/commit/6c598f084ed90ee1318e4c66d8c1751c797b8e3b))
+
+# [4.13.0](https://github.com/ReVanced/revanced-patches/compare/v4.12.0...v4.13.0) (2024-08-15)
+
+
+### Bug Fixes
+
+* **YouTube - GmsCore support:** Fix notifications not working by using the correct permissions ([19ddae2](https://github.com/ReVanced/revanced-patches/commit/19ddae2d15e513e18eb1556c468cd94bd197685b))
+
+
+### Features
+
+* **Google Photos:** Add `Spoof features` patch ([#3459](https://github.com/ReVanced/revanced-patches/issues/3459)) ([7c218cd](https://github.com/ReVanced/revanced-patches/commit/7c218cd168aa72eb99bcb47d12dfa45616e8ad88))
+* **SCB Easy:** Remove broken `Remove debugging detection` patch ([#3518](https://github.com/ReVanced/revanced-patches/issues/3518)) ([f4e23cb](https://github.com/ReVanced/revanced-patches/commit/f4e23cbb8a24638318d8cee20a1991c51855d9d2))
+* **YouTube:** Add `Check watch history domain name resolution` patch ([#3537](https://github.com/ReVanced/revanced-patches/issues/3537)) ([2af1425](https://github.com/ReVanced/revanced-patches/commit/2af142525cda07a131335faadd4b3889979fd077))
+
+# [4.13.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v4.13.0-dev.1...v4.13.0-dev.2) (2024-08-15)
+
+
+### Features
+
+* **YouTube:** Add `Check watch history domain name resolution` patch ([#3537](https://github.com/ReVanced/revanced-patches/issues/3537)) ([2af1425](https://github.com/ReVanced/revanced-patches/commit/2af142525cda07a131335faadd4b3889979fd077))
+
+# [4.13.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v4.12.1-dev.1...v4.13.0-dev.1) (2024-08-15)
+
+
+### Features
+
+* **Google Photos:** Add `Spoof features` patch ([#3459](https://github.com/ReVanced/revanced-patches/issues/3459)) ([7c218cd](https://github.com/ReVanced/revanced-patches/commit/7c218cd168aa72eb99bcb47d12dfa45616e8ad88))
+* **SCB Easy:** Remove broken `Remove debugging detection` patch ([#3518](https://github.com/ReVanced/revanced-patches/issues/3518)) ([f4e23cb](https://github.com/ReVanced/revanced-patches/commit/f4e23cbb8a24638318d8cee20a1991c51855d9d2))
+
+## [4.12.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v4.12.0...v4.12.1-dev.1) (2024-08-15)
+
+
+### Bug Fixes
+
+* **YouTube - GmsCore support:** Fix notifications not working by using the correct permissions ([19ddae2](https://github.com/ReVanced/revanced-patches/commit/19ddae2d15e513e18eb1556c468cd94bd197685b))
+
+# [4.12.0](https://github.com/ReVanced/revanced-patches/compare/v4.11.0...v4.12.0) (2024-08-06)
+
+
+### Bug Fixes
+
+* **Google Photos - GmsCore support:** Fix by checking first if a method exists before trying to patch it ([acf38ca](https://github.com/ReVanced/revanced-patches/commit/acf38cafae5eb9896b43f3a6cbd808ac273cd081))
+* **Instagram - Hide ads:**  Restore compatibility with latest version by fixing fingerprint ([#3455](https://github.com/ReVanced/revanced-patches/issues/3455)) ([4505fa4](https://github.com/ReVanced/revanced-patches/commit/4505fa4138bb55c8957790239c01b8dda63d6cdd))
+* **Messenger - Disable switching emoji to sticker:** Constrain to last working version `439.0.0.29.119` ([6207c31](https://github.com/ReVanced/revanced-patches/commit/6207c314c657a1188d1081b0a196a61e49cad83b))
+* **SoundCloud - Enable offline sync:** Stop crashing by reversing order of patching instructions from last to first to retain indices ([63b6ced](https://github.com/ReVanced/revanced-patches/commit/63b6cede5fa5bcf377ced422da4e861996a41f0d))
+* **YouTube - Bypass image region restrictions:** Move setting to `Misc` menu ([094ae59](https://github.com/ReVanced/revanced-patches/commit/094ae59fc92663fff6c5d6f5cbece41822a326f9))
+* **YouTube - Client Spoof:** Restore missing high qualities by spoofing the iOS client user agent ([#3468](https://github.com/ReVanced/revanced-patches/issues/3468)) ([0e6ae5f](https://github.com/ReVanced/revanced-patches/commit/0e6ae5fee752a76604cf9b95f9a76c0cbe5f7dae))
+* **YouTube - Hide keyword content:** Do not hide flyout menu ([687c9f7](https://github.com/ReVanced/revanced-patches/commit/687c9f7eb03cca5f7b3486f07f2e3453ebc77faf))
+* **YouTube - SponsorBlock:** Correctly show minute timestamp when creating a new segment ([d74c366](https://github.com/ReVanced/revanced-patches/commit/d74c366dbf5f25c20fbfc5a0157c3c15dda82a16))
+* **YouTube - SponsorBlock:** Improve create segment manual seek accuracy ([#3491](https://github.com/ReVanced/revanced-patches/issues/3491)) ([1544981](https://github.com/ReVanced/revanced-patches/commit/15449819ff74b636fb2fa6aacd770142c51d2e5d))
+* **YouTube - Spoof client:** Fix tracking history on brand accounts ([#3480](https://github.com/ReVanced/revanced-patches/issues/3480)) ([69c1f16](https://github.com/ReVanced/revanced-patches/commit/69c1f16f7eb0d5759a44f7f7a09b1757ce8f61dd))
+* **YouTube - Spoof client:** Restore livestream audio only playback with iOS spoofing ([#3504](https://github.com/ReVanced/revanced-patches/issues/3504)) ([90d3288](https://github.com/ReVanced/revanced-patches/commit/90d32880906787d82c4b9a7a1099b46dff3a0870))
+
+
+### Features
+
+* Add `Hide mock location` patch ([#3417](https://github.com/ReVanced/revanced-patches/issues/3417)) ([5f81b40](https://github.com/ReVanced/revanced-patches/commit/5f81b40e7d5567fb5689d08ccc9caeaa267c3143))
+* Add `Spoof build info` patch ([e7829b4](https://github.com/ReVanced/revanced-patches/commit/e7829b41e782c9feda23b9d6acf48bae277d24d9))
+* **Boost for Reddit:** Add `Disable ads` patch ([#3474](https://github.com/ReVanced/revanced-patches/issues/3474)) ([b292c20](https://github.com/ReVanced/revanced-patches/commit/b292c200bf4ea5b4f71d96690ac011e7843552f0))
+* **CandyLink:** Remove non-functional `Unlock pro` patch ([7ae9f8f](https://github.com/ReVanced/revanced-patches/commit/7ae9f8fa0a349b91853e9554f18e564ca6ff887c))
+* **Expense Manager:** Remove non-functional `Unlock pro` patch ([ebbcac7](https://github.com/ReVanced/revanced-patches/commit/ebbcac74fd8598daebb4be0bd7c430c41333e2d4))
+* **Google News:** Add `Enable CustomTabs` and `GmsCore support` patch ([#3111](https://github.com/ReVanced/revanced-patches/issues/3111)) ([ad59096](https://github.com/ReVanced/revanced-patches/commit/ad590962275f888b335252ad5bed0f34e959d3c7))
+* **Google Photos:** Add `GmsCore support` patch ([#3414](https://github.com/ReVanced/revanced-patches/issues/3414)) ([24528e0](https://github.com/ReVanced/revanced-patches/commit/24528e0a6eec17ce0a3c52f8862585933615ad28))
+* **Instagram:** Remove unnecessary `Hide timeline ads` patch ([5e1d001](https://github.com/ReVanced/revanced-patches/commit/5e1d001056df68e1e2b39f1365215c91bcc9e46b))
+* **SoundCloud:** Add `Enable offline sync` patch ([#3407](https://github.com/ReVanced/revanced-patches/issues/3407)) ([4de86c6](https://github.com/ReVanced/revanced-patches/commit/4de86c6407376bcd3cc0513a2f0707410b8d7ccd))
+* **SwissID:** Add `Remove Google Play Integrity Integrity check` patch ([#3478](https://github.com/ReVanced/revanced-patches/issues/3478)) ([60492ae](https://github.com/ReVanced/revanced-patches/commit/60492aea7863e07d8bf1af9380ae9295ca161f3c))
+* **YouTube - Description components:** Add `Hide 'Key concepts' section` option ([#3495](https://github.com/ReVanced/revanced-patches/issues/3495)) ([d75b645](https://github.com/ReVanced/revanced-patches/commit/d75b64595a7ac26faca4c0ae21923b22f6783975))
+* **YouTube:** Add `Bypass image region restrictions` patch ([#3442](https://github.com/ReVanced/revanced-patches/issues/3442)) ([765fab2](https://github.com/ReVanced/revanced-patches/commit/765fab2af2769349446cc0f2109343ef3bd8c621))
+
+# [4.12.0-dev.17](https://github.com/ReVanced/revanced-patches/compare/v4.12.0-dev.16...v4.12.0-dev.17) (2024-08-06)
+
+
+### Bug Fixes
+
+* **Google Photos - GmsCore support:** Fix by checking first if a method exists before trying to patch it ([acf38ca](https://github.com/ReVanced/revanced-patches/commit/acf38cafae5eb9896b43f3a6cbd808ac273cd081))
+* **Messenger - Disable switching emoji to sticker:** Constrain to last working version `439.0.0.29.119` ([6207c31](https://github.com/ReVanced/revanced-patches/commit/6207c314c657a1188d1081b0a196a61e49cad83b))
+
+
+### Features
+
+* **CandyLink:** Remove non-functional `Unlock pro` patch ([7ae9f8f](https://github.com/ReVanced/revanced-patches/commit/7ae9f8fa0a349b91853e9554f18e564ca6ff887c))
+* **Expense Manager:** Remove non-functional `Unlock pro` patch ([ebbcac7](https://github.com/ReVanced/revanced-patches/commit/ebbcac74fd8598daebb4be0bd7c430c41333e2d4))
+* **Instagram:** Remove unnecessary `Hide timeline ads` patch ([5e1d001](https://github.com/ReVanced/revanced-patches/commit/5e1d001056df68e1e2b39f1365215c91bcc9e46b))
+
+# [4.12.0-dev.16](https://github.com/ReVanced/revanced-patches/compare/v4.12.0-dev.15...v4.12.0-dev.16) (2024-08-04)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof client:** Restore livestream audio only playback with iOS spoofing ([#3504](https://github.com/ReVanced/revanced-patches/issues/3504)) ([90d3288](https://github.com/ReVanced/revanced-patches/commit/90d32880906787d82c4b9a7a1099b46dff3a0870))
+
+# [4.12.0-dev.15](https://github.com/ReVanced/revanced-patches/compare/v4.12.0-dev.14...v4.12.0-dev.15) (2024-08-02)
+
+
+### Bug Fixes
+
+* **YouTube - SponsorBlock:** Improve create segment manual seek accuracy ([#3491](https://github.com/ReVanced/revanced-patches/issues/3491)) ([1544981](https://github.com/ReVanced/revanced-patches/commit/15449819ff74b636fb2fa6aacd770142c51d2e5d))
+
+# [4.12.0-dev.14](https://github.com/ReVanced/revanced-patches/compare/v4.12.0-dev.13...v4.12.0-dev.14) (2024-08-01)
+
+
+### Features
+
+* **YouTube - Description components:** Add `Hide 'Key concepts' section` option ([#3495](https://github.com/ReVanced/revanced-patches/issues/3495)) ([d75b645](https://github.com/ReVanced/revanced-patches/commit/d75b64595a7ac26faca4c0ae21923b22f6783975))
+
+# [4.12.0-dev.13](https://github.com/ReVanced/revanced-patches/compare/v4.12.0-dev.12...v4.12.0-dev.13) (2024-07-31)
+
+
+### Features
+
+* **Boost for Reddit:** Add `Disable ads` patch ([#3474](https://github.com/ReVanced/revanced-patches/issues/3474)) ([b292c20](https://github.com/ReVanced/revanced-patches/commit/b292c200bf4ea5b4f71d96690ac011e7843552f0))
+
+# [4.12.0-dev.12](https://github.com/ReVanced/revanced-patches/compare/v4.12.0-dev.11...v4.12.0-dev.12) (2024-07-28)
+
+
+### Features
+
+* **SwissID:** Add `Remove Google Play Integrity Integrity check` patch ([#3478](https://github.com/ReVanced/revanced-patches/issues/3478)) ([60492ae](https://github.com/ReVanced/revanced-patches/commit/60492aea7863e07d8bf1af9380ae9295ca161f3c))
+
+# [4.12.0-dev.11](https://github.com/ReVanced/revanced-patches/compare/v4.12.0-dev.10...v4.12.0-dev.11) (2024-07-28)
+
+
+### Bug Fixes
+
+* **YouTube - Bypass image region restrictions:** Move setting to `Misc` menu ([094ae59](https://github.com/ReVanced/revanced-patches/commit/094ae59fc92663fff6c5d6f5cbece41822a326f9))
+
+# [4.12.0-dev.10](https://github.com/ReVanced/revanced-patches/compare/v4.12.0-dev.9...v4.12.0-dev.10) (2024-07-28)
+
+
+### Bug Fixes
+
+* **YouTube - Client Spoof:** Restore missing high qualities by spoofing the iOS client user agent ([#3468](https://github.com/ReVanced/revanced-patches/issues/3468)) ([0e6ae5f](https://github.com/ReVanced/revanced-patches/commit/0e6ae5fee752a76604cf9b95f9a76c0cbe5f7dae))
+
+# [4.12.0-dev.9](https://github.com/ReVanced/revanced-patches/compare/v4.12.0-dev.8...v4.12.0-dev.9) (2024-07-28)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof client:** Fix tracking history on brand accounts ([#3480](https://github.com/ReVanced/revanced-patches/issues/3480)) ([69c1f16](https://github.com/ReVanced/revanced-patches/commit/69c1f16f7eb0d5759a44f7f7a09b1757ce8f61dd))
+
+# [4.12.0-dev.8](https://github.com/ReVanced/revanced-patches/compare/v4.12.0-dev.7...v4.12.0-dev.8) (2024-07-26)
+
+
+### Bug Fixes
+
+* **YouTube - SponsorBlock:** Correctly show minute timestamp when creating a new segment ([d74c366](https://github.com/ReVanced/revanced-patches/commit/d74c366dbf5f25c20fbfc5a0157c3c15dda82a16))
+
 # [4.12.0-dev.7](https://github.com/ReVanced/revanced-patches/compare/v4.12.0-dev.6...v4.12.0-dev.7) (2024-07-24)
 
 

api/revanced-patches.api

@@ -16,6 +16,14 @@ public final class app/revanced/patches/all/connectivity/wifi/spoof/SpoofWifiPat
 	public fun transform (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;Lkotlin/Triple;)V
 }
 
+public final class app/revanced/patches/all/directory/ChangeDataDirectoryLocationPatch : app/revanced/patches/all/misc/transformation/BaseTransformInstructionsPatch {
+	public static final field INSTANCE Lapp/revanced/patches/all/directory/ChangeDataDirectoryLocationPatch;
+	public fun filterMap (Lcom/android/tools/smali/dexlib2/iface/ClassDef;Lcom/android/tools/smali/dexlib2/iface/Method;Lcom/android/tools/smali/dexlib2/iface/instruction/Instruction;I)Ljava/lang/Integer;
+	public synthetic fun filterMap (Lcom/android/tools/smali/dexlib2/iface/ClassDef;Lcom/android/tools/smali/dexlib2/iface/Method;Lcom/android/tools/smali/dexlib2/iface/instruction/Instruction;I)Ljava/lang/Object;
+	public fun transform (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;I)V
+	public synthetic fun transform (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;Ljava/lang/Object;)V
+}
+
 public final class app/revanced/patches/all/interaction/gestures/PredictiveBackGesturePatch : app/revanced/patcher/patch/ResourcePatch {
 	public static final field INSTANCE Lapp/revanced/patches/all/interaction/gestures/PredictiveBackGesturePatch;
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
@@ -243,6 +251,18 @@ public final class app/revanced/patches/cieid/restrictions/root/BypassRootChecks
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public final class app/revanced/patches/duolingo/ad/DisableAdsPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/duolingo/ad/DisableAdsPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
+public final class app/revanced/patches/duolingo/debug/EnableDebugMenuPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/duolingo/debug/EnableDebugMenuPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/facebook/ads/story/HideStoryAdsPatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/facebook/ads/story/HideStoryAdsPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -279,6 +299,16 @@ public final class app/revanced/patches/googlenews/misc/integrations/Integration
 	public static final field INSTANCE Lapp/revanced/patches/googlenews/misc/integrations/IntegrationsPatch;
 }
 
+public final class app/revanced/patches/googlephotos/features/SpoofFeaturesPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/googlephotos/features/SpoofFeaturesPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
+public final class app/revanced/patches/googlephotos/features/fingerprints/InitializeFeaturesEnumFingerprint : app/revanced/patcher/fingerprint/MethodFingerprint {
+	public static final field INSTANCE Lapp/revanced/patches/googlephotos/features/fingerprints/InitializeFeaturesEnumFingerprint;
+}
+
 public final class app/revanced/patches/googlephotos/misc/gms/GmsCoreSupportPatch : app/revanced/patches/shared/misc/gms/BaseGmsCoreSupportPatch {
 	public static final field INSTANCE Lapp/revanced/patches/googlephotos/misc/gms/GmsCoreSupportPatch;
 }
@@ -423,6 +453,12 @@ public final class app/revanced/patches/music/ad/video/HideMusicVideoAds : app/r
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public final class app/revanced/patches/music/ad/video/HideVideoAds : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/music/ad/video/HideVideoAds;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/music/ad/video/MusicVideoAdsPatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/music/ad/video/MusicVideoAdsPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -684,6 +720,12 @@ public final class app/revanced/patches/reddit/customclients/baconreader/api/Spo
 	public fun patchClientId (Ljava/util/Set;Lapp/revanced/patcher/data/BytecodeContext;)V
 }
 
+public final class app/revanced/patches/reddit/customclients/boostforreddit/ads/DisableAdsPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/reddit/customclients/boostforreddit/ads/DisableAdsPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/reddit/customclients/boostforreddit/api/SpoofClientPatch : app/revanced/patches/reddit/customclients/BaseSpoofClientPatch {
 	public static final field INSTANCE Lapp/revanced/patches/reddit/customclients/boostforreddit/api/SpoofClientPatch;
 	public fun patchClientId (Ljava/util/Set;Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -786,6 +828,12 @@ public final class app/revanced/patches/reddit/customclients/syncforreddit/fix/s
 	public static final field INSTANCE Lapp/revanced/patches/reddit/customclients/syncforreddit/fix/slink/FixSLinksPatch;
 }
 
+public final class app/revanced/patches/reddit/customclients/syncforreddit/fix/user/UseUserEndpointPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/reddit/customclients/syncforreddit/fix/user/UseUserEndpointPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/reddit/customclients/syncforreddit/misc/integrations/IntegrationsPatch : app/revanced/patches/shared/misc/integrations/BaseIntegrationsPatch {
 	public static final field INSTANCE Lapp/revanced/patches/reddit/customclients/syncforreddit/misc/integrations/IntegrationsPatch;
 }
@@ -820,6 +868,12 @@ public final class app/revanced/patches/serviceportalbund/detection/root/RootDet
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public abstract class app/revanced/patches/shared/misc/checks/BaseCheckEnvironmentPatch : app/revanced/patcher/patch/BytecodePatch {
+	public fun <init> (Lapp/revanced/patcher/fingerprint/MethodFingerprint;Ljava/util/Set;Lapp/revanced/patches/shared/misc/integrations/BaseIntegrationsPatch;)V
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/shared/misc/fix/verticalscroll/VerticalScrollPatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/shared/misc/fix/verticalscroll/VerticalScrollPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -1178,6 +1232,12 @@ public final class app/revanced/patches/strava/upselling/DisableSubscriptionSugg
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public final class app/revanced/patches/swissid/integritycheck/RemoveGooglePlayIntegrityCheck : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/swissid/integritycheck/RemoveGooglePlayIntegrityCheck;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/ticktick/misc/themeunlock/UnlockProPatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/ticktick/misc/themeunlock/UnlockProPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -1822,6 +1882,10 @@ public final class app/revanced/patches/youtube/misc/backgroundplayback/Backgrou
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public final class app/revanced/patches/youtube/misc/check/CheckEnvironmentPatch : app/revanced/patches/shared/misc/checks/BaseCheckEnvironmentPatch {
+	public static final field INSTANCE Lapp/revanced/patches/youtube/misc/check/CheckEnvironmentPatch;
+}
+
 public final class app/revanced/patches/youtube/misc/debugging/DebuggingPatch : app/revanced/patcher/patch/ResourcePatch {
 	public static final field INSTANCE Lapp/revanced/patches/youtube/misc/debugging/DebuggingPatch;
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
@@ -1852,6 +1916,12 @@ public final class app/revanced/patches/youtube/misc/fix/playback/SpoofSignature
 	public fun execute (Lapp/revanced/patcher/data/ResourceContext;)V
 }
 
+public final class app/revanced/patches/youtube/misc/fix/playback/SpoofVideoStreamsPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/youtube/misc/fix/playback/SpoofVideoStreamsPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/youtube/misc/fix/playback/UserAgentClientSpoofPatch : app/revanced/patches/all/misc/transformation/BaseTransformInstructionsPatch {
 	public static final field INSTANCE Lapp/revanced/patches/youtube/misc/fix/playback/UserAgentClientSpoofPatch;
 	public synthetic fun filterMap (Lcom/android/tools/smali/dexlib2/iface/ClassDef;Lcom/android/tools/smali/dexlib2/iface/Method;Lcom/android/tools/smali/dexlib2/iface/instruction/Instruction;I)Ljava/lang/Object;
@@ -2092,6 +2162,7 @@ public final class app/revanced/patches/yuka/misc/unlockpremium/UnlockPremiumPat
 }
 
 public final class app/revanced/util/BytecodeUtilsKt {
+	public static final fun alsoResolve (Lapp/revanced/patcher/fingerprint/MethodFingerprint;Lapp/revanced/patcher/data/BytecodeContext;Lapp/revanced/patcher/fingerprint/MethodFingerprint;)Lapp/revanced/patcher/fingerprint/MethodFingerprintResult;
 	public static final fun containsWideLiteralInstructionValue (Lcom/android/tools/smali/dexlib2/iface/Method;J)Z
 	public static final fun findMutableMethodOf (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableClass;Lcom/android/tools/smali/dexlib2/iface/Method;)Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;
 	public static final fun findOpcodeIndicesReversed (Lcom/android/tools/smali/dexlib2/iface/Method;Lcom/android/tools/smali/dexlib2/Opcode;)Ljava/util/List;

build.gradle.kts

@@ -31,6 +31,8 @@ dependencies {
     implementation(libs.guava)
     // Used in JsonGenerator.
     implementation(libs.gson)
+    // Android API stubs defined here.
+    compileOnly(project(":stub"))
 }
 
 kotlin {

gradle.properties

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

settings.gradle.kts

@@ -5,3 +5,5 @@ buildCache {
         isEnabled = "CI" !in System.getenv()
     }
 }
+
+include(":stub")

src/main/kotlin/app/revanced/patches/all/directory/ChangeDataDirectoryLocationPatch.kt

@@ -0,0 +1,73 @@
+package app.revanced.patches.all.directory
+
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import app.revanced.patches.all.misc.transformation.BaseTransformInstructionsPatch
+import app.revanced.util.getReference
+import com.android.tools.smali.dexlib2.iface.ClassDef
+import com.android.tools.smali.dexlib2.iface.Method
+import com.android.tools.smali.dexlib2.iface.instruction.Instruction
+import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+import com.android.tools.smali.dexlib2.immutable.reference.ImmutableMethodReference
+import com.android.tools.smali.dexlib2.util.MethodUtil
+
+@Patch(
+    name = "Change data directory location",
+    description = "Changes the data directory in the application from " +
+        "the app internal storage directory to /sdcard/android/data accessible by root-less devices." +
+        "Using this patch can cause unexpected issues with some apps.",
+    use = false,
+)
+@Suppress("unused")
+object ChangeDataDirectoryLocationPatch : BaseTransformInstructionsPatch<Int>() {
+    override fun filterMap(
+        classDef: ClassDef,
+        method: Method,
+        instruction: Instruction,
+        instructionIndex: Int,
+    ): Int? {
+        val reference = instruction.getReference<MethodReference>() ?: return null
+
+        if (!MethodUtil.methodSignaturesMatch(reference, MethodCall.GetDir.reference)) {
+            return null
+        }
+
+        return instructionIndex
+    }
+
+    override fun transform(
+        mutableMethod: MutableMethod,
+        entry: Int,
+    ) = transformMethodCall(entry, mutableMethod)
+
+    private fun transformMethodCall(
+        instructionIndex: Int,
+        mutableMethod: MutableMethod,
+    ) {
+        val getDirInstruction = mutableMethod.getInstruction<Instruction35c>(instructionIndex)
+        val contextRegister = getDirInstruction.registerC
+        val dataRegister = getDirInstruction.registerD
+
+        mutableMethod.replaceInstruction(
+            instructionIndex,
+            "invoke-virtual { v$contextRegister, v$dataRegister }, " +
+                "Landroid/content/Context;->getExternalFilesDir(Ljava/lang/String;)Ljava/io/File;",
+        )
+    }
+
+    private enum class MethodCall(
+        val reference: MethodReference,
+    ) {
+        GetDir(
+            ImmutableMethodReference(
+                "Landroid/content/Context;",
+                "getDir",
+                listOf("Ljava/lang/String;", "I"),
+                "Ljava/io/File;",
+            ),
+        ),
+    }
+}

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

@@ -83,8 +83,9 @@ object AddResourcesPatch : ResourcePatch(), MutableMap<Value, MutableSet<BaseRes
         "eu-rES" to "eu",
         "fa-rIR" to "fa",
         "fi-rFI" to "fi",
-        "tl-rPH" to "tl",
+        "fil-rPH" to "tl",
         "fr-rFR" to "fr",
+        "ga-rIE" to "ga",
         "gl-rES" to "gl",
         "gu-rIN" to "gu",
         "hi-rIN" to "hi",
@@ -125,6 +126,7 @@ object AddResourcesPatch : ResourcePatch(), MutableMap<Value, MutableSet<BaseRes
         "sk-rSK" to "sk",
         "sl-rSI" to "sl",
         "sq-rAL" to "sq",
+        "sr-rCS" to "b+sr+Latn",
         "sr-rSP" to "sr",
         "sv-rSE" to "sv",
         "sw-rKE" to "sw",
@@ -138,7 +140,6 @@ object AddResourcesPatch : ResourcePatch(), MutableMap<Value, MutableSet<BaseRes
         "uz-rUZ" to "uz",
         "vi-rVN" to "vi",
         "zh-rCN" to "zh-rCN",
-        "zh-rHK" to "zh-rHK",
         "zh-rTW" to "zh-rTW",
         "zu-rZA" to "zu",
     )

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

@@ -1,20 +1,23 @@
 package app.revanced.patches.candylinkvpn
 
-import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.candylinkvpn.fingerprints.IsPremiumPurchasedFingerprint
+import app.revanced.util.exception
 
 @Patch(
-    name = "Unlock pro",
-    compatiblePackages = [CompatiblePackage("com.candylink.openvpn")]
+    compatiblePackages = [CompatiblePackage("com.candylink.openvpn")],
+)
+@Deprecated(
+    "This patch does not work anymore and will be removed in the future, " +
+        "because the servers now check the purchase status.",
 )
 @Suppress("unused")
 object UnlockProPatch : BytecodePatch(
-    setOf(IsPremiumPurchasedFingerprint)
+    setOf(IsPremiumPurchasedFingerprint),
 ) {
     override fun execute(context: BytecodeContext) {
         IsPremiumPurchasedFingerprint.result?.mutableMethod?.addInstructions(
@@ -22,7 +25,7 @@ object UnlockProPatch : BytecodePatch(
             """
                const/4 v0, 0x1
                return v0
-            """
+            """,
         ) ?: throw IsPremiumPurchasedFingerprint.exception
     }
-}
+}

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

@@ -0,0 +1,41 @@
+package app.revanced.patches.duolingo.ad
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.duolingo.ad.fingerprints.InitializeMonetizationDebugSettingsFingerprint
+import app.revanced.util.resultOrThrow
+import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
+
+@Patch(
+    name = "Disable ads",
+    compatiblePackages = [CompatiblePackage("com.duolingo")]
+)
+@Suppress("unused")
+object DisableAdsPatch : BytecodePatch(
+    setOf(InitializeMonetizationDebugSettingsFingerprint)
+) {
+    override fun execute(context: BytecodeContext) {
+        // Couple approaches to remove ads exist:
+        //
+        // MonetizationDebugSettings has a boolean value for "disableAds".
+        // OnboardingState has a getter to check if the user has any "adFreeSessions".
+        // SharedPreferences has a debug boolean value with key "disable_ads", which maps to "DebugCategory.DISABLE_ADS".
+        //
+        // MonetizationDebugSettings seems to be the most general setting to work fine.
+        InitializeMonetizationDebugSettingsFingerprint.resultOrThrow().let {
+            it.mutableMethod.apply {
+                val insertIndex = it.scanResult.patternScanResult!!.startIndex
+                val register = getInstruction<TwoRegisterInstruction>(insertIndex).registerA
+
+                addInstructions(
+                    insertIndex,
+                    "const/4 v$register, 0x1"
+                )
+            }
+        }
+    }
+}

src/main/kotlin/app/revanced/patches/duolingo/ad/fingerprints/InitializeMonetizationDebugSettingsFingerprint.kt

@@ -0,0 +1,21 @@
+package app.revanced.patches.duolingo.ad.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+
+internal object InitializeMonetizationDebugSettingsFingerprint : MethodFingerprint(
+    returnType = "V",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
+    parameters = listOf(
+        "Z", // disableAds
+        "Z", // useDebugBilling
+        "Z", // showManageSubscriptions
+        "Z", // alwaysShowSuperAds
+        "Lcom/duolingo/debug/FamilyQuestOverride;",
+    ),
+    opcodes = listOf(
+        Opcode.IPUT_BOOLEAN
+    )
+)

src/main/kotlin/app/revanced/patches/duolingo/debug/EnableDebugMenuPatch.kt

@@ -0,0 +1,35 @@
+package app.revanced.patches.duolingo.debug
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.duolingo.debug.fingerprints.InitializeBuildConfigProviderFingerprint
+import app.revanced.util.resultOrThrow
+import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
+
+@Patch(
+    name = "Enable debug menu",
+    compatiblePackages = [CompatiblePackage("com.duolingo", ["5.158.4"])],
+    use = false
+)
+@Suppress("unused")
+object EnableDebugMenuPatch : BytecodePatch(
+    setOf(InitializeBuildConfigProviderFingerprint)
+) {
+    override fun execute(context: BytecodeContext) {
+        InitializeBuildConfigProviderFingerprint.resultOrThrow().let {
+            it.mutableMethod.apply {
+                val insertIndex = it.scanResult.patternScanResult!!.startIndex
+                val register = getInstruction<TwoRegisterInstruction>(insertIndex).registerA
+
+                addInstructions(
+                    insertIndex,
+                    "const/4 v$register, 0x1"
+                )
+            }
+        }
+    }
+}

src/main/kotlin/app/revanced/patches/duolingo/debug/fingerprints/InitializeBuildConfigProviderFingerprint.kt

@@ -0,0 +1,25 @@
+package app.revanced.patches.duolingo.debug.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+
+/**
+ * The `BuildConfigProvider` class has two booleans:
+ *
+ * - `isChina`: (usually) compares "play" with "china"...except for builds in China
+ * - `isDebug`: compares "release" with "debug" <-- we want to force this to `true`
+ */
+internal object InitializeBuildConfigProviderFingerprint : MethodFingerprint(
+    returnType = "V",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
+    strings = listOf(
+        "debug",
+        "release",
+        "china",
+    ),
+    opcodes = listOf(
+        Opcode.IPUT_BOOLEAN
+    )
+)

src/main/kotlin/app/revanced/patches/googlephotos/features/SpoofBuildInfoPatch.kt

@@ -0,0 +1,14 @@
+package app.revanced.patches.googlephotos.features
+
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.all.misc.build.BaseSpoofBuildInfoPatch
+
+@Patch(description = "Spoof build info to Google Pixel XL.")
+internal class SpoofBuildInfoPatch : BaseSpoofBuildInfoPatch() {
+    override val brand = "google"
+    override val manufacturer = "Google"
+    override val device = "marlin"
+    override val product = "marlin"
+    override val model = "Pixel XL"
+    override val fingerprint = "google/marlin/marlin:10/QP1A.191005.007.A3/5972272:user/release-keys"
+}

src/main/kotlin/app/revanced/patches/googlephotos/features/SpoofFeaturesPatch.kt

@@ -0,0 +1,87 @@
+package app.revanced.patches.googlephotos.features
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.getInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.stringArrayPatchOption
+import app.revanced.patches.googlephotos.features.fingerprints.InitializeFeaturesEnumFingerprint
+import app.revanced.util.getReference
+import app.revanced.util.resultOrThrow
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.reference.StringReference
+
+@Patch(
+    name = "Spoof features",
+    description = "Spoofs the device to enable Google Pixel exclusive features, including unlimited storage.",
+    dependencies = [SpoofBuildInfoPatch::class],
+    compatiblePackages = [CompatiblePackage("com.google.android.apps.photos")],
+)
+@Suppress("unused")
+object SpoofFeaturesPatch : BytecodePatch(setOf(InitializeFeaturesEnumFingerprint)) {
+    private val featuresToEnable by stringArrayPatchOption(
+        "featuresToEnable",
+        arrayOf(
+            "com.google.android.apps.photos.NEXUS_PRELOAD",
+            "com.google.android.apps.photos.nexus_preload",
+        ),
+        title = "Features to enable",
+        description = "Google Pixel exclusive features to enable. Features up to Pixel XL enable the unlimited storage feature.",
+        required = true,
+    )
+
+    private val featuresToDisable by stringArrayPatchOption(
+        "featuresToDisable",
+        arrayOf(
+            "com.google.android.apps.photos.PIXEL_2017_PRELOAD",
+            "com.google.android.apps.photos.PIXEL_2018_PRELOAD",
+            "com.google.android.apps.photos.PIXEL_2019_MIDYEAR_PRELOAD",
+            "com.google.android.apps.photos.PIXEL_2019_PRELOAD",
+            "com.google.android.feature.PIXEL_2020_MIDYEAR_EXPERIENCE",
+            "com.google.android.feature.PIXEL_2020_EXPERIENCE",
+            "com.google.android.feature.PIXEL_2021_MIDYEAR_EXPERIENCE",
+            "com.google.android.feature.PIXEL_2021_EXPERIENCE",
+            "com.google.android.feature.PIXEL_2022_MIDYEAR_EXPERIENCE",
+            "com.google.android.feature.PIXEL_2022_EXPERIENCE",
+            "com.google.android.feature.PIXEL_2023_MIDYEAR_EXPERIENCE",
+            "com.google.android.feature.PIXEL_2023_EXPERIENCE",
+            "com.google.android.feature.PIXEL_2024_MIDYEAR_EXPERIENCE",
+            "com.google.android.feature.PIXEL_2024_EXPERIENCE",
+            "com.google.android.feature.PIXEL_2025_MIDYEAR_EXPERIENCE",
+        ),
+        title = "Features to disable",
+        description = "Google Pixel exclusive features to disable." +
+            "Features after Pixel XL may have to be disabled for unlimited storage depending on the device.",
+        required = true,
+    )
+
+    override fun execute(context: BytecodeContext) {
+        val featuresToEnable = featuresToEnable!!.toSet()
+        val featuresToDisable = featuresToDisable!!.toSet()
+
+        InitializeFeaturesEnumFingerprint.resultOrThrow().let { result ->
+            result.mutableMethod.apply {
+                getInstructions().filter { it.opcode == Opcode.CONST_STRING }.forEach {
+                    val feature = it.getReference<StringReference>()!!.string
+
+                    val spoofedFeature = when (feature) {
+                        in featuresToEnable -> "android.hardware.wifi"
+                        in featuresToDisable -> "dummy"
+                        else -> return@forEach
+                    }
+
+                    val constStringIndex = it.location.index
+                    val constStringRegister = (it as OneRegisterInstruction).registerA
+
+                    replaceInstruction(
+                        constStringIndex,
+                        "const-string v$constStringRegister, \"$spoofedFeature\"",
+                    )
+                }
+            }
+        }
+    }
+}

src/main/kotlin/app/revanced/patches/googlephotos/features/fingerprints/InitializeFeaturesEnumFingerprint.kt

@@ -0,0 +1,7 @@
+package app.revanced.patches.googlephotos.features.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+
+object InitializeFeaturesEnumFingerprint : MethodFingerprint(
+    strings = listOf("com.google.android.apps.photos.NEXUS_PRELOAD"),
+)

src/main/kotlin/app/revanced/patches/instagram/patches/ad/HideAdsPatch.kt

@@ -10,7 +10,7 @@ import app.revanced.util.exception
 
 @Patch(
     name = "Hide ads",
-    description = "Hides ads in stories, discover, profile, etc." +
+    description = "Hides ads in stories, discover, profile, etc. " +
         "An ad can still appear once when refreshing the home feed.",
     compatiblePackages = [CompatiblePackage("com.instagram.android")],
 )

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

@@ -14,9 +14,9 @@ import app.revanced.util.exception
 import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
 
 @Patch(
-    name = "Hide timeline ads",
     compatiblePackages = [CompatiblePackage("com.instagram.android")],
 )
+@Deprecated("This patch is not needed anymore.", replaceWith = ReplaceWith("HideAdsPatch"))
 @Suppress("unused")
 object HideTimelineAdsPatch : BytecodePatch(
     setOf(

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

@@ -13,7 +13,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 @Patch(
     name = "Disable switching emoji to sticker",
     description = "Disables switching from emoji to sticker search mode in message input field.",
-    compatiblePackages = [CompatiblePackage("com.facebook.orca")],
+    compatiblePackages = [CompatiblePackage("com.facebook.orca", ["439.0.0.29.119"])],
 )
 @Suppress("unused")
 object DisableSwitchingEmojiToStickerPatch : BytecodePatch(

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

@@ -8,20 +8,20 @@ import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.moneymanager.fingerprints.UnlockProFingerprint
 
 @Patch(
-    name = "Unlock pro",
-    compatiblePackages = [CompatiblePackage("com.ithebk.expensemanager")]
+    compatiblePackages = [CompatiblePackage("com.ithebk.expensemanager")],
 )
+@Deprecated("This patch is not functional anymore and will be removed in the future.")
 @Suppress("unused")
 object UnlockProPatch : BytecodePatch(
-    setOf(UnlockProFingerprint)
-){
+    setOf(UnlockProFingerprint),
+) {
     override fun execute(context: BytecodeContext) {
-       UnlockProFingerprint.result!!.mutableMethod.addInstructions(
+        UnlockProFingerprint.result!!.mutableMethod.addInstructions(
             0,
             """
                const/4 v0, 0x1
                return v0 
-            """
+            """,
         )
     }
-}
+}

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

@@ -6,43 +6,43 @@ import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.music.ad.video.fingerprints.ShowMusicVideoAdsParentFingerprint
+import app.revanced.patches.music.ad.video.fingerprints.ShowVideoAdsParentFingerprint
 import app.revanced.util.exception
 
 @Patch(
-    name = "Hide music video ads",
+    name = "Hide video ads",
+    description = "Hides ads that appear while listening to or streaming music videos, podcasts, or songs.",
     compatiblePackages = [
-        CompatiblePackage(
-            "com.google.android.apps.youtube.music",
-            [
-                "6.45.54",
-                "6.51.53",
-                "7.01.53",
-                "7.02.52",
-                "7.03.52",
-            ]
-        )
+        CompatiblePackage("com.google.android.apps.youtube.music")
     ],
 )
 @Suppress("unused")
-object HideMusicVideoAds : BytecodePatch(
-    setOf(ShowMusicVideoAdsParentFingerprint),
+object HideVideoAds : BytecodePatch(
+    setOf(ShowVideoAdsParentFingerprint),
 ) {
     override fun execute(context: BytecodeContext) {
-        ShowMusicVideoAdsParentFingerprint.result?.let {
-            val showMusicVideoAdsMethod = context
+        ShowVideoAdsParentFingerprint.result?.let {
+            val showVideoAdsMethod = context
                 .toMethodWalker(it.mutableMethod)
                 .nextMethod(it.scanResult.patternScanResult!!.startIndex + 1, true).getMethod() as MutableMethod
 
-            showMusicVideoAdsMethod.addInstruction(0, "const/4 p1, 0x0")
-        } ?: throw ShowMusicVideoAdsParentFingerprint.exception
+            showVideoAdsMethod.addInstruction(0, "const/4 p1, 0x0")
+        } ?: throw ShowVideoAdsParentFingerprint.exception
     }
 }
 
-@Deprecated("This patch class has been renamed to HideMusicVideoAds.")
+@Deprecated("This patch class has been renamed to HideVideoAds.")
+object HideMusicVideoAds : BytecodePatch(
+    dependencies = setOf(HideVideoAds::class)
+) {
+    override fun execute(context: BytecodeContext) {
+    }
+}
+
+@Deprecated("This patch class has been renamed to HideVideoAds.")
 object MusicVideoAdsPatch : BytecodePatch(
     dependencies = setOf(HideMusicVideoAds::class),
 ) {
     override fun execute(context: BytecodeContext) {
     }
-}
+}

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

@@ -3,7 +3,7 @@ package app.revanced.patches.music.ad.video.fingerprints
 import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.Opcode
 
-internal object ShowMusicVideoAdsParentFingerprint : MethodFingerprint(
+internal object ShowVideoAdsParentFingerprint : MethodFingerprint(
     opcodes = listOf(
         Opcode.MOVE_RESULT_OBJECT,
         Opcode.INVOKE_VIRTUAL,

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

@@ -12,16 +12,7 @@ import com.android.tools.smali.dexlib2.Opcode
 @Patch(
     description = "Adds more audio codec options. The new audio codecs usually result in better audio quality.",
     compatiblePackages = [
-        CompatiblePackage(
-            "com.google.android.apps.youtube.music",
-            [
-                "6.45.54",
-                "6.51.53",
-                "7.01.53",
-                "7.02.52",
-                "7.03.52",
-            ]
-        )
+        CompatiblePackage("com.google.android.apps.youtube.music")
     ]
 )
 @Deprecated("This patch is no longer needed as the feature is now enabled by default.")

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

@@ -12,16 +12,7 @@ import app.revanced.util.exception
     name = "Enable exclusive audio playback",
     description = "Enables the option to play audio without video.",
     compatiblePackages = [
-        CompatiblePackage(
-            "com.google.android.apps.youtube.music",
-            [
-                "6.45.54",
-                "6.51.53",
-                "7.01.53",
-                "7.02.52",
-                "7.03.52",
-            ]
-        )
+        CompatiblePackage("com.google.android.apps.youtube.music")
     ]
 )
 @Suppress("unused")

src/main/kotlin/app/revanced/patches/music/interaction/permanentrepeat/PermanentRepeatPatch.kt

@@ -14,16 +14,7 @@ import app.revanced.patches.music.interaction.permanentrepeat.fingerprints.Repea
     name = "Permanent repeat",
     description = "Permanently remember your repeating preference even if the playlist ends or another track is played.",
     compatiblePackages = [
-        CompatiblePackage(
-            "com.google.android.apps.youtube.music",
-            [
-                "6.45.54",
-                "6.51.53",
-                "7.01.53",
-                "7.02.52",
-                "7.03.52",
-            ]
-        )
+        CompatiblePackage("com.google.android.apps.youtube.music")
     ],
     use = false
 )

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

@@ -14,16 +14,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
     name = "Hide category bar",
     description = "Hides the category bar at the top of the homepage.",
     compatiblePackages = [
-        CompatiblePackage(
-            "com.google.android.apps.youtube.music",
-            [
-                "6.45.54",
-                "6.51.53",
-                "7.01.53",
-                "7.02.52",
-                "7.03.52",
-            ]
-        )
+        CompatiblePackage("com.google.android.apps.youtube.music")
     ],
     use = false,
 )

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

@@ -17,16 +17,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
     name = "Hide 'Get Music Premium' label",
     description = "Hides the \"Get Music Premium\" label from the account menu and settings.",
     compatiblePackages = [
-        CompatiblePackage(
-            "com.google.android.apps.youtube.music",
-            [
-                "6.45.54",
-                "6.51.53",
-                "7.01.53",
-                "7.02.52",
-                "7.03.52",
-            ]
-        )
+        CompatiblePackage("com.google.android.apps.youtube.music")
     ]
 )
 @Suppress("unused")

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

@@ -23,16 +23,7 @@ import com.android.tools.smali.dexlib2.iface.reference.FieldReference
     name = "Remove upgrade button",
     description = "Removes the upgrade tab from the pivot bar.",
     compatiblePackages = [
-        CompatiblePackage(
-            "com.google.android.apps.youtube.music",
-            [
-                "6.45.54",
-                "6.51.53",
-                "7.01.53",
-                "7.02.52",
-                "7.03.52",
-            ]
-        )
+        CompatiblePackage("com.google.android.apps.youtube.music")
     ]
 )
 @Suppress("unused")

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

@@ -13,16 +13,7 @@ import app.revanced.patches.music.misc.androidauto.fingerprints.CheckCertificate
     name = "Bypass certificate checks",
     description = "Bypasses certificate checks which prevent YouTube Music from working on Android Auto.",
     compatiblePackages = [
-        CompatiblePackage(
-            "com.google.android.apps.youtube.music",
-            [
-                "6.45.54",
-                "6.51.53",
-                "7.01.53",
-                "7.02.52",
-                "7.03.52",
-            ]
-        )
+        CompatiblePackage("com.google.android.apps.youtube.music")
     ]
 )
 @Suppress("unused")

src/main/kotlin/app/revanced/patches/music/misc/backgroundplayback/BackgroundPlaybackPatch.kt

@@ -14,16 +14,7 @@ import app.revanced.util.resultOrThrow
     name = "Remove background playback restrictions",
     description = "Removes restrictions on background playback, including playing kids videos in the background.",
     compatiblePackages = [
-        CompatiblePackage(
-            "com.google.android.apps.youtube.music",
-            [
-                "6.45.54",
-                "6.51.53",
-                "7.01.53",
-                "7.02.52",
-                "7.03.52",
-            ]
-        )
+        CompatiblePackage("com.google.android.apps.youtube.music")
     ]
 )
 @Suppress("unused")

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

@@ -23,16 +23,7 @@ object GmsCoreSupportPatch : BaseGmsCoreSupportPatch(
     integrationsPatchDependency = IntegrationsPatch::class,
     gmsCoreSupportResourcePatch = GmsCoreSupportResourcePatch,
     compatiblePackages = setOf(
-        CompatiblePackage(
-            "com.google.android.apps.youtube.music",
-            setOf(
-                "6.45.54",
-                "6.51.53",
-                "7.01.53",
-                "7.02.52",
-                "7.03.52",
-            ),
-        ),
+        CompatiblePackage("com.google.android.apps.youtube.music"),
     ),
     fingerprints = setOf(
         CastDynamiteModuleV2Fingerprint,

src/main/kotlin/app/revanced/patches/piccomafr/misc/SpoofAndroidDeviceIdPatch.kt

@@ -11,7 +11,7 @@ import app.revanced.util.exception
 
 @Patch(
     name = "Spoof Android device ID",
-    description = "Spoofs the Android device ID used by the app for account authentication." +
+    description = "Spoofs the Android device ID used by the app for account authentication. " +
         "This can be used to copy the account to another device.",
     compatiblePackages = [
         CompatiblePackage(

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

@@ -1,28 +1,25 @@
 package app.revanced.patches.pixiv.ads
 
-import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patches.pixiv.ads.fingerprints.IsNotPremiumFingerprint
+import app.revanced.patches.pixiv.ads.fingerprints.ShouldShowAdsFingerprint
+import app.revanced.util.exception
 
 @Patch(
     name = "Hide ads",
-    compatiblePackages = [CompatiblePackage("jp.pxv.android")]
+    compatiblePackages = [CompatiblePackage("jp.pxv.android")],
 )
 @Suppress("unused")
-object HideAdsPatch : BytecodePatch(setOf(IsNotPremiumFingerprint)) {
-    // Always return false in the "isNotPremium" method which normally returns !this.accountManager.isPremium.
-    // However, this is not the method that controls the user's premium status.
-    // Instead, this method is used to determine whether ads should be shown.
+object HideAdsPatch : BytecodePatch(setOf(ShouldShowAdsFingerprint)) {
     override fun execute(context: BytecodeContext) =
-        IsNotPremiumFingerprint.result?.mutableClass?.virtualMethods?.first()?.addInstructions(
+        ShouldShowAdsFingerprint.result?.mutableMethod?.addInstructions(
             0,
             """
                 const/4 v0, 0x0
                 return v0
-            """
-        ) ?: throw IsNotPremiumFingerprint.exception
-}
+            """,
+        ) ?: throw ShouldShowAdsFingerprint.exception
+}

src/main/kotlin/app/revanced/patches/pixiv/ads/fingerprints/IsNotPremiumFingerprint.kt

@@ -1,21 +0,0 @@
-package app.revanced.patches.pixiv.ads.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-
-
-internal object IsNotPremiumFingerprint : MethodFingerprint(
-    "V",
-    AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
-    listOf("L"),
-    strings = listOf("pixivAccountManager"),
-    customFingerprint = custom@{ _, classDef ->
-        // The "isNotPremium" method is the only method in the class.
-        if (classDef.virtualMethods.count() != 1) return@custom false
-
-        classDef.virtualMethods.first().let { isNotPremiumMethod ->
-            isNotPremiumMethod.parameterTypes.size == 0 && isNotPremiumMethod.returnType == "Z"
-        }
-    }
-)

src/main/kotlin/app/revanced/patches/pixiv/ads/fingerprints/ShouldShowAdsFingerprint.kt

@@ -0,0 +1,14 @@
+package app.revanced.patches.pixiv.ads.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+
+internal object ShouldShowAdsFingerprint : MethodFingerprint(
+    "Z",
+    AccessFlags.PUBLIC or AccessFlags.FINAL,
+    customFingerprint = { methodDef, classDef ->
+        classDef.type.endsWith("AdUtils;") && methodDef.name == "shouldShowAds"
+    }
+)

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

@@ -0,0 +1,23 @@
+package app.revanced.patches.reddit.customclients.boostforreddit.ads
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patches.reddit.customclients.boostforreddit.ads.fingerprints.*
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.util.resultOrThrow
+
+@Patch(
+    name = "Disable ads",
+    compatiblePackages = [CompatiblePackage("com.rubenmayayo.reddit")],
+)
+@Suppress("unused")
+object DisableAdsPatch : BytecodePatch(
+    setOf(MaxMediationFingerprint, AdmobMediationFingerprint),
+) {
+    override fun execute(context: BytecodeContext) =
+        arrayOf(MaxMediationFingerprint, AdmobMediationFingerprint).forEach {
+            it.resultOrThrow().mutableMethod.addInstructions(0, "return-void")
+        }
+}

src/main/kotlin/app/revanced/patches/reddit/customclients/boostforreddit/ads/fingerprints/AdmobMediationFingerprint.kt

@@ -0,0 +1,7 @@
+package app.revanced.patches.reddit.customclients.boostforreddit.ads.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+
+internal object AdmobMediationFingerprint : MethodFingerprint(
+    strings = listOf("AdmobMediation: Attempting to initialize SDK")
+)

src/main/kotlin/app/revanced/patches/reddit/customclients/boostforreddit/ads/fingerprints/MaxMediationFingerprint.kt

@@ -0,0 +1,7 @@
+package app.revanced.patches.reddit.customclients.boostforreddit.ads.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+
+internal object MaxMediationFingerprint : MethodFingerprint(
+    strings = listOf("MaxMediation: Attempting to initialize SDK")
+)

src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/fix/user/UseUserEndpointPatch.kt

@@ -0,0 +1,61 @@
+package app.revanced.patches.reddit.customclients.syncforreddit.fix.user
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.reddit.customclients.syncforreddit.fix.user.fingerprints.*
+import app.revanced.patches.reddit.customclients.syncforreddit.fix.user.fingerprints.OAuthFriendRequestFingerprint
+import app.revanced.patches.reddit.customclients.syncforreddit.fix.user.fingerprints.OAuthSubredditInfoRequestHelperFingerprint
+import app.revanced.patches.reddit.customclients.syncforreddit.fix.user.fingerprints.OAuthUnfriendRequestFingerprint
+import app.revanced.util.getReference
+import app.revanced.util.resultOrThrow
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.reference.StringReference
+
+@Patch(
+    name = "Use /user/ endpoint",
+    description = "Replaces the deprecated endpoint for viewing user profiles /u with /user, that used to fix a bug.",
+    compatiblePackages = [
+        CompatiblePackage("com.laurencedawson.reddit_sync"),
+        CompatiblePackage("com.laurencedawson.reddit_sync.pro"),
+        CompatiblePackage("com.laurencedawson.reddit_sync.dev"),
+    ],
+    use = false,
+)
+@Suppress("unused")
+object UseUserEndpointPatch : BytecodePatch(
+    fingerprints = setOf(
+        OAuthFriendRequestFingerprint,
+        OAuthSubredditInfoRequestConstructorFingerprint,
+        OAuthSubredditInfoRequestHelperFingerprint,
+        OAuthUnfriendRequestFingerprint,
+        OAuthUserIdRequestFingerprint,
+        OAuthUserInfoRequestFingerprint,
+    ),
+) {
+    override fun execute(context: BytecodeContext) {
+        arrayOf(
+            OAuthFriendRequestFingerprint,
+            OAuthSubredditInfoRequestConstructorFingerprint,
+            OAuthSubredditInfoRequestHelperFingerprint,
+            OAuthUnfriendRequestFingerprint,
+            OAuthUserIdRequestFingerprint,
+            OAuthUserInfoRequestFingerprint,
+        ).map(MethodFingerprint::resultOrThrow).map {
+            it.scanResult.stringsScanResult!!.matches.first().index to it.mutableMethod
+        }.forEach { (userPathStringIndex, method) ->
+            val userPathStringInstruction = method.getInstruction<OneRegisterInstruction>(userPathStringIndex)
+            val userPathStringRegister = userPathStringInstruction.registerA
+            val fixedUserPathString = userPathStringInstruction.getReference<StringReference>()!!.string.replace("u/", "user/")
+
+            method.replaceInstruction(
+                userPathStringIndex,
+                "const-string v$userPathStringRegister, \"${fixedUserPathString}\"",
+            )
+        }
+    }
+}

src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/fix/user/fingerprints/BaseUserEndpointFingerprint.kt

@@ -0,0 +1,10 @@
+package app.revanced.patches.reddit.customclients.syncforreddit.fix.user.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+
+internal abstract class BaseUserEndpointFingerprint(source: String, accessFlags: Int? = null) :
+    MethodFingerprint(
+        accessFlags = accessFlags,
+        strings = listOf("u/"),
+        customFingerprint = { _, classDef -> classDef.sourceFile == source },
+    )

src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/fix/user/fingerprints/OAuthFriendRequestFingerprint.kt

@@ -0,0 +1,3 @@
+package app.revanced.patches.reddit.customclients.syncforreddit.fix.user.fingerprints
+
+internal object OAuthFriendRequestFingerprint : BaseUserEndpointFingerprint("OAuthFriendRequest.java")

src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/fix/user/fingerprints/OAuthSubredditInfoRequestConstructorFingerprint.kt

@@ -0,0 +1,10 @@
+package app.revanced.patches.reddit.customclients.syncforreddit.fix.user.fingerprints
+
+import app.revanced.patcher.extensions.or
+import com.android.tools.smali.dexlib2.AccessFlags
+
+internal object OAuthSubredditInfoRequestConstructorFingerprint :
+    BaseUserEndpointFingerprint(
+        "OAuthSubredditInfoRequest.java",
+        AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
+    )

src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/fix/user/fingerprints/OAuthSubredditInfoRequestHelperFingerprint.kt

@@ -0,0 +1,10 @@
+package app.revanced.patches.reddit.customclients.syncforreddit.fix.user.fingerprints
+
+import app.revanced.patcher.extensions.or
+import com.android.tools.smali.dexlib2.AccessFlags
+
+internal object OAuthSubredditInfoRequestHelperFingerprint :
+    BaseUserEndpointFingerprint(
+        "OAuthSubredditInfoRequest.java",
+        AccessFlags.PRIVATE or AccessFlags.STATIC,
+    )

src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/fix/user/fingerprints/OAuthUnfriendRequestFingerprint.kt

@@ -0,0 +1,3 @@
+package app.revanced.patches.reddit.customclients.syncforreddit.fix.user.fingerprints
+
+internal object OAuthUnfriendRequestFingerprint : BaseUserEndpointFingerprint("OAuthUnfriendRequest.java")

src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/fix/user/fingerprints/OAuthUserIdRequestFingerprint.kt

@@ -0,0 +1,3 @@
+package app.revanced.patches.reddit.customclients.syncforreddit.fix.user.fingerprints
+
+internal object OAuthUserIdRequestFingerprint : BaseUserEndpointFingerprint("OAuthUserIdRequest.java")

src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/fix/user/fingerprints/OAuthUserInfoRequestFingerprint.kt

@@ -0,0 +1,3 @@
+package app.revanced.patches.reddit.customclients.syncforreddit.fix.user.fingerprints
+
+internal object OAuthUserInfoRequestFingerprint : BaseUserEndpointFingerprint("OAuthUserInfoRequest.java")

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

@@ -10,11 +10,13 @@ import app.revanced.patches.scbeasy.detection.debugging.fingerprints.DebuggingDe
 
 @Patch(
     use = false,
-    name = "Remove debugging detection",
     description = "Removes the USB and wireless debugging checks.",
     compatiblePackages = [CompatiblePackage("com.scb.phone")]
 )
 @Suppress("unused")
+@Deprecated("This patch no longer work and will be removed in the future " +
+        "due to the complexity of the application.\n" +
+        "See https://github.com/ReVanced/revanced-patches/issues/3517 for more details.")
 object RemoveDebuggingDetectionPatch : BytecodePatch(
     setOf(DebuggingDetectionFingerprint)
 ) {

src/main/kotlin/app/revanced/patches/shared/misc/checks/BaseCheckEnvironmentPatch.kt

@@ -0,0 +1,114 @@
+package app.revanced.patches.shared.misc.checks
+
+import android.os.Build.*
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.util.proxy.mutableTypes.encodedValue.MutableEncodedValue
+import app.revanced.patcher.util.proxy.mutableTypes.encodedValue.MutableLongEncodedValue
+import app.revanced.patcher.util.proxy.mutableTypes.encodedValue.MutableStringEncodedValue
+import app.revanced.patches.all.misc.resources.AddResourcesPatch
+import app.revanced.patches.shared.misc.checks.fingerprints.PatchInfoBuildFingerprint
+import app.revanced.patches.shared.misc.checks.fingerprints.PatchInfoFingerprint
+import app.revanced.patches.shared.misc.integrations.BaseIntegrationsPatch
+import app.revanced.util.exception
+import app.revanced.util.resultOrThrow
+import com.android.tools.smali.dexlib2.immutable.value.ImmutableLongEncodedValue
+import com.android.tools.smali.dexlib2.immutable.value.ImmutableStringEncodedValue
+import java.nio.charset.StandardCharsets
+import java.security.MessageDigest
+import kotlin.io.encoding.Base64
+import kotlin.io.encoding.ExperimentalEncodingApi
+
+abstract class BaseCheckEnvironmentPatch(
+    private val mainActivityOnCreateFingerprint: MethodFingerprint,
+    compatiblePackages: Set<CompatiblePackage>,
+    integrationsPatch: BaseIntegrationsPatch,
+) : BytecodePatch(
+    description = "Checks, if the application was patched by, otherwise warns the user.",
+    compatiblePackages = compatiblePackages,
+    dependencies = setOf(
+        AddResourcesPatch::class,
+        integrationsPatch::class,
+    ),
+    fingerprints = setOf(
+        PatchInfoFingerprint,
+        PatchInfoBuildFingerprint,
+        mainActivityOnCreateFingerprint,
+    ),
+) {
+    override fun execute(context: BytecodeContext) {
+        AddResourcesPatch(BaseCheckEnvironmentPatch::class)
+
+        setPatchInfo()
+        invokeCheck()
+    }
+
+    private fun setPatchInfo() {
+        PatchInfoFingerprint.setClassFields(
+            "PATCH_TIME" to System.currentTimeMillis().encoded,
+        )
+
+        fun setBuildInfo() {
+            PatchInfoBuildFingerprint.setClassFields(
+                "PATCH_BOARD" to BOARD.encodedAndHashed,
+                "PATCH_BOOTLOADER" to BOOTLOADER.encodedAndHashed,
+                "PATCH_BRAND" to BRAND.encodedAndHashed,
+                "PATCH_CPU_ABI" to CPU_ABI.encodedAndHashed,
+                "PATCH_CPU_ABI2" to CPU_ABI2.encodedAndHashed,
+                "PATCH_DEVICE" to DEVICE.encodedAndHashed,
+                "PATCH_DISPLAY" to DISPLAY.encodedAndHashed,
+                "PATCH_FINGERPRINT" to FINGERPRINT.encodedAndHashed,
+                "PATCH_HARDWARE" to HARDWARE.encodedAndHashed,
+                "PATCH_HOST" to HOST.encodedAndHashed,
+                "PATCH_ID" to ID.encodedAndHashed,
+                "PATCH_MANUFACTURER" to MANUFACTURER.encodedAndHashed,
+                "PATCH_MODEL" to MODEL.encodedAndHashed,
+                "PATCH_PRODUCT" to PRODUCT.encodedAndHashed,
+                "PATCH_RADIO" to RADIO.encodedAndHashed,
+                "PATCH_TAGS" to TAGS.encodedAndHashed,
+                "PATCH_TYPE" to TYPE.encodedAndHashed,
+                "PATCH_USER" to USER.encodedAndHashed,
+            )
+        }
+
+        try {
+            Class.forName("android.os.Build")
+            // This only works on Android,
+            // because it uses Android APIs.
+            setBuildInfo()
+        } catch (_: ClassNotFoundException) { }
+    }
+
+    private fun invokeCheck() = mainActivityOnCreateFingerprint.result?.mutableMethod?.addInstructions(
+        0,
+        "invoke-static/range { p0 .. p0 },$INTEGRATIONS_CLASS_DESCRIPTOR->check(Landroid/app/Activity;)V",
+    ) ?: throw mainActivityOnCreateFingerprint.exception
+
+    private companion object {
+        private const val INTEGRATIONS_CLASS_DESCRIPTOR =
+            "Lapp/revanced/integrations/shared/checks/CheckEnvironmentPatch;"
+
+        @OptIn(ExperimentalEncodingApi::class)
+        private val String.encodedAndHashed
+            get() = MutableStringEncodedValue(
+                ImmutableStringEncodedValue(
+                    Base64.encode(
+                        MessageDigest.getInstance("SHA-1")
+                            .digest(this.toByteArray(StandardCharsets.UTF_8)),
+                    ),
+                ),
+            )
+
+        private val Long.encoded get() = MutableLongEncodedValue(ImmutableLongEncodedValue(this))
+
+        private fun <T : MutableEncodedValue> MethodFingerprint.setClassFields(vararg fieldNameValues: Pair<String, T>) {
+            val fieldNameValueMap = mapOf(*fieldNameValues)
+
+            resultOrThrow().mutableClass.fields.forEach { field ->
+                field.initialValue = fieldNameValueMap[field.name] ?: return@forEach
+            }
+        }
+    }
+}

src/main/kotlin/app/revanced/patches/shared/misc/checks/fingerprints/PatchInfoBuildFingerprint.kt

@@ -0,0 +1,7 @@
+package app.revanced.patches.shared.misc.checks.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+
+internal object PatchInfoBuildFingerprint : MethodFingerprint(
+    customFingerprint = { _, classDef -> classDef.type == "Lapp/revanced/integrations/shared/checks/PatchInfo\$Build;" },
+)

src/main/kotlin/app/revanced/patches/shared/misc/checks/fingerprints/PatchInfoFingerprint.kt

@@ -0,0 +1,9 @@
+package app.revanced.patches.shared.misc.checks.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+
+internal object PatchInfoFingerprint : MethodFingerprint(
+    customFingerprint = { _, classDef ->
+        classDef.type == "Lapp/revanced/integrations/shared/checks/PatchInfo;"
+    },
+)

src/main/kotlin/app/revanced/patches/shared/misc/gms/BaseGmsCoreSupportPatch.kt

@@ -18,11 +18,13 @@ import app.revanced.patches.shared.misc.gms.fingerprints.GooglePlayUtilityFinger
 import app.revanced.patches.shared.misc.gms.fingerprints.ServiceCheckFingerprint
 import app.revanced.util.exception
 import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstruction
 import app.revanced.util.returnEarly
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction21c
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction21c
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 import com.android.tools.smali.dexlib2.iface.reference.StringReference
 import com.android.tools.smali.dexlib2.immutable.reference.ImmutableStringReference
 import com.android.tools.smali.dexlib2.util.MethodUtil
@@ -56,7 +58,7 @@ abstract class BaseGmsCoreSupportPatch(
 ) : BytecodePatch(
     name = "GmsCore support",
     description = "Allows patched Google apps to run without root and under a different package name " +
-            "by using GmsCore instead of Google Play Services.",
+        "by using GmsCore instead of Google Play Services.",
     dependencies = setOf(
         ChangePackageNamePatch::class,
         gmsCoreSupportResourcePatch::class,
@@ -100,17 +102,33 @@ abstract class BaseGmsCoreSupportPatch(
         primeMethodFingerprint?.let { transformPrimeMethod(packageName) }
 
         // Return these methods early to prevent the app from crashing.
-        (earlyReturnFingerprints + ServiceCheckFingerprint + CastDynamiteModuleFingerprint).returnEarly()
+        earlyReturnFingerprints.returnEarly()
+        ServiceCheckFingerprint.returnEarly()
+        // Not all apps have CastDynamiteModule, so we need to check if it's present.
+        if (CastDynamiteModuleFingerprint.result != null) {
+            CastDynamiteModuleFingerprint.returnEarly()
+        }
+        // Google Play Utility is not present in all apps, so we need to check if it's present.
         if (GooglePlayUtilityFingerprint.result != null) {
             GooglePlayUtilityFingerprint.returnEarly()
         }
 
         // Verify GmsCore is installed and whitelisted for power optimizations and background usage.
-        mainActivityOnCreateFingerprint.result?.mutableMethod?.addInstructions(
-            0,
-            "invoke-static/range { p0 .. p0 }, Lapp/revanced/integrations/shared/GmsCoreSupport;->" +
+        mainActivityOnCreateFingerprint.result?.mutableMethod?.apply {
+            // Temporary fix for patches with an integrations patch that hook the onCreate method as well.
+            val setContextIndex = indexOfFirstInstruction {
+                val reference = getReference<MethodReference>() ?: return@indexOfFirstInstruction false
+
+                reference.toString() == "Lapp/revanced/integrations/shared/Utils;->setContext(Landroid/content/Context;)V"
+            }
+
+            // Add after setContext call, because this patch needs the context.
+            addInstructions(
+                if (setContextIndex < 0) 0 else setContextIndex + 1,
+                "invoke-static/range { p0 .. p0 }, Lapp/revanced/integrations/shared/GmsCoreSupport;->" +
                     "checkGmsCore(Landroid/app/Activity;)V",
-        ) ?: throw mainActivityOnCreateFingerprint.exception
+            )
+        } ?: throw mainActivityOnCreateFingerprint.exception
 
         // Change the vendor of GmsCore in ReVanced Integrations.
         GmsCoreSupportFingerprint.result?.mutableClass?.methods

src/main/kotlin/app/revanced/patches/shared/misc/gms/BaseGmsCoreSupportResourcePatch.kt

@@ -101,8 +101,8 @@ abstract class BaseGmsCoreSupportResourcePatch(
             "android:authorities=\"$fromPackageName" to "android:authorities=\"$packageName",
             "$fromPackageName.permission.C2D_MESSAGE" to "$packageName.permission.C2D_MESSAGE",
             "$fromPackageName.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION" to "$packageName.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION",
-            "com.google.android.c2dm" to "$packageName.android.c2dm",
-            "com.google.android.libraries.photos.api.mars" to "$packageName.android.apps.photos.api.mars",
+            "com.google.android.c2dm" to "$gmsCoreVendorGroupId.android.c2dm",
+            "com.google.android.libraries.photos.api.mars" to "$gmsCoreVendorGroupId.android.apps.photos.api.mars",
             "</queries>" to "<package android:name=\"$gmsCoreVendorGroupId.android.gms\"/></queries>",
         )
 
@@ -110,9 +110,9 @@ abstract class BaseGmsCoreSupportResourcePatch(
             transformations.entries.fold(get("AndroidManifest.xml", false).readText()) { acc, (from, to) ->
                 acc.replace(
                     from,
-                    to
+                    to,
                 )
-            }
+            },
         )
     }
 

src/main/kotlin/app/revanced/patches/soundcloud/ad/HideAdsPatch.kt

@@ -62,7 +62,7 @@ object HideAdsPatch : BytecodePatch(
 
         // Prevent verification of an HTTP header containing the user's current plan, which would contradict the previous patch.
         InterceptFingerprint.resultOrThrow().let { result ->
-            val conditionIndex = result.scanResult.patternScanResult!!.endIndex
+            val conditionIndex = result.scanResult.patternScanResult!!.endIndex + 1
             result.mutableMethod.addInstruction(
                 conditionIndex,
                 "return-object p1",

src/main/kotlin/app/revanced/patches/soundcloud/ad/fingerprints/InterceptFingerprint.kt

@@ -9,14 +9,13 @@ internal object InterceptFingerprint : MethodFingerprint(
     accessFlags = AccessFlags.PUBLIC.value,
     parameters = listOf("L"),
     opcodes = listOf(
-        Opcode.INVOKE_INTERFACE,
         Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_EQZ,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT_OBJECT
     ),
     strings = listOf("SC-Mob-UserPlan", "Configuration"),
     customFingerprint = { _, classDef ->
-        classDef.sourceFile == "ApiUserPlanInterceptor.java"
+        classDef.sourceFile == "ApiUserPlanInterceptor.java" ||
+        classDef.sourceFile == "ApiUserPlanInterceptor.kt"
     },
 )

src/main/kotlin/app/revanced/patches/swissid/integritycheck/RemoveGooglePlayIntegrityCheck.kt

@@ -0,0 +1,37 @@
+package app.revanced.patches.swissid.integritycheck
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.swissid.integritycheck.fingerprints.CheckIntegrityFingerprint
+import app.revanced.util.resultOrThrow
+
+@Patch(
+    name = "Remove Google Play Integrity check",
+    description = "Removes the Google Play Integrity check. With this it's possible to use SwissID on custom ROMS." +
+            "If the device is rooted, root permissions must be hidden from the app.",
+    compatiblePackages = [CompatiblePackage("com.swisssign.swissid.mobile")],
+)
+@Suppress("unused")
+object RemoveGooglePlayIntegrityCheck : BytecodePatch(
+    setOf(CheckIntegrityFingerprint),
+) {
+    private const val RESULT_METHOD_REFERENCE = " Lcom/swisssign/deviceintegrity/" +
+            "DeviceintegrityPlugin\$onMethodCall\$1;->\$result:" +
+            "Lio/flutter/plugin/common/MethodChannel\$Result;"
+    private const val SUCCESS_METHOD_REFERENCE =
+        "Lio/flutter/plugin/common/MethodChannel\$Result;->success(Ljava/lang/Object;)V"
+
+    override fun execute(context: BytecodeContext) =
+        CheckIntegrityFingerprint.resultOrThrow().mutableMethod.addInstructions(
+            0,
+            """
+                iget-object p1, p0, $RESULT_METHOD_REFERENCE
+                const-string v0, "VALID"
+                invoke-interface {p1, v0}, $SUCCESS_METHOD_REFERENCE
+                return-void
+            """,
+        )
+}

src/main/kotlin/app/revanced/patches/swissid/integritycheck/fingerprints/CheckIntegrityFingerprint.kt

@@ -0,0 +1,11 @@
+package app.revanced.patches.swissid.integritycheck.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+
+internal object CheckIntegrityFingerprint : MethodFingerprint(
+    returnType = "V",
+    parameters = listOf("Lcom/swisssign/deviceintegrity/model/DeviceIntegrityResult;"),
+    strings = listOf("it", "result")
+)

src/main/kotlin/app/revanced/patches/tiktok/interaction/speed/PlaybackSpeedPatch.kt

@@ -20,19 +20,19 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 @Patch(
     name = "Playback speed",
     description = "Enables the playback speed option for all videos and " +
-            "retains the speed configurations in between videos.",
+        "retains the speed configurations in between videos.",
     compatiblePackages = [
         CompatiblePackage("com.ss.android.ugc.trill", ["32.5.3"]),
-        CompatiblePackage("com.zhiliaoapp.musically", ["32.5.3"])
-    ]
+        CompatiblePackage("com.zhiliaoapp.musically", ["32.5.3"]),
+    ],
 )
 @Suppress("unused")
 object PlaybackSpeedPatch : BytecodePatch(
     setOf(
         GetSpeedFingerprint,
         OnRenderFirstFrameFingerprint,
-        SetSpeedFingerprint
-    )
+        SetSpeedFingerprint,
+    ),
 ) {
     override fun execute(context: BytecodeContext) {
         SetSpeedFingerprint.result?.let { onVideoSwiped ->
@@ -44,7 +44,7 @@ object PlaybackSpeedPatch : BytecodePatch(
                 addInstruction(
                     injectIndex,
                     "invoke-static { v$register }," +
-                            " Lapp/revanced/integrations/tiktok/speed/PlaybackSpeedPatch;->rememberPlaybackSpeed(F)V"
+                        " Lapp/revanced/integrations/tiktok/speed/PlaybackSpeedPatch;->rememberPlaybackSpeed(F)V",
                 )
             } ?: throw GetSpeedFingerprint.exception
 
@@ -64,9 +64,9 @@ object PlaybackSpeedPatch : BytecodePatch(
 
                 # Desired playback speed retrieved using getPlaybackSpeed method.
                 invoke-static {}, Lapp/revanced/integrations/tiktok/speed/PlaybackSpeedPatch;->getPlaybackSpeed()F
-                move-result-object v2
+                move-result v2
                 invoke-static { v0, v1, v2 }, ${onVideoSwiped.method}
-            """
+            """,
             ) ?: throw OnRenderFirstFrameFingerprint.exception
 
             // Force enable the playback speed option for all videos.
@@ -75,7 +75,7 @@ object PlaybackSpeedPatch : BytecodePatch(
                 """
                 const/4 v0, 0x1
                 return v0
-            """
+            """,
             ) ?: throw PatchException("Failed to force enable the playback speed option.")
         } ?: throw SetSpeedFingerprint.exception
     }

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

@@ -25,8 +25,8 @@ import com.android.tools.smali.dexlib2.iface.reference.FieldReference
     dependencies = [IntegrationsPatch::class],
     compatiblePackages = [
         CompatiblePackage("com.ss.android.ugc.trill", ["32.5.3"]),
-        CompatiblePackage("com.zhiliaoapp.musically", ["32.5.3"])
-    ]
+        CompatiblePackage("com.zhiliaoapp.musically", ["32.5.3"]),
+    ],
 )
 object SettingsPatch : BytecodePatch(
     setOf(
@@ -34,21 +34,21 @@ object SettingsPatch : BytecodePatch(
         AddSettingsEntryFingerprint,
         SettingsEntryFingerprint,
         SettingsEntryInfoFingerprint,
-    )
+    ),
 ) {
     private const val INTEGRATIONS_CLASS_DESCRIPTOR =
         "Lapp/revanced/integrations/tiktok/settings/AdPersonalizationActivityHook;"
 
     private const val INITIALIZE_SETTINGS_METHOD_DESCRIPTOR =
         "$INTEGRATIONS_CLASS_DESCRIPTOR->initialize(" +
-                "Lcom/bytedance/ies/ugc/aweme/commercialize/compliance/personalization/AdPersonalizationActivity;" +
-                ")Z"
+            "Lcom/bytedance/ies/ugc/aweme/commercialize/compliance/personalization/AdPersonalizationActivity;" +
+            ")Z"
 
     private const val CREATE_SETTINGS_ENTRY_METHOD_DESCRIPTOR =
         "$INTEGRATIONS_CLASS_DESCRIPTOR->createSettingsEntry(" +
-                "Ljava/lang/String;" +
-                "Ljava/lang/String;" +
-                ")Ljava/lang/Object;"
+            "Ljava/lang/String;" +
+            "Ljava/lang/String;" +
+            ")Ljava/lang/Object;"
 
     override fun execute(context: BytecodeContext) {
         // Find the class name of classes which construct a settings entry
@@ -70,8 +70,8 @@ object SettingsPatch : BytecodePatch(
                 markIndex + 2,
                 listOf(
                     getUnitManager,
-                    addEntry
-                )
+                    addEntry,
+                ),
             )
 
             addInstructions(
@@ -81,7 +81,8 @@ object SettingsPatch : BytecodePatch(
                     const-string v1, "$settingsButtonInfoClass"
                     invoke-static {v0, v1}, $CREATE_SETTINGS_ENTRY_METHOD_DESCRIPTOR
                     move-result-object v0
-                """
+                    check-cast v0, ${SettingsEntryFingerprint.result!!.classDef}
+                """,
             )
         } ?: throw AddSettingsEntryFingerprint.exception
 
@@ -102,12 +103,10 @@ object SettingsPatch : BytecodePatch(
                     if-eqz v$usableRegister, :do_not_open
                     return-void
                 """,
-                ExternalLabel("do_not_open", getInstruction(initializeSettingsIndex))
+                ExternalLabel("do_not_open", getInstruction(initializeSettingsIndex)),
             )
         } ?: throw AdPersonalizationActivityOnCreateFingerprint.exception
     }
 
-    private fun String.toClassName(): String {
-        return substring(1, this.length - 1).replace("/", ".")
-    }
-}
+    private fun String.toClassName(): String = substring(1, this.length - 1).replace("/", ".")
+}

src/main/kotlin/app/revanced/patches/twitter/misc/links/OpenLinksWithAppChooserPatch.kt

@@ -12,7 +12,7 @@ import app.revanced.util.exception
     name = "Open links with app chooser",
     description = "Instead of opening links directly, open them with an app chooser. " +
         "As a result you can select a browser to open the link with.",
-    compatiblePackages = [CompatiblePackage("com.twitter.android")],
+    compatiblePackages = [CompatiblePackage("com.twitter.android", ["10.48.0-release"])],
     use = false,
 )
 @Suppress("unused")

src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt

@@ -97,6 +97,7 @@ object HideLayoutComponentsPatch : BytecodePatch(
                     SwitchPreference("revanced_hide_attributes_section"),
                     SwitchPreference("revanced_hide_chapters_section"),
                     SwitchPreference("revanced_hide_info_cards_section"),
+                    SwitchPreference("revanced_hide_key_concepts_section"),
                     SwitchPreference("revanced_hide_podcast_section"),
                     SwitchPreference("revanced_hide_transcript_section"),
                 ),
@@ -137,8 +138,10 @@ object HideLayoutComponentsPatch : BytecodePatch(
                     SwitchPreference("revanced_hide_keyword_content_search"),
                     TextPreference("revanced_hide_keyword_content_phrases", inputType = InputType.TEXT_MULTI_LINE),
                     NonInteractivePreference("revanced_hide_keyword_content_about"),
-                ),
-            ),
+                    NonInteractivePreference(key = "revanced_hide_keyword_content_about_whole_words",
+                        tag = "app.revanced.integrations.youtube.settings.preference.HtmlPreference")
+                )
+            )
         )
 
         SettingsPatch.PreferenceScreen.GENERAL_LAYOUT.addPreferences(

src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsResourcePatch.kt

@@ -38,6 +38,7 @@ object HideShortsComponentsResourcePatch : ResourcePatch() {
             SwitchPreference("revanced_hide_shorts_subscribe_button"),
             SwitchPreference("revanced_hide_shorts_paused_overlay_buttons"),
             SwitchPreference("revanced_hide_shorts_save_sound_button"),
+            SwitchPreference("revanced_hide_shorts_use_this_sound_button"),
             SwitchPreference("revanced_hide_shorts_shop_button"),
             SwitchPreference("revanced_hide_shorts_tagged_products"),
             SwitchPreference("revanced_hide_shorts_search_suggestions"),

src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/BypassImageRegionRestrictions.kt

@@ -12,7 +12,7 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
 
 @Patch(
     name = "Bypass image region restrictions",
-    description = "Adds an option to use a different host for user avatar and channel images," +
+    description = "Adds an option to use a different host for user avatar and channel images " +
             "and can fix missing images that are blocked in some countries.",
     dependencies = [
         IntegrationsPatch::class,
@@ -60,7 +60,7 @@ object BypassImageRegionRestrictions : BytecodePatch(emptySet()) {
     override fun execute(context: BytecodeContext) {
         AddResourcesPatch(this::class)
 
-        SettingsPatch.PreferenceScreen.GENERAL_LAYOUT.addPreferences(
+        SettingsPatch.PreferenceScreen.MISC.addPreferences(
             SwitchPreference("revanced_bypass_image_region_restrictions")
         )
 

src/main/kotlin/app/revanced/patches/youtube/misc/check/CheckEnvironmentPatch.kt

@@ -0,0 +1,13 @@
+package app.revanced.patches.youtube.misc.check
+
+import app.revanced.patches.shared.misc.checks.BaseCheckEnvironmentPatch
+import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
+import app.revanced.patches.youtube.shared.fingerprints.MainActivityOnCreateFingerprint
+
+@Suppress("unused")
+object CheckEnvironmentPatch :
+    BaseCheckEnvironmentPatch(
+        mainActivityOnCreateFingerprint = MainActivityOnCreateFingerprint,
+        integrationsPatch = IntegrationsPatch,
+        compatiblePackages = setOf(CompatiblePackage("com.google.android.youtube")),
+    )

src/main/kotlin/app/revanced/patches/youtube/misc/dns/CheckWatchHistoryDomainNameResolutionPatch.kt

@@ -0,0 +1,69 @@
+package app.revanced.patches.youtube.misc.dns
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.all.misc.resources.AddResourcesPatch
+import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
+import app.revanced.patches.youtube.shared.fingerprints.MainActivityOnCreateFingerprint
+import app.revanced.util.resultOrThrow
+
+@Patch(
+    name = "Check watch history domain name resolution",
+    description = "Checks if the device DNS server is preventing user watch history from being saved.",
+    dependencies = [IntegrationsPatch::class],
+    compatiblePackages = [
+        CompatiblePackage(
+            "com.google.android.youtube",
+            [
+                "18.32.39",
+                "18.37.36",
+                "18.38.44",
+                "18.43.45",
+                "18.44.41",
+                "18.45.43",
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.36",
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.38",
+                "19.10.39",
+                "19.11.43",
+                "19.12.41",
+                "19.13.37",
+                "19.14.43",
+                "19.15.36",
+                "19.16.39",
+            ],
+        ),
+    ],
+)
+@Suppress("unused")
+internal object CheckWatchHistoryDomainNameResolutionPatch : BytecodePatch(
+    setOf(MainActivityOnCreateFingerprint),
+) {
+    private const val INTEGRATIONS_CLASS_DESCRIPTOR =
+        "Lapp/revanced/integrations/youtube/patches/CheckWatchHistoryDomainNameResolutionPatch;"
+
+    override fun execute(context: BytecodeContext) {
+        AddResourcesPatch(this::class)
+
+        MainActivityOnCreateFingerprint.resultOrThrow().mutableMethod.addInstructions(
+            // FIXME: Insert index must be greater than the insert index used by GmsCoreSupport,
+            //  as both patch the same method and GmsCoreSupport check should be first,
+            //  but the patch does not depend on GmsCoreSupport, so it should not be possible to enforce this
+            //  unless a third patch is added that this patch and GmsCoreSupport depend on to manage
+            //  the order of the patches.
+            1,
+            "invoke-static/range { p0 .. p0 }, $INTEGRATIONS_CLASS_DESCRIPTOR->checkDnsResolver(Landroid/app/Activity;)V",
+        )
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/SpoofClientPatch.kt

@@ -1,309 +1,11 @@
 package app.revanced.patches.youtube.misc.fix.playback
 
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.getInstructions
-import app.revanced.patcher.extensions.or
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchException
-import app.revanced.patcher.patch.annotation.CompatiblePackage
-import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
-import app.revanced.patches.all.misc.resources.AddResourcesPatch
-import app.revanced.patches.shared.misc.settings.preference.PreferenceScreen
-import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
-import app.revanced.patches.youtube.misc.fix.playback.fingerprints.*
-import app.revanced.patches.youtube.misc.settings.SettingsPatch
-import app.revanced.util.getReference
-import app.revanced.util.indexOfFirstInstructionOrThrow
-import app.revanced.util.resultOrThrow
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.builder.MutableMethodImplementation
-import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
-import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
-import com.android.tools.smali.dexlib2.iface.reference.FieldReference
-import com.android.tools.smali.dexlib2.iface.reference.TypeReference
-import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
-import com.android.tools.smali.dexlib2.immutable.ImmutableMethodParameter
 
-@Patch(
-    name = "Spoof client",
-    description = "Spoofs the client to allow video playback.",
-    dependencies = [
-        SettingsPatch::class,
-        AddResourcesPatch::class,
-        UserAgentClientSpoofPatch::class,
-    ],
-    compatiblePackages = [
-        CompatiblePackage(
-            "com.google.android.youtube",
-            [
-                "18.37.36",
-                "18.38.44",
-                "18.43.45",
-                "18.44.41",
-                "18.45.43",
-                "18.48.39",
-                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                "19.09.38",
-                "19.10.39",
-                "19.11.43",
-                "19.12.41",
-                "19.13.37",
-                "19.14.43",
-                "19.15.36",
-                "19.16.39",
-            ],
-        ),
-    ],
-)
+@Deprecated("This patch is obsolete.", replaceWith = ReplaceWith("SpoofVideoStreamsPatch"))
 object SpoofClientPatch : BytecodePatch(
-    setOf(
-        // Client type spoof.
-        BuildInitPlaybackRequestFingerprint,
-        BuildPlayerRequestURIFingerprint,
-        SetPlayerRequestClientTypeFingerprint,
-        CreatePlayerRequestBodyFingerprint,
-        CreatePlayerRequestBodyWithModelFingerprint,
-
-        // Player gesture config.
-        PlayerGestureConfigSyntheticFingerprint,
-
-        // Player speed menu item.
-        CreatePlaybackSpeedMenuItemFingerprint,
-    ),
+    dependencies = setOf(SpoofVideoStreamsPatch::class),
 ) {
-    private const val INTEGRATIONS_CLASS_DESCRIPTOR =
-        "Lapp/revanced/integrations/youtube/patches/spoof/SpoofClientPatch;"
-    private const val CLIENT_INFO_CLASS_DESCRIPTOR =
-        "Lcom/google/protos/youtube/api/innertube/InnertubeContext\$ClientInfo;"
-
-    override fun execute(context: BytecodeContext) {
-        AddResourcesPatch(this::class)
-
-        SettingsPatch.PreferenceScreen.MISC.addPreferences(
-            PreferenceScreen(
-                key = "revanced_spoof_client_screen",
-                sorting = PreferenceScreen.Sorting.UNSORTED,
-                preferences = setOf(
-                    SwitchPreference("revanced_spoof_client"),
-                    SwitchPreference("revanced_spoof_client_use_ios"),
-                ),
-            ),
-        )
-
-        // region Block /initplayback requests to fall back to /get_watch requests.
-
-        BuildInitPlaybackRequestFingerprint.resultOrThrow().let {
-            val moveUriStringIndex = it.scanResult.patternScanResult!!.startIndex
-
-            it.mutableMethod.apply {
-                val targetRegister = getInstruction<OneRegisterInstruction>(moveUriStringIndex).registerA
-
-                addInstructions(
-                    moveUriStringIndex + 1,
-                    """
-                        invoke-static { v$targetRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->blockInitPlaybackRequest(Ljava/lang/String;)Ljava/lang/String;
-                        move-result-object v$targetRegister
-                    """,
-                )
-            }
-        }
-
-        // endregion
-
-        // region Block /get_watch requests to fall back to /player requests.
-
-        BuildPlayerRequestURIFingerprint.resultOrThrow().let {
-            val invokeToStringIndex = it.scanResult.patternScanResult!!.startIndex
-
-            it.mutableMethod.apply {
-                val uriRegister = getInstruction<FiveRegisterInstruction>(invokeToStringIndex).registerC
-
-                addInstructions(
-                    invokeToStringIndex,
-                    """
-                        invoke-static { v$uriRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->blockGetWatchRequest(Landroid/net/Uri;)Landroid/net/Uri;
-                        move-result-object v$uriRegister
-                    """,
-                )
-            }
-        }
-
-        // endregion
-
-        // region Get field references to be used below.
-
-        val (clientInfoField, clientInfoClientTypeField, clientInfoClientVersionField) =
-            SetPlayerRequestClientTypeFingerprint.resultOrThrow().let { result ->
-                // Field in the player request object that holds the client info object.
-                val clientInfoField = result.mutableMethod
-                    .getInstructions().find { instruction ->
-                        // requestMessage.clientInfo = clientInfoBuilder.build();
-                        instruction.opcode == Opcode.IPUT_OBJECT &&
-                            instruction.getReference<FieldReference>()?.type == CLIENT_INFO_CLASS_DESCRIPTOR
-                    }?.getReference<FieldReference>() ?: throw PatchException("Could not find clientInfoField")
-
-                // Client info object's client type field.
-                val clientInfoClientTypeField = result.mutableMethod
-                    .getInstruction(result.scanResult.patternScanResult!!.endIndex)
-                    .getReference<FieldReference>() ?: throw PatchException("Could not find clientInfoClientTypeField")
-
-                // Client info object's client version field.
-                val clientInfoClientVersionField = result.mutableMethod
-                    .getInstruction(result.scanResult.stringsScanResult!!.matches.first().index + 1)
-                    .getReference<FieldReference>() ?: throw PatchException("Could not find clientInfoClientVersionField")
-
-                Triple(clientInfoField, clientInfoClientTypeField, clientInfoClientVersionField)
-            }
-
-        val clientInfoClientModelField = CreatePlayerRequestBodyWithModelFingerprint.resultOrThrow().let {
-            val getClientModelIndex = CreatePlayerRequestBodyWithModelFingerprint.indexOfBuildModelInstruction(it.method)
-
-            // The next IPUT_OBJECT instruction after getting the client model is setting the client model field.
-            val index = it.mutableMethod.indexOfFirstInstructionOrThrow(getClientModelIndex) {
-                opcode == Opcode.IPUT_OBJECT
-            }
-
-            it.mutableMethod.getInstruction(index).getReference<FieldReference>()
-                ?: throw PatchException("Could not find clientInfoClientModelField")
-        }
-
-        // endregion
-
-        // region Spoof client type for /player requests.
-
-        CreatePlayerRequestBodyFingerprint.resultOrThrow().let { result ->
-            val setClientInfoMethodName = "patch_setClientInfo"
-            val checkCastIndex = result.scanResult.patternScanResult!!.startIndex
-            var clientInfoContainerClassName: String
-
-            result.mutableMethod.apply {
-                val checkCastInstruction = getInstruction<OneRegisterInstruction>(checkCastIndex)
-                val requestMessageInstanceRegister = checkCastInstruction.registerA
-                clientInfoContainerClassName = checkCastInstruction.getReference<TypeReference>()!!.type
-
-                addInstruction(
-                    checkCastIndex + 1,
-                    "invoke-static { v$requestMessageInstanceRegister }," +
-                        " ${result.classDef.type}->$setClientInfoMethodName($clientInfoContainerClassName)V",
-                )
-            }
-
-            // Change client info to use the spoofed values.
-            // Do this in a helper method, to remove the need of picking out multiple free registers from the hooked code.
-            result.mutableClass.methods.add(
-                ImmutableMethod(
-                    result.mutableClass.type,
-                    setClientInfoMethodName,
-                    listOf(ImmutableMethodParameter(clientInfoContainerClassName, null, "clientInfoContainer")),
-                    "V",
-                    AccessFlags.PRIVATE or AccessFlags.STATIC,
-                    null,
-                    null,
-                    MutableMethodImplementation(3),
-                ).toMutable().apply {
-                    addInstructions(
-                        """
-                            invoke-static { }, $INTEGRATIONS_CLASS_DESCRIPTOR->isClientSpoofingEnabled()Z
-                            move-result v0
-                            if-eqz v0, :disabled
-                            
-                            iget-object v0, p0, $clientInfoField
-                            
-                            # Set client type to the spoofed value.
-                            iget v1, v0, $clientInfoClientTypeField
-                            invoke-static { v1 }, $INTEGRATIONS_CLASS_DESCRIPTOR->getClientTypeId(I)I
-                            move-result v1
-                            iput v1, v0, $clientInfoClientTypeField
-                            
-                            # Set client model to the spoofed value.
-                            iget-object v1, v0, $clientInfoClientModelField
-                            invoke-static { v1 }, $INTEGRATIONS_CLASS_DESCRIPTOR->getClientModel(Ljava/lang/String;)Ljava/lang/String;
-                            move-result-object v1
-                            iput-object v1, v0, $clientInfoClientModelField
-
-                            # Set client version to the spoofed value.
-                            iget-object v1, v0, $clientInfoClientVersionField
-                            invoke-static { v1 }, $INTEGRATIONS_CLASS_DESCRIPTOR->getClientVersion(Ljava/lang/String;)Ljava/lang/String;
-                            move-result-object v1
-                            iput-object v1, v0, $clientInfoClientVersionField
-                            
-                            :disabled
-                            return-void
-                        """,
-                    )
-                },
-            )
-        }
-
-        // endregion
-
-        // region Fix player gesture if spoofing to iOS.
-
-        PlayerGestureConfigSyntheticFingerprint.resultOrThrow().let {
-            val endIndex = it.scanResult.patternScanResult!!.endIndex
-            val downAndOutLandscapeAllowedIndex = endIndex - 3
-            val downAndOutPortraitAllowedIndex = endIndex - 9
-
-            arrayOf(
-                downAndOutLandscapeAllowedIndex,
-                downAndOutPortraitAllowedIndex,
-            ).forEach { index ->
-                val gestureAllowedMethod = context.toMethodWalker(it.mutableMethod)
-                    .nextMethod(index, true)
-                    .getMethod() as MutableMethod
-
-                gestureAllowedMethod.apply {
-                    val isAllowedIndex = getInstructions().lastIndex
-                    val isAllowed = getInstruction<OneRegisterInstruction>(isAllowedIndex).registerA
-
-                    addInstructions(
-                        isAllowedIndex,
-                        """
-                            invoke-static { v$isAllowed }, $INTEGRATIONS_CLASS_DESCRIPTOR->enablePlayerGesture(Z)Z
-                            move-result v$isAllowed
-                        """,
-                    )
-                }
-            }
-        }
-
-        // endregion
-
-        // Fix playback speed menu item if spoofing to iOS.
-
-        CreatePlaybackSpeedMenuItemFingerprint.resultOrThrow().let {
-            val scanResult = it.scanResult.patternScanResult!!
-            if (scanResult.startIndex != 0) throw PatchException("Unexpected start index: ${scanResult.startIndex}")
-
-            it.mutableMethod.apply {
-                // Find the conditional check if the playback speed menu item is not created.
-                val shouldCreateMenuIndex = indexOfFirstInstructionOrThrow(scanResult.endIndex) { opcode == Opcode.IF_EQZ }
-                val shouldCreateMenuRegister = getInstruction<OneRegisterInstruction>(shouldCreateMenuIndex).registerA
-
-                addInstructions(
-                    shouldCreateMenuIndex,
-                    """
-                        invoke-static { v$shouldCreateMenuRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->forceCreatePlaybackSpeedMenu(Z)Z
-                        move-result v$shouldCreateMenuRegister
-                    """,
-                )
-            }
-        }
-
-        // endregion
-    }
-}
+    override fun execute(context: BytecodeContext) {}
+}

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/SpoofSignaturePatch.kt

@@ -1,239 +1,12 @@
 package app.revanced.patches.youtube.misc.fix.playback
 
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.all.misc.resources.AddResourcesPatch
-import app.revanced.patches.shared.misc.settings.preference.PreferenceScreen
-import app.revanced.patches.shared.misc.settings.preference.PreferenceScreen.Sorting
-import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
-import app.revanced.patches.youtube.misc.fix.playback.fingerprints.*
-import app.revanced.patches.youtube.misc.playertype.PlayerTypeHookPatch
-import app.revanced.patches.youtube.misc.settings.SettingsPatch
-import app.revanced.patches.youtube.video.information.VideoInformationPatch
-import app.revanced.patches.youtube.video.playerresponse.PlayerResponseMethodHookPatch
-import app.revanced.util.exception
-import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
-import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
-import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
 
-@Patch(
-    description = "Spoofs the signature to prevent playback issues.",
-    dependencies = [
-        SettingsPatch::class,
-        PlayerTypeHookPatch::class,
-        PlayerResponseMethodHookPatch::class,
-        VideoInformationPatch::class,
-        SpoofSignatureResourcePatch::class,
-        AddResourcesPatch::class,
-    ],
-)
-@Deprecated("This patch will be removed in the future.")
+@Deprecated("This patch is obsolete.", replaceWith = ReplaceWith("SpoofVideoStreamsPatch"))
 object SpoofSignaturePatch : BytecodePatch(
-    setOf(
-        PlayerResponseModelImplGeneralFingerprint,
-        PlayerResponseModelImplLiveStreamFingerprint,
-        PlayerResponseModelImplRecommendedLevelFingerprint,
-        StoryboardRendererSpecFingerprint,
-        StoryboardRendererDecoderSpecFingerprint,
-        StoryboardRendererDecoderRecommendedLevelFingerprint,
-        StoryboardThumbnailParentFingerprint,
-        SpoofSignaturePatchScrubbedPreviewLayoutFingerprint,
-        StatsQueryParameterFingerprint,
-        ParamsMapPutFingerprint,
-    ),
+    dependencies = setOf(SpoofVideoStreamsPatch::class),
 ) {
-    private const val INTEGRATIONS_CLASS_DESCRIPTOR =
-        "Lapp/revanced/integrations/youtube/patches/spoof/SpoofSignaturePatch;"
-
-    override fun execute(context: BytecodeContext) {
-        AddResourcesPatch(this::class)
-
-        SettingsPatch.PreferenceScreen.MISC.addPreferences(
-            PreferenceScreen(
-                key = "revanced_spoof_signature_verification_screen",
-                sorting = Sorting.UNSORTED,
-                preferences = setOf(
-                    SwitchPreference("revanced_spoof_signature_verification_enabled"),
-                    SwitchPreference("revanced_spoof_signature_in_feed_enabled"),
-                    SwitchPreference("revanced_spoof_storyboard"),
-                ),
-            ),
-        )
-
-        // Hook the player parameters.
-        PlayerResponseMethodHookPatch += PlayerResponseMethodHookPatch.Hook.ProtoBufferParameter(
-            "$INTEGRATIONS_CLASS_DESCRIPTOR->spoofParameter(Ljava/lang/String;Ljava/lang/String;Z)Ljava/lang/String;",
-        )
-
-        // Force the seekbar time and chapters to always show up.
-        // This is used if the storyboard spec fetch fails, for viewing paid videos,
-        // or if storyboard spoofing is turned off.
-        StoryboardThumbnailParentFingerprint.result?.classDef?.let { classDef ->
-            StoryboardThumbnailFingerprint.also {
-                it.resolve(
-                    context,
-                    classDef,
-                )
-            }.result?.let {
-                val endIndex = it.scanResult.patternScanResult!!.endIndex
-                // Replace existing instruction to preserve control flow label.
-                // The replaced return instruction always returns false
-                // (it is the 'no thumbnails found' control path),
-                // so there is no need to pass the existing return value to integrations.
-                it.mutableMethod.replaceInstruction(
-                    endIndex,
-                    """
-                        invoke-static {}, $INTEGRATIONS_CLASS_DESCRIPTOR->getSeekbarThumbnailOverrideValue()Z
-                    """,
-                )
-                // Since this is end of the method must replace one line then add the rest.
-                it.mutableMethod.addInstructions(
-                    endIndex + 1,
-                    """
-                    move-result v0
-                    return v0
-                """,
-                )
-            } ?: throw StoryboardThumbnailFingerprint.exception
-        }
-
-        // If storyboard spoofing is turned off, then hide the empty seekbar thumbnail view.
-        SpoofSignaturePatchScrubbedPreviewLayoutFingerprint.result?.apply {
-            val endIndex = scanResult.patternScanResult!!.endIndex
-            mutableMethod.apply {
-                val imageViewFieldName = getInstruction<ReferenceInstruction>(endIndex).reference
-                addInstructions(
-                    implementation!!.instructions.lastIndex,
-                    """
-                        iget-object v0, p0, $imageViewFieldName   # copy imageview field to a register
-                        invoke-static {v0}, $INTEGRATIONS_CLASS_DESCRIPTOR->seekbarImageViewCreated(Landroid/widget/ImageView;)V
-                    """,
-                )
-            }
-        } ?: throw SpoofSignaturePatchScrubbedPreviewLayoutFingerprint.exception
-
-        /**
-         * Hook StoryBoard renderer url
-         */
-        arrayOf(
-            PlayerResponseModelImplGeneralFingerprint,
-            PlayerResponseModelImplLiveStreamFingerprint,
-        ).forEach { fingerprint ->
-            fingerprint.result?.let {
-                it.mutableMethod.apply {
-                    val getStoryBoardIndex = it.scanResult.patternScanResult!!.endIndex
-                    val getStoryBoardRegister =
-                        getInstruction<OneRegisterInstruction>(getStoryBoardIndex).registerA
-
-                    addInstructions(
-                        getStoryBoardIndex,
-                        """
-                        invoke-static { v$getStoryBoardRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->getStoryboardRendererSpec(Ljava/lang/String;)Ljava/lang/String;
-                        move-result-object v$getStoryBoardRegister
-                    """,
-                    )
-                }
-            } ?: throw fingerprint.exception
-        }
-
-        // Hook recommended seekbar thumbnails quality level.
-        StoryboardRendererDecoderRecommendedLevelFingerprint.result?.let {
-            val moveOriginalRecommendedValueIndex = it.scanResult.patternScanResult!!.endIndex
-            val originalValueRegister = it.mutableMethod
-                .getInstruction<OneRegisterInstruction>(moveOriginalRecommendedValueIndex).registerA
-
-            it.mutableMethod.addInstructions(
-                moveOriginalRecommendedValueIndex + 1,
-                """
-                        invoke-static { v$originalValueRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->getRecommendedLevel(I)I
-                        move-result v$originalValueRegister
-                """,
-            )
-        } ?: throw StoryboardRendererDecoderRecommendedLevelFingerprint.exception
-
-        // Hook the recommended precise seeking thumbnails quality level.
-        PlayerResponseModelImplRecommendedLevelFingerprint.result?.let {
-            it.mutableMethod.apply {
-                val moveOriginalRecommendedValueIndex = it.scanResult.patternScanResult!!.endIndex
-                val originalValueRegister =
-                    getInstruction<OneRegisterInstruction>(moveOriginalRecommendedValueIndex).registerA
-
-                addInstructions(
-                    moveOriginalRecommendedValueIndex,
-                    """
-                        invoke-static { v$originalValueRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->getRecommendedLevel(I)I
-                        move-result v$originalValueRegister
-                        """,
-                )
-            }
-        } ?: throw PlayerResponseModelImplRecommendedLevelFingerprint.exception
-
-        StoryboardRendererSpecFingerprint.result?.let {
-            it.mutableMethod.apply {
-                val storyBoardUrlParams = 0
-
-                addInstructionsWithLabels(
-                    0,
-                    """
-                        if-nez p$storyBoardUrlParams, :ignore
-                        invoke-static { p$storyBoardUrlParams }, $INTEGRATIONS_CLASS_DESCRIPTOR->getStoryboardRendererSpec(Ljava/lang/String;)Ljava/lang/String;
-                        move-result-object p$storyBoardUrlParams
-                    """,
-                    ExternalLabel("ignore", getInstruction(0)),
-                )
-            }
-        } ?: throw StoryboardRendererSpecFingerprint.exception
-
-        // Hook the seekbar thumbnail decoder and use a NULL spec for live streams.
-        StoryboardRendererDecoderSpecFingerprint.result?.let {
-            val storyBoardUrlIndex = it.scanResult.patternScanResult!!.startIndex + 1
-            val storyboardUrlRegister =
-                it.mutableMethod.getInstruction<OneRegisterInstruction>(storyBoardUrlIndex).registerA
-
-            it.mutableMethod.addInstructions(
-                storyBoardUrlIndex + 1,
-                """
-                        invoke-static { v$storyboardUrlRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->getStoryboardDecoderRendererSpec(Ljava/lang/String;)Ljava/lang/String;
-                        move-result-object v$storyboardUrlRegister
-                """,
-            )
-        } ?: throw StoryboardRendererDecoderSpecFingerprint.exception
-
-        // Fix stats not being tracked.
-        // Due to signature spoofing "adformat" is present in query parameters made for /stats requests,
-        // even though, for regular videos, it should not be.
-        // This breaks stats tracking.
-        // Replace the ad parameter with the video parameter in the query parameters.
-        StatsQueryParameterFingerprint.result?.let {
-            val putMethod = ParamsMapPutFingerprint.result?.method?.toString()
-                ?: throw ParamsMapPutFingerprint.exception
-
-            it.mutableMethod.apply {
-                val adParamIndex = it.scanResult.stringsScanResult!!.matches.first().index
-                val videoParamIndex = adParamIndex + 3
-
-                // Replace the ad parameter with the video parameter.
-                replaceInstruction(adParamIndex, getInstruction(videoParamIndex))
-
-                // Call paramsMap.put instead of paramsMap.putIfNotExist
-                // because the key is already present in the map.
-                val putAdParamIndex = adParamIndex + 1
-                val putIfKeyNotExistsInstruction = getInstruction<FiveRegisterInstruction>(putAdParamIndex)
-                replaceInstruction(
-                    putAdParamIndex,
-                    "invoke-virtual { " +
-                        "v${putIfKeyNotExistsInstruction.registerC}, " +
-                        "v${putIfKeyNotExistsInstruction.registerD}, " +
-                        "v${putIfKeyNotExistsInstruction.registerE} }, " +
-                        putMethod,
-                )
-            }
-        } ?: throw StatsQueryParameterFingerprint.exception
-    }
+    override fun execute(context: BytecodeContext) {}
 }
+

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/SpoofSignatureResourcePatch.kt

@@ -2,18 +2,8 @@ package app.revanced.patches.youtube.misc.fix.playback
 
 import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patches.shared.misc.mapping.ResourceMappingPatch
 
-@Patch(dependencies = [ResourceMappingPatch::class])
 @Deprecated("This patch will be removed in the future.")
 object SpoofSignatureResourcePatch : ResourcePatch() {
-    internal var scrubbedPreviewThumbnailResourceId: Long = -1
-
-    override fun execute(context: ResourceContext) {
-        scrubbedPreviewThumbnailResourceId = ResourceMappingPatch[
-            "id",
-            "thumbnail",
-        ]
-    }
+    override fun execute(context: ResourceContext) {}
 }

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/SpoofVideoStreamsPatch.kt

@@ -0,0 +1,285 @@
+package app.revanced.patches.youtube.misc.fix.playback
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.getInstructions
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
+import app.revanced.patches.all.misc.resources.AddResourcesPatch
+import app.revanced.patches.shared.misc.settings.preference.ListPreference
+import app.revanced.patches.shared.misc.settings.preference.NonInteractivePreference
+import app.revanced.patches.shared.misc.settings.preference.PreferenceScreen
+import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
+import app.revanced.patches.youtube.misc.fix.playback.fingerprints.BuildInitPlaybackRequestFingerprint
+import app.revanced.patches.youtube.misc.fix.playback.fingerprints.BuildMediaDataSourceFingerprint
+import app.revanced.patches.youtube.misc.fix.playback.fingerprints.BuildPlayerRequestURIFingerprint
+import app.revanced.patches.youtube.misc.fix.playback.fingerprints.BuildRequestFingerprint
+import app.revanced.patches.youtube.misc.fix.playback.fingerprints.CreateStreamingDataFingerprint
+import app.revanced.patches.youtube.misc.fix.playback.fingerprints.ProtobufClassParseByteBufferFingerprint
+import app.revanced.patches.youtube.misc.settings.SettingsPatch
+import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstructionOrThrow
+import app.revanced.util.resultOrThrow
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.builder.MutableMethodImplementation
+import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.reference.FieldReference
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
+import com.android.tools.smali.dexlib2.immutable.ImmutableMethodParameter
+
+@Patch(
+    name = "Spoof video streams",
+    description = "Spoofs the client video streams to allow video playback.",
+    dependencies = [
+        SettingsPatch::class,
+        AddResourcesPatch::class,
+        UserAgentClientSpoofPatch::class,
+    ],
+    compatiblePackages = [
+        CompatiblePackage(
+            "com.google.android.youtube",
+            [
+                "18.37.36",
+                "18.38.44",
+                "18.43.45",
+                "18.44.41",
+                "18.45.43",
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.36",
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.38",
+                "19.10.39",
+                "19.11.43",
+                "19.12.41",
+                "19.13.37",
+                "19.14.43",
+                "19.15.36",
+                "19.16.39",
+            ],
+        ),
+    ],
+)
+object SpoofVideoStreamsPatch : BytecodePatch(
+    setOf(
+        BuildInitPlaybackRequestFingerprint,
+        BuildPlayerRequestURIFingerprint,
+        CreateStreamingDataFingerprint,
+        BuildMediaDataSourceFingerprint,
+        BuildRequestFingerprint,
+        ProtobufClassParseByteBufferFingerprint,
+    ),
+) {
+    private const val INTEGRATIONS_CLASS_DESCRIPTOR =
+        "Lapp/revanced/integrations/youtube/patches/spoof/SpoofVideoStreamsPatch;"
+
+    override fun execute(context: BytecodeContext) {
+        AddResourcesPatch(this::class)
+
+        SettingsPatch.PreferenceScreen.MISC.addPreferences(
+            PreferenceScreen(
+                key = "revanced_spoof_video_streams_screen",
+                sorting = PreferenceScreen.Sorting.UNSORTED,
+                preferences = setOf(
+                    SwitchPreference("revanced_spoof_video_streams"),
+                    ListPreference(
+                        "revanced_spoof_video_streams_client",
+                        summaryKey = null
+                    ),
+                    SwitchPreference(
+                        "revanced_spoof_video_streams_ios_force_avc",
+                        tag = "app.revanced.integrations.youtube.settings.preference.ForceAVCSpoofingPreference",
+                    ),
+                    NonInteractivePreference("revanced_spoof_video_streams_about_android_vr"),
+                    NonInteractivePreference("revanced_spoof_video_streams_about_ios"),
+                ),
+            ),
+        )
+
+        // region Block /initplayback requests to fall back to /get_watch requests.
+
+        BuildInitPlaybackRequestFingerprint.resultOrThrow().let {
+            val moveUriStringIndex = it.scanResult.patternScanResult!!.startIndex
+
+            it.mutableMethod.apply {
+                val targetRegister = getInstruction<OneRegisterInstruction>(moveUriStringIndex).registerA
+
+                addInstructions(
+                    moveUriStringIndex + 1,
+                    """
+                        invoke-static { v$targetRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->blockInitPlaybackRequest(Ljava/lang/String;)Ljava/lang/String;
+                        move-result-object v$targetRegister
+                    """,
+                )
+            }
+        }
+
+        // endregion
+
+        // region Block /get_watch requests to fall back to /player requests.
+
+        BuildPlayerRequestURIFingerprint.resultOrThrow().let {
+            val invokeToStringIndex = it.scanResult.patternScanResult!!.startIndex
+
+            it.mutableMethod.apply {
+                val uriRegister = getInstruction<FiveRegisterInstruction>(invokeToStringIndex).registerC
+
+                addInstructions(
+                    invokeToStringIndex,
+                    """
+                        invoke-static { v$uriRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->blockGetWatchRequest(Landroid/net/Uri;)Landroid/net/Uri;
+                        move-result-object v$uriRegister
+                    """,
+                )
+            }
+        }
+
+        // endregion
+
+        // region Get replacement streams at player requests.
+
+        BuildRequestFingerprint.resultOrThrow().mutableMethod.apply {
+            val newRequestBuilderIndex = indexOfFirstInstructionOrThrow {
+                opcode == Opcode.INVOKE_VIRTUAL &&
+                    getReference<MethodReference>()?.name == "newUrlRequestBuilder"
+            }
+            val urlRegister = getInstruction<FiveRegisterInstruction>(newRequestBuilderIndex).registerD
+            val freeRegister = getInstruction<OneRegisterInstruction>(newRequestBuilderIndex + 1).registerA
+
+            addInstructions(
+                newRequestBuilderIndex,
+                """
+                    move-object v$freeRegister, p1
+                    invoke-static { v$urlRegister, v$freeRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->fetchStreams(Ljava/lang/String;Ljava/util/Map;)V
+                """,
+            )
+        }
+
+        // endregion
+
+        // region Replace the streaming data with the replacement streams.
+
+        CreateStreamingDataFingerprint.resultOrThrow().let { result ->
+            result.mutableMethod.apply {
+                val setStreamDataMethodName = "patch_setStreamingData"
+                val resultMethodType = result.mutableClass.type
+                val videoDetailsIndex = result.scanResult.patternScanResult!!.endIndex
+                val videoDetailsRegister = getInstruction<TwoRegisterInstruction>(videoDetailsIndex).registerA
+                val videoDetailsClass = getInstruction(videoDetailsIndex).getReference<FieldReference>()!!.type
+
+                addInstruction(
+                    videoDetailsIndex + 1,
+                    "invoke-direct { p0, v$videoDetailsRegister }, " +
+                        "$resultMethodType->$setStreamDataMethodName($videoDetailsClass)V",
+                )
+
+                val protobufClass = ProtobufClassParseByteBufferFingerprint.resultOrThrow().mutableMethod.definingClass
+                val setStreamingDataIndex = result.scanResult.patternScanResult!!.startIndex
+
+                val playerProtoClass = getInstruction(setStreamingDataIndex + 1)
+                    .getReference<FieldReference>()!!.definingClass
+
+                val setStreamingDataField = getInstruction(setStreamingDataIndex).getReference<FieldReference>()
+
+                val getStreamingDataField = getInstruction(
+                    indexOfFirstInstructionOrThrow {
+                        opcode == Opcode.IGET_OBJECT && getReference<FieldReference>()?.definingClass == playerProtoClass
+                    }
+                ).getReference<FieldReference>()
+
+                // Use a helper method to avoid the need of picking out multiple free registers from the hooked code.
+                result.mutableClass.methods.add(
+                    ImmutableMethod(
+                        resultMethodType,
+                        setStreamDataMethodName,
+                        listOf(ImmutableMethodParameter(videoDetailsClass, null, "videoDetails")),
+                        "V",
+                        AccessFlags.PRIVATE or AccessFlags.FINAL,
+                        null,
+                        null,
+                        MutableMethodImplementation(9),
+                    ).toMutable().apply {
+                        addInstructionsWithLabels(
+                            0,
+                            """
+                            invoke-static { }, $INTEGRATIONS_CLASS_DESCRIPTOR->isSpoofingEnabled()Z
+                            move-result v0
+                            if-eqz v0, :disabled
+    
+                            # Get video id.
+                            iget-object v2, p1, $videoDetailsClass->c:Ljava/lang/String;
+                            if-eqz v2, :disabled
+    
+                            # Get streaming data.
+                            invoke-static { v2 }, $INTEGRATIONS_CLASS_DESCRIPTOR->getStreamingData(Ljava/lang/String;)Ljava/nio/ByteBuffer;
+                            move-result-object v3
+                            if-eqz v3, :disabled
+    
+                            # Parse streaming data.
+                            sget-object v4, $playerProtoClass->a:$playerProtoClass
+                            invoke-static { v4, v3 }, $protobufClass->parseFrom(${protobufClass}Ljava/nio/ByteBuffer;)$protobufClass
+                            move-result-object v5
+                            check-cast v5, $playerProtoClass
+    
+                            # Set streaming data.
+                            iget-object v6, v5, $getStreamingDataField
+                            if-eqz v6, :disabled
+                            iput-object v6, p0, $setStreamingDataField
+                            
+                            :disabled
+                            return-void
+                        """,
+                        )
+                    },
+                )
+            }
+        }
+
+        // endregion
+
+        // region Remove /videoplayback request body to fix playback.
+        // This is needed when using iOS client as streaming data source.
+
+        BuildMediaDataSourceFingerprint.resultOrThrow().let {
+            it.mutableMethod.apply {
+                val targetIndex = getInstructions().lastIndex
+
+                // Instructions are added just before the method returns,
+                // so there's no concern of clobbering in-use registers.
+                addInstructions(
+                    targetIndex,
+                    """
+                        # Field a: Stream uri.
+                        # Field c: Http method.
+                        # Field d: Post data.
+                        move-object v0, p0  # method has over 15 registers and must copy p0 to a lower register.
+                        iget-object v1, v0, $definingClass->a:Landroid/net/Uri;
+                        iget v2, v0, $definingClass->c:I
+                        iget-object v3, v0, $definingClass->d:[B
+                        invoke-static { v1, v2, v3 }, $INTEGRATIONS_CLASS_DESCRIPTOR->removeVideoPlaybackPostBody(Landroid/net/Uri;I[B)[B
+                        move-result-object v1
+                        iput-object v1, v0, $definingClass->d:[B
+                    """,
+                )
+            }
+        }
+
+        // endregion
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/BuildMediaDataSourceFingerprint.kt

@@ -0,0 +1,22 @@
+package app.revanced.patches.youtube.misc.fix.playback.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+internal object BuildMediaDataSourceFingerprint : MethodFingerprint(
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
+    returnType = "V",
+    parameters = listOf(
+        "Landroid/net/Uri;",
+        "J",
+        "I",
+        "[B",
+        "Ljava/util/Map;",
+        "J",
+        "J",
+        "Ljava/lang/String;",
+        "I",
+        "Ljava/lang/Object;"
+    )
+)

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/BuildRequestFingerprint.kt

@@ -0,0 +1,36 @@
+package app.revanced.patches.youtube.misc.fix.playback.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+internal object BuildRequestFingerprint : MethodFingerprint(
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
+    returnType = "Lorg/chromium/net/UrlRequest;",
+    customFingerprint = { methodDef, _ ->
+        // Different targets have slightly different parameters
+
+        // Earlier targets have parameters:
+        //L
+        //Ljava/util/Map;
+        //[B
+        //L
+        //L
+        //L
+        //Lorg/chromium/net/UrlRequest$Callback;
+
+        // Later targets have parameters:
+        //L
+        //Ljava/util/Map;
+        //[B
+        //L
+        //L
+        //L
+        //Lorg/chromium/net/UrlRequest\$Callback;
+        //L
+
+        val parameterTypes = methodDef.parameterTypes
+        (parameterTypes.size == 7 || parameterTypes.size == 8)
+                && parameterTypes[1] == "Ljava/util/Map;" // URL headers.
+    }
+)

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/CreatePlaybackSpeedMenuItemFingerprint.kt

@@ -1,34 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-internal object CreatePlaybackSpeedMenuItemFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    returnType = "V",
-    opcodes = listOf(
-        Opcode.IGET_OBJECT, // First instruction of the method
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.CONST_4,
-        Opcode.IF_EQZ,
-        Opcode.INVOKE_INTERFACE,
-        null // MOVE_RESULT or MOVE_RESULT_OBJECT, Return value controls the creation of the playback speed menu item.
-    ),
-    // 19.01 and earlier is missing the second parameter.
-    // Since this fingerprint is somewhat weak, work around by checking for both method parameter signatures.
-    customFingerprint = custom@{ methodDef, _ ->
-        // 19.01 and earlier parameters are: "[L"
-        // 19.02+ parameters are "[L", "F"
-        val parameterTypes = methodDef.parameterTypes
-        val firstParameter = parameterTypes.firstOrNull()
-
-        if (firstParameter == null || !firstParameter.startsWith("[L")) {
-            return@custom false
-        }
-
-        parameterTypes.size == 1 || (parameterTypes.size == 2 && parameterTypes[1] == "F")
-    }
-)

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/CreatePlayerRequestBodyFingerprint.kt

@@ -1,15 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.fingerprints
-
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import com.android.tools.smali.dexlib2.Opcode
-
-internal object CreatePlayerRequestBodyFingerprint : MethodFingerprint(
-    returnType = "V",
-    parameters = listOf("L"),
-    opcodes = listOf(
-        Opcode.CHECK_CAST,
-        Opcode.IGET,
-        Opcode.AND_INT_LIT16,
-    ),
-    strings = listOf("ms"),
-)

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/CreatePlayerRequestBodyWithModelFingerprint.kt

@@ -1,31 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import app.revanced.patches.youtube.misc.fix.playback.fingerprints.CreatePlayerRequestBodyWithModelFingerprint.indexOfBuildModelInstruction
-import app.revanced.util.containsWideLiteralInstructionValue
-import app.revanced.util.getReference
-import app.revanced.util.indexOfFirstInstruction
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.iface.Method
-import com.android.tools.smali.dexlib2.iface.reference.FieldReference
-
-internal object CreatePlayerRequestBodyWithModelFingerprint : MethodFingerprint(
-    returnType = "L",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters = listOf(),
-    customFingerprint = { methodDef, _ ->
-        methodDef.containsWideLiteralInstructionValue(1073741824) &&
-                indexOfBuildModelInstruction(methodDef) >= 0
-    },
-) {
-    fun indexOfBuildModelInstruction(methodDef: Method) =
-        methodDef.indexOfFirstInstruction {
-            val reference = getReference<FieldReference>()
-            reference?.definingClass == "Landroid/os/Build;" &&
-                    reference.name == "MODEL" &&
-                    reference.type == "Ljava/lang/String;"
-        }
-}
-
-

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/CreateStreamingDataFingerprint.kt

@@ -0,0 +1,24 @@
+package app.revanced.patches.youtube.misc.fix.playback.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+
+internal object CreateStreamingDataFingerprint : MethodFingerprint(
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
+    returnType = "V",
+    parameters = listOf("L"),
+    opcodes = listOf(
+        Opcode.IPUT_OBJECT,
+        Opcode.IGET_OBJECT,
+        Opcode.IF_NEZ,
+        Opcode.SGET_OBJECT,
+        Opcode.IPUT_OBJECT
+    ),
+    customFingerprint = { methodDef, classDef ->
+        classDef.fields.any { field ->
+            field.name == "a" && field.type.endsWith("/StreamingDataOuterClass\$StreamingData;")
+        }
+    },
+)

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/ParamsMapPutFingerprint.kt

@@ -1,25 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-@Deprecated("Fingerprint is obsolete and will be deleted soon")
-internal object ParamsMapPutFingerprint : MethodFingerprint(
-    returnType = "V",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters = listOf(
-        "Ljava/lang/String;",
-        "Ljava/lang/String;",
-    ),
-    opcodes = listOf(
-        Opcode.CONST_4,
-        Opcode.CONST_4,
-        Opcode.CONST_4,
-        Opcode.MOVE_OBJECT,
-        Opcode.MOVE_OBJECT,
-        Opcode.MOVE_OBJECT,
-        Opcode.INVOKE_DIRECT_RANGE,
-    ),
-)

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/PlayerGestureConfigSyntheticFingerprint.kt

@@ -1,49 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import app.revanced.util.getReference
-import app.revanced.util.indexOfFirstInstruction
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.iface.Method
-import com.android.tools.smali.dexlib2.iface.reference.MethodReference
-
-internal object PlayerGestureConfigSyntheticFingerprint : MethodFingerprint(
-    returnType = "V",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters = listOf("Ljava/lang/Object;"),
-    opcodes = listOf(
-        Opcode.SGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_EQZ,
-        Opcode.IF_EQZ,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_VIRTUAL, // playerGestureConfig.downAndOutLandscapeAllowed.
-        Opcode.MOVE_RESULT,
-        Opcode.CHECK_CAST,
-        Opcode.IPUT_BOOLEAN,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_VIRTUAL, // playerGestureConfig.downAndOutPortraitAllowed.
-        Opcode.MOVE_RESULT,
-        Opcode.IPUT_BOOLEAN,
-        Opcode.RETURN_VOID,
-    ),
-    customFingerprint = { methodDef, classDef ->
-        fun indexOfDownAndOutAllowedInstruction(methodDef: Method) =
-            methodDef.indexOfFirstInstruction {
-                val reference = getReference<MethodReference>()
-                reference?.definingClass == "Lcom/google/android/libraries/youtube/innertube/model/media/PlayerConfigModel;" &&
-                    reference.parameterTypes.isEmpty() &&
-                    reference.returnType == "Z"
-            }
-
-        // This method is always called "a" because this kind of class always has a single method.
-        methodDef.name == "a" && classDef.methods.count() == 2 &&
-            indexOfDownAndOutAllowedInstruction(methodDef) >= 0
-    },
-)

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/PlayerResponseModelImplGeneralFingerprint.kt

@@ -1,24 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import app.revanced.util.containsWideLiteralInstructionValue
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-@Deprecated("Fingerprint is obsolete and will be deleted soon")
-internal object PlayerResponseModelImplGeneralFingerprint : MethodFingerprint(
-    returnType = "Ljava/lang/String;",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters = emptyList(),
-    opcodes = listOf(
-        Opcode.RETURN_OBJECT,
-        Opcode.CONST_4,
-        Opcode.RETURN_OBJECT,
-    ),
-    customFingerprint = handler@{ methodDef, _ ->
-        if (!methodDef.definingClass.endsWith("/PlayerResponseModelImpl;")) return@handler false
-
-        methodDef.containsWideLiteralInstructionValue(55735497)
-    },
-)

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/PlayerResponseModelImplLiveStreamFingerprint.kt

@@ -1,24 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import app.revanced.util.containsWideLiteralInstructionValue
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-@Deprecated("Fingerprint is obsolete and will be deleted soon")
-internal object PlayerResponseModelImplLiveStreamFingerprint : MethodFingerprint(
-    returnType = "Ljava/lang/String;",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters = emptyList(),
-    opcodes = listOf(
-        Opcode.RETURN_OBJECT,
-        Opcode.CONST_4,
-        Opcode.RETURN_OBJECT,
-    ),
-    customFingerprint = handler@{ methodDef, _ ->
-        if (!methodDef.definingClass.endsWith("/PlayerResponseModelImpl;")) return@handler false
-
-        methodDef.containsWideLiteralInstructionValue(70276274)
-    },
-)

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/PlayerResponseModelImplRecommendedLevelFingerprint.kt

@@ -1,24 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import app.revanced.util.containsWideLiteralInstructionValue
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-@Deprecated("Fingerprint is obsolete and will be deleted soon")
-internal object PlayerResponseModelImplRecommendedLevelFingerprint : MethodFingerprint(
-    returnType = "I",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters = emptyList(),
-    opcodes = listOf(
-        Opcode.SGET_OBJECT,
-        Opcode.IGET,
-        Opcode.RETURN,
-    ),
-    customFingerprint = handler@{ methodDef, _ ->
-        if (!methodDef.definingClass.endsWith("/PlayerResponseModelImpl;")) return@handler false
-
-        methodDef.containsWideLiteralInstructionValue(55735497)
-    },
-)

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/ProtobufClassParseByteBufferFingerprint.kt

@@ -0,0 +1,19 @@
+package app.revanced.patches.youtube.misc.fix.playback.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+
+internal object ProtobufClassParseByteBufferFingerprint : MethodFingerprint(
+    accessFlags = AccessFlags.PROTECTED or AccessFlags.STATIC,
+    parameters = listOf("L", "Ljava/nio/ByteBuffer;"),
+    returnType = "L",
+    opcodes = listOf(
+        Opcode.SGET_OBJECT,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.RETURN_OBJECT,
+    ),
+    customFingerprint = { methodDef, _ -> methodDef.name == "parseFrom" },
+)

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/SetPlayerRequestClientTypeFingerprint.kt

@@ -1,13 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.fingerprints
-
-import app.revanced.util.patch.LiteralValueFingerprint
-import com.android.tools.smali.dexlib2.Opcode
-
-internal object SetPlayerRequestClientTypeFingerprint : LiteralValueFingerprint(
-    opcodes = listOf(
-        Opcode.IGET,
-        Opcode.IPUT, // Sets ClientInfo.clientId.
-    ),
-    strings = listOf("10.29"),
-    literalSupplier = { 134217728 }
-)

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/SpoofSignaturePatchScrubbedPreviewLayoutFingerprint.kt

@@ -1,28 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patches.youtube.misc.fix.playback.SpoofSignatureResourcePatch
-import app.revanced.util.patch.LiteralValueFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-@Deprecated("Fingerprint is obsolete and will be deleted soon")
-internal object SpoofSignaturePatchScrubbedPreviewLayoutFingerprint : LiteralValueFingerprint(
-    accessFlags = AccessFlags.PRIVATE or AccessFlags.FINAL,
-    returnType = "V",
-    parameters = listOf("Landroid/content/Context;", "Landroid/util/AttributeSet;", "I", "I"),
-    opcodes = listOf(
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.CONST,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.IPUT_OBJECT, // preview imageview
-    ),
-    // This resource is used in ~ 40 different locations, but this method has a distinct list of parameters to match to.
-    literalSupplier = { SpoofSignatureResourcePatch.scrubbedPreviewThumbnailResourceId },
-)

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/StatsQueryParameterFingerprint.kt

@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.fingerprints
-
-import app.revanced.patcher.fingerprint.MethodFingerprint
-
-@Deprecated("Fingerprint is obsolete and will be deleted soon")
-internal object StatsQueryParameterFingerprint : MethodFingerprint(
-    strings = listOf("adunit"),
-)

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/StoryboardRendererDecoderRecommendedLevelFingerprint.kt

@@ -1,24 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-/**
- * Resolves to the same method as [StoryboardRendererDecoderSpecFingerprint].
- */
-@Deprecated("Fingerprint is obsolete and will be deleted soon")
-internal object StoryboardRendererDecoderRecommendedLevelFingerprint : MethodFingerprint(
-    returnType = "V",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters = listOf("Lcom/google/android/libraries/youtube/innertube/model/player/PlayerResponseModel;"),
-    opcodes = listOf(
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT,
-    ),
-    strings = listOf("#-1#"),
-)

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/StoryboardRendererDecoderSpecFingerprint.kt

@@ -1,24 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-/**
- * Resolves to the same method as [StoryboardRendererDecoderRecommendedLevelFingerprint].
- */
-@Deprecated("Fingerprint is obsolete and will be deleted soon")
-internal object StoryboardRendererDecoderSpecFingerprint : MethodFingerprint(
-    returnType = "V",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters = listOf("Lcom/google/android/libraries/youtube/innertube/model/player/PlayerResponseModel;"),
-    opcodes = listOf(
-        Opcode.INVOKE_INTERFACE, // First instruction of the method.
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CONST_4,
-        Opcode.CONST_4,
-        Opcode.IF_NEZ,
-    ),
-    strings = listOf("#-1#"),
-)

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/StoryboardRendererSpecFingerprint.kt

@@ -1,13 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-
-@Deprecated("Fingerprint is obsolete and will be deleted soon")
-internal object StoryboardRendererSpecFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
-    returnType = "L",
-    parameters = listOf("Ljava/lang/String;", "J"),
-    strings = listOf("\\|"),
-)

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/StoryboardThumbnailFingerprint.kt

@@ -1,24 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-/**
- * Resolves using the class found in [StoryboardThumbnailParentFingerprint].
- */
-@Deprecated("Fingerprint is obsolete and will be deleted soon")
-internal object StoryboardThumbnailFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    returnType = "Z",
-    parameters = listOf(),
-    opcodes = listOf(
-        Opcode.MOVE_RESULT,
-        Opcode.IF_GTZ,
-        Opcode.GOTO,
-        Opcode.CONST_4,
-        Opcode.RETURN,
-        Opcode.RETURN, // Last instruction of method.
-    ),
-)

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/StoryboardThumbnailParentFingerprint.kt

@@ -1,18 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-
-/**
- * Here lies code that creates the seekbar thumbnails.
- *
- * An additional change here might force the thumbnails to be created,
- * or possibly a change somewhere else (maybe involving YouTube 18.23.35 class `hte`)
- */
-@Deprecated("Fingerprint is obsolete and will be deleted soon")
-internal object StoryboardThumbnailParentFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    returnType = "Landroid/graphics/Bitmap;",
-    strings = listOf("Storyboard regionDecoder.decodeRegion exception - "),
-)

src/main/kotlin/app/revanced/patches/youtube/misc/imageurlhook/CronetImageUrlHook.kt

@@ -16,6 +16,7 @@ import app.revanced.patches.youtube.misc.imageurlhook.fingerprints.cronet.reques
 import app.revanced.patches.youtube.misc.imageurlhook.fingerprints.cronet.request.callback.OnResponseStartedFingerprint
 import app.revanced.patches.youtube.misc.imageurlhook.fingerprints.cronet.request.callback.OnSucceededFingerprint
 import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
+import app.revanced.util.alsoResolve
 import app.revanced.util.resultOrThrow
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
@@ -84,17 +85,14 @@ object CronetImageUrlHook : BytecodePatch(
     }
 
     override fun execute(context: BytecodeContext) {
-        fun MethodFingerprint.alsoResolve(fingerprint: MethodFingerprint) =
-            also { resolve(context, fingerprint.resultOrThrow().classDef) }.resultOrThrow()
-
         loadImageUrlMethod = MessageDigestImageUrlFingerprint
-            .alsoResolve(MessageDigestImageUrlParentFingerprint).mutableMethod
+            .alsoResolve(context, MessageDigestImageUrlParentFingerprint).mutableMethod
 
         loadImageSuccessCallbackMethod = OnSucceededFingerprint
-            .alsoResolve(OnResponseStartedFingerprint).mutableMethod
+            .alsoResolve(context, OnResponseStartedFingerprint).mutableMethod
 
         loadImageErrorCallbackMethod = OnFailureFingerprint
-            .alsoResolve(OnResponseStartedFingerprint).mutableMethod
+            .alsoResolve(context, OnResponseStartedFingerprint).mutableMethod
 
         // The URL is required for the failure callback hook, but the URL field is obfuscated.
         // Add a helper get method that returns the URL field.

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

@@ -15,6 +15,7 @@ import app.revanced.patches.shared.misc.settings.preference.IntentPreference
 import app.revanced.patches.shared.misc.settings.preference.NonInteractivePreference
 import app.revanced.patches.shared.misc.settings.preference.PreferenceScreen.Sorting
 import app.revanced.patches.shared.misc.settings.preference.TextPreference
+import app.revanced.patches.youtube.misc.check.CheckEnvironmentPatch
 import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.fingerprints.LicenseActivityOnCreateFingerprint
 import app.revanced.patches.youtube.misc.settings.fingerprints.SetThemeFingerprint
@@ -30,6 +31,9 @@ import java.io.Closeable
         IntegrationsPatch::class,
         SettingsResourcePatch::class,
         AddResourcesPatch::class,
+        // Currently there is no easy way to make a mandatory patch,
+        // so for now this is a dependent of this patch.
+        CheckEnvironmentPatch::class,
     ],
 )
 object SettingsPatch :

src/main/kotlin/app/revanced/patches/youtube/misc/settings/SettingsResourcePatch.kt

@@ -28,8 +28,6 @@ object SettingsResourcePatch : BaseSettingsResourcePatch(
     override fun execute(context: ResourceContext) {
         super.execute(context)
 
-        AddResourcesPatch(this::class)
-
         // Used for a fingerprint from SettingsPatch.
         appearanceStringId = ResourceMappingPatch["string", "app_theme_appearance_dark"]
 

src/main/kotlin/app/revanced/patches/youtube/video/information/VideoInformationPatch.kt

@@ -7,12 +7,14 @@ import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
 import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
 import app.revanced.patches.youtube.video.information.fingerprints.*
 import app.revanced.patches.youtube.video.playerresponse.PlayerResponseMethodHookPatch
 import app.revanced.patches.youtube.video.videoid.VideoIdPatch
+import app.revanced.util.alsoResolve
 import app.revanced.util.exception
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionOrThrow
@@ -45,9 +47,11 @@ object VideoInformationPatch : BytecodePatch(
     )
 ) {
     private const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/youtube/patches/VideoInformation;"
+    private const val INTEGRATIONS_PLAYER_INTERFACE = "Lapp/revanced/integrations/youtube/patches/VideoInformation${'$'}PlaybackController;"
 
     private lateinit var playerInitMethod: MutableMethod
-    private var playerInitInsertIndex = 4
+    private var playerInitInsertIndex = -1
+    private var playerInitInsertRegister = -1
 
     private lateinit var mdxInitMethod: MutableMethod
     private var mdxInitInsertIndex = -1
@@ -70,42 +74,43 @@ object VideoInformationPatch : BytecodePatch(
         with(PlayerInitFingerprint.resultOrThrow()) {
             playerInitMethod = mutableClass.methods.first { MethodUtil.isConstructor(it) }
 
-            // hook the player controller for use through integrations
+            // find the location of the first invoke-direct call and extract the register storing the 'this' object reference.
+            val initThisIndex = playerInitMethod.indexOfFirstInstructionOrThrow {
+                opcode == Opcode.INVOKE_DIRECT && getReference<MethodReference>()?.name == "<init>"
+            }
+            playerInitInsertRegister = playerInitMethod.getInstruction<FiveRegisterInstruction>(initThisIndex).registerC
+            playerInitInsertIndex = initThisIndex + 1
+
+            // Hook the player controller for use through integrations.
             onCreateHook(INTEGRATIONS_CLASS_DESCRIPTOR, "initialize")
 
-            // seek method
             val seekFingerprintResultMethod =
-                SeekFingerprint.also { it.resolve(context, classDef) }.resultOrThrow().method
+                SeekFingerprint.alsoResolve(context, PlayerInitFingerprint).method
+            val seekRelativeFingerprintResultMethod =
+                SeekRelativeFingerprint.alsoResolve(context, PlayerInitFingerprint).method
 
-            // create helper method
-            val seekHelperMethod = generateSeekMethodHelper(seekFingerprintResultMethod)
-
-            // add the seekTo method to the class for the integrations to call
-            mutableClass.methods.add(seekHelperMethod)
+            // Create integrations interface methods.
+            addSeekInterfaceMethods(mutableClass, seekFingerprintResultMethod, seekRelativeFingerprintResultMethod)
         }
 
         with(MdxPlayerDirectorSetVideoStageFingerprint.resultOrThrow()) {
             mdxInitMethod = mutableClass.methods.first { MethodUtil.isConstructor(it) }
 
-            // find the location of the first invoke-direct call and extract the register storing the 'this' object reference
             val initThisIndex = mdxInitMethod.indexOfFirstInstructionOrThrow {
                 opcode == Opcode.INVOKE_DIRECT && getReference<MethodReference>()?.name == "<init>"
             }
             mdxInitInsertRegister = mdxInitMethod.getInstruction<FiveRegisterInstruction>(initThisIndex).registerC
             mdxInitInsertIndex = initThisIndex + 1
 
-            // hook the MDX director for use through integrations
+            // Hook the MDX director for use through integrations.
             onCreateHookMdx(INTEGRATIONS_CLASS_DESCRIPTOR, "initializeMdx")
 
-            // MDX seek method
             val mdxSeekFingerprintResultMethod =
-                MdxSeekFingerprint.apply { resolve(context, classDef) }.resultOrThrow().method
+                MdxSeekFingerprint.alsoResolve(context, MdxPlayerDirectorSetVideoStageFingerprint).method
+            val mdxSeekRelativeFingerprintResultMethod =
+                MdxSeekRelativeFingerprint.alsoResolve(context, MdxPlayerDirectorSetVideoStageFingerprint).method
 
-            // create helper method
-            val mdxSeekHelperMethod = generateSeekMethodHelper(mdxSeekFingerprintResultMethod)
-
-            // add the seekTo method to the class for the integrations to call
-            mutableClass.methods.add(mdxSeekHelperMethod)
+            addSeekInterfaceMethods(mutableClass, mdxSeekFingerprintResultMethod, mdxSeekRelativeFingerprintResultMethod)
         }
 
         with(CreateVideoPlayerSeekbarFingerprint.result!!) {
@@ -173,33 +178,42 @@ object VideoInformationPatch : BytecodePatch(
         userSelectedPlaybackSpeedHook(INTEGRATIONS_CLASS_DESCRIPTOR, "userSelectedPlaybackSpeed")
     }
 
-    private fun generateSeekMethodHelper(seekMethod: Method): MutableMethod {
+    private fun addSeekInterfaceMethods(targetClass: MutableClass, seekToMethod: Method, seekToRelativeMethod: Method) {
+        // Add the interface and methods that integrations calls.
+        targetClass.interfaces.add(INTEGRATIONS_PLAYER_INTERFACE)
 
-        // create helper method
-        val generatedMethod = ImmutableMethod(
-            seekMethod.definingClass,
-            "seekTo",
-            listOf(ImmutableMethodParameter("J", null, "time")),
-            "Z",
-            AccessFlags.PUBLIC or AccessFlags.FINAL,
-            null, null,
-            MutableMethodImplementation(4)
-        ).toMutable()
+        arrayOf(
+            seekToMethod to "seekTo",
+            seekToRelativeMethod to "seekToRelative"
+        ).forEach { (method, name) ->
+            // Add interface method.
+            // Get enum type for the seek helper method.
+            val seekSourceEnumType = method.parameterTypes[1].toString()
 
-        // get enum type for the seek helper method
-        val seekSourceEnumType = seekMethod.parameterTypes[1].toString()
+            val interfaceImplementation = ImmutableMethod(
+                targetClass.type,
+                name,
+                listOf(ImmutableMethodParameter("J", null, "time")),
+                "Z",
+                AccessFlags.PUBLIC or AccessFlags.FINAL,
+                null, null,
+                MutableMethodImplementation(4)
+            ).toMutable()
 
-        // insert helper method instructions
-        generatedMethod.addInstructions(
-            0,
-            """
-                sget-object v0, $seekSourceEnumType->a:$seekSourceEnumType
-                invoke-virtual { p0, p1, p2, v0 }, $seekMethod
-                move-result p1
-                return p1
-            """
-        )
-        return generatedMethod
+            // Insert helper method instructions.
+            interfaceImplementation.addInstructions(
+                0,
+                """
+                    # first enum (field a) is SEEK_SOURCE_UNKNOWN
+                    sget-object v0, $seekSourceEnumType->a:$seekSourceEnumType
+                    invoke-virtual { p0, p1, p2, v0 }, $method
+                    move-result p1
+                    return p1
+                """
+            )
+
+            targetClass.methods.add(interfaceImplementation)
+        }
     }
 
     private fun MutableMethod.insert(insertIndex: Int, register: String, descriptor: String) =
@@ -220,8 +234,8 @@ object VideoInformationPatch : BytecodePatch(
     internal fun onCreateHook(targetMethodClass: String, targetMethodName: String) =
         playerInitMethod.insert(
             playerInitInsertIndex++,
-            "v0",
-            "$targetMethodClass->$targetMethodName(Ljava/lang/Object;)V"
+            "v$playerInitInsertRegister",
+            "$targetMethodClass->$targetMethodName($INTEGRATIONS_PLAYER_INTERFACE)V"
         )
 
     /**
@@ -234,7 +248,7 @@ object VideoInformationPatch : BytecodePatch(
         mdxInitMethod.insert(
             mdxInitInsertIndex++,
             "v$mdxInitInsertRegister",
-            "$targetMethodClass->$targetMethodName(Ljava/lang/Object;)V"
+            "$targetMethodClass->$targetMethodName($INTEGRATIONS_PLAYER_INTERFACE)V"
         )
 
     /**

src/main/kotlin/app/revanced/patches/youtube/video/information/fingerprints/MdxSeekFingerprint.kt

@@ -5,6 +5,9 @@ import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 
+/**
+ * Resolves using class found in [MdxPlayerDirectorSetVideoStageFingerprint].
+ */
 internal object MdxSeekFingerprint : MethodFingerprint(
     accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
     returnType = "Z",

src/main/kotlin/app/revanced/patches/youtube/video/information/fingerprints/MdxSeekRelativeFingerprint.kt

@@ -0,0 +1,19 @@
+package app.revanced.patches.youtube.video.information.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+
+/**
+ * Resolves using class found in [MdxPlayerDirectorSetVideoStageFingerprint].
+ */
+internal object MdxSeekRelativeFingerprint : MethodFingerprint(
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    returnType = "Z",
+    parameters = listOf("J", "L"),
+    opcodes = listOf(
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_INTERFACE
+    )
+)

src/main/kotlin/app/revanced/patches/youtube/video/information/fingerprints/SeekFingerprint.kt

@@ -3,6 +3,9 @@ package app.revanced.patches.youtube.video.information.fingerprints
 
 import app.revanced.patcher.fingerprint.MethodFingerprint
 
+/**
+ * Resolves using class found in [PlayerInitFingerprint].
+ */
 internal object SeekFingerprint : MethodFingerprint(
     strings = listOf("Attempting to seek during an ad")
 )

src/main/kotlin/app/revanced/patches/youtube/video/information/fingerprints/SeekRelativeFingerprint.kt

@@ -0,0 +1,21 @@
+package app.revanced.patches.youtube.video.information.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+
+/**
+ * Resolves using class found in [PlayerInitFingerprint].
+ */
+internal object SeekRelativeFingerprint : MethodFingerprint(
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    returnType = "Z",
+    parameters = listOf("J", "L"),
+    opcodes = listOf(
+        Opcode.ADD_LONG_2ADDR,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT,
+        Opcode.RETURN
+    )
+)

src/main/kotlin/app/revanced/util/BytecodeUtils.kt

@@ -249,3 +249,9 @@ fun Iterable<MethodFingerprint>.returnEarly(bool: Boolean = false) = forEach { f
 fun List<MethodFingerprint>.returnEarly(bool: Boolean = false) = forEach { fingerprint ->
     fingerprint.returnEarly(bool)
 }
+
+/**
+ * Resolves this fingerprint using the classDef of a parent fingerprint.
+ */
+fun MethodFingerprint.alsoResolve(context: BytecodeContext, parentFingerprint: MethodFingerprint) =
+    also { resolve(context, parentFingerprint.resultOrThrow().classDef) }.resultOrThrow()

src/main/resources/addresources/values-af-rZA/strings.xml

@@ -32,15 +32,16 @@ This is because Crowdin requires temporarily flattening this file and removing t
 -->
 <resources>
   <app id="shared">
+  <patch id="misc.checks.BaseCheckEnvironmentPatch">
+  </patch>
   <patch id="misc.settings.BaseSettingsResourcePatch">
+  <!-- Settings about dialog. -->
   </patch>
   <patch id="misc.gms.BaseGmsCoreSupportResourcePatch">
   <!-- Translations of this should not be longer than the original English text, otherwise the text can be clipped and not entirely shown. -->
   </patch>
   </app>
   <app id="youtube">
-  <patch id="misc.settings.SettingsResourcePatch">
-  </patch>
   <patch id="misc.settings.SettingsPatch">
   </patch>
   <patch id="misc.debugging.DebuggingPatch">
@@ -57,7 +58,7 @@ This is because Crowdin requires temporarily flattening this file and removing t
   <!-- 'Component path builder strings' is the technical name for identifying the Litho UI layout items to hide. This is an advanced feature and most users will never use this. -->
   <!-- For localization it is preferred, but not required, if 'LeBlanc' is replaced with a localized name or a familiar word that has upper case letters in the middle of the word.
                  This is because keywords can be in any language, and showing an example in the localized script helps convey this. -->
-  <!-- Translations of this should not be longer than the original English text, otherwise the text can be clipped and not entirely shown. -->
+  <!-- Translations _must_ use a localized example.  For languages that do not use spaces between words (Chinese, Japanese, etc) the English AI example should be used since no localized examples exist.  Or if using machine translations, or if nobody wants to think of a localized example, then the English 'ai' example should be left as-is. -->
   <!-- Translations of this should not be longer than the original English text, otherwise the text can be clipped and not entirely shown. -->
   </patch>
   <patch id="ad.general.HideAdsResourcePatch">
@@ -171,10 +172,6 @@ This is because Crowdin requires temporarily flattening this file and removing t
   <patch id="layout.sponsorblock.SponsorBlockResourcePatch">
   <!-- Translations should use language similar to 'revanced_ryd_compact_layout_title' -->
   <!-- Toast shown if network connection times out. Translations of this should not be longer than the original English or the text can be clipped and not entirely shown. -->
-  <!-- Do not rearrange the (hour):(minute):second) time format operators here.
-                 YT shows the same seekbar time format for all languages, and this string is confirming the segment time as it appears in the seekbar. -->
-  <!-- Do not rearrange the (hour):(minute):second) time format operators here.
-                 YT shows the same seekbar time format for all languages, and this string is confirming the segment time as it appears in the seekbar. -->
   <!-- Shown in the settings preferences, and translations can be any text length. -->
   </patch>
   <patch id="layout.spoofappversion.SpoofAppVersionPatch">
@@ -208,6 +205,8 @@ This is because Crowdin requires temporarily flattening this file and removing t
   </patch>
   <patch id="misc.announcements.AnnouncementsPatch">
   </patch>
+  <patch id="misc.dns.CheckWatchHistoryDomainNameResolutionPatch">
+  </patch>
   <patch id="misc.autorepeat.AutoRepeatPatch">
   </patch>
   <patch id="misc.dimensions.spoof.SpoofDeviceDimensionsPatch">
@@ -234,10 +233,7 @@ This is because Crowdin requires temporarily flattening this file and removing t
   </patch>
   <patch id="interaction.seekbar.EnableSlideToSeekPatch">
   </patch>
-  <patch id="misc.fix.playback.SpoofClientPatch">
-  </patch>
-  <!-- This patch is no longer used, these strings are not in use, and these strings will be deleted in the future. -->
-  <patch id="misc.fix.playback.SpoofSignaturePatch">
+  <patch id="misc.fix.playback.SpoofVideoStreamsPatch">
   </patch>
   <!-- This patch is no longer used and these strings will soon be deleted. -->
   <patch id="video.hdrbrightness.HDRBrightnessPatch">

src/main/resources/addresources/values-am-rET/strings.xml

@@ -32,15 +32,16 @@ This is because Crowdin requires temporarily flattening this file and removing t
 -->
 <resources>
   <app id="shared">
+  <patch id="misc.checks.BaseCheckEnvironmentPatch">
+  </patch>
   <patch id="misc.settings.BaseSettingsResourcePatch">
+  <!-- Settings about dialog. -->
   </patch>
   <patch id="misc.gms.BaseGmsCoreSupportResourcePatch">
   <!-- Translations of this should not be longer than the original English text, otherwise the text can be clipped and not entirely shown. -->
   </patch>
   </app>
   <app id="youtube">
-  <patch id="misc.settings.SettingsResourcePatch">
-  </patch>
   <patch id="misc.settings.SettingsPatch">
   </patch>
   <patch id="misc.debugging.DebuggingPatch">
@@ -57,7 +58,7 @@ This is because Crowdin requires temporarily flattening this file and removing t
   <!-- 'Component path builder strings' is the technical name for identifying the Litho UI layout items to hide. This is an advanced feature and most users will never use this. -->
   <!-- For localization it is preferred, but not required, if 'LeBlanc' is replaced with a localized name or a familiar word that has upper case letters in the middle of the word.
                  This is because keywords can be in any language, and showing an example in the localized script helps convey this. -->
-  <!-- Translations of this should not be longer than the original English text, otherwise the text can be clipped and not entirely shown. -->
+  <!-- Translations _must_ use a localized example.  For languages that do not use spaces between words (Chinese, Japanese, etc) the English AI example should be used since no localized examples exist.  Or if using machine translations, or if nobody wants to think of a localized example, then the English 'ai' example should be left as-is. -->
   <!-- Translations of this should not be longer than the original English text, otherwise the text can be clipped and not entirely shown. -->
   </patch>
   <patch id="ad.general.HideAdsResourcePatch">
@@ -171,10 +172,6 @@ This is because Crowdin requires temporarily flattening this file and removing t
   <patch id="layout.sponsorblock.SponsorBlockResourcePatch">
   <!-- Translations should use language similar to 'revanced_ryd_compact_layout_title' -->
   <!-- Toast shown if network connection times out. Translations of this should not be longer than the original English or the text can be clipped and not entirely shown. -->
-  <!-- Do not rearrange the (hour):(minute):second) time format operators here.
-                 YT shows the same seekbar time format for all languages, and this string is confirming the segment time as it appears in the seekbar. -->
-  <!-- Do not rearrange the (hour):(minute):second) time format operators here.
-                 YT shows the same seekbar time format for all languages, and this string is confirming the segment time as it appears in the seekbar. -->
   <!-- Shown in the settings preferences, and translations can be any text length. -->
   </patch>
   <patch id="layout.spoofappversion.SpoofAppVersionPatch">
@@ -208,6 +205,8 @@ This is because Crowdin requires temporarily flattening this file and removing t
   </patch>
   <patch id="misc.announcements.AnnouncementsPatch">
   </patch>
+  <patch id="misc.dns.CheckWatchHistoryDomainNameResolutionPatch">
+  </patch>
   <patch id="misc.autorepeat.AutoRepeatPatch">
   </patch>
   <patch id="misc.dimensions.spoof.SpoofDeviceDimensionsPatch">
@@ -234,10 +233,7 @@ This is because Crowdin requires temporarily flattening this file and removing t
   </patch>
   <patch id="interaction.seekbar.EnableSlideToSeekPatch">
   </patch>
-  <patch id="misc.fix.playback.SpoofClientPatch">
-  </patch>
-  <!-- This patch is no longer used, these strings are not in use, and these strings will be deleted in the future. -->
-  <patch id="misc.fix.playback.SpoofSignaturePatch">
+  <patch id="misc.fix.playback.SpoofVideoStreamsPatch">
   </patch>
   <!-- This patch is no longer used and these strings will soon be deleted. -->
   <patch id="video.hdrbrightness.HDRBrightnessPatch">

src/main/resources/addresources/values-ar-rSA/strings.xml

@@ -32,6 +32,17 @@ This is because Crowdin requires temporarily flattening this file and removing t
 -->
 <resources>
   <app id="shared">
+  <patch id="misc.checks.BaseCheckEnvironmentPatch">
+  <string name="revanced_check_environment_failed_title">فشلت عمليات التحقق</string>
+  <string name="revanced_check_environment_dialog_open_official_source_button">فتح الموقع الرسمي</string>
+  <string name="revanced_check_environment_dialog_ignore_button">تجاهل</string>
+  <string name="revanced_check_environment_failed_message">&lt;h5&gt;لا يبدو أن هذا التطبيق قد تم تعديله من قبلك.&lt;/h5&gt;&lt;br&gt;قد لا يعمل هذا التطبيق بشكل صحيح، &lt;b&gt;قد يكون ضارًا أو حتى خطيرًا للاستخدام&lt;/b&gt;.&lt;br&gt;&lt;br&gt;تشير هذه الفحوصات إلى أن هذا التطبيق تم تعديله مسبقًا أو تم الحصول عليه من شخص آخر:&lt;br&gt;&lt;br&gt;&lt;small&gt;%1$s&lt;/small&gt;&lt;br&gt;يوصى بشدة بـ &lt;b&gt;إلغاء تثبيت هذا التطبيق وتعديله بنفسك&lt;/b&gt; للتأكد من أنك تستخدم تطبيقًا معتمدًا وآمنًا.&lt;p&gt;&lt;br&gt;في حالة تجاهل هذا التحذير، سيتم عرضه مرتين فقط.</string>
+  <string name="revanced_check_environment_not_same_patching_device">تم تعديله على جهاز مختلف</string>
+  <string name="revanced_check_environment_manager_not_expected_installer">لم يتم تثبيته بواسطة ReVanced Manager</string>
+  <string name="revanced_check_environment_not_near_patch_time">تم تعديله قبل أكثر من 10 دقائق</string>
+  <string name="revanced_check_environment_not_near_patch_time_days">تم التعديل منذ %s يوم</string>
+  <string name="revanced_check_environment_not_near_patch_time_invalid">تاريخ إنشاء APK تالف</string>
+  </patch>
   <patch id="misc.settings.BaseSettingsResourcePatch">
   <string name="revanced_settings_confirm_user_dialog_title">هل ترغب في المتابعة؟</string>
   <string name="revanced_settings_reset">إعادة التعيين</string>
@@ -42,6 +53,14 @@ This is because Crowdin requires temporarily flattening this file and removing t
   <string name="revanced_settings_import_reset">إعادة تعيين إعدادات ReVanced إلى الوضع الافتراضي</string>
   <string name="revanced_settings_import_success">تم استيراد %d إعدادات</string>
   <string name="revanced_settings_import_failure_parse">فشل الاستيراد: %s</string>
+  <string name="revanced_pref_import_export_title">استيراد / تصدير</string>
+  <string name="revanced_pref_import_export_summary">استيراد / تصدير إعدادات ReVanced</string>
+  <!-- Settings about dialog. -->
+  <string name="revanced_settings_about_links_body">أنت تستخدم إصدار ReVanced Patches &lt;i&gt;%s&lt;/i&gt;</string>
+  <string name="revanced_settings_about_links_dev_header">ملاحظة</string>
+  <string name="revanced_settings_about_links_dev_body">هذا الإصدار هو إصدار مسبق، وقد تواجه مشاكل غير متوقعة</string>
+  <string name="revanced_settings_about_links_header">الروابط الرسمية</string>
+  <string name="revanced_settings_about_links_donate">تبرع</string>
   </patch>
   <patch id="misc.gms.BaseGmsCoreSupportResourcePatch">
   <!-- Translations of this should not be longer than the original English text, otherwise the text can be clipped and not entirely shown. -->
@@ -54,14 +73,6 @@ This is because Crowdin requires temporarily flattening this file and removing t
   </patch>
   </app>
   <app id="youtube">
-  <patch id="misc.settings.SettingsResourcePatch">
-  <string name="revanced_settings_about_links_body">أنت تستخدم إصدار ReVanced Patches &lt;i&gt;%s&lt;/i&gt;</string>
-  <string name="revanced_settings_about_links_dev_header">ملاحظة</string>
-  <string name="revanced_settings_about_links_dev_body">هذا الإصدار هو إصدار مسبق، وقد تواجه مشاكل غير متوقعة</string>
-  <string name="revanced_settings_about_links_header">الروابط الرسمية</string>
-  <string name="revanced_pref_import_export_title">استيراد / تصدير</string>
-  <string name="revanced_pref_import_export_summary">استيراد / تصدير إعدادات ReVanced</string>
-  </patch>
   <patch id="misc.settings.SettingsPatch">
   <string name="revanced_settings_screen_00_about_title">لمحة</string>
   <string name="revanced_settings_screen_01_ads_title">الإعلانات</string>
@@ -211,6 +222,9 @@ This is because Crowdin requires temporarily flattening this file and removing t
   <string name="revanced_hide_info_cards_section_title">إخفاء قسم بطاقات المعلومات</string>
   <string name="revanced_hide_info_cards_section_summary_on">تم إخفاء قسم بطاقات المعلومات</string>
   <string name="revanced_hide_info_cards_section_summary_off">يتم عرض قسم بطاقات المعلومات</string>
+  <string name="revanced_hide_key_concepts_section_title">إخفاء قسم \'المفاهيم الأساسية\'</string>
+  <string name="revanced_hide_key_concepts_section_summary_on">تم إخفاء قسم \'المفاهيم الأساسية\'</string>
+  <string name="revanced_hide_key_concepts_section_summary_off">يتم عرض قسم \'المفاهيم الأساسية\'</string>
   <string name="revanced_hide_transcript_section_title">إخفاء قسم النص</string>
   <string name="revanced_hide_transcript_section_summary_on">تم إخفاء قسم النص</string>
   <string name="revanced_hide_transcript_section_summary_off">يتم عرض قسم النص</string>
@@ -239,14 +253,18 @@ This is because Crowdin requires temporarily flattening this file and removing t
   <string name="revanced_hide_keyword_content_phrases_title">الكلمات المفتاحية المراد إخفاؤها</string>
   <!-- For localization it is preferred, but not required, if 'LeBlanc' is replaced with a localized name or a familiar word that has upper case letters in the middle of the word.
                  This is because keywords can be in any language, and showing an example in the localized script helps convey this. -->
-  <string name="revanced_hide_keyword_content_phrases_summary">الكلمات المفتاحية والعبارات المراد إخفاؤها، مفصولة بأسطر جديد\n\nالكلمات التي تحتوي على أحرف كبيرة في الوسط يجب إدخالها مع التغليف (مثل: iPhone, TikTok, Leblanc)</string>
+  <string name="revanced_hide_keyword_content_phrases_summary">الكلمات والعبارات الرئيسية التي يجب إخفاؤها، مفصولة بسطر جديد\n\nالكلمات الرئيسية يمكن أن تكون أسماء قنوات أو أي نص يظهر في عناوين الفيديو\n\nيجب إدخال الكلمات التي تحتوي على أحرف كبيرة في الوسط بإستخدام الأحرف الكبيرة (مثال: iPhone، TikTok، LeBlanc)</string>
   <string name="revanced_hide_keyword_content_about_title">حول تصفية الكلمات المفتاحية</string>
-  <string name="revanced_hide_keyword_content_about_summary">الصفحة الرئيسية/الاشتراك/نتائج البحث يتم تصفيتها لإخفاء المحتوى الذي يطابق عبارات الكلمات المفتاحية\n\nالتقييد\n• بعض المقاطع القصيرة قد لا تكون مخفية\n• بعض مكونات واجهة المستخدم قد لا تكون مخفية\n• البحث عن كلمة رئيسية قد لا يظهر أي نتائج</string>
+  <string name="revanced_hide_keyword_content_about_summary">الصفحة الرئيسية/الاشتراكات/نتائج الإشتراك/يتم تصفية نتائج البحث لإخفاء المحتوى الذي يتطابق مع عبارات الكلمات الرئيسية\n\nالقيود\n• لا يمكن إخفاء فيديوهات Shorts بواسطة اسم القناة\n• قد لا تكون بعض مكونات واجهة المستخدم مخفية\n• قد لا تظهر نتائج بحث عن كلمة رئيسية</string>
+  <string name="revanced_hide_keyword_content_about_whole_words_title">مطابقة الكلمات بأكملها</string>
+  <!-- Translations _must_ use a localized example.  For languages that do not use spaces between words (Chinese, Japanese, etc) the English AI example should be used since no localized examples exist.  Or if using machine translations, or if nobody wants to think of a localized example, then the English 'ai' example should be left as-is. -->
+  <string name="revanced_hide_keyword_content_about_whole_words_summary">سيؤدي وضع علامة اقتباس مزدوجة حول كلمة رئيسية/عبارة إلى منع التطابقات الجزئية لعناوين الفيديو وأسماء القنوات.&lt;br&gt;&lt;br&gt;على سبيل المثال،&lt;br&gt;&lt;b&gt;\"ai\"&lt;/b&gt; سيخفي الفيديو: &lt;b&gt;How does AI work?&lt;/b&gt;&lt;br&gt;ولكن لن يخفي: &lt;b&gt;What does fair use mean?&lt;/b&gt;</string>
   <!-- Translations of this should not be longer than the original English text, otherwise the text can be clipped and not entirely shown. -->
-  <string name="revanced_hide_keyword_toast_invalid_common">الكلمة المفتاحية غير صالحة. لا يمكن استخدام: \'%s\' كعامل تصفية</string>
-  <!-- Translations of this should not be longer than the original English text, otherwise the text can be clipped and not entirely shown. -->
-  <string name="revanced_hide_keyword_toast_invalid_length">الكلمة المفتاحية غير صالحة. \'%1$s\' أقل من %2$d حرفًا</string>
-  <string name="revanced_hide_keyword_toast_invalid_broad">الكلمة الرئيسية \'%s\' سوف تخفي جميع الفيديوهات</string>
+  <string name="revanced_hide_keyword_toast_invalid_common">لا يمكن استخدام الكلمة الرئيسية: %s</string>
+  <string name="revanced_hide_keyword_toast_invalid_common_whole_word_required">إضافة اقتباسات لاستخدام الكلمة الرئيسية: %s</string>
+  <string name="revanced_hide_keyword_toast_invalid_conflicting">الكلمة الرئيسية لها بيانات متضاربة: %s</string>
+  <string name="revanced_hide_keyword_toast_invalid_length">الكلمة الرئيسية قصيرة جدًا وتتطلب اقتباسات: %s</string>
+  <string name="revanced_hide_keyword_toast_invalid_broad">الكلمة الرئيسية سوف تخفي جميع الفيديوهات: %s</string>
   </patch>
   <patch id="ad.general.HideAdsResourcePatch">
   <string name="revanced_hide_general_ads_title">إخفاء الإعلانات العامة</string>
@@ -612,6 +630,9 @@ This is because Crowdin requires temporarily flattening this file and removing t
   <string name="revanced_hide_shorts_save_sound_button_title">إخفاء حفظ الصوت إلى زر قائمة التشغيل</string>
   <string name="revanced_hide_shorts_save_sound_button_summary_on">تم إخفاء حفظ الصوت في قائمة التشغيل</string>
   <string name="revanced_hide_shorts_save_sound_button_summary_off">يتم عرض حفظ الصوت في قائمة التشغيل</string>
+  <string name="revanced_hide_shorts_use_this_sound_button_title">إخفاء زر استخدام هذا الصوت</string>
+  <string name="revanced_hide_shorts_use_this_sound_button_summary_on">تم إخفاء زر استخدام هذا الصوت</string>
+  <string name="revanced_hide_shorts_use_this_sound_button_summary_off">يتم عرض زر استخدام هذا الصوت</string>
   <string name="revanced_hide_shorts_search_suggestions_title">إخفاء اقتراحات البحث</string>
   <string name="revanced_hide_shorts_search_suggestions_summary_on">تم إخفاء اقتراحات البحث</string>
   <string name="revanced_hide_shorts_search_suggestions_summary_off">يتم عرض اقتراحات البحث</string>
@@ -675,7 +696,6 @@ This is because Crowdin requires temporarily flattening this file and removing t
   <string name="revanced_player_overlay_opacity_invalid_toast">شفافية واجهة المشغل يجب أن تكون بين 0-100</string>
   </patch>
   <patch id="layout.returnyoutubedislike.ReturnYouTubeDislikeResourcePatch">
-  <string name="revanced_ryd_video_likes_hidden_by_video_owner">مخفي</string>
   <!-- Toast shown if network connection times out. Translations of this should not be longer than the original English or the text can be clipped and not entirely shown. -->
   <string name="revanced_ryd_failure_connection_timeout">لم يعجبني غير متاح مؤقتًا (انتهت مهلة API)</string>
   <string name="revanced_ryd_failure_connection_status_code">لم يعجبني غير متاح (الحالة %d)</string>
@@ -771,6 +791,7 @@ This is because Crowdin requires temporarily flattening this file and removing t
   <string name="revanced_sb_general_skipcount_sum_off">تم تعطيل تتبع مرات التخطي</string>
   <string name="revanced_sb_general_min_duration">الحد الأدنى لمدة المقطع</string>
   <string name="revanced_sb_general_min_duration_sum">لن يتم عرض المقاطع الأقصر من هذه القيمة (بالثواني) أو تخطيها</string>
+  <string name="revanced_sb_general_min_duration_invalid">المدة الزمنية غير صالحة</string>
   <string name="revanced_sb_general_uuid">معرف المستخدم الفريد الخاص بك</string>
   <string name="revanced_sb_general_uuid_sum">يجب أن يبقى هذا خاصًا. انه مثل كلمة المرور ولا ينبغي مشاركته مع أي شخص. إذا كان شخص ما يملك هذا، فيمكنه انتحال شخصيتك</string>
   <string name="revanced_sb_general_uuid_invalid">يجب أن يكون معرف المستخدم الخاص 30 حرفًا على الأقل</string>
@@ -864,17 +885,13 @@ This is because Crowdin requires temporarily flattening this file and removing t
   <string name="revanced_sb_new_segment_choose_category">اختيار فئة المقطع</string>
   <string name="revanced_sb_new_segment_disabled_category">الفئة معطلة في الإعدادات. تمكين الفئة للإرسال.</string>
   <string name="revanced_sb_new_segment_title">مقطع مانِع رُعَاة جديد</string>
-  <!-- Do not rearrange the (hour):(minute):second) time format operators here.
-                 YT shows the same seekbar time format for all languages, and this string is confirming the segment time as it appears in the seekbar. -->
-  <string name="revanced_sb_new_segment_mark_time_as_question">تعيين %1$02d:%2$02d:%3$03d كبداية أم نهاية لمقطع جديد؟</string>
+  <string name="revanced_sb_new_segment_mark_time_as_question">تعيين %s كبداية أو نهاية لمقطع جديد؟</string>
   <string name="revanced_sb_new_segment_mark_start">البداية</string>
   <string name="revanced_sb_new_segment_mark_end">النهاية</string>
   <string name="revanced_sb_new_segment_now">الآن</string>
   <string name="revanced_sb_new_segment_time_start">الوقت الذي يبدأ عنده المقطع</string>
   <string name="revanced_sb_new_segment_time_end">الوقت الذي ينتهي عنده المقطع</string>
   <string name="revanced_sb_new_segment_confirm_title">هل الأوقات صحيحة؟</string>
-  <!-- Do not rearrange the (hour):(minute):second) time format operators here.
-                 YT shows the same seekbar time format for all languages, and this string is confirming the segment time as it appears in the seekbar. -->
   <string name="revanced_sb_new_segment_confirm_content">المقطع من\n\n%1$s\nto\n%2$s\n\n(%3$s)\n\nReady to جاهز للإرسال؟</string>
   <string name="revanced_sb_new_segment_start_is_before_end">يجب أن تكون البداية قبل النهاية</string>
   <string name="revanced_sb_new_segment_mark_locations_first">ضع علامة على موقعين في شريط الوقت أولًا</string>
@@ -893,6 +910,7 @@ This is because Crowdin requires temporarily flattening this file and removing t
   <string name="revanced_sb_stats_username_changed">تم تغيير اسم المستخدم بنجاح</string>
   <string name="revanced_sb_stats_reputation">سمعتك هي &lt;b&gt;%.2f&lt;/b&gt;</string>
   <string name="revanced_sb_stats_submissions">لقد أنشأت &lt;b&gt;%s&lt;/b&gt; مقطع</string>
+  <string name="revanced_sb_stats_submissions_sum">اضغط هنا لعرض المقاطع الخاصة بك</string>
   <string name="revanced_sb_stats_saved_zero">متصدرين SponsorBlock</string>
   <string name="revanced_sb_stats_saved">لقد قمت بحفظ الناس من &lt;b&gt;%s&lt;/b&gt; مقطع</string>
   <string name="revanced_sb_stats_saved_sum_zero">اضغط هنا لرؤية الإحصائيات العالمية وأبرز المساهمين</string>
@@ -925,7 +943,7 @@ This is because Crowdin requires temporarily flattening this file and removing t
   <string name="revanced_spoof_app_version_target_entry_2">18.20.39 - استعادة سرعة الفيديو الواسعة &amp; قائمة الجودة</string>
   <string name="revanced_spoof_app_version_target_entry_3">18.09.39 - استعادة علامة تبويب المكتبة</string>
   <string name="revanced_spoof_app_version_target_entry_4">17.41.37 - استعادة رف قائمة التشغيل القديم</string>
-  <string name="revanced_spoof_app_version_target_entry_5">17.30.34 - استعادة تصميم واجهة المستخدم القديم</string>
+  <string name="revanced_spoof_app_version_target_entry_5">17.33.42 - استعادة تصميم واجهة المستخدم القديم</string>
   </patch>
   <patch id="layout.startpage.ChangeStartPagePatch">
   <string name="revanced_start_page_title">تعيين صفحة البداية</string>
@@ -1035,6 +1053,11 @@ This is because Crowdin requires temporarily flattening this file and removing t
   <string name="revanced_announcements_connection_failed">فشل الاتصال بموفر الإعلانات</string>
   <string name="revanced_announcements_dialog_dismiss">تجاهل</string>
   </patch>
+  <patch id="misc.dns.CheckWatchHistoryDomainNameResolutionPatch">
+  <string name="revanced_check_watch_history_domain_name_dialog_title">تحذير</string>
+  <string name="revanced_check_watch_history_domain_name_dialog_message">لم يتم حفظ سجل المشاهدة الخاص بك.&lt;br&gt;&lt;br&gt;من المرجح أن يكون السبب في ذلك هو مانع إعلانات DNS أو وكيل الشبكة.&lt;br&gt;&lt;br&gt;لإصلاح هذه المشكلة، قم بإضافة &lt;b&gt;s.youtube.com&lt;/b&gt; إلى القائمة البيضاء أو قم بإيقاف تشغيل جميع أدوات حظر DNS ووكلاء البروكسي.</string>
+  <string name="revanced_check_watch_history_domain_name_dialog_ignore">لا تعرض مرة أخرى</string>
+  </patch>
   <patch id="misc.autorepeat.AutoRepeatPatch">
   <string name="revanced_auto_repeat_title">تمكين التكرار التلقائي</string>
   <string name="revanced_auto_repeat_summary_on">تم تمكين التكرار التلقائي</string>
@@ -1109,21 +1132,23 @@ This is because Crowdin requires temporarily flattening this file and removing t
   <string name="revanced_slide_to_seek_summary_on">تم تمكين Slide to Seek</string>
   <string name="revanced_slide_to_seek_summary_off">تم تعطيل Slide to Seek</string>
   </patch>
-  <patch id="misc.fix.playback.SpoofClientPatch">
-  <string name="revanced_spoof_client_screen_title">Spoof Client</string>
-  <string name="revanced_spoof_client_screen_summary">محاكاة العميل لمنع مشكلات التشغيل</string>
-  <string name="revanced_spoof_client_title">Spoof Client</string>
-  <string name="revanced_spoof_client_summary_on">يتم محاكاة العميل</string>
-  <string name="revanced_spoof_client_summary_off">لا يتم محاكاة العميل\n\nقد لا يعمل تشغيل الفيديو</string>
-  <string name="revanced_spoof_client_user_dialog_message">إيقاف تشغيل هذا الإعداد قد يسبب مشاكل في تشغيل الفيديو.</string>
-  <string name="revanced_spoof_client_use_ios_title">Spoof Client to iOS</string>
-  <string name="revanced_spoof_client_use_ios_summary_on">تتم حاليًا محاكاة العميل إلى iOS\n\nالآثار الجانبية تشمل:\n• لا يوجد فيديو HDR\n• قد لا يعمل سجل المشاهدة\n• قد تكون جودة الفيديو الأعلى مفقودة\n• لا يمكن تشغيل البث المباشر كصوت فقط\n• البث المباشر غير متوفر على Android 8.0</string>
-  <string name="revanced_spoof_client_use_ios_summary_off">تتم محاكاة العميل حاليًا إلى Android VR\n\nالآثار الجانبية تشمل:\n• لا يوجد فيديو HDR\n• فيديوهات الأطفال لا يتم تشغيلهم\n• مقاطع الفيديو المتوقفة يمكن أن تستأنف عشوائيا\n• جودة منخفضة لمصغرات شريط التقدم\n• زر التنزيل مخفي بشكل دائم\n• بطاقات نهاية الشاشة مخفية بشكل دائم</string>
-  <string name="revanced_spoof_client_storyboard_timeout">محاكاة مصغرات العميل غير متوفرة (انتهت مهلة API)</string>
-  <string name="revanced_spoof_client_storyboard_io_exception">محاكاة مصغرات العميل غير متوفرة مؤقتًا: %s</string>
-  </patch>
-  <!-- This patch is no longer used, these strings are not in use, and these strings will be deleted in the future. -->
-  <patch id="misc.fix.playback.SpoofSignaturePatch">
+  <patch id="misc.fix.playback.SpoofVideoStreamsPatch">
+  <string name="revanced_spoof_video_streams_screen_title">Spoof Video Streams</string>
+  <string name="revanced_spoof_video_streams_screen_summary">تزييف تدفقات الفيديو الخاصة بالعميل لمنع حدوث مشكلات أثناء التشغيل</string>
+  <string name="revanced_spoof_video_streams_title">Spoof Video Streams</string>
+  <string name="revanced_spoof_video_streams_summary_on">يتم تزييف تدفقات الفيديو</string>
+  <string name="revanced_spoof_video_streams_summary_off">لا يتم تزييف تدفقات الفيديو\n\nقد لا يعمل تشغيل الفيديو</string>
+  <string name="revanced_spoof_video_streams_user_dialog_message">إيقاف تشغيل هذا الإعداد قد يسبب مشاكل في تشغيل الفيديو.</string>
+  <string name="revanced_spoof_video_streams_client_type_title">العميل الافتراضي</string>
+  <string name="revanced_spoof_video_streams_ios_force_avc_title">فرض AVC (H.264)</string>
+  <string name="revanced_spoof_video_streams_ios_force_avc_summary_on">ترميز الفيديو هو AVC (H.264)</string>
+  <string name="revanced_spoof_video_streams_ios_force_avc_summary_off">ترميز الفيديو هو VP9 أو AV1</string>
+  <string name="revanced_spoof_video_streams_ios_force_avc_no_hardware_vp9_summary_on">لا يحتوي جهازك على فك تشفير الأجهزة VP9، وهذا الإعداد يعمل دائما عند تمكين تزييف العميل</string>
+  <string name="revanced_spoof_video_streams_ios_force_avc_user_dialog_message">قد يؤدي تمكين هذا إلى تحسين عمر البطارية وإصلاح مشكلة تقطيع التشغيل.\n\nيتمتع تنسيق AVC بدقة قصوى تبلغ 1080P، وسيستخدم تشغيل الفيديو المزيد من بيانات الإنترنت مقارنةً بتنسيق VP9 أو AV1.</string>
+  <string name="revanced_spoof_video_streams_about_ios_title">التأثيرات الجانبية لمحاكاة iOS</string>
+  <string name="revanced_spoof_video_streams_about_ios_summary">• قد لا يتم تشغيل الأفلام أو الفيديوهات المدفوعة\n• يبدأ البث المباشر من البداية</string>
+  <string name="revanced_spoof_video_streams_about_android_vr_title">التأثيرات الجانبية لمحاكاة Android VR</string>
+  <string name="revanced_spoof_video_streams_about_android_vr_summary">• قائمة المقطع الصوتي مفقودة</string>
   </patch>
   <!-- This patch is no longer used and these strings will soon be deleted. -->
   <patch id="video.hdrbrightness.HDRBrightnessPatch">