chore: Release v5.37.1-dev.3 [skip ci]

## [5.37.1-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.37.1-dev.2...v5.37.1-dev.3) (2025-09-15)

### Bug Fixes

* **Spoof video streams:** Remove Android TV and iOS TV clients, add experimental VisionOS, add temporary fix for `Force original audio` to work with any spoof client ([#5861](https://github.com/ReVanced/revanced-patches/issues/5861)) ([abe3943](abe3943f98))

CHANGELOG.md

@@ -1,3 +1,384 @@
+## [5.37.1-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.37.1-dev.2...v5.37.1-dev.3) (2025-09-15)
+
+
+### Bug Fixes
+
+* **Spoof video streams:** Remove Android TV and iOS TV clients, add experimental VisionOS, add temporary fix for `Force original audio` to work with any spoof client ([#5861](https://github.com/ReVanced/revanced-patches/issues/5861)) ([abe3943](https://github.com/ReVanced/revanced-patches/commit/abe3943f98fd86dcd74c7e07cf65d3c7fc24fef9))
+
+## [5.37.1-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.37.1-dev.1...v5.37.1-dev.2) (2025-09-15)
+
+
+### Bug Fixes
+
+* **Instagram - Hide navigation buttons:** Support v397.1.0.52.81 ([#5855](https://github.com/ReVanced/revanced-patches/issues/5855)) ([f11d1ef](https://github.com/ReVanced/revanced-patches/commit/f11d1ef9907082512f139d4ab0e2e9f707de7e48))
+
+## [5.37.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.37.0...v5.37.1-dev.1) (2025-09-15)
+
+
+### Bug Fixes
+
+* **YouTube Music - Spoof video streams:** Fix playback issues when using a cellular network ([fa04c8e](https://github.com/ReVanced/revanced-patches/commit/fa04c8eecfbdd0b6ed082b464ca9032536d71762))
+
+# [5.37.0](https://github.com/ReVanced/revanced-patches/compare/v5.36.0...v5.37.0) (2025-09-15)
+
+
+### Bug Fixes
+
+* **Instagram - Hide navigation buttons:** Add constrain to known working version ([e6c79f1](https://github.com/ReVanced/revanced-patches/commit/e6c79f13834c83fef04e4dee5e628cb0b9a27765))
+* Resolve patching with dev branch ([09b941a](https://github.com/ReVanced/revanced-patches/commit/09b941abf0e8029999565082b02a88b5de507ec4))
+* **Spotify:** Remove broken `Spoof client` patch ([#5833](https://github.com/ReVanced/revanced-patches/issues/5833)) ([dcd4245](https://github.com/ReVanced/revanced-patches/commit/dcd42454bd5f87dddd720534f6120c4ef90063a3))
+* **Viber - Hide ads:** Add constrain to known working version ([2db0948](https://github.com/ReVanced/revanced-patches/commit/2db0948beaf2b68391a1fe7f21e92d31c7df61e7))
+* **YouTube Music - Spoof streaming data:** Fix audio playback stuttering ([#5839](https://github.com/ReVanced/revanced-patches/issues/5839)) ([2a85a3b](https://github.com/ReVanced/revanced-patches/commit/2a85a3b29092729ae16d1fd93803634ce5f08e95))
+
+
+### Features
+
+* **Viber:** Add `Hide ads` patch ([#5826](https://github.com/ReVanced/revanced-patches/issues/5826)) ([0abfab7](https://github.com/ReVanced/revanced-patches/commit/0abfab79d7cda15bf17c53679fbfffb021662649))
+
+# [5.37.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v5.37.0-dev.5...v5.37.0-dev.6) (2025-09-15)
+
+
+### Bug Fixes
+
+* **Instagram - Hide navigation buttons:** Add constrain to known working version ([e6c79f1](https://github.com/ReVanced/revanced-patches/commit/e6c79f13834c83fef04e4dee5e628cb0b9a27765))
+
+# [5.37.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v5.37.0-dev.4...v5.37.0-dev.5) (2025-09-15)
+
+
+### Bug Fixes
+
+* **Viber - Hide ads:** Add constrain to known working version ([2db0948](https://github.com/ReVanced/revanced-patches/commit/2db0948beaf2b68391a1fe7f21e92d31c7df61e7))
+
+# [5.37.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.37.0-dev.3...v5.37.0-dev.4) (2025-09-14)
+
+
+### Bug Fixes
+
+* **YouTube Music - Spoof streaming data:** Fix audio playback stuttering ([#5839](https://github.com/ReVanced/revanced-patches/issues/5839)) ([2a85a3b](https://github.com/ReVanced/revanced-patches/commit/2a85a3b29092729ae16d1fd93803634ce5f08e95))
+
+# [5.37.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.37.0-dev.2...v5.37.0-dev.3) (2025-09-14)
+
+
+### Bug Fixes
+
+* **Spotify:** Remove broken `Spoof client` patch ([#5833](https://github.com/ReVanced/revanced-patches/issues/5833)) ([dcd4245](https://github.com/ReVanced/revanced-patches/commit/dcd42454bd5f87dddd720534f6120c4ef90063a3))
+
+# [5.37.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.37.0-dev.1...v5.37.0-dev.2) (2025-09-14)
+
+
+### Bug Fixes
+
+* Resolve patching with dev branch ([09b941a](https://github.com/ReVanced/revanced-patches/commit/09b941abf0e8029999565082b02a88b5de507ec4))
+
+# [5.37.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.36.0...v5.37.0-dev.1) (2025-09-14)
+
+
+### Features
+
+* **Viber:** Add `Hide ads` patch ([#5826](https://github.com/ReVanced/revanced-patches/issues/5826)) ([0abfab7](https://github.com/ReVanced/revanced-patches/commit/0abfab79d7cda15bf17c53679fbfffb021662649))
+
+# [5.36.0](https://github.com/ReVanced/revanced-patches/compare/v5.35.0...v5.36.0) (2025-09-14)
+
+
+### Bug Fixes
+
+* **Duolingo - Disable ads:** Support latest app target ([#5782](https://github.com/ReVanced/revanced-patches/issues/5782)) ([88b47ef](https://github.com/ReVanced/revanced-patches/commit/88b47ef414cd073ec3800258b32aceb6f383a411))
+* **YouTube - Hide layout components:** Hide new type of Playable shelf ([8cd8e59](https://github.com/ReVanced/revanced-patches/commit/8cd8e59bbc3a878269276b8ae5f627b044d157f0))
+* **YouTube Music:** Resolve playback issues, change recommended app target to `7.29.52` ([#5813](https://github.com/ReVanced/revanced-patches/issues/5813)) ([a53b00d](https://github.com/ReVanced/revanced-patches/commit/a53b00dd514dbe2b3406f3c1013a4f58a7f481c5))
+
+
+### Features
+
+* **YouTube - SponsorBlock:** Add 'Hook' segment category ([#5783](https://github.com/ReVanced/revanced-patches/issues/5783)) ([9d4aa5c](https://github.com/ReVanced/revanced-patches/commit/9d4aa5cd16a6f9e95cf7c626351b46b86ca80efe))
+
+# [5.36.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.35.0...v5.36.0-dev.1) (2025-09-13)
+
+
+### Bug Fixes
+
+* **Duolingo - Disable ads:** Support latest app target ([#5782](https://github.com/ReVanced/revanced-patches/issues/5782)) ([88b47ef](https://github.com/ReVanced/revanced-patches/commit/88b47ef414cd073ec3800258b32aceb6f383a411))
+* **YouTube - Hide layout components:** Hide new type of Playable shelf ([8cd8e59](https://github.com/ReVanced/revanced-patches/commit/8cd8e59bbc3a878269276b8ae5f627b044d157f0))
+* **YouTube Music:** Resolve playback issues, change recommended app target to `7.29.52` ([#5813](https://github.com/ReVanced/revanced-patches/issues/5813)) ([a53b00d](https://github.com/ReVanced/revanced-patches/commit/a53b00dd514dbe2b3406f3c1013a4f58a7f481c5))
+
+
+### Features
+
+* **YouTube - SponsorBlock:** Add 'Hook' segment category ([#5783](https://github.com/ReVanced/revanced-patches/issues/5783)) ([9d4aa5c](https://github.com/ReVanced/revanced-patches/commit/9d4aa5cd16a6f9e95cf7c626351b46b86ca80efe))
+
+# [5.36.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.35.0...v5.36.0-dev.1) (2025-09-13)
+
+
+### Bug Fixes
+
+* **Duolingo - Disable ads:** Support latest app target ([#5782](https://github.com/ReVanced/revanced-patches/issues/5782)) ([88b47ef](https://github.com/ReVanced/revanced-patches/commit/88b47ef414cd073ec3800258b32aceb6f383a411))
+* **YouTube - Hide layout components:** Hide new type of Playable shelf ([8cd8e59](https://github.com/ReVanced/revanced-patches/commit/8cd8e59bbc3a878269276b8ae5f627b044d157f0))
+* **YouTube Music:** Resolve playback issues, change recommended app target to `7.29.52` ([#5813](https://github.com/ReVanced/revanced-patches/issues/5813)) ([a53b00d](https://github.com/ReVanced/revanced-patches/commit/a53b00dd514dbe2b3406f3c1013a4f58a7f481c5))
+
+
+### Features
+
+* **YouTube - SponsorBlock:** Add 'Hook' segment category ([#5783](https://github.com/ReVanced/revanced-patches/issues/5783)) ([9d4aa5c](https://github.com/ReVanced/revanced-patches/commit/9d4aa5cd16a6f9e95cf7c626351b46b86ca80efe))
+
+# [5.36.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.35.0...v5.36.0-dev.1) (2025-09-13)
+
+
+### Bug Fixes
+
+* **Duolingo - Disable ads:** Support latest app target ([#5782](https://github.com/ReVanced/revanced-patches/issues/5782)) ([88b47ef](https://github.com/ReVanced/revanced-patches/commit/88b47ef414cd073ec3800258b32aceb6f383a411))
+* **YouTube - Hide layout components:** Hide new type of Playable shelf ([8cd8e59](https://github.com/ReVanced/revanced-patches/commit/8cd8e59bbc3a878269276b8ae5f627b044d157f0))
+
+
+### Features
+
+* **YouTube - SponsorBlock:** Add 'Hook' segment category ([#5783](https://github.com/ReVanced/revanced-patches/issues/5783)) ([9d4aa5c](https://github.com/ReVanced/revanced-patches/commit/9d4aa5cd16a6f9e95cf7c626351b46b86ca80efe))
+
+# [5.36.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.35.0...v5.36.0-dev.1) (2025-09-12)
+
+
+### Bug Fixes
+
+* **Duolingo - Disable ads:** Support latest app target ([#5782](https://github.com/ReVanced/revanced-patches/issues/5782)) ([88b47ef](https://github.com/ReVanced/revanced-patches/commit/88b47ef414cd073ec3800258b32aceb6f383a411))
+* **YouTube - Hide layout components:** Hide new type of Playable shelf ([8cd8e59](https://github.com/ReVanced/revanced-patches/commit/8cd8e59bbc3a878269276b8ae5f627b044d157f0))
+
+
+### Features
+
+* **YouTube - SponsorBlock:** Add 'Hook' segment category ([#5783](https://github.com/ReVanced/revanced-patches/issues/5783)) ([9d4aa5c](https://github.com/ReVanced/revanced-patches/commit/9d4aa5cd16a6f9e95cf7c626351b46b86ca80efe))
+
+# [5.36.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.35.1-dev.1...v5.36.0-dev.1) (2025-09-12)
+
+
+### Features
+
+* **YouTube - SponsorBlock:** Add 'Hook' segment category ([#5783](https://github.com/ReVanced/revanced-patches/issues/5783)) ([2e042c4](https://github.com/ReVanced/revanced-patches/commit/2e042c4b3366fa3daf991d5560fcae991d00ad12))
+
+## [5.35.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.35.0...v5.35.1-dev.1) (2025-09-11)
+
+
+### Bug Fixes
+
+* **Duolingo - Disable ads:** Support latest app target ([#5782](https://github.com/ReVanced/revanced-patches/issues/5782)) ([8491516](https://github.com/ReVanced/revanced-patches/commit/849151637389b8f399356d0d331bb74482f3f05d))
+* **YouTube - Hide layout components:** Hide new type of Playable shelf ([3af4126](https://github.com/ReVanced/revanced-patches/commit/3af41265338ddaab52d009f53370c57abddd4599))
+
+# [5.35.0](https://github.com/ReVanced/revanced-patches/compare/v5.34.0...v5.35.0) (2025-09-09)
+
+
+### Bug Fixes
+
+* **Instagram - Hide navigation buttons:** Fix Manager patching error ([0d10e94](https://github.com/ReVanced/revanced-patches/commit/0d10e94663283fac09f3efc57c9b9805c38c4e13))
+* **Proton mail:** Constrain patches to last working app target ([21c34b9](https://github.com/ReVanced/revanced-patches/commit/21c34b908e07a97de8c31c7c828b44a8cc4739b6))
+* Revert dependency updates to fix Manager pre-release patching ([4c7a1a8](https://github.com/ReVanced/revanced-patches/commit/4c7a1a8554c67797bf663e5230f566c5a9b229af))
+* **Spotify - Unlock Premium:** Make compatible with latest versions again by fixing fingerprint ([#5684](https://github.com/ReVanced/revanced-patches/issues/5684)) ([30dcff1](https://github.com/ReVanced/revanced-patches/commit/30dcff13a56883efc499b71faadb403877cd1c67))
+* **YouTube - Hide layout components:** Hide Playable shelf header ([fbb5046](https://github.com/ReVanced/revanced-patches/commit/fbb50463f0e3f533a278c5251cfbce59f09ce641))
+
+
+### Features
+
+* **BaconReader:** Add `Fix Redgifs API` patch ([#5761](https://github.com/ReVanced/revanced-patches/issues/5761)) ([08868c0](https://github.com/ReVanced/revanced-patches/commit/08868c00d3c4f1f37f4a77f333a03ca5a3259b59))
+* **Boost/Sync for Reddit:** Add `Fix Redgifs` patch  ([#5725](https://github.com/ReVanced/revanced-patches/issues/5725)) ([c5e8079](https://github.com/ReVanced/revanced-patches/commit/c5e8079eab08075a72078cd0fa79f3beb1f75d98))
+* **Instagram:** Add `Hide navigation buttons` patch ([#5678](https://github.com/ReVanced/revanced-patches/issues/5678)) ([415cf0f](https://github.com/ReVanced/revanced-patches/commit/415cf0fb5b9b3dcaf4592943a69eea1c10447b07))
+* **Instagram:** Add `Hide Stories from Home` patch ([#5756](https://github.com/ReVanced/revanced-patches/issues/5756)) ([3ae3251](https://github.com/ReVanced/revanced-patches/commit/3ae3251dc0317b6ced136fe9aa14be369642f203))
+
+# [5.35.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v5.35.0-dev.4...v5.35.0-dev.5) (2025-09-06)
+
+
+### Features
+
+* **BaconReader:** Add `Fix Redgifs API` patch ([#5761](https://github.com/ReVanced/revanced-patches/issues/5761)) ([08868c0](https://github.com/ReVanced/revanced-patches/commit/08868c00d3c4f1f37f4a77f333a03ca5a3259b59))
+* **Instagram:** Add `Hide Stories from Home` patch ([#5756](https://github.com/ReVanced/revanced-patches/issues/5756)) ([3ae3251](https://github.com/ReVanced/revanced-patches/commit/3ae3251dc0317b6ced136fe9aa14be369642f203))
+
+# [5.35.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.35.0-dev.3...v5.35.0-dev.4) (2025-09-04)
+
+
+### Features
+
+* **Boost/Sync for Reddit:** Add `Fix Redgifs` patch  ([#5725](https://github.com/ReVanced/revanced-patches/issues/5725)) ([c5e8079](https://github.com/ReVanced/revanced-patches/commit/c5e8079eab08075a72078cd0fa79f3beb1f75d98))
+
+# [5.35.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.35.0-dev.2...v5.35.0-dev.3) (2025-09-04)
+
+
+### Bug Fixes
+
+* **Instagram - Hide navigation buttons:** Fix Manager patching error ([0d10e94](https://github.com/ReVanced/revanced-patches/commit/0d10e94663283fac09f3efc57c9b9805c38c4e13))
+
+# [5.35.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.35.0-dev.1...v5.35.0-dev.2) (2025-09-04)
+
+
+### Bug Fixes
+
+* Revert dependency updates to fix Manager pre-release patching ([4c7a1a8](https://github.com/ReVanced/revanced-patches/commit/4c7a1a8554c67797bf663e5230f566c5a9b229af))
+
+# [5.35.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.34.1-dev.3...v5.35.0-dev.1) (2025-09-03)
+
+
+### Features
+
+* **Instagram:** Add `Hide navigation buttons` patch ([#5678](https://github.com/ReVanced/revanced-patches/issues/5678)) ([415cf0f](https://github.com/ReVanced/revanced-patches/commit/415cf0fb5b9b3dcaf4592943a69eea1c10447b07))
+
+## [5.34.1-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.34.1-dev.2...v5.34.1-dev.3) (2025-08-24)
+
+
+### Bug Fixes
+
+* **YouTube - Hide layout components:** Hide Playable shelf header ([fbb5046](https://github.com/ReVanced/revanced-patches/commit/fbb50463f0e3f533a278c5251cfbce59f09ce641))
+
+## [5.34.1-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.34.1-dev.1...v5.34.1-dev.2) (2025-08-22)
+
+
+### Bug Fixes
+
+* **Proton mail:** Constrain patches to last working app target ([21c34b9](https://github.com/ReVanced/revanced-patches/commit/21c34b908e07a97de8c31c7c828b44a8cc4739b6))
+
+## [5.34.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.34.0...v5.34.1-dev.1) (2025-08-21)
+
+
+### Bug Fixes
+
+* **Spotify - Unlock Premium:** Make compatible with latest versions again by fixing fingerprint ([#5684](https://github.com/ReVanced/revanced-patches/issues/5684)) ([30dcff1](https://github.com/ReVanced/revanced-patches/commit/30dcff13a56883efc499b71faadb403877cd1c67))
+
+# [5.34.0](https://github.com/ReVanced/revanced-patches/compare/v5.33.0...v5.34.0) (2025-08-19)
+
+
+### Bug Fixes
+
+* **Backdrops:** Remove broken patch that is no longer supported ([#5627](https://github.com/ReVanced/revanced-patches/issues/5627)) ([ebb8332](https://github.com/ReVanced/revanced-patches/commit/ebb83320838aa99dd4417d45a50333dd42c1218a))
+* **pixiv - Hide ads:** Constrain patch to last working app target ([d8ea56c](https://github.com/ReVanced/revanced-patches/commit/d8ea56ca4be47df1c43f96ec41b91c800f1d9daf))
+* **Twitch:** Constrain patches to last working app targets ([#5373](https://github.com/ReVanced/revanced-patches/issues/5373)) ([29a4748](https://github.com/ReVanced/revanced-patches/commit/29a47481c4efa209a3a53df60613b59a73adbe07))
+* **YouTube - Hide layout components:** Do not hide community posts on channel profiles ([#5634](https://github.com/ReVanced/revanced-patches/issues/5634)) ([9e3d5a2](https://github.com/ReVanced/revanced-patches/commit/9e3d5a2b36106479470f3f69920518b57e8c4dca))
+* **YouTube - Player Controls:** Fix chapter title overlapping the bottom buttons ([#5673](https://github.com/ReVanced/revanced-patches/issues/5673)) ([09ccee7](https://github.com/ReVanced/revanced-patches/commit/09ccee71384df338bbf8acc1097f619a372c4868))
+* **YouTube - SponsorBlock:** Do not hide voting or create button when the video ends ([6aba4e2](https://github.com/ReVanced/revanced-patches/commit/6aba4e284de9bb94b49eea8be2baf2870eecbbcf))
+* **YouTube - Video playback:** Disable HDR video does not disable Dolby Vision HDR ([#5661](https://github.com/ReVanced/revanced-patches/issues/5661)) ([6dab988](https://github.com/ReVanced/revanced-patches/commit/6dab98810645b96bd0387ba7d607e5d8ffb1b5bb))
+* **YouTube - Video quality:** Fix additional incorrect quality resolutions used by YouTube ([a2a1fbe](https://github.com/ReVanced/revanced-patches/commit/a2a1fbe2959be8334c54cfc3426c24a960c55c8f))
+* **YouTube - Video quality:** Show FHD+ icon for 1080p 60fps enhanced bitrate ([76bed37](https://github.com/ReVanced/revanced-patches/commit/76bed3734093713af24ef065d5ffc5b1cd83f29a))
+* **YouTube:** Use correct fade out animation when tapping to dismiss the video overlay ([#5670](https://github.com/ReVanced/revanced-patches/issues/5670)) ([cce6737](https://github.com/ReVanced/revanced-patches/commit/cce6737f627fc7621bbde50a5653b6af14c6f31a))
+
+
+### Features
+
+* **Instagram:** Support latest app version ([#5611](https://github.com/ReVanced/revanced-patches/issues/5611)) ([26fe690](https://github.com/ReVanced/revanced-patches/commit/26fe690dfbefe6c412c5f81f208a3b1d2fbd7a0a))
+* **NU.nl:** Support latest app version ([#5643](https://github.com/ReVanced/revanced-patches/issues/5643)) ([7338e4a](https://github.com/ReVanced/revanced-patches/commit/7338e4a5a99f913256120d0d58fede3aa4ee8922))
+* **YouTube - Hide player flyout menu items:** Add option to hide quality flyout menu ([eb55068](https://github.com/ReVanced/revanced-patches/commit/eb5506856a2eaf2a8585e598868ddba3e1429159))
+* **YouTube - Hide video action buttons:** Add "Hide Hype button" setting ([f13f377](https://github.com/ReVanced/revanced-patches/commit/f13f3770e7c4fd5bff8f3e224fb1b1ead50a3c18))
+* **YouTube - Hide video action buttons:** Add "Hide Promote button" setting ([1959396](https://github.com/ReVanced/revanced-patches/commit/1959396a53f4c07b94acddc5c0ee6cdf7ade7c7b))
+* **YouTube - Playback speed:** Show current playback speed on player speed dialog button ([#5607](https://github.com/ReVanced/revanced-patches/issues/5607)) ([279436a](https://github.com/ReVanced/revanced-patches/commit/279436a3657b50f98bb4cc64dc88dc14e422f204))
+* **YouTube:** Add `Disable sign in to TV popup` patch ([#5639](https://github.com/ReVanced/revanced-patches/issues/5639)) ([d0e5bd0](https://github.com/ReVanced/revanced-patches/commit/d0e5bd0479a8910b081c483ed2a6ab4d7134e3c3))
+
+# [5.34.0-dev.13](https://github.com/ReVanced/revanced-patches/compare/v5.34.0-dev.12...v5.34.0-dev.13) (2025-08-19)
+
+
+### Bug Fixes
+
+* **YouTube - Player Controls:** Fix chapter title overlapping the bottom buttons ([#5673](https://github.com/ReVanced/revanced-patches/issues/5673)) ([09ccee7](https://github.com/ReVanced/revanced-patches/commit/09ccee71384df338bbf8acc1097f619a372c4868))
+
+# [5.34.0-dev.13](https://github.com/ReVanced/revanced-patches/compare/v5.34.0-dev.12...v5.34.0-dev.13) (2025-08-18)
+
+
+### Bug Fixes
+
+* **YouTube - Player Controls:** Fix chapter title overlapping the bottom buttons ([#5673](https://github.com/ReVanced/revanced-patches/issues/5673)) ([09ccee7](https://github.com/ReVanced/revanced-patches/commit/09ccee71384df338bbf8acc1097f619a372c4868))
+
+# [5.34.0-dev.12](https://github.com/ReVanced/revanced-patches/compare/v5.34.0-dev.11...v5.34.0-dev.12) (2025-08-18)
+
+
+### Bug Fixes
+
+* **YouTube:** Use correct fade out animation when tapping to dismiss the video overlay ([#5670](https://github.com/ReVanced/revanced-patches/issues/5670)) ([cce6737](https://github.com/ReVanced/revanced-patches/commit/cce6737f627fc7621bbde50a5653b6af14c6f31a))
+
+# [5.34.0-dev.11](https://github.com/ReVanced/revanced-patches/compare/v5.34.0-dev.10...v5.34.0-dev.11) (2025-08-16)
+
+
+### Bug Fixes
+
+* **YouTube - SponsorBlock:** Do not hide voting or create button when the video ends ([6aba4e2](https://github.com/ReVanced/revanced-patches/commit/6aba4e284de9bb94b49eea8be2baf2870eecbbcf))
+
+# [5.34.0-dev.10](https://github.com/ReVanced/revanced-patches/compare/v5.34.0-dev.9...v5.34.0-dev.10) (2025-08-16)
+
+
+### Bug Fixes
+
+* **YouTube - Video playback:** Disable HDR video does not disable Dolby Vision HDR ([#5661](https://github.com/ReVanced/revanced-patches/issues/5661)) ([6dab988](https://github.com/ReVanced/revanced-patches/commit/6dab98810645b96bd0387ba7d607e5d8ffb1b5bb))
+
+
+### Features
+
+* **YouTube - Hide video action buttons:** Add "Hide Promote button" setting ([1959396](https://github.com/ReVanced/revanced-patches/commit/1959396a53f4c07b94acddc5c0ee6cdf7ade7c7b))
+
+# [5.34.0-dev.10](https://github.com/ReVanced/revanced-patches/compare/v5.34.0-dev.9...v5.34.0-dev.10) (2025-08-16)
+
+
+### Features
+
+* **YouTube - Hide video action buttons:** Add "Hide Promote button" setting ([1959396](https://github.com/ReVanced/revanced-patches/commit/1959396a53f4c07b94acddc5c0ee6cdf7ade7c7b))
+
+# [5.34.0-dev.10](https://github.com/ReVanced/revanced-patches/compare/v5.34.0-dev.9...v5.34.0-dev.10) (2025-08-16)
+
+
+### Features
+
+* **YouTube - Hide video action buttons:** Add "Hide Promote button" setting ([1959396](https://github.com/ReVanced/revanced-patches/commit/1959396a53f4c07b94acddc5c0ee6cdf7ade7c7b))
+
+# [5.34.0-dev.9](https://github.com/ReVanced/revanced-patches/compare/v5.34.0-dev.8...v5.34.0-dev.9) (2025-08-16)
+
+
+### Features
+
+* **YouTube - Hide video action buttons:** Add "Hide Hype button" setting ([f13f377](https://github.com/ReVanced/revanced-patches/commit/f13f3770e7c4fd5bff8f3e224fb1b1ead50a3c18))
+
+# [5.34.0-dev.8](https://github.com/ReVanced/revanced-patches/compare/v5.34.0-dev.7...v5.34.0-dev.8) (2025-08-15)
+
+
+### Features
+
+* **NU.nl:** Support latest app version ([#5643](https://github.com/ReVanced/revanced-patches/issues/5643)) ([7338e4a](https://github.com/ReVanced/revanced-patches/commit/7338e4a5a99f913256120d0d58fede3aa4ee8922))
+* **YouTube:** Add `Disable sign in to TV popup` patch ([#5639](https://github.com/ReVanced/revanced-patches/issues/5639)) ([d0e5bd0](https://github.com/ReVanced/revanced-patches/commit/d0e5bd0479a8910b081c483ed2a6ab4d7134e3c3))
+
+# [5.34.0-dev.7](https://github.com/ReVanced/revanced-patches/compare/v5.34.0-dev.6...v5.34.0-dev.7) (2025-08-13)
+
+
+### Bug Fixes
+
+* **YouTube - Video quality:** Fix additional incorrect quality resolutions used by YouTube ([a2a1fbe](https://github.com/ReVanced/revanced-patches/commit/a2a1fbe2959be8334c54cfc3426c24a960c55c8f))
+
+# [5.34.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v5.34.0-dev.5...v5.34.0-dev.6) (2025-08-11)
+
+
+### Bug Fixes
+
+* **YouTube - Video quality:** Show FHD+ icon for 1080p 60fps enhanced bitrate ([76bed37](https://github.com/ReVanced/revanced-patches/commit/76bed3734093713af24ef065d5ffc5b1cd83f29a))
+
+# [5.34.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v5.34.0-dev.4...v5.34.0-dev.5) (2025-08-10)
+
+
+### Features
+
+* **YouTube - Hide player flyout menu items:** Add option to hide quality flyout menu ([eb55068](https://github.com/ReVanced/revanced-patches/commit/eb5506856a2eaf2a8585e598868ddba3e1429159))
+
+# [5.34.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.34.0-dev.3...v5.34.0-dev.4) (2025-08-10)
+
+
+### Bug Fixes
+
+* **YouTube - Hide layout components:** Do not hide community posts on channel profiles ([#5634](https://github.com/ReVanced/revanced-patches/issues/5634)) ([9e3d5a2](https://github.com/ReVanced/revanced-patches/commit/9e3d5a2b36106479470f3f69920518b57e8c4dca))
+
+# [5.34.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.34.0-dev.2...v5.34.0-dev.3) (2025-08-09)
+
+
+### Bug Fixes
+
+* **pixiv - Hide ads:** Constrain patch to last working app target ([d8ea56c](https://github.com/ReVanced/revanced-patches/commit/d8ea56ca4be47df1c43f96ec41b91c800f1d9daf))
+
+# [5.34.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.34.0-dev.1...v5.34.0-dev.2) (2025-08-09)
+
+
+### Bug Fixes
+
+* **Backdrops:** Remove broken patch that is no longer supported ([#5627](https://github.com/ReVanced/revanced-patches/issues/5627)) ([ebb8332](https://github.com/ReVanced/revanced-patches/commit/ebb83320838aa99dd4417d45a50333dd42c1218a))
+
+
+### Features
+
+* **YouTube - Playback speed:** Show current playback speed on player speed dialog button ([#5607](https://github.com/ReVanced/revanced-patches/issues/5607)) ([279436a](https://github.com/ReVanced/revanced-patches/commit/279436a3657b50f98bb4cc64dc88dc14e422f204))
+
 # [5.34.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.33.0...v5.34.0-dev.1) (2025-08-08)
 
 

adsfund.json

@@ -0,0 +1,8 @@
+{
+  "info": "This is verification file for ads.fund project",
+  "project": {
+    "name": "Revanced Patches",
+    "walletAddress": "0x7ab4091e00363654bf84B34151225742cd92FCE5",
+    "tokenAddress": "0xadf325f255083a3f3d9a9d01ffb3db52a148d802"
+  }
+}

extensions/baconreader/build.gradle.kts

@@ -0,0 +1,5 @@
+dependencies {
+    compileOnly(project(":extensions:shared:library"))
+    compileOnly(libs.annotation)
+    compileOnly(libs.okhttp)
+}

extensions/baconreader/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest/>

extensions/baconreader/src/main/java/app/revanced/extension/baconreader/FixRedgifsApiPatch.java

@@ -0,0 +1,22 @@
+package app.revanced.extension.baconreader;
+
+import app.revanced.extension.shared.fixes.redgifs.BaseFixRedgifsApiPatch;
+import okhttp3.OkHttpClient;
+
+/**
+ * @noinspection unused
+ */
+public class FixRedgifsApiPatch extends BaseFixRedgifsApiPatch {
+    static {
+        INSTANCE = new FixRedgifsApiPatch();
+    }
+
+    public String getDefaultUserAgent() {
+        // BaconReader uses a static user agent for Redgifs API calls
+        return "BaconReader";
+    }
+
+    public static OkHttpClient install(OkHttpClient.Builder builder) {
+        return builder.addInterceptor(INSTANCE).build();
+    }
+}

extensions/boostforreddit/build.gradle.kts

@@ -1,4 +1,6 @@
 dependencies {
     compileOnly(project(":extensions:shared:library"))
     compileOnly(project(":extensions:boostforreddit:stub"))
+    compileOnly(libs.annotation)
+    compileOnly(libs.okhttp)
 }

extensions/boostforreddit/src/main/java/app/revanced/extension/boostforreddit/FixRedgifsApiPatch.java

@@ -0,0 +1,22 @@
+package app.revanced.extension.boostforreddit;
+
+import app.revanced.extension.shared.fixes.redgifs.BaseFixRedgifsApiPatch;
+import okhttp3.OkHttpClient;
+
+/**
+ * @noinspection unused
+ */
+public class FixRedgifsApiPatch extends BaseFixRedgifsApiPatch {
+    static {
+        INSTANCE = new FixRedgifsApiPatch();
+    }
+
+    public String getDefaultUserAgent() {
+        // Boost uses a static user agent for Redgifs API calls
+        return "Boost";
+    }
+
+    public static OkHttpClient createClient() {
+        return new OkHttpClient.Builder().addInterceptor(INSTANCE).build();
+    }
+}

extensions/music/build.gradle.kts

@@ -1,3 +1,9 @@
+dependencies {
+    compileOnly(project(":extensions:shared:library"))
+    compileOnly(project(":extensions:youtube:stub"))
+    compileOnly(libs.annotation)
+}
+
 android {
     defaultConfig {
         minSdk = 26

extensions/music/src/main/java/app/revanced/extension/music/patches/spoof/SpoofVideoStreamsPatch.java

@@ -0,0 +1,27 @@
+package app.revanced.extension.music.patches.spoof;
+
+import static app.revanced.extension.shared.spoof.ClientType.ANDROID_VR_1_43_32;
+import static app.revanced.extension.shared.spoof.ClientType.ANDROID_VR_1_61_48;
+import static app.revanced.extension.shared.spoof.ClientType.VISIONOS;
+
+import java.util.List;
+
+import app.revanced.extension.shared.spoof.ClientType;
+import app.revanced.extension.shared.spoof.requests.StreamingDataRequest;
+
+@SuppressWarnings("unused")
+public class SpoofVideoStreamsPatch {
+
+    /**
+     * Injection point.
+     */
+    public static void setClientOrderToUse() {
+        List<ClientType> availableClients = List.of(
+                ANDROID_VR_1_43_32,
+                ANDROID_VR_1_61_48,
+                VISIONOS
+        );
+
+        StreamingDataRequest.setClientOrderToUse(availableClients, ANDROID_VR_1_43_32);
+    }
+}

extensions/music/src/main/java/app/revanced/extension/music/spoof/SpoofClientPatch.java

@@ -1,27 +0,0 @@
-package app.revanced.extension.music.spoof;
-
-/**
- * @noinspection unused
- */
-public class SpoofClientPatch {
-    private static final int CLIENT_TYPE_ID = 26;
-    private static final String CLIENT_VERSION = "6.21";
-    private static final String DEVICE_MODEL = "iPhone16,2";
-    private static final String OS_VERSION = "17.7.2.21H221";
-
-    public static int getClientId() {
-        return CLIENT_TYPE_ID;
-    }
-
-    public static String getClientVersion() {
-        return CLIENT_VERSION;
-    }
-
-    public static String getClientModel() {
-        return DEVICE_MODEL;
-    }
-
-    public static String getOsVersion() {
-        return OS_VERSION;
-    }
-}

extensions/shared/build.gradle.kts

@@ -1,3 +1,4 @@
 dependencies {
     implementation(project(":extensions:shared:library"))
+    compileOnly(libs.okhttp)
 }

extensions/shared/library/build.gradle.kts

@@ -18,4 +18,5 @@ android {
 
 dependencies {
     compileOnly(libs.annotation)
+    compileOnly(libs.okhttp)
 }

extensions/shared/library/src/main/java/app/revanced/extension/shared/Utils.java

@@ -329,7 +329,7 @@ public class Utils {
             return (R) child;
         }
 
-        throw new IllegalArgumentException("View with resource name '" + str + "' not found");
+        throw new IllegalArgumentException("View with resource name not found: " + str);
     }
 
     /**

extensions/shared/library/src/main/java/app/revanced/extension/shared/fixes/redgifs/BaseFixRedgifsApiPatch.java

@@ -0,0 +1,71 @@
+package app.revanced.extension.shared.fixes.redgifs;
+
+import androidx.annotation.NonNull;
+
+import org.json.JSONException;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+
+import app.revanced.extension.shared.Logger;
+import okhttp3.Interceptor;
+import okhttp3.MediaType;
+import okhttp3.Protocol;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+
+
+public abstract class BaseFixRedgifsApiPatch implements Interceptor {
+    protected static BaseFixRedgifsApiPatch INSTANCE;
+    public abstract String getDefaultUserAgent();
+
+    @NonNull
+    @Override
+    public Response intercept(@NonNull Chain chain) throws IOException {
+        Request request = chain.request();
+        if (!request.url().host().equals("api.redgifs.com")) {
+            return chain.proceed(request);
+        }
+
+        String userAgent = getDefaultUserAgent();
+
+        if (request.header("Authorization") != null) {
+            Response response = chain.proceed(request.newBuilder().header("User-Agent", userAgent).build());
+            if (response.isSuccessful()) {
+                return response;
+            }
+            // It's possible that the user agent is being overwritten later down in the interceptor
+            // chain, so make sure we grab the new user agent from the request headers.
+            userAgent = response.request().header("User-Agent");
+            response.close();
+        }
+
+        try {
+            RedgifsTokenManager.RedgifsToken token = RedgifsTokenManager.refreshToken(userAgent);
+
+            // Emulate response for old OAuth endpoint
+            if (request.url().encodedPath().equals("/v2/oauth/client")) {
+                String responseBody = RedgifsTokenManager.getEmulatedOAuthResponseBody(token);
+                return new Response.Builder()
+                        .message("OK")
+                        .code(HttpURLConnection.HTTP_OK)
+                        .protocol(Protocol.HTTP_1_1)
+                        .request(request)
+                        .header("Content-Type", "application/json")
+                        .body(ResponseBody.create(
+                                responseBody, MediaType.get("application/json")))
+                        .build();
+            }
+
+            Request modifiedRequest = request.newBuilder()
+                    .header("Authorization", "Bearer " + token.getAccessToken())
+                    .header("User-Agent", userAgent)
+                    .build();
+            return chain.proceed(modifiedRequest);
+        } catch (JSONException ex) {
+            Logger.printException(() -> "Could not parse Redgifs response", ex);
+            throw new IOException(ex);
+        }
+    }
+}

extensions/shared/library/src/main/java/app/revanced/extension/shared/fixes/redgifs/RedgifsTokenManager.java

@@ -0,0 +1,94 @@
+package app.revanced.extension.shared.fixes.redgifs;
+
+import static app.revanced.extension.shared.requests.Route.Method.GET;
+
+import androidx.annotation.GuardedBy;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import app.revanced.extension.shared.requests.Requester;
+
+
+/**
+ * Manages Redgifs token lifecycle.
+ */
+public class RedgifsTokenManager {
+    public static class RedgifsToken {
+        // Expire after 23 hours to provide some breathing room
+        private static final long EXPIRY_SECONDS = 23 * 60 * 60;
+
+        private final String accessToken;
+        private final long refreshTimeInSeconds;
+
+        public RedgifsToken(String accessToken, long refreshTime) {
+            this.accessToken = accessToken;
+            this.refreshTimeInSeconds = refreshTime;
+        }
+
+        public String getAccessToken() {
+            return accessToken;
+        }
+
+        public long getExpiryTimeInSeconds() {
+            return refreshTimeInSeconds + EXPIRY_SECONDS;
+        }
+
+        public boolean isValid() {
+            if (accessToken == null) return false;
+            return getExpiryTimeInSeconds() >= System.currentTimeMillis() / 1000;
+        }
+    }
+    public static final String REDGIFS_API_HOST = "https://api.redgifs.com";
+    private static final String GET_TEMPORARY_TOKEN = REDGIFS_API_HOST + "/v2/auth/temporary";
+    @GuardedBy("itself")
+    private static final Map<String, RedgifsToken> tokenMap = new HashMap<>();
+
+    private static String getToken(String userAgent) throws IOException, JSONException {
+        HttpURLConnection connection = (HttpURLConnection) new URL(GET_TEMPORARY_TOKEN).openConnection();
+        connection.setFixedLengthStreamingMode(0);
+        connection.setRequestMethod(GET.name());
+        connection.setRequestProperty("User-Agent", userAgent);
+        connection.setRequestProperty("Content-Type", "application/json");
+        connection.setRequestProperty("Accept", "application/json");
+        connection.setUseCaches(false);
+
+        JSONObject responseObject = Requester.parseJSONObject(connection);
+        return responseObject.getString("token");
+    }
+
+    public static RedgifsToken refreshToken(String userAgent) throws IOException, JSONException {
+        synchronized(tokenMap) {
+            // Reference: https://github.com/JeffreyCA/Apollo-ImprovedCustomApi/pull/67
+            RedgifsToken token = tokenMap.get(userAgent);
+            if (token != null && token.isValid()) {
+                return token;
+            }
+
+            // Copy user agent from original request if present because Redgifs verifies
+            // that the user agent in subsequent requests matches the one in the OAuth token.
+            String accessToken = getToken(userAgent);
+            long refreshTime = System.currentTimeMillis() / 1000;
+            token = new RedgifsToken(accessToken, refreshTime);
+            tokenMap.put(userAgent, token);
+            return token;
+        }
+    }
+
+    public static String getEmulatedOAuthResponseBody(RedgifsToken token) throws JSONException {
+        // Reference: https://github.com/JeffreyCA/Apollo-ImprovedCustomApi/pull/67
+        JSONObject responseObject = new JSONObject();
+        responseObject.put("access_token", token.accessToken);
+        responseObject.put("expiry_time", token.getExpiryTimeInSeconds() - (System.currentTimeMillis() / 1000));
+        responseObject.put("scope", "read");
+        responseObject.put("token_type", "Bearer");
+        return responseObject.toString();
+    }
+}

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java

@@ -4,7 +4,6 @@ import static java.lang.Boolean.FALSE;
 import static java.lang.Boolean.TRUE;
 import static app.revanced.extension.shared.settings.Setting.parent;
 import static app.revanced.extension.shared.spoof.SpoofVideoStreamsPatch.AudioStreamLanguageOverrideAvailability;
-import static app.revanced.extension.shared.spoof.SpoofVideoStreamsPatch.SpoofiOSAvailability;
 
 import app.revanced.extension.shared.spoof.ClientType;
 
@@ -31,9 +30,6 @@ public class BaseSettings {
     public static final BooleanSetting SPOOF_VIDEO_STREAMS = new BooleanSetting("revanced_spoof_video_streams", TRUE, true, "revanced_spoof_video_streams_user_dialog_message");
     public static final EnumSetting<AppLanguage> SPOOF_VIDEO_STREAMS_LANGUAGE = new EnumSetting<>("revanced_spoof_video_streams_language", AppLanguage.DEFAULT, new AudioStreamLanguageOverrideAvailability());
     public static final BooleanSetting SPOOF_STREAMING_DATA_STATS_FOR_NERDS = new BooleanSetting("revanced_spoof_streaming_data_stats_for_nerds", TRUE, parent(SPOOF_VIDEO_STREAMS));
-    public static final BooleanSetting SPOOF_VIDEO_STREAMS_IOS_FORCE_AVC = new BooleanSetting("revanced_spoof_video_streams_ios_force_avc", FALSE, true,
-            "revanced_spoof_video_streams_ios_force_avc_user_dialog_message", new SpoofiOSAvailability());
     // Client type must be last spoof setting due to cyclic references.
-    public static final EnumSetting<ClientType> SPOOF_VIDEO_STREAMS_CLIENT_TYPE = new EnumSetting<>("revanced_spoof_video_streams_client_type", ClientType.ANDROID_UNPLUGGED, true, parent(SPOOF_VIDEO_STREAMS));
-
+    public static final EnumSetting<ClientType> SPOOF_VIDEO_STREAMS_CLIENT_TYPE = new EnumSetting<>("revanced_spoof_video_streams_client_type", ClientType.ANDROID_VR_1_61_48, true, parent(SPOOF_VIDEO_STREAMS));
 }

extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/ClientType.java

@@ -2,17 +2,21 @@ package app.revanced.extension.shared.spoof;
 
 import android.os.Build;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import java.util.Locale;
 import java.util.Objects;
 
 import app.revanced.extension.shared.Logger;
-import app.revanced.extension.shared.settings.BaseSettings;
 
 public enum ClientType {
+    /**
+     * Video not playable: Kids / Paid / Movie / Private / Age-restricted.
+     * This client can only be used when logged out.
+     */
     // https://dumps.tadiphone.dev/dumps/oculus/eureka
-    ANDROID_VR_NO_AUTH(
+    ANDROID_VR_1_61_48(
             28,
             "ANDROID_VR",
             "com.google.android.apps.youtube.vr.oculus",
@@ -27,29 +31,32 @@ public enum ClientType {
             "1.61.48",
             false,
             false,
-            "Android VR No auth"
+            "Android VR 1.61"
     ),
-    // Chromecast with Google TV 4K.
-    // https://dumps.tadiphone.dev/dumps/google/kirkwood
-    ANDROID_UNPLUGGED(
-            29,
-            "ANDROID_UNPLUGGED",
-            "com.google.android.apps.youtube.unplugged",
-            "Google",
-            "Google TV Streamer",
-            "Android",
-            "14",
-            "34",
-            "UTT3.240625.001.K5",
-            "132.0.6808.3",
-            "8.49.0",
-            true,
-            true,
-            "Android TV"
+    /**
+     * Uses non adaptive bitrate, which fixes audio stuttering with YT Music.
+     * Does not use AV1.
+     */
+    ANDROID_VR_1_43_32(
+            ANDROID_VR_1_61_48.id,
+            ANDROID_VR_1_61_48.clientName,
+            Objects.requireNonNull(ANDROID_VR_1_61_48.packageName),
+            ANDROID_VR_1_61_48.deviceMake,
+            ANDROID_VR_1_61_48.deviceModel,
+            ANDROID_VR_1_61_48.osName,
+            ANDROID_VR_1_61_48.osVersion,
+            Objects.requireNonNull(ANDROID_VR_1_61_48.androidSdkVersion),
+            Objects.requireNonNull(ANDROID_VR_1_61_48.buildId),
+            "107.0.5284.2",
+            "1.43.32",
+            ANDROID_VR_1_61_48.requiresAuth,
+            ANDROID_VR_1_61_48.useAuth,
+            "Android VR 1.43"
     ),
-    // Cannot play livestreams and lacks HDR, but can play videos with music and labeled "for children".
-    // Google Pixel 9 Pro Fold
-    // https://dumps.tadiphone.dev/dumps/google/barbet
+    /**
+     * Cannot play livestreams and lacks HDR, but can play videos with music and labeled "for children".
+     * <a href="https://dumps.tadiphone.dev/dumps/google/barbet">Google Pixel 9 Pro Fold</a>
+     */
     ANDROID_CREATOR(
             14,
             "ANDROID_CREATOR",
@@ -66,58 +73,22 @@ public enum ClientType {
             true,
             "Android Creator"
     ),
-    IOS_UNPLUGGED(
-            33,
-            "IOS_UNPLUGGED",
-            "com.google.ios.youtubeunplugged",
+    /**
+     * Internal YT client for an unreleased YT client. May stop working at any time.
+     */
+    VISIONOS(101,
+            "VISIONOS",
             "Apple",
-            forceAVC()
-                    // 11 Pro Max (last device with iOS 13)
-                    ? "iPhone12,5"
-                    // 15 Pro Max
-                    : "iPhone16,2",
-            "iOS",
-            forceAVC()
-                    // iOS 13 and earlier uses only AVC. 14+ adds VP9 and AV1.
-                    ? "13.7.17H35"
-                    : "18.2.22C152",
-            null,
-            null,
-            null,
-            // Version number should be a valid iOS release.
-            // https://www.ipa4fun.com/history/152043/
-            forceAVC()
-                    // Some newer versions can also force AVC,
-                    // but 6.45 is the last version that supports iOS 13.
-                    ? "6.45"
-                    : "8.49",
-            true,
-            true,
-            forceAVC()
-                    ? "iOS TV Force AVC"
-                    : "iOS TV"
-    ),
-    ANDROID_VR_AUTH(
-            ANDROID_VR_NO_AUTH.id,
-            ANDROID_VR_NO_AUTH.clientName,
-            ANDROID_VR_NO_AUTH.packageName,
-            ANDROID_VR_NO_AUTH.deviceMake,
-            ANDROID_VR_NO_AUTH.deviceModel,
-            ANDROID_VR_NO_AUTH.osName,
-            ANDROID_VR_NO_AUTH.osVersion,
-            ANDROID_VR_NO_AUTH.androidSdkVersion,
-            ANDROID_VR_NO_AUTH.buildId,
-            ANDROID_VR_NO_AUTH.cronetVersion,
-            ANDROID_VR_NO_AUTH.clientVersion,
-            ANDROID_VR_NO_AUTH.requiresAuth,
-            true,
-            "Android VR Auth"
+            "RealityDevice14,1",
+            "visionOS",
+            "1.3.21O771",
+            "0.1",
+            "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Safari/605.1.15",
+            false,
+            false,
+            "visionOS"
     );
 
-    private static boolean forceAVC() {
-        return BaseSettings.SPOOF_VIDEO_STREAMS_IOS_FORCE_AVC.get();
-    }
-
     /**
      * YouTube
      * <a href="https://github.com/zerodytrash/YouTube-Internal-Clients?tab=readme-ov-file#clients">client type</a>
@@ -129,6 +100,7 @@ public enum ClientType {
     /**
      * App package name.
      */
+    @Nullable
     private final String packageName;
 
     /**
@@ -198,17 +170,20 @@ public enum ClientType {
      */
     public final String friendlyName;
 
+    /**
+     * Android constructor.
+     */
     @SuppressWarnings("ConstantLocale")
     ClientType(int id,
                String clientName,
-               String packageName,
+               @NonNull String packageName,
                String deviceMake,
                String deviceModel,
                String osName,
                String osVersion,
-               @Nullable String androidSdkVersion,
-               @Nullable String buildId,
-               @Nullable String cronetVersion,
+               @NonNull String androidSdkVersion,
+               @NonNull String buildId,
+               @NonNull String cronetVersion,
                String clientVersion,
                boolean requiresAuth,
                boolean useAuth,
@@ -229,31 +204,44 @@ public enum ClientType {
         this.friendlyName = friendlyName;
 
         Locale defaultLocale = Locale.getDefault();
-        if (androidSdkVersion == null) {
-            // Convert version from '18.2.22C152' into '18_2_22'
-            String userAgentOsVersion = osVersion
-                    .replaceAll("(\\d+\\.\\d+\\.\\d+).*", "$1")
-                    .replace(".", "_");
-            // https://github.com/mitmproxy/mitmproxy/issues/4836
-            this.userAgent = String.format("%s/%s (%s; U; CPU iOS %s like Mac OS X; %s)",
-                    packageName,
-                    clientVersion,
-                    deviceModel,
-                    userAgentOsVersion,
-                    defaultLocale
-            );
-        } else {
-            this.userAgent = String.format("%s/%s (Linux; U; Android %s; %s; %s; Build/%s; Cronet/%s)",
-                    packageName,
-                    clientVersion,
-                    osVersion,
-                    defaultLocale,
-                    deviceModel,
-                    Objects.requireNonNull(buildId),
-                    Objects.requireNonNull(cronetVersion)
-            );
-        }
+        this.userAgent = String.format("%s/%s (Linux; U; Android %s; %s; %s; Build/%s; Cronet/%s)",
+                packageName,
+                clientVersion,
+                osVersion,
+                defaultLocale,
+                deviceModel,
+                Objects.requireNonNull(buildId),
+                Objects.requireNonNull(cronetVersion)
+        );
         Logger.printDebug(() -> "userAgent: " + this.userAgent);
     }
 
+    @SuppressWarnings("ConstantLocale")
+    ClientType(int id,
+               String clientName,
+               String deviceMake,
+               String deviceModel,
+               String osName,
+               String osVersion,
+               String clientVersion,
+               String userAgent,
+               boolean requiresAuth,
+               boolean useAuth,
+               String friendlyName) {
+        this.id = id;
+        this.clientName = clientName;
+        this.deviceMake = deviceMake;
+        this.deviceModel = deviceModel;
+        this.osName = osName;
+        this.osVersion = osVersion;
+        this.clientVersion = clientVersion;
+        this.userAgent = userAgent;
+        this.requiresAuth = requiresAuth;
+        this.useAuth = useAuth;
+        this.friendlyName = friendlyName;
+        this.packageName = null;
+        this.androidSdkVersion = null;
+        this.buildId = null;
+        this.cronetVersion = null;
+    }
 }

extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/SpoofVideoStreamsPatch.java

@@ -10,6 +10,7 @@ import java.util.Map;
 
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.AppLanguage;
 import app.revanced.extension.shared.settings.BaseSettings;
 import app.revanced.extension.shared.settings.Setting;
 import app.revanced.extension.shared.spoof.requests.StreamingDataRequest;
@@ -19,13 +20,25 @@ public class SpoofVideoStreamsPatch {
     private static final boolean SPOOF_STREAMING_DATA = BaseSettings.SPOOF_VIDEO_STREAMS.get();
 
     private static final boolean FIX_HLS_CURRENT_TIME = SPOOF_STREAMING_DATA
-            && BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get() == ClientType.IOS_UNPLUGGED;
+            && BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get() == ClientType.VISIONOS;
+
+    @Nullable
+    private static volatile AppLanguage languageOverride;
 
     /**
-     * Any unreachable ip address.  Used to intentionally fail requests.
+     * Domain used for internet connectivity verification.
+     * It has an empty response body and is only used to check for a 204 response code.
+     * <p>
+     * If an unreachable IP address (127.0.0.1) is used, no response code is provided.
+     * <p>
+     * YouTube handles unreachable IP addresses without issue.
+     * YouTube Music has an issue with waiting for the Cronet connect timeout of 30s on mobile networks.
+     * <p>
+     * Using a VPN or DNS can temporarily resolve this issue,
+     * But the ideal workaround is to avoid using an unreachable IP address.
      */
-    private static final String UNREACHABLE_HOST_URI_STRING = "https://127.0.0.0";
-    private static final Uri UNREACHABLE_HOST_URI = Uri.parse(UNREACHABLE_HOST_URI_STRING);
+    private static final String INTERNET_CONNECTION_CHECK_URI_STRING = "https://www.google.com/gen_204";
+    private static final Uri INTERNET_CONNECTION_CHECK_URI = Uri.parse(INTERNET_CONNECTION_CHECK_URI_STRING);
 
     /**
      * @return If this patch was included during patching.
@@ -34,10 +47,21 @@ public class SpoofVideoStreamsPatch {
         return false; // Modified during patching.
     }
 
-    public static boolean notSpoofingToAndroid() {
-        return !isPatchIncluded()
-                || !BaseSettings.SPOOF_VIDEO_STREAMS.get()
-                || BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get() == ClientType.IOS_UNPLUGGED;
+    public static boolean spoofingToClientWithNoMultiAudioStreams() {
+        return isPatchIncluded() && BaseSettings.SPOOF_VIDEO_STREAMS.get();
+    }
+
+    /**
+     * @param language Language override for non-authenticated requests. If this is null then
+     *                 {@link BaseSettings#SPOOF_VIDEO_STREAMS_LANGUAGE} is used.
+     */
+    public static void setLanguageOverride(@Nullable AppLanguage language) {
+        languageOverride = language;
+    }
+
+    @Nullable
+    public static AppLanguage getLanguageOverride() {
+        return languageOverride;
     }
 
     /**
@@ -53,9 +77,9 @@ public class SpoofVideoStreamsPatch {
                 String path = playerRequestUri.getPath();
 
                 if (path != null && path.contains("get_watch")) {
-                    Logger.printDebug(() -> "Blocking 'get_watch' by returning unreachable uri");
+                    Logger.printDebug(() -> "Blocking 'get_watch' by returning internet connection check uri");
 
-                    return UNREACHABLE_HOST_URI;
+                    return INTERNET_CONNECTION_CHECK_URI;
                 }
             } catch (Exception ex) {
                 Logger.printException(() -> "blockGetWatchRequest failure", ex);
@@ -77,9 +101,9 @@ public class SpoofVideoStreamsPatch {
                 String path = originalUri.getPath();
 
                 if (path != null && path.contains("initplayback")) {
-                    Logger.printDebug(() -> "Blocking 'initplayback' by clearing query");
+                    Logger.printDebug(() -> "Blocking 'initplayback' by returning internet connection check uri");
 
-                    return originalUri.buildUpon().clearQuery().build().toString();
+                    return INTERNET_CONNECTION_CHECK_URI_STRING;
                 }
             } catch (Exception ex) {
                 Logger.printException(() -> "blockInitPlaybackRequest failure", ex);
@@ -252,16 +276,8 @@ public class SpoofVideoStreamsPatch {
     public static final class AudioStreamLanguageOverrideAvailability implements Setting.Availability {
         @Override
         public boolean isAvailable() {
-            return BaseSettings.SPOOF_VIDEO_STREAMS.get()
-                    && BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get() == ClientType.ANDROID_VR_NO_AUTH;
-        }
-    }
-
-    public static final class SpoofiOSAvailability implements Setting.Availability {
-        @Override
-        public boolean isAvailable() {
-            return BaseSettings.SPOOF_VIDEO_STREAMS.get()
-                    && BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get() == ClientType.IOS_UNPLUGGED;
+            // Since all current clients are un-authenticated, this works for all spoof clients.
+            return BaseSettings.SPOOF_VIDEO_STREAMS.get();
         }
     }
 }

extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/requests/PlayerRoutes.java

@@ -1,5 +1,7 @@
 package app.revanced.extension.shared.spoof.requests;
 
+import static app.revanced.extension.shared.spoof.ClientType.ANDROID_VR_1_43_32;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -10,8 +12,10 @@ import java.util.Locale;
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.requests.Requester;
 import app.revanced.extension.shared.requests.Route;
+import app.revanced.extension.shared.settings.AppLanguage;
 import app.revanced.extension.shared.settings.BaseSettings;
 import app.revanced.extension.shared.spoof.ClientType;
+import app.revanced.extension.shared.spoof.SpoofVideoStreamsPatch;
 
 final class PlayerRoutes {
     static final Route.CompiledRoute GET_STREAMING_DATA = new Route(
@@ -37,14 +41,16 @@ final class PlayerRoutes {
         try {
             JSONObject context = new JSONObject();
 
-            // Can override default language only if no login is used.
-            // Could use preferred audio for all clients that do not login,
-            // but if this is a fall over client it will set the language even though
-            // the audio language is not selectable in the UI.
-            ClientType userSelectedClient = BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get();
-            Locale streamLocale = userSelectedClient == ClientType.ANDROID_VR_NO_AUTH
-                    ? BaseSettings.SPOOF_VIDEO_STREAMS_LANGUAGE.get().getLocale()
-                    : Locale.getDefault();
+            AppLanguage language = SpoofVideoStreamsPatch.getLanguageOverride();
+            if (language == null || BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get() == ANDROID_VR_1_43_32) {
+                // Force original audio has not overrode the language.
+                // Or if YT has fallen over to the very last client (VR 1.43), then always
+                // use the app language because forcing an audio stream of specific languages
+                // can sometimes fail so it's better to try and load something rather than nothing.
+                language = BaseSettings.SPOOF_VIDEO_STREAMS_LANGUAGE.get();
+            }
+            //noinspection ExtractMethodRecommender
+            Locale streamLocale = language.getLocale();
 
             JSONObject client = new JSONObject();
             client.put("deviceMake", clientType.deviceMake);

extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/requests/StreamingDataRequest.java

@@ -35,21 +35,27 @@ import app.revanced.extension.shared.spoof.ClientType;
  */
 public class StreamingDataRequest {
 
-    private static final ClientType[] CLIENT_ORDER_TO_USE;
+    private static volatile ClientType[] clientOrderToUse = ClientType.values();
 
-    static {
-        ClientType[] allClientTypes = ClientType.values();
-        ClientType preferredClient = BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get();
+    public static void setClientOrderToUse(List<ClientType> availableClients, ClientType preferredClient) {
+        Objects.requireNonNull(preferredClient);
 
-        CLIENT_ORDER_TO_USE = new ClientType[allClientTypes.length];
-        CLIENT_ORDER_TO_USE[0] = preferredClient;
+        int availableClientSize = availableClients.size();
+        if (!availableClients.contains(preferredClient)) {
+            availableClientSize++;
+        }
+
+        clientOrderToUse = new ClientType[availableClientSize];
+        clientOrderToUse[0] = preferredClient;
 
         int i = 1;
-        for (ClientType c : allClientTypes) {
+        for (ClientType c : availableClients) {
             if (c != preferredClient) {
-                CLIENT_ORDER_TO_USE[i++] = c;
+                clientOrderToUse[i++] = c;
             }
         }
+
+        Logger.printDebug(() -> "Available spoof clients: " + Arrays.toString(clientOrderToUse));
     }
 
     private static final String AUTHORIZATION_HEADER = "Authorization";
@@ -193,9 +199,9 @@ public class StreamingDataRequest {
 
         // Retry with different client if empty response body is received.
         int i = 0;
-        for (ClientType clientType : CLIENT_ORDER_TO_USE) {
+        for (ClientType clientType : clientOrderToUse) {
             // Show an error if the last client type fails, or if debug is enabled then show for all attempts.
-            final boolean showErrorToast = (++i == CLIENT_ORDER_TO_USE.length) || debugEnabled;
+            final boolean showErrorToast = (++i == clientOrderToUse.length) || debugEnabled;
 
             HttpURLConnection connection = send(clientType, videoId, playerHeaders, showErrorToast);
             if (connection != null) {

extensions/syncforreddit/build.gradle.kts

@@ -2,4 +2,5 @@ dependencies {
     compileOnly(project(":extensions:shared:library"))
     compileOnly(project(":extensions:syncforreddit:stub"))
     compileOnly(libs.annotation)
+    compileOnly(libs.okhttp)
 }

extensions/syncforreddit/src/main/java/app/revanced/extension/syncforreddit/FixRedgifsApiPatch.java

@@ -0,0 +1,22 @@
+package app.revanced.extension.syncforreddit;
+
+import app.revanced.extension.shared.fixes.redgifs.BaseFixRedgifsApiPatch;
+import okhttp3.OkHttpClient;
+
+/**
+ * @noinspection unused
+ */
+public class FixRedgifsApiPatch extends BaseFixRedgifsApiPatch {
+    static {
+        INSTANCE = new FixRedgifsApiPatch();
+    }
+
+    public String getDefaultUserAgent() {
+        // To be filled in by patch
+        return "";
+    }
+
+    public static OkHttpClient install(OkHttpClient.Builder builder) {
+        return builder.addInterceptor(INSTANCE).build();
+    }
+}

extensions/youtube/src/main/java/app/revanced/extension/youtube/Event.kt

@@ -1,16 +1,20 @@
 package app.revanced.extension.youtube
 
+import app.revanced.extension.shared.Logger
+import java.util.Collections
+
 /**
  * generic event provider class
  */
 class Event<T> {
-    private val eventListeners = mutableSetOf<(T) -> Unit>()
+    private val eventListeners = Collections.synchronizedSet(mutableSetOf<(T) -> Unit>())
 
     operator fun plusAssign(observer: (T) -> Unit) {
         addObserver(observer)
     }
 
     fun addObserver(observer: (T) -> Unit) {
+        Logger.printDebug { "Adding observer: $observer" }
         eventListeners.add(observer)
     }
 
@@ -23,7 +27,8 @@ class Event<T> {
     }
 
     operator fun invoke(value: T) {
-        for (observer in eventListeners)
+        for (observer in eventListeners) {
             observer.invoke(value)
+        }
     }
 }

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisableHdrPatch.java

@@ -1,5 +1,7 @@
 package app.revanced.extension.youtube.patches;
 
+import android.view.Display;
+
 import app.revanced.extension.youtube.settings.Settings;
 
 @SuppressWarnings("unused")
@@ -8,8 +10,10 @@ public class DisableHdrPatch {
     /**
      * Injection point.
      */
-    public static boolean disableHDRVideo() {
-        return !Settings.DISABLE_HDR_VIDEO.get();
+    public static int[] disableHdrVideo(Display.HdrCapabilities capabilities) {
+        return Settings.DISABLE_HDR_VIDEO.get()
+                ? new int[0]
+                : capabilities.getSupportedHdrTypes();
     }
 }
 

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisableSignInToTvPopupPatch.java

@@ -0,0 +1,14 @@
+package app.revanced.extension.youtube.patches;
+
+import app.revanced.extension.youtube.settings.Settings;
+
+@SuppressWarnings("unused")
+public class DisableSignInToTvPopupPatch {
+
+    /**
+     * Injection point.
+     */
+    public static boolean disableSignInToTvPopup() {
+        return Settings.DISABLE_SIGNIN_TO_TV_POPUP.get();
+    }
+}

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ForceOriginalAudioPatch.java

@@ -1,7 +1,7 @@
 package app.revanced.extension.youtube.patches;
 
 import app.revanced.extension.shared.Logger;
-import app.revanced.extension.shared.settings.Setting;
+import app.revanced.extension.shared.settings.AppLanguage;
 import app.revanced.extension.shared.spoof.SpoofVideoStreamsPatch;
 import app.revanced.extension.youtube.settings.Settings;
 
@@ -11,16 +11,20 @@ public class ForceOriginalAudioPatch {
     private static final String DEFAULT_AUDIO_TRACKS_SUFFIX = ".4";
 
     /**
-     * If the conditions to use this patch were present when the app launched.
+     * Injection point.
      */
-    public static boolean PATCH_AVAILABLE = SpoofVideoStreamsPatch.notSpoofingToAndroid();
-
-    public static final class ForceOriginalAudioAvailability implements Setting.Availability {
-        @Override
-        public boolean isAvailable() {
-            // Check conditions of launch and now. Otherwise if spoofing is changed
-            // without a restart the setting will show as available when it's not.
-            return PATCH_AVAILABLE && SpoofVideoStreamsPatch.notSpoofingToAndroid();
+    public static void setPreferredLanguage() {
+        if (Settings.FORCE_ORIGINAL_AUDIO.get()) {
+            // None of the current spoof clients support audio track menu,
+            // And all are un-authenticated and can request any language code
+            // (authenticated requests ignore the language code and always use the account language).
+            // To still support force original audio, if it's enabled then pick a language
+            // that is not auto-dubbed by YouTube: https://support.google.com/youtube/answer/15569972
+            // but the language is also supported natively by the Meta Quest device that
+            // Android VR is spoofing.
+            AppLanguage override = AppLanguage.SV;
+            Logger.printDebug(() -> "Setting language override: " + override);
+            SpoofVideoStreamsPatch.setLanguageOverride(override);
         }
     }
 

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/PlayerControlsPatch.java

@@ -57,11 +57,4 @@ public class PlayerControlsPatch {
     private static void fullscreenButtonVisibilityChanged(boolean isVisible) {
         // Code added during patching.
     }
-
-    /**
-     * Injection point.
-     */
-    public static String getPlayerTopControlsLayoutResourceName(String original) {
-        return "default";
-    }
 }

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/PlayerControlsVisibilityHookPatch.java

@@ -0,0 +1,18 @@
+package app.revanced.extension.youtube.patches;
+
+import androidx.annotation.Nullable;
+
+import app.revanced.extension.youtube.shared.PlayerControlsVisibility;
+
+@SuppressWarnings("unused")
+public class PlayerControlsVisibilityHookPatch {
+
+    /**
+     * Injection point.
+     */
+    public static void setPlayerControlsVisibility(@Nullable Enum<?> youTubePlayerControlsVisibility) {
+        if (youTubePlayerControlsVisibility == null) return;
+
+        PlayerControlsVisibility.setFromString(youTubePlayerControlsVisibility.name());
+    }
+}

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/VideoInformation.java

@@ -1,12 +1,18 @@
 package app.revanced.extension.youtube.patches;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.google.android.libraries.youtube.innertube.model.media.VideoQuality;
 
 import java.lang.ref.WeakReference;
+import java.util.Arrays;
 import java.util.Objects;
 
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
+import app.revanced.extension.youtube.Event;
+import app.revanced.extension.youtube.shared.ShortsPlayerState;
 import app.revanced.extension.youtube.shared.VideoState;
 
 /**
@@ -16,11 +22,30 @@ import app.revanced.extension.youtube.shared.VideoState;
 public final class VideoInformation {
 
     public interface PlaybackController {
-        // Methods are added to YT classes during patching.
-        boolean seekTo(long videoTime);
-        void seekToRelative(long videoTimeOffset);
+        // Methods are added during patching.
+        boolean patch_seekTo(long videoTime);
+        void patch_seekToRelative(long videoTimeOffset);
     }
 
+    /**
+     * Interface to use obfuscated methods.
+     */
+    public interface VideoQualityMenuInterface {
+        // Method is added during patching.
+        void patch_setQuality(VideoQuality quality);
+    }
+
+    /**
+     * Video resolution of the automatic quality option..
+     */
+    public static final int AUTOMATIC_VIDEO_QUALITY_VALUE = -2;
+
+    /**
+     * Video quality names are the same text for all languages.
+     * Premium can be "1080p Premium" or "1080p60 Premium"
+     */
+    public static final String VIDEO_QUALITY_PREMIUM_NAME = "Premium";
+
     private static final float DEFAULT_YOUTUBE_PLAYBACK_SPEED = 1.0f;
     /**
      * Prefix present in all Short player parameters signature.
@@ -30,12 +55,10 @@ public final class VideoInformation {
     private static WeakReference<PlaybackController> playerControllerRef = new WeakReference<>(null);
     private static WeakReference<PlaybackController> mdxPlayerDirectorRef = new WeakReference<>(null);
 
-    @NonNull
     private static String videoId = "";
     private static long videoLength = 0;
     private static long videoTime = -1;
 
-    @NonNull
     private static volatile String playerResponseVideoId = "";
     private static volatile boolean playerResponseVideoIdIsShort;
     private static volatile boolean videoIdIsShort;
@@ -45,6 +68,44 @@ public final class VideoInformation {
      */
     private static float playbackSpeed = DEFAULT_YOUTUBE_PLAYBACK_SPEED;
 
+    private static int desiredVideoResolution = AUTOMATIC_VIDEO_QUALITY_VALUE;
+
+    private static boolean qualityNeedsUpdating;
+
+    /**
+     * The available qualities of the current video.
+     */
+    @Nullable
+    private static VideoQuality[] currentQualities;
+
+    /**
+     * The current quality of the video playing.
+     * This is always the actual quality even if Automatic quality is active.
+     */
+    @Nullable
+    private static VideoQuality currentQuality;
+
+    /**
+     * The current VideoQualityMenuInterface, set during setVideoQuality.
+     */
+    @Nullable
+    private static VideoQualityMenuInterface currentMenuInterface;
+
+    /**
+     * Callback for when the current quality changes.
+     */
+    public static final Event<VideoQuality> onQualityChange = new Event<>();
+
+    @Nullable
+    public static VideoQuality[] getCurrentQualities() {
+        return currentQualities;
+    }
+
+    @Nullable
+    public static VideoQuality getCurrentQuality() {
+        return currentQuality;
+    }
+
     /**
      * Injection point.
      *
@@ -52,12 +113,18 @@ public final class VideoInformation {
      */
     public static void initialize(@NonNull PlaybackController playerController) {
         try {
+            Logger.printDebug(() -> "newVideoStarted");
+
             playerControllerRef = new WeakReference<>(Objects.requireNonNull(playerController));
             videoTime = -1;
             videoLength = 0;
             playbackSpeed = DEFAULT_YOUTUBE_PLAYBACK_SPEED;
+            desiredVideoResolution = AUTOMATIC_VIDEO_QUALITY_VALUE;
+            currentQualities = null;
+            currentMenuInterface = null;
+            setCurrentQuality(null);
         } catch (Exception ex) {
-            Logger.printException(() -> "Failed to initialize", ex);
+            Logger.printException(() -> "initialize failure", ex);
         }
     }
 
@@ -197,14 +264,14 @@ public final class VideoInformation {
             if (controller == null) {
                 Logger.printDebug(() -> "Cannot seekTo because player controller is null");
             } else {
-                if (controller.seekTo(adjustedSeekTime)) return true;
+                if (controller.patch_seekTo(adjustedSeekTime)) return true;
                 Logger.printDebug(() -> "seekTo did not succeeded. Trying MXD.");
                 // Else the video is loading or changing videos, or video is casting to a different device.
             }
 
             // Try calling the seekTo method of the MDX player director (called when casting).
             // The difference has to be a different second mark in order to avoid infinite skip loops
-            // as the Lounge API only supports seconds.
+            // as the Lounge API only supports whole seconds.
             if (adjustedSeekTime / 1000 == videoTime / 1000) {
                 Logger.printDebug(() -> "Skipping seekTo for MDX because seek time is too small "
                         + "(" + (adjustedSeekTime - videoTime) + "ms)");
@@ -217,9 +284,9 @@ public final class VideoInformation {
                 return false;
             }
 
-            return controller.seekTo(adjustedSeekTime);
+            return controller.patch_seekTo(adjustedSeekTime);
         } catch (Exception ex) {
-            Logger.printException(() -> "Failed to seek", ex);
+            Logger.printException(() -> "seekTo failure", ex);
             return false;
         }
     }
@@ -239,7 +306,7 @@ public final class VideoInformation {
             if (controller == null) {
                 Logger.printDebug(() -> "Cannot seek relative as player controller is null");
             } else {
-                controller.seekToRelative(seekTime);
+                controller.patch_seekToRelative(seekTime);
             }
 
             // Adjust the fine adjustment function so it's at least 1 second before/after.
@@ -255,10 +322,10 @@ public final class VideoInformation {
             if (controller == null) {
                 Logger.printDebug(() -> "Cannot seek relative as MXD player controller is null");
             } else {
-                controller.seekToRelative(adjustedSeekTime);
+                controller.patch_seekToRelative(adjustedSeekTime);
             }
         } catch (Exception ex) {
-            Logger.printException(() -> "Failed to seek relative", ex);
+            Logger.printException(() -> "seekToRelative failure", ex);
         }
     }
 
@@ -339,14 +406,13 @@ public final class VideoInformation {
     }
 
     /**
-     * @return If the playback is at the end of the video.
-     *        <p>
      * If video is playing in the background with no video visible,
      * this always returns false (even if the video is actually at the end).
      * <p>
      * This is equivalent to checking for {@link VideoState#ENDED},
      * but can give a more up-to-date result for code calling from some hooks.
      *
+     * @return If the playback is at the end of the video.
      * @see VideoState
      */
     @SuppressWarnings("BooleanMethodIsAlwaysInverted")
@@ -373,4 +439,137 @@ public final class VideoInformation {
             playbackSpeed = newlyLoadedPlaybackSpeed;
         }
     }
+
+    /**
+     * @param resolution The desired video quality resolution to use.
+     */
+    public static void setDesiredVideoResolution(int resolution) {
+        Utils.verifyOnMainThread();
+        Logger.printDebug(() -> "Setting desired video resolution: " + resolution);
+        desiredVideoResolution = resolution;
+        qualityNeedsUpdating = true;
+    }
+
+    private static void setCurrentQuality(@Nullable VideoQuality quality) {
+        Utils.verifyOnMainThread();
+        if (currentQuality != quality) {
+            Logger.printDebug(() -> "Current quality changed to: " + quality);
+            currentQuality = quality;
+            onQualityChange.invoke(quality);
+        }
+    }
+
+    /**
+     * Forcefully changes the video quality of the currently playing video.
+     */
+    public static void changeQuality(VideoQuality quality) {
+        Utils.verifyOnMainThread();
+
+        if (currentMenuInterface == null) {
+            Logger.printException(() -> "Cannot change quality, menu interface is null");
+            return;
+        }
+        currentMenuInterface.patch_setQuality(quality);
+    }
+
+    /**
+     * Injection point. Fixes bad data used by YouTube.
+     * Issue can be reproduced by selecting 480p quality on any Short,
+     * and occasionally with random regular videos.
+     */
+    public static int fixVideoQualityResolution(String name, int quality) {
+        try {
+            if (!name.startsWith(Integer.toString(quality))) {
+                final int suffixIndex = name.indexOf('p');
+                if (suffixIndex > 0) {
+                    final int fixedQuality = Integer.parseInt(name.substring(0, suffixIndex));
+                    Logger.printDebug(() -> "Fixing wrong quality resolution from: " +
+                            name + "(" + quality + ") to: " + name + ")" + fixedQuality + ")");
+                    return fixedQuality;
+                }
+            }
+        } catch (Exception ex) {
+            Logger.printException(() -> "fixVideoQualityResolution failed", ex);
+        }
+
+        return quality;
+    }
+
+    /**
+     * Injection point.
+     *
+     * @param qualities Video qualities available, ordered from largest to smallest, with index 0 being the 'automatic' value of -2
+     * @param originalQualityIndex quality index to use, as chosen by YouTube
+     */
+    public static int setVideoQuality(VideoQuality[] qualities, VideoQualityMenuInterface menu, int originalQualityIndex) {
+        try {
+            Utils.verifyOnMainThread();
+            currentMenuInterface = menu;
+
+            final boolean availableQualitiesChanged = (currentQualities == null)
+                    || !Arrays.equals(currentQualities, qualities);
+            if (availableQualitiesChanged) {
+                currentQualities = qualities;
+                Logger.printDebug(() -> "VideoQualities: " + Arrays.toString(currentQualities));
+            }
+
+            // On extremely slow internet connections the index can initially be -1
+            originalQualityIndex = Math.max(0, originalQualityIndex);
+
+            VideoQuality updatedCurrentQuality = qualities[originalQualityIndex];
+            if (updatedCurrentQuality.patch_getResolution() != AUTOMATIC_VIDEO_QUALITY_VALUE
+                    && (currentQuality == null || currentQuality != updatedCurrentQuality)) {
+                setCurrentQuality(updatedCurrentQuality);
+            }
+
+            final int preferredQuality = desiredVideoResolution;
+            if (preferredQuality == AUTOMATIC_VIDEO_QUALITY_VALUE) {
+                return originalQualityIndex; // Nothing to do.
+            }
+
+            // After changing videos the qualities can initially be for the prior video.
+            // If the qualities have changed and the default is not auto then an update is needed.
+            if (qualityNeedsUpdating) {
+                qualityNeedsUpdating = false;
+            } else if (!availableQualitiesChanged) {
+                return originalQualityIndex;
+            }
+
+            // Find the highest quality that is equal to or less than the preferred.
+            int i = 0;
+            final int lastQualityIndex = qualities.length - 1;
+            for (VideoQuality quality : qualities) {
+                final int qualityResolution = quality.patch_getResolution();
+                if ((qualityResolution != AUTOMATIC_VIDEO_QUALITY_VALUE && qualityResolution <= preferredQuality)
+                        // Use the lowest video quality if the default is lower than all available.
+                        || i == lastQualityIndex) {
+                    final boolean qualityNeedsChange = (i != originalQualityIndex);
+                    Logger.printDebug(() -> qualityNeedsChange
+                            ? "Changing video quality from: " + updatedCurrentQuality + " to: " + quality
+                            : "Video is already the preferred quality: " + quality
+                    );
+
+                    // On first load of a new regular video, if the video is already the
+                    // desired quality then the quality flyout will show 'Auto' (ie: Auto (720p)).
+                    //
+                    // To prevent user confusion, set the video index even if the
+                    // quality is already correct so the UI picker will not display "Auto".
+                    //
+                    // Only change Shorts quality if the quality actually needs to change,
+                    // because the "auto" option is not shown in the flyout
+                    // and setting the same quality again can cause the Short to restart.
+                    if (qualityNeedsChange || !ShortsPlayerState.isOpen()) {
+                        changeQuality(quality);
+                        return i;
+                    }
+
+                    return originalQualityIndex;
+                }
+                i++;
+            }
+        } catch (Exception ex) {
+            Logger.printException(() -> "setVideoQuality failure", ex);
+        }
+        return originalQualityIndex;
+    }
 }

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/ButtonsFilter.java

@@ -83,6 +83,14 @@ final class ButtonsFilter extends Filter {
                 new ByteArrayFilterGroup(
                         Settings.HIDE_CLIP_BUTTON,
                         "yt_outline_scissors"
+                ),
+                new ByteArrayFilterGroup(
+                        Settings.HIDE_HYPE_BUTTON,
+                        "yt_outline_star_shooting"
+                ),
+                new ByteArrayFilterGroup(
+                        Settings.HIDE_PROMOTE_BUTTON,
+                        "yt_outline_megaphone"
                 )
         );
     }

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/Filter.java

@@ -40,7 +40,6 @@ abstract class Filter {
     /**
      * Adds callbacks to {@link #isFiltered(String, String, byte[], StringFilterGroup, FilterContentType, int)}
      * if any of the groups are found.
-     * <p>
      */
     protected final void addIdentifierCallbacks(StringFilterGroup... groups) {
         identifierCallbacks.addAll(Arrays.asList(groups));
@@ -58,7 +57,6 @@ abstract class Filter {
      * Called after an enabled filter has been matched.
      * Default implementation is to always filter the matched component and log the action.
      * Subclasses can perform additional or different checks if needed.
-     *
      * <p>
      * Method is called off the main thread.
      *

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/LayoutComponentsFilter.java

@@ -32,6 +32,7 @@ public final class LayoutComponentsFilter extends Filter {
     );
 
     private final StringTrieSearch exceptions = new StringTrieSearch();
+    private final StringFilterGroup communityPosts;
     private final StringFilterGroup surveys;
     private final StringFilterGroup notifyMe;
     private final StringFilterGroup singleItemInformationPanel;
@@ -44,6 +45,7 @@ public final class LayoutComponentsFilter extends Filter {
     private final StringFilterGroup chipBar;
     private final StringFilterGroup channelProfile;
     private final ByteArrayFilterGroupList channelProfileBuffer;
+    private final ByteArrayFilterGroup playablesBuffer;
 
     public LayoutComponentsFilter() {
         exceptions.addPatterns(
@@ -68,7 +70,7 @@ public final class LayoutComponentsFilter extends Filter {
 
         // Paths.
 
-        final var communityPosts = new StringFilterGroup(
+        communityPosts = new StringFilterGroup(
                 Settings.HIDE_COMMUNITY_POSTS,
                 "post_base_wrapper", // may be obsolete and no longer needed.
                 "text_post_root.eml",
@@ -189,6 +191,12 @@ public final class LayoutComponentsFilter extends Filter {
                 "mini_game_card.eml"
         );
 
+        // Playable horizontal shelf header.
+        playablesBuffer = new ByteArrayFilterGroup(
+                Settings.HIDE_PLAYABLES,
+                "FEmini_app_destination"
+        );
+
         final var quickActions = new StringFilterGroup(
                 Settings.HIDE_QUICK_ACTIONS,
                 "quick_actions"
@@ -325,6 +333,12 @@ public final class LayoutComponentsFilter extends Filter {
             return channelProfileBuffer.check(buffer).isFiltered();
         }
 
+        if (matchedGroup == communityPosts && NavigationBar.isBackButtonVisible()) {
+            // Allow community posts on channel profile page,
+            // or if viewing an individual channel in the feed.
+            return false;
+        }
+
         if (exceptions.matches(path)) return false; // Exceptions are not filtered.
 
         if (matchedGroup == compactChannelBarInner) {
@@ -335,7 +349,9 @@ public final class LayoutComponentsFilter extends Filter {
         }
 
         if (matchedGroup == horizontalShelves) {
-            return contentIndex == 0 && (hideShelves() || ticketShelf.check(buffer).isFiltered());
+            return contentIndex == 0 && (hideShelves()
+                    || ticketShelf.check(buffer).isFiltered()
+                    || playablesBuffer.check(buffer).isFiltered());
         }
 
         if (matchedGroup == chipBar) {

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/PlayerFlyoutMenuItemsFilter.java

@@ -3,34 +3,26 @@ package app.revanced.extension.youtube.patches.components;
 import app.revanced.extension.shared.settings.Setting;
 import app.revanced.extension.shared.spoof.SpoofVideoStreamsPatch;
 import app.revanced.extension.youtube.settings.Settings;
-import app.revanced.extension.youtube.shared.PlayerType;
+import app.revanced.extension.youtube.shared.ShortsPlayerState;
 
 @SuppressWarnings("unused")
 public class PlayerFlyoutMenuItemsFilter extends Filter {
 
     public static final class HideAudioFlyoutMenuAvailability implements Setting.Availability {
-        private static final boolean AVAILABLE_ON_LAUNCH = SpoofVideoStreamsPatch.notSpoofingToAndroid();
+        private static final boolean AVAILABLE_ON_LAUNCH = !SpoofVideoStreamsPatch.spoofingToClientWithNoMultiAudioStreams();
 
         @Override
         public boolean isAvailable() {
             // Check conditions of launch and now. Otherwise if spoofing is changed
             // without a restart the setting will show as available when it's not.
-            return AVAILABLE_ON_LAUNCH && SpoofVideoStreamsPatch.notSpoofingToAndroid();
+            return AVAILABLE_ON_LAUNCH && !SpoofVideoStreamsPatch.spoofingToClientWithNoMultiAudioStreams();
         }
     }
 
     private final ByteArrayFilterGroupList flyoutFilterGroupList = new ByteArrayFilterGroupList();
-
-    private final ByteArrayFilterGroup exception;
     private final StringFilterGroup videoQualityMenuFooter;
 
     public PlayerFlyoutMenuItemsFilter() {
-        exception = new ByteArrayFilterGroup(
-                // Whitelist Quality menu item when "Hide Additional settings menu" is enabled
-                Settings.HIDE_PLAYER_FLYOUT_ADDITIONAL_SETTINGS,
-                "quality_sheet"
-        );
-
         videoQualityMenuFooter = new StringFilterGroup(
                 Settings.HIDE_PLAYER_FLYOUT_VIDEO_QUALITY_FOOTER,
                 "quality_sheet_footer"
@@ -44,11 +36,11 @@ public class PlayerFlyoutMenuItemsFilter extends Filter {
         flyoutFilterGroupList.addAll(
                 new ByteArrayFilterGroup(
                         Settings.HIDE_PLAYER_FLYOUT_CAPTIONS,
-                        "closed_caption"
+                        "closed_caption_"
                 ),
                 new ByteArrayFilterGroup(
                         Settings.HIDE_PLAYER_FLYOUT_ADDITIONAL_SETTINGS,
-                        "yt_outline_gear"
+                        "yt_outline_gear_"
                 ),
                 new ByteArrayFilterGroup(
                         Settings.HIDE_PLAYER_FLYOUT_LOOP_VIDEO,
@@ -56,31 +48,31 @@ public class PlayerFlyoutMenuItemsFilter extends Filter {
                 ),
                 new ByteArrayFilterGroup(
                         Settings.HIDE_PLAYER_FLYOUT_AMBIENT_MODE,
-                        "yt_outline_screen_light"
+                        "yt_outline_screen_light_"
                 ),
                 new ByteArrayFilterGroup(
                         Settings.HIDE_PLAYER_FLYOUT_STABLE_VOLUME,
-                        "volume_stable"
+                        "volume_stable_"
                 ),
                 new ByteArrayFilterGroup(
                         Settings.HIDE_PLAYER_FLYOUT_HELP,
-                        "yt_outline_question_circle"
+                        "yt_outline_question_circle_"
                 ),
                 new ByteArrayFilterGroup(
                         Settings.HIDE_PLAYER_FLYOUT_MORE_INFO,
-                        "yt_outline_info_circle"
+                        "yt_outline_info_circle_"
                 ),
                 new ByteArrayFilterGroup(
                         Settings.HIDE_PLAYER_FLYOUT_LOCK_SCREEN,
-                        "yt_outline_lock"
+                        "yt_outline_lock_"
                 ),
                 new ByteArrayFilterGroup(
                         Settings.HIDE_PLAYER_FLYOUT_SPEED,
-                        "yt_outline_play_arrow_half_circle"
+                        "yt_outline_play_arrow_half_circle_"
                 ),
                 new ByteArrayFilterGroup(
                         Settings.HIDE_PLAYER_FLYOUT_AUDIO_TRACK,
-                        "yt_outline_person_radar"
+                        "yt_outline_person_radar_"
                 ),
                 new ByteArrayFilterGroup(
                         Settings.HIDE_PLAYER_FLYOUT_SLEEP_TIMER,
@@ -88,7 +80,11 @@ public class PlayerFlyoutMenuItemsFilter extends Filter {
                 ),
                 new ByteArrayFilterGroup(
                         Settings.HIDE_PLAYER_FLYOUT_WATCH_IN_VR,
-                        "yt_outline_vr"
+                        "yt_outline_vr_"
+                ),
+                new ByteArrayFilterGroup(
+                        Settings.HIDE_PLAYER_FLYOUT_VIDEO_QUALITY,
+                        "yt_outline_adjust_"
                 )
         );
     }
@@ -105,7 +101,7 @@ public class PlayerFlyoutMenuItemsFilter extends Filter {
         }
 
         // Shorts also use this player flyout panel
-        if (PlayerType.getCurrent().isNoneOrHidden() || exception.check(buffer).isFiltered()) {
+        if (ShortsPlayerState.isOpen()) {
             return false;
         }
 

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/playback/quality/RememberVideoQualityPatch.java

@@ -3,12 +3,8 @@ package app.revanced.extension.youtube.patches.playback.quality;
 import static app.revanced.extension.shared.StringRef.str;
 import static app.revanced.extension.shared.Utils.NetworkType;
 
-import androidx.annotation.Nullable;
-
 import com.google.android.libraries.youtube.innertube.model.media.VideoQuality;
 
-import java.util.Arrays;
-
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.BooleanSetting;
@@ -16,69 +12,15 @@ import app.revanced.extension.shared.settings.IntegerSetting;
 import app.revanced.extension.youtube.patches.VideoInformation;
 import app.revanced.extension.youtube.settings.Settings;
 import app.revanced.extension.youtube.shared.ShortsPlayerState;
-import app.revanced.extension.youtube.videoplayer.VideoQualityDialogButton;
 
 @SuppressWarnings("unused")
 public class RememberVideoQualityPatch {
 
-    /**
-     * Interface to use obfuscated methods.
-     */
-    public interface VideoQualityMenuInterface {
-        void patch_setQuality(VideoQuality quality);
-    }
-
-    /**
-     * Video resolution of the automatic quality option..
-     */
-    public static final int AUTOMATIC_VIDEO_QUALITY_VALUE = -2;
-
-    /**
-     * All quality names are the same for all languages.
-     * VideoQuality also has a resolution enum that can be used if needed.
-     */
-    public static final String VIDEO_QUALITY_1080P_PREMIUM_NAME = "1080p Premium";
-
     private static final IntegerSetting videoQualityWifi = Settings.VIDEO_QUALITY_DEFAULT_WIFI;
     private static final IntegerSetting videoQualityMobile = Settings.VIDEO_QUALITY_DEFAULT_MOBILE;
     private static final IntegerSetting shortsQualityWifi = Settings.SHORTS_QUALITY_DEFAULT_WIFI;
     private static final IntegerSetting shortsQualityMobile = Settings.SHORTS_QUALITY_DEFAULT_MOBILE;
 
-    private static boolean qualityNeedsUpdating;
-
-    /**
-     * The available qualities of the current video.
-     */
-    @Nullable
-    private static VideoQuality[] currentQualities;
-
-    /**
-     * The current quality of the video playing.
-     * This is always the actual quality even if Automatic quality is active.
-     */
-    @Nullable
-    private static VideoQuality currentQuality;
-
-    /**
-     * The current VideoQualityMenuInterface, set during setVideoQuality.
-     */
-    @Nullable
-    private static VideoQualityMenuInterface currentMenuInterface;
-
-    @Nullable
-    public static VideoQuality[] getCurrentQualities() {
-        return currentQualities;
-    }
-
-    @Nullable
-    public static VideoQuality getCurrentQuality() {
-        return currentQuality;
-    }
-
-    @Nullable
-    public static VideoQualityMenuInterface getCurrentMenuInterface() {
-        return currentMenuInterface;
-    }
 
     public static boolean shouldRememberVideoQuality() {
         BooleanSetting preference = ShortsPlayerState.isOpen()
@@ -128,87 +70,12 @@ public class RememberVideoQualityPatch {
 
     /**
      * Injection point.
-     *
-     * @param qualities Video qualities available, ordered from largest to smallest, with index 0 being the 'automatic' value of -2
-     * @param originalQualityIndex quality index to use, as chosen by YouTube
-     */
-    public static int setVideoQuality(VideoQuality[] qualities, VideoQualityMenuInterface menu, int originalQualityIndex) {
-        try {
-            Utils.verifyOnMainThread();
-            currentMenuInterface = menu;
-
-            final boolean availableQualitiesChanged = (currentQualities == null)
-                    || !Arrays.equals(currentQualities, qualities);
-            if (availableQualitiesChanged) {
-                currentQualities = qualities;
-                Logger.printDebug(() -> "VideoQualities: " + Arrays.toString(currentQualities));
-            }
-
-            VideoQuality updatedCurrentQuality = qualities[originalQualityIndex];
-            if (updatedCurrentQuality.patch_getResolution() != AUTOMATIC_VIDEO_QUALITY_VALUE
-                    && (currentQuality == null || currentQuality != updatedCurrentQuality)) {
-                currentQuality = updatedCurrentQuality;
-                Logger.printDebug(() -> "Current quality changed to: " + updatedCurrentQuality);
-
-                VideoQualityDialogButton.updateButtonIcon(updatedCurrentQuality);
-            }
-
-            final int preferredQuality = getDefaultQualityResolution();
-            if (preferredQuality == AUTOMATIC_VIDEO_QUALITY_VALUE) {
-                return originalQualityIndex; // Nothing to do.
-            }
-
-            // After changing videos the qualities can initially be for the prior video.
-            // If the qualities have changed and the default is not auto then an update is needed.
-            if (!qualityNeedsUpdating && !availableQualitiesChanged) {
-                return originalQualityIndex;
-            }
-            qualityNeedsUpdating = false;
-
-            // Find the highest quality that is equal to or less than the preferred.
-            int i = 0;
-            for (VideoQuality quality : qualities) {
-                final int qualityResolution = quality.patch_getResolution();
-                if ((qualityResolution != AUTOMATIC_VIDEO_QUALITY_VALUE && qualityResolution <= preferredQuality)
-                        // Use the lowest video quality if the default is lower than all available.
-                        || i == qualities.length - 1) {
-                    final boolean qualityNeedsChange = (i != originalQualityIndex);
-                    Logger.printDebug(() -> qualityNeedsChange
-                            ? "Changing video quality from: " + updatedCurrentQuality + " to: " + quality
-                            : "Video is already the preferred quality: " + quality
-                    );
-
-                    // On first load of a new regular video, if the video is already the
-                    // desired quality then the quality flyout will show 'Auto' (ie: Auto (720p)).
-                    //
-                    // To prevent user confusion, set the video index even if the
-                    // quality is already correct so the UI picker will not display "Auto".
-                    //
-                    // Only change Shorts quality if the quality actually needs to change,
-                    // because the "auto" option is not shown in the flyout
-                    // and setting the same quality again can cause the Short to restart.
-                    if (qualityNeedsChange || !ShortsPlayerState.isOpen()) {
-                        menu.patch_setQuality(qualities[i]);
-                        return i;
-                    }
-
-                    return originalQualityIndex;
-                }
-                i++;
-            }
-        } catch (Exception ex) {
-            Logger.printException(() -> "setVideoQuality failure", ex);
-        }
-        return originalQualityIndex;
-    }
-
-    /**
-     * Injection point.
-     * @param userSelectedQualityIndex Element index of {@link #currentQualities}.
+     * @param userSelectedQualityIndex Element index of {@link VideoInformation#getCurrentQualities()}.
      */
     public static void userChangedShortsQuality(int userSelectedQualityIndex) {
         try {
             if (shouldRememberVideoQuality()) {
+                VideoQuality[] currentQualities = VideoInformation.getCurrentQualities();
                 if (currentQualities == null) {
                     Logger.printDebug(() -> "Cannot save default quality, qualities is null");
                     return;
@@ -227,6 +94,7 @@ public class RememberVideoQualityPatch {
      */
     public static void userChangedQuality(int videoResolution) {
         Utils.verifyOnMainThread();
+        Logger.printDebug(() -> "User changed quality to: " + videoResolution);
 
         if (shouldRememberVideoQuality()) {
             saveDefaultQuality(videoResolution);
@@ -237,27 +105,6 @@ public class RememberVideoQualityPatch {
      * Injection point.
      */
     public static void newVideoStarted(VideoInformation.PlaybackController ignoredPlayerController) {
-        Utils.verifyOnMainThread();
-
-        Logger.printDebug(() -> "newVideoStarted");
-        currentQualities = null;
-        currentQuality = null;
-        currentMenuInterface = null;
-        qualityNeedsUpdating = true;
-
-        // Hide the quality button until playback starts and the qualities are available.
-        VideoQualityDialogButton.updateButtonIcon(null);
-    }
-
-    /**
-     * Injection point. Fixes bad data used by YouTube.
-     */
-    public static int fixVideoQualityResolution(String name, int quality) {
-        final int correctQuality = 480;
-        if (name.equals("480p") && quality != correctQuality) {
-            return correctQuality;
-        }
-
-        return quality;
+        VideoInformation.setDesiredVideoResolution(getDefaultQualityResolution());
     }
 }

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/playback/speed/CustomPlaybackSpeedPatch.java

@@ -100,7 +100,8 @@ public class CustomPlaybackSpeedPatch {
     private static WeakReference<Dialog> currentDialog = new WeakReference<>(null);
 
     static {
-        // Cap at 2 decimals (rounds automatically).
+        // Use same 2 digit format as built in speed picker,
+        speedFormatter.setMinimumFractionDigits(2);
         speedFormatter.setMaximumFractionDigits(2);
 
         final float holdSpeed = Settings.SPEED_TAP_AND_HOLD.get();
@@ -321,7 +322,7 @@ public class CustomPlaybackSpeedPatch {
         TextView currentSpeedText = new TextView(context);
         float currentSpeed = VideoInformation.getPlaybackSpeed();
         // Initially show with only 0 minimum digits, so 1.0 shows as 1x
-        currentSpeedText.setText(formatSpeedStringX(currentSpeed, 0));
+        currentSpeedText.setText(formatSpeedStringX(currentSpeed));
         currentSpeedText.setTextColor(Utils.getAppForegroundColor());
         currentSpeedText.setTextSize(16);
         currentSpeedText.setTypeface(Typeface.DEFAULT_BOLD);
@@ -398,10 +399,11 @@ public class CustomPlaybackSpeedPatch {
                 return null;
             }
 
-            VideoInformation.overridePlaybackSpeed(roundedSpeed);
-            RememberPlaybackSpeedPatch.userSelectedPlaybackSpeed(roundedSpeed);
-            currentSpeedText.setText(formatSpeedStringX(roundedSpeed, 2)); // Update display.
+            currentSpeedText.setText(formatSpeedStringX(roundedSpeed)); // Update display.
             speedSlider.setProgress(speedToProgressValue(roundedSpeed)); // Update slider.
+
+            RememberPlaybackSpeedPatch.userSelectedPlaybackSpeed(roundedSpeed);
+            VideoInformation.overridePlaybackSpeed(roundedSpeed);
             return null;
         };
 
@@ -437,7 +439,7 @@ public class CustomPlaybackSpeedPatch {
         gridParams.setMargins(0, 0, 0, 0); // No margins around GridLayout.
         gridLayout.setLayoutParams(gridParams);
 
-        // For all buttons show at least 1 zero in decimal (2 -> "2.0").
+        // For button use 1 digit minimum.
         speedFormatter.setMinimumFractionDigits(1);
 
         // Add buttons for each preset playback speed.
@@ -455,7 +457,7 @@ public class CustomPlaybackSpeedPatch {
 
             // Create speed button.
             Button speedButton = new Button(context, null, 0);
-            speedButton.setText(speedFormatter.format(speed)); // Do not use 'x' speed format.
+            speedButton.setText(speedFormatter.format(speed));
             speedButton.setTextColor(Utils.getAppForegroundColor());
             speedButton.setTextSize(12);
             speedButton.setAllCaps(false);
@@ -498,6 +500,9 @@ public class CustomPlaybackSpeedPatch {
             gridLayout.addView(buttonContainer);
         }
 
+        // Restore 2 digit minimum.
+        speedFormatter.setMinimumFractionDigits(2);
+
         // Add in-rows speed buttons layout to main layout.
         mainLayout.addView(gridLayout);
 
@@ -631,8 +636,7 @@ public class CustomPlaybackSpeedPatch {
      * @param speed The playback speed value to format.
      * @return A string representation of the speed with 'x' (e.g. "1.25x" or "1.00x").
      */
-    private static String formatSpeedStringX(float speed, int minimumFractionDigits) {
-        speedFormatter.setMinimumFractionDigits(minimumFractionDigits);
+    private static String formatSpeedStringX(float speed) {
         return speedFormatter.format(speed) + 'x';
     }
 

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/spoof/SpoofAppVersionPatch.java

@@ -9,7 +9,7 @@ public class SpoofAppVersionPatch {
     private static final String SPOOF_APP_VERSION_TARGET = Settings.SPOOF_APP_VERSION_TARGET.get();
 
     /**
-     * Injection point
+     * injection point.
      */
     public static String getYouTubeVersionOverride(String version) {
         if (SPOOF_APP_VERSION_ENABLED) return SPOOF_APP_VERSION_TARGET;

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/spoof/SpoofVideoStreamsPatch.java

@@ -0,0 +1,32 @@
+package app.revanced.extension.youtube.patches.spoof;
+
+import static app.revanced.extension.shared.spoof.ClientType.ANDROID_CREATOR;
+import static app.revanced.extension.shared.spoof.ClientType.ANDROID_VR_1_43_32;
+import static app.revanced.extension.shared.spoof.ClientType.ANDROID_VR_1_61_48;
+import static app.revanced.extension.shared.spoof.ClientType.VISIONOS;
+
+import java.util.List;
+
+import app.revanced.extension.shared.settings.BaseSettings;
+import app.revanced.extension.shared.spoof.ClientType;
+import app.revanced.extension.shared.spoof.requests.StreamingDataRequest;
+
+@SuppressWarnings("unused")
+public class SpoofVideoStreamsPatch {
+
+    /**
+     * Injection point.
+     */
+    public static void setClientOrderToUse() {
+        List<ClientType> availableClients = List.of(
+                ANDROID_VR_1_61_48,
+                ANDROID_CREATOR,
+                VISIONOS,
+                // VR 1.43 must be last as spoof streaming data handles it slightly differently.
+                ANDROID_VR_1_43_32
+        );
+
+        StreamingDataRequest.setClientOrderToUse(availableClients,
+                BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get());
+    }
+}

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/theme/SeekbarColorPatch.java

@@ -126,7 +126,7 @@ public final class SeekbarColorPatch {
     }
 
     /**
-     * Injection point
+     * injection point.
      */
     public static boolean useLotteLaunchSplashScreen(boolean original) {
         // This method is only used for development purposes to force the old style launch screen.

extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/Settings.java

@@ -12,7 +12,6 @@ import static app.revanced.extension.youtube.patches.ChangeHeaderPatch.HeaderLog
 import static app.revanced.extension.youtube.patches.ChangeStartPagePatch.ChangeStartPageTypeAvailability;
 import static app.revanced.extension.youtube.patches.ChangeStartPagePatch.StartPage;
 import static app.revanced.extension.youtube.patches.ExitFullscreenPatch.FullscreenMode;
-import static app.revanced.extension.youtube.patches.ForceOriginalAudioPatch.ForceOriginalAudioAvailability;
 import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerHorizontalDragAvailability;
 import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerType;
 import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerType.MINIMAL;
@@ -75,7 +74,7 @@ public class Settings extends BaseSettings {
             "0.25\n0.5\n0.75\n1.0\n1.25\n1.5\n1.75\n2.0\n2.5\n3.0\n4.0\n5.0\n6.0\n7.0\n8.0", true);
 
     // Audio
-    public static final BooleanSetting FORCE_ORIGINAL_AUDIO = new BooleanSetting("revanced_force_original_audio", FALSE, new ForceOriginalAudioAvailability());
+    public static final BooleanSetting FORCE_ORIGINAL_AUDIO = new BooleanSetting("revanced_force_original_audio", FALSE, true);
 
     // Ads
     public static final BooleanSetting HIDE_CREATOR_STORE_SHELF = new BooleanSetting("revanced_hide_creator_store_shelf", TRUE);
@@ -223,7 +222,9 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting HIDE_ASK_BUTTON = new BooleanSetting("revanced_hide_ask_button", FALSE);
     public static final BooleanSetting HIDE_CLIP_BUTTON = new BooleanSetting("revanced_hide_clip_button", TRUE);
     public static final BooleanSetting HIDE_DOWNLOAD_BUTTON = new BooleanSetting("revanced_hide_download_button", FALSE);
+    public static final BooleanSetting HIDE_HYPE_BUTTON = new BooleanSetting("revanced_hide_hype_button", FALSE);
     public static final BooleanSetting HIDE_LIKE_DISLIKE_BUTTON = new BooleanSetting("revanced_hide_like_dislike_button", FALSE);
+    public static final BooleanSetting HIDE_PROMOTE_BUTTON = new BooleanSetting("revanced_hide_promote_button", FALSE);
     public static final BooleanSetting HIDE_REMIX_BUTTON = new BooleanSetting("revanced_hide_remix_button", TRUE);
     public static final BooleanSetting HIDE_REPORT_BUTTON = new BooleanSetting("revanced_hide_report_button", FALSE);
     public static final BooleanSetting HIDE_SAVE_BUTTON = new BooleanSetting("revanced_hide_save_button", FALSE);
@@ -244,6 +245,7 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting HIDE_PLAYER_FLYOUT_SPEED = new BooleanSetting("revanced_hide_player_flyout_speed", FALSE);
     public static final BooleanSetting HIDE_PLAYER_FLYOUT_STABLE_VOLUME = new BooleanSetting("revanced_hide_player_flyout_stable_volume", FALSE);
     public static final BooleanSetting HIDE_PLAYER_FLYOUT_VIDEO_QUALITY_FOOTER = new BooleanSetting("revanced_hide_player_flyout_video_quality_footer", FALSE);
+    public static final BooleanSetting HIDE_PLAYER_FLYOUT_VIDEO_QUALITY = new BooleanSetting("revanced_hide_player_flyout_video_quality", FALSE);
     public static final BooleanSetting HIDE_PLAYER_FLYOUT_WATCH_IN_VR = new BooleanSetting("revanced_hide_player_flyout_watch_in_vr", TRUE);
 
     // General layout
@@ -255,6 +257,7 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting GRADIENT_LOADING_SCREEN = new BooleanSetting("revanced_gradient_loading_screen", FALSE, true);
     public static final EnumSetting<SplashScreenAnimationStyle> SPLASH_SCREEN_ANIMATION_STYLE = new EnumSetting<>("revanced_splash_screen_animation_style", SplashScreenAnimationStyle.FPS_60_ONE_SECOND, true);
     public static final EnumSetting<HeaderLogo> HEADER_LOGO = new EnumSetting<>("revanced_header_logo", HeaderLogo.DEFAULT, true);
+    public static final BooleanSetting DISABLE_SIGNIN_TO_TV_POPUP = new BooleanSetting("revanced_disable_signin_to_tv_popup", FALSE);
 
     public static final BooleanSetting REMOVE_VIEWER_DISCRETION_DIALOG = new BooleanSetting("revanced_remove_viewer_discretion_dialog", FALSE,
             "revanced_remove_viewer_discretion_dialog_user_dialog_message");
@@ -432,6 +435,9 @@ public class Settings extends BaseSettings {
     public static final StringSetting SB_CATEGORY_HIGHLIGHT = new StringSetting("sb_highlight", MANUAL_SKIP.reVancedKeyValue);
     public static final StringSetting SB_CATEGORY_HIGHLIGHT_COLOR = new StringSetting("sb_highlight_color", "#FF1684");
     public static final FloatSetting  SB_CATEGORY_HIGHLIGHT_OPACITY = new FloatSetting("sb_highlight_opacity", 0.8f);
+    public static final StringSetting SB_CATEGORY_HOOK = new StringSetting("sb_hook", IGNORE.reVancedKeyValue);
+    public static final StringSetting SB_CATEGORY_HOOK_COLOR = new StringSetting("sb_hook_color", "#395699");
+    public static final FloatSetting  SB_CATEGORY_HOOK_OPACITY = new FloatSetting("sb_hook_opacity", 0.8f);
     public static final StringSetting SB_CATEGORY_INTRO = new StringSetting("sb_intro", MANUAL_SKIP.reVancedKeyValue);
     public static final StringSetting SB_CATEGORY_INTRO_COLOR = new StringSetting("sb_intro_color", "#00FFFF");
     public static final FloatSetting  SB_CATEGORY_INTRO_OPACITY = new FloatSetting("sb_intro_opacity", 0.8f);

extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/ForceOriginalAudioSwitchPreference.java

@@ -1,36 +0,0 @@
-package app.revanced.extension.youtube.settings.preference;
-
-import static app.revanced.extension.shared.StringRef.str;
-
-import android.content.Context;
-import android.preference.SwitchPreference;
-import android.util.AttributeSet;
-
-import app.revanced.extension.youtube.patches.ForceOriginalAudioPatch;
-
-@SuppressWarnings({"deprecation", "unused"})
-public class ForceOriginalAudioSwitchPreference extends SwitchPreference {
-
-    {
-        if (!ForceOriginalAudioPatch.PATCH_AVAILABLE) {
-            // Show why force audio is not available.
-            String summary = str("revanced_force_original_audio_not_available");
-            setSummary(summary);
-            setSummaryOn(summary);
-            setSummaryOff(summary);
-        }
-    }
-
-    public ForceOriginalAudioSwitchPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-    }
-    public ForceOriginalAudioSwitchPreference(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-    public ForceOriginalAudioSwitchPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-    public ForceOriginalAudioSwitchPreference(Context context) {
-        super(context);
-    }
-}

extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/HideAudioFlyoutMenuPreference.java

@@ -12,8 +12,8 @@ import app.revanced.extension.shared.spoof.SpoofVideoStreamsPatch;
 public class HideAudioFlyoutMenuPreference extends SwitchPreference {
 
     {
-        // Audio menu is not available if spoofing to Android client type.
-        if (!SpoofVideoStreamsPatch.notSpoofingToAndroid()) {
+        // Audio menu is not available if spoofing to most client types.
+        if (SpoofVideoStreamsPatch.spoofingToClientWithNoMultiAudioStreams()) {
             String summary = str("revanced_hide_player_flyout_audio_track_not_available");
             setSummary(summary);
             setSummaryOn(summary);

extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/SpoofStreamingDataSideEffectsPreference.java

@@ -78,20 +78,17 @@ public class SpoofStreamingDataSideEffectsPreference extends Preference {
         Logger.printDebug(() -> "Updating spoof stream side effects preference");
         setEnabled(BaseSettings.SPOOF_VIDEO_STREAMS.get());
 
-        String key = "revanced_spoof_video_streams_about_" +
-                (clientType == ClientType.IOS_UNPLUGGED
-                        ? "ios_tv"
-                        : "android");
-        String title = str(key + "_title");
-        String summary = str(key + "_summary");
-
-        // Android VR supports AV1 but all other clients do not.
-        if (clientType != ClientType.ANDROID_VR_AUTH && clientType != ClientType.ANDROID_VR_NO_AUTH) {
-            summary += '\n' + str("revanced_spoof_video_streams_about_no_av1");
-        }
-
+        String title = str("revanced_spoof_video_streams_about_title");
+        // Currently only Android VR and VisionOS are supported, and both have the same base side effects.
+        String summary = str("revanced_spoof_video_streams_about_android_summary");
         summary += '\n' + str("revanced_spoof_video_streams_about_kids_videos");
 
+        if (clientType == ClientType.VISIONOS) {
+            summary = str("revanced_spoof_video_streams_about_experimental")
+                    + '\n' + summary
+                    + '\n' + str("revanced_spoof_video_streams_about_no_av1");
+        }
+
         setTitle(title);
         setSummary(summary);
     }

extensions/youtube/src/main/java/app/revanced/extension/youtube/shared/PlayerControlsVisibility.kt

@@ -0,0 +1,48 @@
+package app.revanced.extension.youtube.shared
+
+import app.revanced.extension.shared.Logger
+import app.revanced.extension.youtube.Event
+
+/**
+ * PlayerControls visibility state.
+ */
+enum class PlayerControlsVisibility {
+    PLAYER_CONTROLS_VISIBILITY_UNKNOWN,
+    PLAYER_CONTROLS_VISIBILITY_WILL_HIDE,
+    PLAYER_CONTROLS_VISIBILITY_HIDDEN,
+    PLAYER_CONTROLS_VISIBILITY_WILL_SHOW,
+    PLAYER_CONTROLS_VISIBILITY_SHOWN;
+
+    companion object {
+
+        private val nameToPlayerControlsVisibility = PlayerControlsVisibility.entries.associateBy { it.name }
+
+        @JvmStatic
+        fun setFromString(enumName: String) {
+            val newType = nameToPlayerControlsVisibility[enumName]
+            if (newType == null) {
+                Logger.printException { "Unknown PlayerControlsVisibility encountered: $enumName" }
+            } else {
+                current = newType
+            }
+        }
+
+        @JvmStatic
+        var current
+            get() = currentPlayerControlsVisibility
+            private set(type) {
+                if (currentPlayerControlsVisibility != type) {
+                    Logger.printDebug { "Changed to: $type" }
+
+                    currentPlayerControlsVisibility = type
+                    onChange(type)
+                }
+            }
+
+        @Volatile // Read/write from different threads.
+        private var currentPlayerControlsVisibility = PLAYER_CONTROLS_VISIBILITY_UNKNOWN
+
+        @JvmStatic
+        val onChange = Event<PlayerControlsVisibility>()
+    }
+}

extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/SegmentPlaybackController.java

@@ -13,9 +13,9 @@ import android.graphics.Rect;
 import android.graphics.drawable.ShapeDrawable;
 import android.graphics.drawable.shapes.RoundRectShape;
 import android.text.TextUtils;
-import android.util.DisplayMetrics;
 import android.util.Range;
 import android.view.Gravity;
+import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
@@ -168,6 +168,11 @@ public class SegmentPlaybackController {
      */
     private static WeakReference<Dialog> toastDialogRef = new WeakReference<>(null);
 
+    /**
+     * Visibility of the ad progress UI component.
+     */
+    private static volatile int adProgressTextVisibility = -1;
+
     static {
         // Dismiss toast if app changes to PiP while undo skip is shown.
         PlayerType.getOnChange().addObserver((PlayerType type) -> {
@@ -337,6 +342,7 @@ public class SegmentPlaybackController {
      */
     static void executeDownloadSegments(String videoId) {
         Objects.requireNonNull(videoId);
+        Utils.verifyOffMainThread();
 
         SponsorSegment[] segments = SBRequester.getSegments(videoId);
 
@@ -368,6 +374,35 @@ public class SegmentPlaybackController {
         });
     }
 
+    /**
+     * Injection point.
+     */
+    @SuppressWarnings("unused")
+    public static void setAdProgressTextVisibility(int visibility) {
+        if (adProgressTextVisibility != visibility) {
+            adProgressTextVisibility = visibility;
+
+            Logger.printDebug(() -> {
+                String visibilityMessage = switch (visibility) {
+                    case View.VISIBLE   -> "VISIBLE";
+                    case View.GONE      -> "GONE";
+                    case View.INVISIBLE -> "INVISIBLE";
+                    default -> "UNKNOWN";
+                };
+                return "AdProgressText visibility changed to: " + visibilityMessage;
+            });
+        }
+    }
+
+    /**
+     * When a video ad is playing in a regular video player, segments or the Skip button should be hidden.
+     * @return Whether the Ad Progress TextView is visible in the regular video player.
+     */
+    public static boolean isAdProgressTextVisible() {
+        return adProgressTextVisibility == View.VISIBLE;
+    }
+
+
     /**
      * Injection point.
      * Updates SponsorBlock every 1000ms.
@@ -377,7 +412,8 @@ public class SegmentPlaybackController {
         try {
             if (!Settings.SB_ENABLED.get()
                     || PlayerType.getCurrent().isNoneOrHidden() // Shorts playback.
-                    || segments == null || segments.length == 0) {
+                    || segments == null || segments.length == 0
+                    || isAdProgressTextVisible()) {
                 return;
             }
             Logger.printDebug(() -> "setVideoTime: " + millis);
@@ -672,7 +708,14 @@ public class SegmentPlaybackController {
                 // Check for any smaller embedded segments, and count those as auto-skipped.
                 final boolean showSkipToast = Settings.SB_TOAST_ON_SKIP.get();
                 for (SponsorSegment otherSegment : Objects.requireNonNull(segments)) {
-                    if (segmentToSkip.end < otherSegment.start) {
+                    if (otherSegment.end <= segmentToSkip.start) {
+                        // Other segment does not overlap, and is before this skipped segment.
+                        // This situation can only happen if a video is opened and adjusted to
+                        // a later time in the video where earlier auto skip segments
+                        // have not been encountered yet.
+                        continue;
+                    }
+                    if (segmentToSkip.end <= otherSegment.start) {
                         break; // No other segments can be contained.
                     }
 
@@ -877,7 +920,7 @@ public class SegmentPlaybackController {
     }
 
     /**
-     * Injection point
+     * injection point.
      */
     @SuppressWarnings("unused")
     public static void setSponsorBarRect(Object self) {
@@ -909,7 +952,7 @@ public class SegmentPlaybackController {
     }
 
     /**
-     * Injection point
+     * injection point.
      */
     @SuppressWarnings("unused")
     public static void setSponsorBarThickness(int thickness) {
@@ -923,7 +966,8 @@ public class SegmentPlaybackController {
     public static String appendTimeWithoutSegments(String totalTime) {
         try {
             if (Settings.SB_ENABLED.get() && Settings.SB_VIDEO_LENGTH_WITHOUT_SEGMENTS.get()
-                    && !TextUtils.isEmpty(totalTime) && !TextUtils.isEmpty(timeWithoutSegments)) {
+                    && !TextUtils.isEmpty(totalTime) && !TextUtils.isEmpty(timeWithoutSegments)
+                    && !isAdProgressTextVisible()) {
                 // Force LTR layout, to match the same LTR video time/length layout YouTube uses for all languages
                 return "\u202D" + totalTime + timeWithoutSegments; // u202D = left to right override
             }
@@ -984,7 +1028,7 @@ public class SegmentPlaybackController {
     @SuppressWarnings("unused")
     public static void drawSponsorTimeBars(final Canvas canvas, final float posY) {
         try {
-            if (segments == null) return;
+            if (segments == null || isAdProgressTextVisible()) return;
             final long videoLength = VideoInformation.getVideoLength();
             if (videoLength <= 0) return;
 

extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/SegmentCategory.java

@@ -52,6 +52,8 @@ public enum SegmentCategory {
             sf("revanced_sb_skip_button_preview_beginning"), sf("revanced_sb_skip_button_preview_middle"), sf("revanced_sb_skip_button_preview_end"),
             sf("revanced_sb_skipped_preview_beginning"), sf("revanced_sb_skipped_preview_middle"), sf("revanced_sb_skipped_preview_end"),
             SB_CATEGORY_PREVIEW, SB_CATEGORY_PREVIEW_COLOR, SB_CATEGORY_PREVIEW_OPACITY),
+    HOOK("hook", sf("revanced_sb_segments_hook"), sf("revanced_sb_segments_hook_sum"), sf("revanced_sb_skip_button_hook"), sf("revanced_sb_skipped_hook"),
+            SB_CATEGORY_HOOK, SB_CATEGORY_HOOK_COLOR, SB_CATEGORY_HOOK_OPACITY),
     FILLER("filler", sf("revanced_sb_segments_filler"), sf("revanced_sb_segments_filler_sum"), sf("revanced_sb_skip_button_filler"), sf("revanced_sb_skipped_filler"),
             SB_CATEGORY_FILLER, SB_CATEGORY_FILLER_COLOR, SB_CATEGORY_FILLER_OPACITY),
     MUSIC_OFFTOPIC("music_offtopic", sf("revanced_sb_segments_nomusic"), sf("revanced_sb_segments_nomusic_sum"), sf("revanced_sb_skip_button_nomusic"), sf("revanced_sb_skipped_nomusic"),
@@ -69,6 +71,7 @@ public enum SegmentCategory {
             INTRO,
             OUTRO,
             PREVIEW,
+            HOOK,
             FILLER,
             MUSIC_OFFTOPIC,
     };
@@ -81,6 +84,7 @@ public enum SegmentCategory {
             INTRO,
             OUTRO,
             PREVIEW,
+            HOOK,
             FILLER,
             MUSIC_OFFTOPIC,
     };

extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/CreateSegmentButton.java

@@ -5,10 +5,11 @@ import android.view.View;
 import androidx.annotation.Nullable;
 
 import app.revanced.extension.shared.Logger;
-import app.revanced.extension.youtube.patches.VideoInformation;
 import app.revanced.extension.youtube.settings.Settings;
+import app.revanced.extension.youtube.sponsorblock.SegmentPlaybackController;
 import app.revanced.extension.youtube.videoplayer.PlayerControlButton;
 
+@SuppressWarnings("unused")
 public class CreateSegmentButton {
     @Nullable
     private static PlayerControlButton instance;
@@ -18,7 +19,7 @@ public class CreateSegmentButton {
     }
 
     /**
-     * injection point
+     * injection point.
      */
     public static void initialize(View controlsView) {
         try {
@@ -26,7 +27,7 @@ public class CreateSegmentButton {
                     controlsView,
                     "revanced_sb_create_segment_button",
                     null,
-                    CreateSegmentButton::shouldBeShown,
+                    CreateSegmentButton::isButtonEnabled,
                     v -> SponsorBlockViewController.toggleNewSegmentLayoutVisibility(),
                     null
             );
@@ -36,21 +37,28 @@ public class CreateSegmentButton {
     }
 
     /**
-     * Injection point
+     * injection point.
+     */
+    public static void setVisibilityNegatedImmediate() {
+        if (instance != null) instance.setVisibilityNegatedImmediate();
+    }
+
+    /**
+     * injection point.
      */
     public static void setVisibilityImmediate(boolean visible) {
         if (instance != null) instance.setVisibilityImmediate(visible);
     }
 
     /**
-     * Injection point
+     * injection point.
      */
     public static void setVisibility(boolean visible, boolean animated) {
         if (instance != null) instance.setVisibility(visible, animated);
     }
 
-    private static boolean shouldBeShown() {
+    private static boolean isButtonEnabled() {
         return Settings.SB_ENABLED.get() && Settings.SB_CREATE_NEW_SEGMENT.get()
-                && !VideoInformation.isAtEndOfVideo();
+                && !SegmentPlaybackController.isAdProgressTextVisible();
     }
 }

extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SponsorBlockViewController.java

@@ -16,7 +16,6 @@ import java.util.Objects;
 
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
-import app.revanced.extension.youtube.settings.Settings;
 import app.revanced.extension.youtube.shared.PlayerType;
 import app.revanced.extension.youtube.sponsorblock.objects.SponsorSegment;
 import kotlin.Unit;
@@ -227,22 +226,4 @@ public class SponsorBlockViewController {
         params.bottomMargin = fullScreen ? ctaBottomMargin : defaultBottomMargin;
         view.setLayoutParams(params);
     }
-
-    /**
-     * Injection point.
-     */
-    public static void endOfVideoReached() {
-        try {
-            Logger.printDebug(() -> "endOfVideoReached");
-            // the buttons automatically set themselves to visible when appropriate,
-            // but if buttons are showing when the end of the video is reached then they need
-            // to be forcefully hidden
-            if (!Settings.AUTO_REPEAT.get()) {
-                CreateSegmentButton.hideControls();
-                VotingButton.hideControls();
-            }
-        } catch (Exception ex) {
-            Logger.printException(() -> "endOfVideoReached failure", ex);
-        }
-    }
 }

extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/VotingButton.java

@@ -5,12 +5,12 @@ import android.view.View;
 import androidx.annotation.Nullable;
 
 import app.revanced.extension.shared.Logger;
-import app.revanced.extension.youtube.patches.VideoInformation;
 import app.revanced.extension.youtube.settings.Settings;
 import app.revanced.extension.youtube.sponsorblock.SegmentPlaybackController;
 import app.revanced.extension.youtube.sponsorblock.SponsorBlockUtils;
 import app.revanced.extension.youtube.videoplayer.PlayerControlButton;
 
+@SuppressWarnings("unused")
 public class VotingButton {
     @Nullable
     private static PlayerControlButton instance;
@@ -20,7 +20,7 @@ public class VotingButton {
     }
 
     /**
-     * injection point
+     * injection point.
      */
     public static void initialize(View controlsView) {
         try {
@@ -28,7 +28,7 @@ public class VotingButton {
                     controlsView,
                     "revanced_sb_voting_button",
                     null,
-                    VotingButton::shouldBeShown,
+                    VotingButton::isButtonEnabled,
                     v -> SponsorBlockUtils.onVotingClicked(v.getContext()),
                     null
             );
@@ -38,21 +38,29 @@ public class VotingButton {
     }
 
     /**
-     * Injection point
+     * injection point.
+     */
+    public static void setVisibilityNegatedImmediate() {
+        if (instance != null) instance.setVisibilityNegatedImmediate();
+    }
+
+    /**
+     * injection point.
      */
     public static void setVisibilityImmediate(boolean visible) {
         if (instance != null) instance.setVisibilityImmediate(visible);
     }
 
     /**
-     * Injection point
+     * injection point.
      */
     public static void setVisibility(boolean visible, boolean animated) {
         if (instance != null) instance.setVisibility(visible, animated);
     }
 
-    private static boolean shouldBeShown() {
+    private static boolean isButtonEnabled() {
         return Settings.SB_ENABLED.get() && Settings.SB_VOTING_BUTTON.get()
-                && SegmentPlaybackController.videoHasSegments() && !VideoInformation.isAtEndOfVideo();
+                && SegmentPlaybackController.videoHasSegments()
+                && !SegmentPlaybackController.isAdProgressTextVisible();
     }
 }

extensions/youtube/src/main/java/app/revanced/extension/youtube/videoplayer/CopyVideoUrlButton.java

@@ -7,7 +7,6 @@ import androidx.annotation.Nullable;
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.youtube.patches.CopyVideoUrlPatch;
 import app.revanced.extension.youtube.settings.Settings;
-import app.revanced.extension.youtube.shared.PlayerType;
 
 @SuppressWarnings("unused")
 public class CopyVideoUrlButton {
@@ -22,7 +21,7 @@ public class CopyVideoUrlButton {
             instance = new PlayerControlButton(
                     controlsView,
                     "revanced_copy_video_url_button",
-                    "revanced_copy_video_url_button_placeholder",
+                    null,
                     Settings.COPY_VIDEO_URL::get,
                     view -> CopyVideoUrlPatch.copyUrl(false),
                     view -> {
@@ -35,15 +34,22 @@ public class CopyVideoUrlButton {
         }
     }
 
+    /**`
+     * injection point.
+     */
+    public static void setVisibilityNegatedImmediate() {
+        if (instance != null) instance.setVisibilityNegatedImmediate();
+    }
+
     /**
-     * injection point
+     * injection point.
      */
     public static void setVisibilityImmediate(boolean visible) {
         if (instance != null) instance.setVisibilityImmediate(visible);
     }
 
     /**
-     * injection point
+     * injection point.
      */
     public static void setVisibility(boolean visible, boolean animated) {
         if (instance != null) instance.setVisibility(visible, animated);

extensions/youtube/src/main/java/app/revanced/extension/youtube/videoplayer/CopyVideoUrlTimestampButton.java

@@ -7,7 +7,6 @@ import androidx.annotation.Nullable;
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.youtube.patches.CopyVideoUrlPatch;
 import app.revanced.extension.youtube.settings.Settings;
-import app.revanced.extension.youtube.shared.PlayerType;
 
 @SuppressWarnings("unused")
 public class CopyVideoUrlTimestampButton {
@@ -22,7 +21,7 @@ public class CopyVideoUrlTimestampButton {
             instance = new PlayerControlButton(
                     controlsView,
                     "revanced_copy_video_url_timestamp_button",
-                    "revanced_copy_video_url_timestamp_button_placeholder",
+                    null,
                     Settings.COPY_VIDEO_URL_TIMESTAMP::get,
                     view -> CopyVideoUrlPatch.copyUrl(true),
                     view -> {
@@ -36,14 +35,21 @@ public class CopyVideoUrlTimestampButton {
     }
 
     /**
-     * injection point
+     * injection point.
+     */
+    public static void setVisibilityNegatedImmediate() {
+        if (instance != null) instance.setVisibilityNegatedImmediate();
+    }
+
+    /**
+     * injection point.
      */
     public static void setVisibilityImmediate(boolean visible) {
         if (instance != null) instance.setVisibilityImmediate(visible);
     }
 
     /**
-     * injection point
+     * injection point.
      */
     public static void setVisibility(boolean visible, boolean animated) {
         if (instance != null) instance.setVisibility(visible, animated);

extensions/youtube/src/main/java/app/revanced/extension/youtube/videoplayer/ExternalDownloadButton.java

@@ -22,7 +22,7 @@ public class ExternalDownloadButton {
             instance = new PlayerControlButton(
                     controlsView,
                     "revanced_external_download_button",
-                    "revanced_external_download_button_placeholder",
+                    null,
                     Settings.EXTERNAL_DOWNLOADER::get,
                     ExternalDownloadButton::onDownloadClick,
                     null
@@ -33,14 +33,21 @@ public class ExternalDownloadButton {
     }
 
     /**
-     * injection point
+     * injection point.
+     */
+    public static void setVisibilityNegatedImmediate() {
+        if (instance != null) instance.setVisibilityNegatedImmediate();
+    }
+
+    /**
+     * injection point.
      */
     public static void setVisibilityImmediate(boolean visible) {
         if (instance != null) instance.setVisibilityImmediate(visible);
     }
 
     /**
-     * Injection point
+     * injection point.
      */
     public static void setVisibility(boolean visible, boolean animated) {
         if (instance != null) instance.setVisibility(visible, animated);

extensions/youtube/src/main/java/app/revanced/extension/youtube/videoplayer/PlaybackSpeedDialogButton.java

@@ -4,16 +4,26 @@ import android.view.View;
 
 import androidx.annotation.Nullable;
 
+import java.text.DecimalFormat;
+
 import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
 import app.revanced.extension.youtube.patches.VideoInformation;
 import app.revanced.extension.youtube.patches.playback.speed.CustomPlaybackSpeedPatch;
 import app.revanced.extension.youtube.settings.Settings;
 
 @SuppressWarnings("unused")
 public class PlaybackSpeedDialogButton {
+
     @Nullable
     private static PlayerControlButton instance;
 
+    private static final DecimalFormat speedDecimalFormatter = new DecimalFormat();
+    static {
+        speedDecimalFormatter.setMinimumFractionDigits(1);
+        speedDecimalFormatter.setMaximumFractionDigits(2);
+    }
+
     /**
      * Injection point.
      */
@@ -21,8 +31,9 @@ public class PlaybackSpeedDialogButton {
         try {
             instance = new PlayerControlButton(
                     controlsView,
+                    "revanced_playback_speed_dialog_button_container",
                     "revanced_playback_speed_dialog_button",
-                    "revanced_playback_speed_dialog_button_placeholder",
+                    "revanced_playback_speed_dialog_button_text",
                     Settings.PLAYBACK_SPEED_DIALOG_BUTTON::get,
                     view -> {
                         try {
@@ -37,11 +48,11 @@ public class PlaybackSpeedDialogButton {
                     },
                     view -> {
                         try {
+                            final float defaultSpeed = Settings.PLAYBACK_SPEED_DEFAULT.get();
                             final float speed = (!Settings.REMEMBER_PLAYBACK_SPEED_LAST_SELECTED.get() ||
-                                    VideoInformation.getPlaybackSpeed() == Settings.PLAYBACK_SPEED_DEFAULT.get())
+                                    VideoInformation.getPlaybackSpeed() == defaultSpeed)
                                     ? 1.0f
-                                    : Settings.PLAYBACK_SPEED_DEFAULT.get();
-
+                                    : defaultSpeed;
                             VideoInformation.overridePlaybackSpeed(speed);
                         } catch (Exception ex) {
                             Logger.printException(() -> "speed button reset failure", ex);
@@ -49,22 +60,60 @@ public class PlaybackSpeedDialogButton {
                         return true;
                     }
             );
+
+            // Set the appropriate icon.
+            updateButtonAppearance();
         } catch (Exception ex) {
             Logger.printException(() -> "initializeButton failure", ex);
         }
     }
 
     /**
-     * injection point
+     * injection point.
      */
-    public static void setVisibilityImmediate(boolean visible) {
-        if (instance != null) instance.setVisibilityImmediate(visible);
+    public static void setVisibilityNegatedImmediate() {
+        if (instance != null) instance.setVisibilityNegatedImmediate();
     }
 
     /**
-     * injection point
+     * Injection point.
+     */
+    public static void setVisibilityImmediate(boolean visible) {
+        if (instance != null) {
+            instance.setVisibilityImmediate(visible);
+        }
+    }
+
+    /**
+     * Injection point.
      */
     public static void setVisibility(boolean visible, boolean animated) {
-        if (instance != null) instance.setVisibility(visible, animated);
+        if (instance != null) {
+            instance.setVisibility(visible, animated);
+        }
     }
-}
+
+    /**
+     * Injection point.
+     */
+    public static void videoSpeedChanged(float currentVideoSpeed) {
+        updateButtonAppearance();
+    }
+
+    /**
+     * Updates the button's appearance, including icon and text overlay.
+     */
+    private static void updateButtonAppearance() {
+        if (instance == null) return;
+
+        try {
+            Utils.verifyOnMainThread();
+
+            String speedText = speedDecimalFormatter.format(VideoInformation.getPlaybackSpeed());
+            instance.setTextOverlay(speedText);
+            Logger.printDebug(() -> "Updated playback speed button text to: " + speedText);
+        } catch (Exception ex) {
+            Logger.printException(() -> "updateButtonAppearance failure", ex);
+        }
+    }
+}

extensions/youtube/src/main/java/app/revanced/extension/youtube/videoplayer/PlayerControlButton.java

@@ -1,8 +1,9 @@
 package app.revanced.extension.youtube.videoplayer;
 
 import android.view.View;
-import android.view.animation.Animation;
+import android.view.ViewPropertyAnimator;
 import android.widget.ImageView;
+import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 
@@ -10,78 +11,70 @@ import java.lang.ref.WeakReference;
 
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
+import app.revanced.extension.youtube.shared.PlayerControlsVisibility;
 import app.revanced.extension.youtube.shared.PlayerType;
 import kotlin.Unit;
 
 public class PlayerControlButton {
-    public interface PlayerControlButtonVisibility {
+
+    public interface PlayerControlButtonStatus {
         /**
          * @return If the button should be shown when the player overlay is visible.
          */
-        boolean shouldBeShown();
+        boolean buttonEnabled();
     }
 
-    private static final int fadeInDuration;
-    private static final int fadeOutDuration;
-
-    private static final Animation fadeInAnimation;
-    private static final Animation fadeOutAnimation;
-    private static final Animation fadeOutImmediate;
-
-    static {
-        fadeInDuration = Utils.getResourceInteger("fade_duration_fast");
-        fadeOutDuration = Utils.getResourceInteger("fade_duration_scheduled");
-
-        fadeInAnimation = Utils.getResourceAnimation("fade_in");
-        fadeInAnimation.setDuration(fadeInDuration);
-
-        fadeOutAnimation = Utils.getResourceAnimation("fade_out");
-        fadeOutAnimation.setDuration(fadeOutDuration);
-
-        // Animation for the fast fade out after tapping the overlay.
-        // Currently not used but should be.
-        fadeOutImmediate = Utils.getResourceAnimation("abc_fade_out");
-        fadeOutImmediate.setDuration(Utils.getResourceInteger("fade_duration_fast"));
-    }
+    private static final int fadeInDuration = Utils.getResourceInteger("fade_duration_fast");
+    private static final int fadeOutDuration = Utils.getResourceInteger("fade_duration_scheduled");
 
+    private final WeakReference<View> containerRef;
     private final WeakReference<View> buttonRef;
-    /**
-     * Empty view with the same layout size as the button. Used to fill empty space while the
-     * fade out animation runs. Without this the chapter titles overlapping the button when fading out.
-     */
-    private final WeakReference<View> placeHolderRef;
-    private final PlayerControlButtonVisibility visibilityCheck;
+    private final WeakReference<TextView> textOverlayRef;
+    private final PlayerControlButtonStatus enabledStatus;
     private boolean isVisible;
+    private long lastTimeSetVisible;
 
     public PlayerControlButton(View controlsViewGroup,
-                               String imageViewButtonId,
-                               @Nullable String placeholderId,
-                               PlayerControlButtonVisibility buttonVisibility,
+                               String buttonId,
+                               @Nullable String textOverlayId,
+                               PlayerControlButtonStatus enabledStatus,
                                View.OnClickListener onClickListener,
                                @Nullable View.OnLongClickListener longClickListener) {
-        ImageView imageView = Utils.getChildViewByResourceName(controlsViewGroup, imageViewButtonId);
-        imageView.setVisibility(View.GONE);
+        this(controlsViewGroup, buttonId, buttonId, textOverlayId,
+                enabledStatus, onClickListener, longClickListener);
+    }
 
-        View tempPlaceholder = null;
-        if (placeholderId != null) {
-            tempPlaceholder = Utils.getChildViewByResourceName(controlsViewGroup, placeholderId);
-            tempPlaceholder.setVisibility(View.GONE);
-        }
-        placeHolderRef = new WeakReference<>(tempPlaceholder);
+    public PlayerControlButton(View controlsViewGroup,
+                               String viewToHide,
+                               String buttonId,
+                               @Nullable String textOverlayId,
+                               PlayerControlButtonStatus enabledStatus,
+                               View.OnClickListener onClickListener,
+                               @Nullable View.OnLongClickListener longClickListener) {
+        View containerView = Utils.getChildViewByResourceName(controlsViewGroup, viewToHide);
+        containerView.setVisibility(View.GONE);
+        containerRef = new WeakReference<>(containerView);
 
-        imageView.setOnClickListener(onClickListener);
+        View button = Utils.getChildViewByResourceName(controlsViewGroup, buttonId);
+        button.setOnClickListener(onClickListener);
         if (longClickListener != null) {
-            imageView.setOnLongClickListener(longClickListener);
+            button.setOnLongClickListener(longClickListener);
         }
+        buttonRef = new WeakReference<>(button);
 
-        visibilityCheck = buttonVisibility;
-        buttonRef = new WeakReference<>(imageView);
+        TextView tempTextOverlay = null;
+        if (textOverlayId != null) {
+            tempTextOverlay = Utils.getChildViewByResourceName(controlsViewGroup, textOverlayId);
+        }
+        textOverlayRef = new WeakReference<>(tempTextOverlay);
+
+        this.enabledStatus = enabledStatus;
         isVisible = false;
 
         // Update the visibility after the player type changes.
         // This ensures that button animations are cleared and their states are updated correctly
         // when switching between states like minimized, maximized, or fullscreen, preventing
-        // "stuck" animations or incorrect visibility.  Without this fix the issue is most noticable
+        // "stuck" animations or incorrect visibility.  Without this fix the issue is most noticeable
         // when maximizing type 3 miniplayer.
         PlayerType.getOnChange().addObserver((PlayerType type) -> {
             playerTypeChanged(type);
@@ -89,13 +82,55 @@ public class PlayerControlButton {
         });
     }
 
+    public void setVisibilityNegatedImmediate() {
+        try {
+            Utils.verifyOnMainThread();
+            if (PlayerControlsVisibility.getCurrent() != PlayerControlsVisibility.PLAYER_CONTROLS_VISIBILITY_HIDDEN) {
+                return;
+            }
+
+            final boolean buttonEnabled = enabledStatus.buttonEnabled();
+            if (!buttonEnabled) {
+                return;
+            }
+
+            View container = containerRef.get();
+            if (container == null) {
+                return;
+            }
+
+            isVisible = false;
+
+            ViewPropertyAnimator animate = container.animate();
+            animate.cancel();
+
+            // If the overlay is tapped to display then immediately tapped to dismiss
+            // before the fade in animation finishes, then the fade out animation is
+            // the time between when the fade in started and now.
+            final long animationDuration = Math.min(fadeInDuration,
+                    System.currentTimeMillis() - lastTimeSetVisible);
+            if (animationDuration <= 0) {
+                // Should never happen, but handle just in case.
+                container.setVisibility(View.GONE);
+                return;
+            }
+
+            animate.alpha(0)
+                    .setDuration(animationDuration)
+                    .withEndAction(() -> container.setVisibility(View.GONE))
+                    .start();
+        } catch (Exception ex) {
+            Logger.printException(() -> "setVisibilityNegatedImmediate failure", ex);
+        }
+    }
+
     public void setVisibilityImmediate(boolean visible) {
         if (visible) {
             // Fix button flickering, by pushing this call to the back of
             // the main thread and letting other layout code run first.
-            Utils.runOnMainThread(() -> private_setVisibility(true, false));
+            Utils.runOnMainThread(() -> privateSetVisibility(true, false));
         } else {
-            private_setVisibility(false, false);
+            privateSetVisibility(false, false);
         }
     }
 
@@ -103,47 +138,53 @@ public class PlayerControlButton {
         // Ignore this call, otherwise with full screen thumbnails the buttons are visible while seeking.
         if (visible && !animated) return;
 
-        private_setVisibility(visible, animated);
+        privateSetVisibility(visible, animated);
     }
 
-    private void private_setVisibility(boolean visible, boolean animated) {
+    private void privateSetVisibility(boolean visible, boolean animated) {
         try {
+            Utils.verifyOnMainThread();
+
             if (isVisible == visible) return;
             isVisible = visible;
 
-            View button = buttonRef.get();
-            if (button == null) return;
+            if (visible) {
+                lastTimeSetVisible = System.currentTimeMillis();
+            }
 
-            View placeholder = placeHolderRef.get();
-            final boolean shouldBeShown = visibilityCheck.shouldBeShown();
+            View container = containerRef.get();
+            if (container == null) {
+                return;
+            }
+
+            if (visible && enabledStatus.buttonEnabled()) {
+                ViewPropertyAnimator animate = container.animate();
+                animate.cancel();
+                container.setVisibility(View.VISIBLE);
 
-            if (visible && shouldBeShown) {
-                button.clearAnimation();
                 if (animated) {
-                    button.startAnimation(PlayerControlButton.fadeInAnimation);
+                    container.setAlpha(0);
+                    animate.alpha(1)
+                            .setDuration(fadeInDuration)
+                            .start();
+                } else {
+                    container.setAlpha(1);
                 }
-                button.setVisibility(View.VISIBLE);
+            } else if (container.getVisibility() == View.VISIBLE) {
+                ViewPropertyAnimator animate = container.animate();
+                animate.cancel();
 
-                if (placeholder != null) {
-                    placeholder.setVisibility(View.GONE);
-                }
-            } else {
-                if (button.getVisibility() == View.VISIBLE) {
-                    button.clearAnimation();
-                    if (animated) {
-                        button.startAnimation(PlayerControlButton.fadeOutAnimation);
-                    }
-                    button.setVisibility(View.GONE);
-                }
-
-                if (placeholder != null) {
-                    placeholder.setVisibility(shouldBeShown
-                            ? View.VISIBLE
-                            : View.GONE);
+                if (animated) {
+                    animate.alpha(0)
+                            .setDuration(fadeOutDuration)
+                            .withEndAction(() -> container.setVisibility(View.GONE))
+                            .start();
+                } else {
+                    container.setVisibility(View.GONE);
                 }
             }
         } catch (Exception ex) {
-            Logger.printException(() -> "private_setVisibility failure", ex);
+            Logger.printException(() -> "privateSetVisibility failure", ex);
         }
     }
 
@@ -151,41 +192,36 @@ public class PlayerControlButton {
      * Synchronizes the button state after the player state changes.
      */
     private void playerTypeChanged(PlayerType newType) {
+        Utils.verifyOnMainThread();
         if (newType != PlayerType.WATCH_WHILE_MINIMIZED && !newType.isMaximizedOrFullscreen()) {
             return;
         }
 
-        View button = buttonRef.get();
-        if (button == null) return;
+        View container = containerRef.get();
+        if (container == null) {
+            return;
+        }
 
-        button.clearAnimation();
-        View placeholder = placeHolderRef.get();
+        container.animate().cancel();
 
-        if (visibilityCheck.shouldBeShown()) {
-            if (isVisible) {
-                button.setVisibility(View.VISIBLE);
-                if (placeholder != null) placeholder.setVisibility(View.GONE);
-            } else {
-                button.setVisibility(View.GONE);
-                if (placeholder != null) placeholder.setVisibility(View.VISIBLE);
-            }
+        if (isVisible && enabledStatus.buttonEnabled()) {
+            container.setVisibility(View.VISIBLE);
+            container.setAlpha(1);
         } else {
-            button.setVisibility(View.GONE);
-            if (placeholder != null) placeholder.setVisibility(View.GONE);
+            container.setVisibility(View.GONE);
         }
     }
 
     public void hide() {
-        if (!isVisible) return;
-
         Utils.verifyOnMainThread();
-        View view = buttonRef.get();
+        if (!isVisible) {
+            return;
+        }
+        isVisible = false;
+
+        View view = containerRef.get();
         if (view == null) return;
         view.setVisibility(View.GONE);
-
-        view = placeHolderRef.get();
-        if (view != null) view.setVisibility(View.GONE);
-        isVisible = false;
     }
 
     /**
@@ -193,50 +229,24 @@ public class PlayerControlButton {
      * @param resourceId Drawable identifier, or zero to hide the icon.
      */
     public void setIcon(int resourceId) {
-        try {
-            View button = buttonRef.get();
-            if (button instanceof ImageView imageButton) {
-                imageButton.setImageResource(resourceId);
-            }
-        } catch (Exception ex) {
-            Logger.printException(() -> "setIcon failure", ex);
+        Utils.verifyOnMainThread();
+
+        View button = buttonRef.get();
+        if (button instanceof ImageView imageButton) {
+            imageButton.setImageResource(resourceId);
         }
     }
 
     /**
-     * Starts an animation on the button.
-     * @param animation The animation to apply.
+     * Sets the text to be displayed on the text overlay.
+     * @param text The text to set on the overlay, or null to clear the text.
      */
-    public void startAnimation(Animation animation) {
-        try {
-            View button = buttonRef.get();
-            if (button != null) {
-                button.startAnimation(animation);
-            }
-        } catch (Exception ex) {
-            Logger.printException(() -> "startAnimation failure", ex);
-        }
-    }
+    public void setTextOverlay(CharSequence text) {
+        Utils.verifyOnMainThread();
 
-    /**
-     * Clears any animation on the button.
-     */
-    public void clearAnimation() {
-        try {
-            View button = buttonRef.get();
-            if (button != null) {
-                button.clearAnimation();
-            }
-        } catch (Exception ex) {
-            Logger.printException(() -> "clearAnimation failure", ex);
+        TextView textOverlay = textOverlayRef.get();
+        if (textOverlay != null) {
+            textOverlay.setText(text);
         }
     }
-
-    /**
-     * Returns the View associated with this button.
-     * @return The button View.
-     */
-    public View getView() {
-        return buttonRef.get();
-    }
 }

extensions/youtube/src/main/java/app/revanced/extension/youtube/videoplayer/VideoQualityDialogButton.java

@@ -2,9 +2,8 @@ package app.revanced.extension.youtube.videoplayer;
 
 import static app.revanced.extension.shared.StringRef.str;
 import static app.revanced.extension.shared.Utils.dipToPixels;
-import static app.revanced.extension.youtube.patches.playback.quality.RememberVideoQualityPatch.AUTOMATIC_VIDEO_QUALITY_VALUE;
-import static app.revanced.extension.youtube.patches.playback.quality.RememberVideoQualityPatch.VIDEO_QUALITY_1080P_PREMIUM_NAME;
-import static app.revanced.extension.youtube.patches.playback.quality.RememberVideoQualityPatch.VideoQualityMenuInterface;
+import static app.revanced.extension.youtube.patches.VideoInformation.AUTOMATIC_VIDEO_QUALITY_VALUE;
+import static app.revanced.extension.youtube.patches.VideoInformation.VIDEO_QUALITY_PREMIUM_NAME;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -14,6 +13,7 @@ import android.graphics.drawable.shapes.RoundRectShape;
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
 import android.text.style.ForegroundColorSpan;
+import android.text.style.UnderlineSpan;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
@@ -39,73 +39,25 @@ import java.util.List;
 
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
+import app.revanced.extension.youtube.patches.VideoInformation;
 import app.revanced.extension.youtube.patches.playback.quality.RememberVideoQualityPatch;
 import app.revanced.extension.youtube.settings.Settings;
+import kotlin.Unit;
 
 @SuppressWarnings("unused")
 public class VideoQualityDialogButton {
 
-    private static final int DRAWABLE_LD = getDrawableIdentifier("revanced_video_quality_dialog_button_ld");
-    private static final int DRAWABLE_SD = getDrawableIdentifier("revanced_video_quality_dialog_button_sd");
-    private static final int DRAWABLE_HD = getDrawableIdentifier("revanced_video_quality_dialog_button_hd");
-    private static final int DRAWABLE_FHD = getDrawableIdentifier("revanced_video_quality_dialog_button_fhd");
-    private static final int DRAWABLE_FHD_PLUS = getDrawableIdentifier("revanced_video_quality_dialog_button_fhd_plus");
-    private static final int DRAWABLE_QHD = getDrawableIdentifier("revanced_video_quality_dialog_button_qhd");
-    private static final int DRAWABLE_4K = getDrawableIdentifier("revanced_video_quality_dialog_button_4k");
-    private static final int DRAWABLE_UNKNOWN = getDrawableIdentifier("revanced_video_quality_dialog_button_unknown");
-
     @Nullable
     private static PlayerControlButton instance;
 
-    /**
-     * The current resource name of the button icon.
-     */
-    private static int currentIconResource;
+    @Nullable
+    private static CharSequence currentOverlayText;
 
-    private static int getDrawableIdentifier(String resourceName) {
-        final int resourceId = Utils.getResourceIdentifier(resourceName, "drawable");
-        if (resourceId == 0) Logger.printException(() -> "Could not find resource: " + resourceName);
-        return resourceId;
-    }
-
-    /**
-     * Updates the button icon based on the current video quality.
-     */
-    public static void updateButtonIcon(@Nullable VideoQuality quality) {
-        try {
-            Utils.verifyOnMainThread();
-            if (instance == null) return;
-
-            final int resolution = quality == null
-                    ? AUTOMATIC_VIDEO_QUALITY_VALUE // Video is still loading.
-                    : quality.patch_getResolution();
-
-            final int iconResource = switch (resolution) {
-                case 144, 240, 360 -> DRAWABLE_LD;
-                case 480  -> DRAWABLE_SD;
-                case 720  -> DRAWABLE_HD;
-                case 1080 -> VIDEO_QUALITY_1080P_PREMIUM_NAME.equals(quality.patch_getQualityName())
-                        ? DRAWABLE_FHD_PLUS
-                        : DRAWABLE_FHD;
-                case 1440 -> DRAWABLE_QHD;
-                case 2160 -> DRAWABLE_4K;
-                default -> DRAWABLE_UNKNOWN;
-            };
-
-            if (iconResource != currentIconResource) {
-                currentIconResource = iconResource;
-
-                Utils.runOnMainThreadDelayed(() -> {
-                    if (iconResource != currentIconResource) {
-                        Logger.printDebug(() -> "Ignoring stale button update to: " + quality);
-                        return;
-                    }
-                    instance.setIcon(iconResource);
-                }, 100);
-            }
-        } catch (Exception ex) {
-            Logger.printException(() -> "updateButtonIcon failure", ex);
-        }
+    static {
+        VideoInformation.onQualityChange.addObserver((@Nullable VideoQuality quality) -> {
+            updateButtonText(quality);
+            return Unit.INSTANCE;
+        });
     }
 
     /**
@@ -115,8 +67,9 @@ public class VideoQualityDialogButton {
         try {
             instance = new PlayerControlButton(
                     controlsView,
+                    "revanced_video_quality_dialog_button_container",
                     "revanced_video_quality_dialog_button",
-                    "revanced_video_quality_dialog_button_placeholder",
+                    "revanced_video_quality_dialog_button_text",
                     Settings.VIDEO_QUALITY_DIALOG_BUTTON::get,
                     view -> {
                         try {
@@ -127,9 +80,8 @@ public class VideoQualityDialogButton {
                     },
                     view -> {
                         try {
-                            VideoQuality[] qualities = RememberVideoQualityPatch.getCurrentQualities();
-                            VideoQualityMenuInterface menu = RememberVideoQualityPatch.getCurrentMenuInterface();
-                            if (qualities == null || menu == null) {
+                            VideoQuality[] qualities = VideoInformation.getCurrentQualities();
+                            if (qualities == null) {
                                 Logger.printDebug(() -> "Cannot reset quality, videoQualities is null");
                                 return true;
                             }
@@ -140,7 +92,7 @@ public class VideoQualityDialogButton {
                                 final int resolution = quality.patch_getResolution();
                                 if (resolution != AUTOMATIC_VIDEO_QUALITY_VALUE && resolution <= defaultResolution) {
                                     Logger.printDebug(() -> "Resetting quality to: " + quality);
-                                    menu.patch_setQuality(quality);
+                                    VideoInformation.changeQuality(quality);
                                     return true;
                                 }
                             }
@@ -156,13 +108,20 @@ public class VideoQualityDialogButton {
                     }
             );
 
-            // Set initial icon.
-            updateButtonIcon(RememberVideoQualityPatch.getCurrentQuality());
+            // Set initial text.
+            updateButtonText(VideoInformation.getCurrentQuality());
         } catch (Exception ex) {
             Logger.printException(() -> "initializeButton failure", ex);
         }
     }
 
+    /**
+     * injection point.
+     */
+    public static void setVisibilityNegatedImmediate() {
+        if (instance != null) instance.setVisibilityNegatedImmediate();
+    }
+
     /**
      * Injection point.
      */
@@ -181,13 +140,56 @@ public class VideoQualityDialogButton {
         }
     }
 
+    /**
+     * Updates the button text based on the current video quality.
+     */
+    public static void updateButtonText(@Nullable VideoQuality quality) {
+        try {
+            Utils.verifyOnMainThread();
+            if (instance == null) return;
+
+            final int resolution = quality == null
+                    ? AUTOMATIC_VIDEO_QUALITY_VALUE // Video is still loading.
+                    : quality.patch_getResolution();
+
+            SpannableStringBuilder text = new SpannableStringBuilder();
+            String qualityText = switch (resolution) {
+                case AUTOMATIC_VIDEO_QUALITY_VALUE -> "";
+                case 144, 240, 360 -> "LD";
+                case 480  -> "SD";
+                case 720  -> "HD";
+                case 1080 -> "FHD";
+                case 1440 -> "QHD";
+                case 2160 -> "4K";
+                default   -> "?"; // Should never happen.
+            };
+            text.append(qualityText);
+
+            if (quality != null && quality.patch_getQualityName().contains(VIDEO_QUALITY_PREMIUM_NAME)) {
+                // Underline the entire "FHD" text for 1080p Premium.
+                text.setSpan(new UnderlineSpan(), 0, qualityText.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            }
+
+            currentOverlayText = text;
+            Utils.runOnMainThreadDelayed(() -> {
+                if (currentOverlayText != text) {
+                    Logger.printDebug(() -> "Ignoring stale button text update of: " + text);
+                    return;
+                }
+                instance.setTextOverlay(text);
+            }, 100);
+        } catch (Exception ex) {
+            Logger.printException(() -> "updateButtonText failure", ex);
+        }
+    }
+
     /**
      * Shows a dialog with available video qualities, excluding Auto, with a title showing the current quality.
      */
     private static void showVideoQualityDialog(Context context) {
         try {
-            VideoQuality[] currentQualities = RememberVideoQualityPatch.getCurrentQualities();
-            VideoQuality currentQuality = RememberVideoQualityPatch.getCurrentQuality();
+            VideoQuality[] currentQualities = VideoInformation.getCurrentQualities();
+            VideoQuality currentQuality = VideoInformation.getCurrentQuality();
             if (currentQualities == null || currentQuality == null) {
                 Logger.printDebug(() -> "Cannot show qualities dialog, videoQualities is null");
                 return;
@@ -198,12 +200,6 @@ public class VideoQualityDialogButton {
                 return;
             }
 
-            VideoQualityMenuInterface menu = RememberVideoQualityPatch.getCurrentMenuInterface();
-            if (menu == null) {
-                Logger.printDebug(() -> "Cannot show qualities dialog, menu is null");
-                return;
-            }
-
             // -1 adjustment for automatic quality at first index.
             int listViewSelectedIndex = -1;
             for (VideoQuality quality : currentQualities) {
@@ -317,15 +313,8 @@ public class VideoQualityDialogButton {
                 try {
                     final int originalIndex = which + 1; // Adjust for automatic.
                     VideoQuality selectedQuality = currentQualities[originalIndex];
-                    Logger.printDebug(() -> "User clicked on quality: " + selectedQuality);
-
-                    if (RememberVideoQualityPatch.shouldRememberVideoQuality()) {
-                        RememberVideoQualityPatch.saveDefaultQuality(selectedQuality.patch_getResolution());
-                    }
-                    // Don't update button icon now. Icon will update when the actual
-                    // quality is changed by YT.  This is needed to ensure the icon is correct
-                    // if YT ignores changing from 1080p Premium to regular 1080p.
-                    menu.patch_setQuality(selectedQuality);
+                    RememberVideoQualityPatch.userChangedQuality(selectedQuality.patch_getResolution());
+                    VideoInformation.changeQuality(selectedQuality);
 
                     dialog.dismiss();
                 } catch (Exception ex) {
@@ -356,9 +345,12 @@ public class VideoQualityDialogButton {
                     portraitWidth = Math.min(
                             portraitWidth,
                             context.getResources().getDisplayMetrics().heightPixels);
+                    // Limit height in landscape mode.
+                    params.height = Utils.percentageHeightToPixels(80);
+                } else {
+                    params.height = WindowManager.LayoutParams.WRAP_CONTENT;
                 }
                 params.width = portraitWidth;
-                params.height = WindowManager.LayoutParams.WRAP_CONTENT;
                 window.setAttributes(params);
                 window.setBackgroundDrawable(null);
             }
@@ -428,6 +420,15 @@ public class VideoQualityDialogButton {
     }
 
     private static class CustomQualityAdapter extends ArrayAdapter<String> {
+        private static final int CUSTOM_LIST_ITEM_CHECKED_ID = Utils.getResourceIdentifier(
+                "revanced_custom_list_item_checked", "layout");
+        private static final int CHECK_ICON_ID = Utils.getResourceIdentifier(
+                "revanced_check_icon", "id");
+        private static final int CHECK_ICON_PLACEHOLDER_ID = Utils.getResourceIdentifier(
+                "revanced_check_icon_placeholder", "id");
+        private static final int ITEM_TEXT_ID = Utils.getResourceIdentifier(
+                "revanced_item_text", "id");
+
         private int selectedPosition = -1;
 
         public CustomQualityAdapter(@NonNull Context context, @NonNull List<String> objects) {
@@ -446,20 +447,14 @@ public class VideoQualityDialogButton {
 
             if (convertView == null) {
                 convertView = LayoutInflater.from(getContext()).inflate(
-                        Utils.getResourceIdentifier("revanced_custom_list_item_checked", "layout"),
+                        CUSTOM_LIST_ITEM_CHECKED_ID,
                         parent,
                         false
                 );
                 viewHolder = new ViewHolder();
-                viewHolder.checkIcon = convertView.findViewById(
-                        Utils.getResourceIdentifier("revanced_check_icon", "id")
-                );
-                viewHolder.placeholder = convertView.findViewById(
-                        Utils.getResourceIdentifier("revanced_check_icon_placeholder", "id")
-                );
-                viewHolder.textView = convertView.findViewById(
-                        Utils.getResourceIdentifier("revanced_item_text", "id")
-                );
+                viewHolder.checkIcon = convertView.findViewById(CHECK_ICON_ID);
+                viewHolder.placeholder = convertView.findViewById(CHECK_ICON_PLACEHOLDER_ID);
+                viewHolder.textView = convertView.findViewById(ITEM_TEXT_ID);
                 convertView.setTag(viewHolder);
             } else {
                 viewHolder = (ViewHolder) convertView.getTag();

gradle.properties

@@ -3,4 +3,4 @@ org.gradle.jvmargs = -Xms512M -Xmx2048M
 org.gradle.parallel = true
 android.useAndroidX = true
 kotlin.code.style = official
-version = 5.34.0-dev.1
+version = 5.37.1-dev.3

gradle/libs.versions.toml

@@ -11,8 +11,8 @@ appcompat = "1.7.0"
 okhttp = "5.0.0-alpha.14"
 retrofit = "2.11.0"
 guava = "33.4.0-jre"
-protobuf-javalite = "4.31.1"
-protoc = "4.31.1"
+protobuf-javalite = "4.32.0"
+protoc = "4.32.0"
 protobuf = "0.9.5"
 antlr4 = "4.13.2"
 nanohttpd = "2.3.1"

patches/api/patches.api

@@ -264,6 +264,14 @@ public final class app/revanced/patches/instagram/ads/HideAdsPatchKt {
 	public static final fun getHideAdsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/instagram/hide/navigation/HideNavigationButtonsKt {
+	public static final fun getHideNavigationButtonsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
+public final class app/revanced/patches/instagram/hide/stories/HideStoriesKt {
+	public static final fun getHideStoriesPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/instagram/misc/signature/SignatureCheckPatchKt {
 	public static final fun getSignatureCheckPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -384,14 +392,21 @@ public final class app/revanced/patches/music/misc/gms/GmsCoreSupportPatchKt {
 	public static final fun getGmsCoreSupportPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
-public final class app/revanced/patches/music/misc/spoof/SpoofClientPatchKt {
-	public static final fun getSpoofClientPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+public final class app/revanced/patches/music/misc/spoof/SpoofVideoStreamsKt {
+	public static final fun getSpoofVideoStreamsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
 public final class app/revanced/patches/music/misc/spoof/UserAgentClientSpoofPatchKt {
 	public static final fun getUserAgentClientSpoofPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/music/playservice/VersionCheckPatchKt {
+	public static final fun getVersionCheckPatch ()Lapp/revanced/patcher/patch/ResourcePatch;
+	public static final fun is_7_33_or_greater ()Z
+	public static final fun is_8_11_or_greater ()Z
+	public static final fun is_8_15_or_greater ()Z
+}
+
 public final class app/revanced/patches/myexpenses/misc/pro/UnlockProPatchKt {
 	public static final fun getUnlockProPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -508,6 +523,13 @@ public final class app/revanced/patches/reddit/ad/general/HideAdsPatchKt {
 	public static final fun getHideAdsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/reddit/customclients/FixRedgifsApiPatchKt {
+	public static final field CREATE_NEW_CLIENT_METHOD Ljava/lang/String;
+	public static final field INSTALL_NEW_CLIENT_METHOD Ljava/lang/String;
+	public static final fun fixRedgifsApiPatch (Lapp/revanced/patcher/patch/Patch;Lkotlin/jvm/functions/Function1;)Lapp/revanced/patcher/patch/BytecodePatch;
+	public static synthetic fun fixRedgifsApiPatch$default (Lapp/revanced/patcher/patch/Patch;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/reddit/customclients/FixSLinksPatchKt {
 	public static final field RESOLVE_S_LINK_METHOD Ljava/lang/String;
 	public static final field SET_ACCESS_TOKEN_METHOD Ljava/lang/String;
@@ -524,6 +546,14 @@ public final class app/revanced/patches/reddit/customclients/baconreader/api/Spo
 	public static final fun getSpoofClientPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/reddit/customclients/baconreader/fix/redgifs/FixRedgifsApiPatchKt {
+	public static final fun getFixRedgifsApi ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
+public final class app/revanced/patches/reddit/customclients/baconreader/misc/extension/SharedExtensionPatchKt {
+	public static final fun getSharedExtensionPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/reddit/customclients/boostforreddit/ads/DisableAdsPatchKt {
 	public static final fun getDisableAdsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -536,6 +566,10 @@ public final class app/revanced/patches/reddit/customclients/boostforreddit/fix/
 	public static final fun getFixAudioMissingInDownloadsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/reddit/customclients/boostforreddit/fix/redgifs/FixRedgifsApiPatchKt {
+	public static final fun getFixRedgifsApi ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/reddit/customclients/boostforreddit/fix/slink/FixSLinksPatchKt {
 	public static final field EXTENSION_CLASS_DESCRIPTOR Ljava/lang/String;
 	public static final fun getFixSlinksPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
@@ -606,6 +640,10 @@ public final class app/revanced/patches/reddit/customclients/sync/syncforreddit/
 	public static final fun getSharedExtensionPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/reddit/customclients/sync/syncforreddit/fix/redgifs/FixRedgifsApiPatchKt {
+	public static final fun getFixRedgifsApi ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/reddit/customclients/sync/syncforreddit/fix/slink/FixSLinksPatchKt {
 	public static final field EXTENSION_CLASS_DESCRIPTOR Ljava/lang/String;
 	public static final fun getFixSLinksPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
@@ -952,10 +990,6 @@ public final class app/revanced/patches/spotify/lite/ondemand/OnDemandPatchKt {
 	public static final fun getOnDemandPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
-public final class app/revanced/patches/spotify/misc/UnlockPremiumPatchKt {
-	public static final fun getUnlockPremiumPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
-}
-
 public final class app/revanced/patches/spotify/misc/extension/ExtensionPatchKt {
 	public static final fun getSharedExtensionPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -1208,6 +1242,10 @@ public final class app/revanced/patches/twitter/misc/links/SanitizeSharingLinksP
 	public static final fun getSanitizeSharingLinksPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/viber/ads/HideAdsPatchKt {
+	public static final fun getHideAdsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/vsco/misc/pro/UnlockProPatchKt {
 	public static final fun getUnlockProPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -1357,6 +1395,10 @@ public final class app/revanced/patches/youtube/layout/hide/shorts/HideShortsCom
 	public static final fun getHideShortsComponentsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/youtube/layout/hide/signintotvpopup/DisableSignInToTvPatchPopupKt {
+	public static final fun getDisableSignInToTvPopupPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/youtube/layout/hide/suggestedvideoendscreen/DisableSuggestedVideoEndScreenPatchKt {
 	public static final fun getDisableSuggestedVideoEndScreenPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -1532,6 +1574,10 @@ public final class app/revanced/patches/youtube/misc/navigation/NavigationBarHoo
 	public static final fun setHookNavigationButtonCreated (Lkotlin/jvm/functions/Function1;)V
 }
 
+public final class app/revanced/patches/youtube/misc/playercontrols/PlayerControlsOverlayVisibilityPatchKt {
+	public static final fun getPlayerControlsOverlayVisibilityPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/youtube/misc/playercontrols/PlayerControlsPatchKt {
 	public static final fun getAddBottomControl ()Lkotlin/jvm/functions/Function1;
 	public static final fun getPlayerControlsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
@@ -1660,12 +1706,12 @@ public final class app/revanced/patches/youtube/video/quality/RememberVideoQuali
 	public static final fun getRememberVideoQualityPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
-public final class app/revanced/patches/youtube/video/quality/VideoQualityPatchKt {
-	public static final fun getVideoQualityPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+public final class app/revanced/patches/youtube/video/quality/VideoQualityDialogButtonPatchKt {
+	public static final fun getVideoQualityDialogButtonPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
-public final class app/revanced/patches/youtube/video/quality/button/VideoQualityDialogButtonPatchKt {
-	public static final fun getVideoQualityButtonPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+public final class app/revanced/patches/youtube/video/quality/VideoQualityPatchKt {
+	public static final fun getVideoQualityPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
 public final class app/revanced/patches/youtube/video/speed/PlaybackSpeedPatchKt {

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

@@ -3,6 +3,7 @@ package app.revanced.patches.backdrops.misc.pro
 import app.revanced.patcher.fingerprint
 import com.android.tools.smali.dexlib2.Opcode
 
+@Deprecated("Fingerprint no longer resolves and will soon be deleted.")
 internal val proUnlockFingerprint = fingerprint {
     opcodes(
         Opcode.INVOKE_VIRTUAL,

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

@@ -6,9 +6,8 @@ import app.revanced.patcher.patch.bytecodePatch
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 
 @Suppress("unused")
-val proUnlockPatch = bytecodePatch(
-    name = "Pro unlock",
-) {
+@Deprecated("This patch no longer works and will soon be deleted.")
+val proUnlockPatch = bytecodePatch{
     compatibleWith("com.backdrops.wallpapers")
 
     execute {

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

@@ -19,14 +19,16 @@ val disableAdsPatch = bytecodePatch(
         // 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.method.apply {
-            val insertIndex = initializeMonetizationDebugSettingsFingerprint.patternMatch!!.startIndex
-            val register = getInstruction<TwoRegisterInstruction>(insertIndex).registerA
+        initializeMonetizationDebugSettingsFingerprint
+            .match(monetizationDebugSettingsToStringFingerprint.classDef)
+            .method.apply {
+                val insertIndex = initializeMonetizationDebugSettingsFingerprint.patternMatch!!.startIndex
+                val register = getInstruction<TwoRegisterInstruction>(insertIndex).registerA
 
-            addInstructions(
-                insertIndex,
-                "const/4 v$register, 0x1",
-            )
-        }
+                addInstructions(
+                    insertIndex,
+                    "const/4 v$register, 0x1",
+                )
+            }
     }
 }

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

@@ -7,13 +7,11 @@ import com.android.tools.smali.dexlib2.Opcode
 internal val initializeMonetizationDebugSettingsFingerprint = fingerprint {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR)
     returns("V")
-    parameters(
-        "Z", // disableAds
-        "Z", // useDebugBilling
-        "Z", // showManageSubscriptions
-        "Z", // alwaysShowSuperAds
-        // matches "Lcom/duolingo/debug/FamilyQuestOverride;" or "Lcom/duolingo/data/debug/monetization/FamilyQuestOverride;"
-        "Lcom/duolingo/",
-    )
+    // Parameters have not been reliable for fingerprinting between versions.
     opcodes(Opcode.IPUT_BOOLEAN)
 }
+
+internal val monetizationDebugSettingsToStringFingerprint = fingerprint {
+    strings("MonetizationDebugSettings(") // Partial string match.
+    custom { method, _ -> method.name == "toString" }
+}

patches/src/main/kotlin/app/revanced/patches/instagram/hide/navigation/Fingerprints.kt

@@ -0,0 +1,29 @@
+
+package app.revanced.patches.instagram.hide.navigation
+
+import app.revanced.patcher.fingerprint
+import com.android.tools.smali.dexlib2.Opcode
+
+internal val tabCreateButtonsLoopStartFingerprint = fingerprint {
+    returns("V")
+    strings("InstagramMainActivity.createTabButtons")
+    opcodes(
+        //Loop Start
+        Opcode.IF_GE, // Check if index is finished (index, size)
+        //Injection
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT_OBJECT
+    )
+}
+
+internal val tabCreateButtonsLoopEndFingerprint = fingerprint {
+    returns("V")
+    strings("InstagramMainActivity.createTabButtons")
+    opcodes(
+        Opcode.IPUT_OBJECT,
+        // Injection Jump
+        Opcode.ADD_INT_LIT8, //Increase Index
+        Opcode.GOTO // Jump to loopStart
+        // LoopEnd
+        )
+}

patches/src/main/kotlin/app/revanced/patches/instagram/hide/navigation/HideNavigationButtons.kt

@@ -0,0 +1,80 @@
+package app.revanced.patches.instagram.hide.navigation
+
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.patch.booleanOption
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patcher.util.smali.ExternalLabel
+import app.revanced.util.findFreeRegister
+import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
+import java.util.logging.Logger
+
+@Suppress("unused")
+val hideNavigationButtonsPatch = bytecodePatch(
+    name = "Hide navigation buttons",
+    description = "Hides navigation bar buttons, such as the Reels and Create button.",
+    use = false
+) {
+    compatibleWith("com.instagram.android"("397.1.0.52.81"))
+
+    val hideReels by booleanOption(
+        key = "hideReels",
+        default = true,
+        title = "Hide Reels",
+        description = "Permanently hides the Reels button."
+    )
+
+    val hideCreate by booleanOption(
+        key = "hideCreate",
+        default = true,
+        title = "Hide Create",
+        description = "Permanently hides the Create button."
+    )
+
+    execute {
+        if (!hideReels!! && !hideCreate!!) {
+            return@execute Logger.getLogger(this::class.java.name).warning(
+                "No hide navigation buttons options are enabled. No changes made."
+            )
+        }
+
+        tabCreateButtonsLoopStartFingerprint.method.apply {
+                // Check the current loop index, and skip over adding the
+                // navigation button view if the index matches a given button.
+
+                val startIndex = tabCreateButtonsLoopStartFingerprint.patternMatch!!.startIndex
+                val endIndex = tabCreateButtonsLoopEndFingerprint.patternMatch!!.endIndex
+                val insertIndex = startIndex + 1
+                val loopIndexRegister = getInstruction<TwoRegisterInstruction>(startIndex).registerA
+                val freeRegister = findFreeRegister(insertIndex, loopIndexRegister)
+                val instruction = getInstruction(endIndex - 1)
+
+                var instructions = buildString {
+                    if (hideCreate!!) {
+                        appendLine(
+                            """
+                                const v$freeRegister, 0x2
+                                if-eq v$freeRegister, v$loopIndexRegister, :skipAddView
+                            """
+                        )
+                    }
+
+                    if (hideReels!!) {
+                        appendLine(
+                            """
+                                const v$freeRegister, 0x3
+                                if-eq v$freeRegister, v$loopIndexRegister, :skipAddView
+                            """
+                        )
+                    }
+                }
+
+                addInstructionsWithLabels(
+                    insertIndex,
+                    instructions,
+                    ExternalLabel("skipAddView", instruction)
+                )
+            }
+        }
+    }
+

patches/src/main/kotlin/app/revanced/patches/instagram/hide/stories/Fingerprints.kt

@@ -0,0 +1,17 @@
+package app.revanced.patches.instagram.hide.stories
+import app.revanced.patcher.fingerprint
+import com.android.tools.smali.dexlib2.Opcode
+
+
+internal val getOrCreateAvatarViewFingerprint = fingerprint {
+        parameters()
+        returns("L")
+        custom { method, classDef ->
+            classDef.type == "Lcom/instagram/reels/ui/views/reelavatar/RecyclerReelAvatarView;"
+        }
+        opcodes(
+            Opcode.INVOKE_VIRTUAL,
+            Opcode.IPUT_OBJECT,
+            Opcode.INVOKE_VIRTUAL // Add View (Story)
+        )
+    }

patches/src/main/kotlin/app/revanced/patches/instagram/hide/stories/HideStories.kt

@@ -0,0 +1,20 @@
+package app.revanced.patches.instagram.hide.stories
+import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
+import app.revanced.patcher.patch.bytecodePatch
+
+@Suppress("unused")
+val hideStoriesPatch = bytecodePatch(
+    name = "Hide Stories from Home",
+    description = "Hides Stories from the main page, by removing the buttons.",
+    use = false
+) {
+    compatibleWith("com.instagram.android")
+
+    execute {
+        val addStoryMethod = getOrCreateAvatarViewFingerprint.method // Creates Story
+        val addStoryEndIndex = getOrCreateAvatarViewFingerprint.patternMatch!!.endIndex
+
+        // Remove addView of Story.
+        addStoryMethod.removeInstruction(addStoryEndIndex)
+    }
+}

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

@@ -8,7 +8,11 @@ val hideVideoAdsPatch = bytecodePatch(
     name = "Hide music video ads",
     description = "Hides ads that appear while listening to or streaming music videos, podcasts, or songs.",
 ) {
-    compatibleWith("com.google.android.apps.youtube.music")
+    compatibleWith(
+        "com.google.android.apps.youtube.music"(
+            "7.29.52"
+        )
+    )
 
     execute {
         navigate(showVideoAdsParentFingerprint.originalMethod)

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

@@ -8,7 +8,11 @@ val enableExclusiveAudioPlaybackPatch = bytecodePatch(
     name = "Enable exclusive audio playback",
     description = "Enables the option to play audio without video.",
 ) {
-    compatibleWith("com.google.android.apps.youtube.music")
+    compatibleWith(
+        "com.google.android.apps.youtube.music"(
+            "7.29.52"
+        )
+    )
 
     execute {
         allowExclusiveAudioPlaybackFingerprint.method.returnEarly(true)

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

@@ -11,7 +11,11 @@ val permanentRepeatPatch = bytecodePatch(
     description = "Permanently remember your repeating preference even if the playlist ends or another track is played.",
     use = false,
 ) {
-    compatibleWith("com.google.android.apps.youtube.music")
+    compatibleWith(
+        "com.google.android.apps.youtube.music"(
+            "7.29.52"
+        )
+    )
 
     execute {
         val startIndex = repeatTrackFingerprint.patternMatch!!.endIndex

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

@@ -9,7 +9,11 @@ val permanentShufflePatch = bytecodePatch(
     description = "Permanently remember your shuffle preference " +
         "even if the playlist ends or another track is played."
 ) {
-    compatibleWith("com.google.android.apps.youtube.music")
+    compatibleWith(
+        "com.google.android.apps.youtube.music"(
+            "7.29.52"
+        )
+    )
 
     execute {
         disableShuffleFingerprint.method.addInstruction(0, "return-void")

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

@@ -3,6 +3,7 @@ package app.revanced.patches.music.layout.compactheader
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.util.findFreeRegister
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 
 @Suppress("unused")
@@ -11,19 +12,24 @@ val hideCategoryBar = bytecodePatch(
     description = "Hides the category bar at the top of the homepage.",
     use = false,
 ) {
-    compatibleWith("com.google.android.apps.youtube.music")
+    compatibleWith(
+        "com.google.android.apps.youtube.music"(
+            "7.29.52"
+        )
+    )
 
     execute {
         constructCategoryBarFingerprint.method.apply {
             val insertIndex = constructCategoryBarFingerprint.patternMatch!!.startIndex
             val register = getInstruction<OneRegisterInstruction>(insertIndex - 1).registerA
+            val freeRegister = findFreeRegister(insertIndex, register)
 
             addInstructions(
                 insertIndex,
                 """
-                    const/16 v2, 0x8
-                    invoke-virtual {v$register, v2}, Landroid/view/View;->setVisibility(I)V
-                """,
+                    const/16 v$freeRegister, 0x8
+                    invoke-virtual { v$register, v$freeRegister }, Landroid/view/View;->setVisibility(I)V
+                """
             )
         }
     }

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

@@ -11,7 +11,11 @@ val hideGetPremiumPatch = bytecodePatch(
     name = "Hide 'Get Music Premium' label",
     description = "Hides the \"Get Music Premium\" label from the account menu and settings.",
 ) {
-    compatibleWith("com.google.android.apps.youtube.music")
+    compatibleWith(
+        "com.google.android.apps.youtube.music"(
+            "7.29.52"
+        )
+    )
 
     execute {
         hideGetPremiumFingerprint.method.apply {

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

@@ -18,7 +18,11 @@ val removeUpgradeButtonPatch = bytecodePatch(
     name = "Remove upgrade button",
     description = "Removes the upgrade tab from the pivot bar.",
 ) {
-    compatibleWith("com.google.android.apps.youtube.music")
+    compatibleWith(
+        "com.google.android.apps.youtube.music"(
+            "7.29.52"
+        )
+    )
 
     execute {
         pivotBarConstructorFingerprint.method.apply {

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

@@ -8,7 +8,11 @@ val bypassCertificateChecksPatch = bytecodePatch(
     name = "Bypass certificate checks",
     description = "Bypasses certificate checks which prevent YouTube Music from working on Android Auto.",
 ) {
-    compatibleWith("com.google.android.apps.youtube.music")
+    compatibleWith(
+        "com.google.android.apps.youtube.music"(
+            "7.29.52"
+        )
+    )
 
     execute {
         checkCertificateFingerprint.method.returnEarly(true)

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

@@ -8,7 +8,11 @@ val backgroundPlaybackPatch = bytecodePatch(
     name = "Remove background playback restrictions",
     description = "Removes restrictions on background playback, including playing kids videos in the background.",
 ) {
-    compatibleWith("com.google.android.apps.youtube.music")
+    compatibleWith(
+        "com.google.android.apps.youtube.music"(
+            "7.29.52"
+        )
+    )
 
     execute {
         kidsBackgroundPlaybackPolicyControllerFingerprint.method.addInstruction(

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

@@ -4,7 +4,7 @@ import app.revanced.patcher.patch.Option
 import app.revanced.patches.music.misc.extension.sharedExtensionPatch
 import app.revanced.patches.music.misc.gms.Constants.MUSIC_PACKAGE_NAME
 import app.revanced.patches.music.misc.gms.Constants.REVANCED_MUSIC_PACKAGE_NAME
-import app.revanced.patches.music.misc.spoof.spoofClientPatch
+import app.revanced.patches.music.misc.spoof.spoofVideoStreamsPatch
 import app.revanced.patches.shared.castContextFetchFingerprint
 import app.revanced.patches.shared.misc.gms.gmsCoreSupportPatch
 import app.revanced.patches.shared.primeMethodFingerprint
@@ -21,7 +21,7 @@ val gmsCoreSupportPatch = gmsCoreSupportPatch(
     extensionPatch = sharedExtensionPatch,
     gmsCoreSupportResourcePatchFactory = ::gmsCoreSupportResourcePatch,
 ) {
-    dependsOn(spoofClientPatch)
+    dependsOn(spoofVideoStreamsPatch)
 
     compatibleWith(MUSIC_PACKAGE_NAME)
 }

patches/src/main/kotlin/app/revanced/patches/music/misc/spoof/Fingerprints.kt

@@ -1,39 +0,0 @@
-package app.revanced.patches.music.misc.spoof
-
-import app.revanced.patcher.fingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-internal val playerRequestConstructorFingerprint = fingerprint {
-    accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR)
-    strings("player")
-}
-
-/**
- * Matches using the class found in [playerRequestConstructorFingerprint].
- */
-internal val createPlayerRequestBodyFingerprint = fingerprint {
-    parameters("L")
-    returns("V")
-    opcodes(
-        Opcode.CHECK_CAST,
-        Opcode.IGET,
-        Opcode.AND_INT_LIT16,
-    )
-    strings("ms")
-}
-
-/**
- * Used to get a reference to other clientInfo fields.
- */
-internal val setClientInfoFieldsFingerprint = fingerprint {
-    returns("L")
-    strings("Google Inc.")
-}
-
-/**
- * Used to get a reference to the clientInfo and clientInfo.clientVersion field.
- */
-internal val setClientInfoClientVersionFingerprint = fingerprint {
-    strings("10.29")
-}

patches/src/main/kotlin/app/revanced/patches/music/misc/spoof/SpoofClientPatch.kt

@@ -1,105 +0,0 @@
-package app.revanced.patches.music.misc.spoof
-
-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.instructions
-import app.revanced.patcher.patch.bytecodePatch
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
-import app.revanced.patches.music.misc.extension.sharedExtensionPatch
-import app.revanced.util.getReference
-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.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
-
-private const val EXTENSION_CLASS_DESCRIPTOR =
-    "Lapp/revanced/extension/music/spoof/SpoofClientPatch;"
-
-// TODO: Replace this patch with spoofVideoStreamsPatch once possible.
-val spoofClientPatch = bytecodePatch(
-    name = "Spoof client",
-    description = "Spoofs the client to fix playback.",
-) {
-    compatibleWith("com.google.android.apps.youtube.music")
-
-    dependsOn(
-        sharedExtensionPatch,
-        // TODO: Add settingsPatch
-        userAgentClientSpoofPatch,
-    )
-
-    execute {
-        val playerRequestClass = playerRequestConstructorFingerprint.classDef
-
-        val createPlayerRequestBodyMatch = createPlayerRequestBodyFingerprint.match(playerRequestClass)
-
-        val clientInfoContainerClass = createPlayerRequestBodyMatch.method
-            .getInstruction(createPlayerRequestBodyMatch.patternMatch!!.startIndex)
-            .getReference<TypeReference>()!!.type
-
-        val clientInfoField = setClientInfoClientVersionFingerprint.method.instructions.first {
-            it.opcode == Opcode.IPUT_OBJECT && it.getReference<FieldReference>()!!.definingClass == clientInfoContainerClass
-        }.getReference<FieldReference>()!!
-
-        val setClientInfoFieldInstructions = setClientInfoFieldsFingerprint.method.instructions.filter {
-            (it.opcode == Opcode.IPUT_OBJECT || it.opcode == Opcode.IPUT) &&
-                it.getReference<FieldReference>()!!.definingClass == clientInfoField.type
-        }.map { it.getReference<FieldReference>()!! }
-
-        // Offsets are known for the fields in the clientInfo object.
-        val clientIdField = setClientInfoFieldInstructions[0]
-        val clientModelField = setClientInfoFieldInstructions[5]
-        val osVersionField = setClientInfoFieldInstructions[7]
-        val clientVersionField = setClientInfoClientVersionFingerprint.method
-            .getInstruction(setClientInfoClientVersionFingerprint.stringMatches!!.first().index + 1)
-            .getReference<FieldReference>()
-
-        // Helper method to spoof the client info.
-        val spoofClientInfoMethod = ImmutableMethod(
-            playerRequestClass.type,
-            "spoofClientInfo",
-            listOf(ImmutableMethodParameter(clientInfoContainerClass, null, null)),
-            "V",
-            AccessFlags.PRIVATE.value or AccessFlags.STATIC.value,
-            null,
-            null,
-            MutableMethodImplementation(3),
-        ).toMutable().also(playerRequestClass.methods::add).apply {
-            addInstructions(
-                """
-                    iget-object v0, p0, $clientInfoField
-                
-                    invoke-static { }, $EXTENSION_CLASS_DESCRIPTOR->getClientId()I
-                    move-result v1
-                    iput v1, v0, $clientIdField
-    
-                    invoke-static { }, $EXTENSION_CLASS_DESCRIPTOR->getClientModel()Ljava/lang/String;
-                    move-result-object v1
-                    iput-object v1, v0, $clientModelField
-                
-                    invoke-static { }, $EXTENSION_CLASS_DESCRIPTOR->getClientVersion()Ljava/lang/String;
-                    move-result-object v1
-                    iput-object v1, v0, $clientVersionField
-    
-                    invoke-static { }, $EXTENSION_CLASS_DESCRIPTOR->getOsVersion()Ljava/lang/String;
-                    move-result-object v1
-                    iput-object v1, v0, $osVersionField
-    
-                    return-void
-                """,
-            )
-        }
-
-        createPlayerRequestBodyMatch.method.apply {
-            val checkCastIndex = createPlayerRequestBodyMatch.patternMatch!!.startIndex
-            val clientInfoContainerRegister = getInstruction<OneRegisterInstruction>(checkCastIndex).registerA
-
-            addInstruction(checkCastIndex + 1, "invoke-static {v$clientInfoContainerRegister}, $spoofClientInfoMethod")
-        }
-    }
-}

patches/src/main/kotlin/app/revanced/patches/music/misc/spoof/SpoofVideoStreams.kt

@@ -0,0 +1,33 @@
+package app.revanced.patches.music.misc.spoof
+
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patches.music.misc.extension.sharedExtensionPatch
+import app.revanced.patches.music.misc.gms.musicActivityOnCreateFingerprint
+import app.revanced.patches.music.playservice.is_7_33_or_greater
+import app.revanced.patches.music.playservice.is_8_11_or_greater
+import app.revanced.patches.music.playservice.is_8_15_or_greater
+import app.revanced.patches.music.playservice.versionCheckPatch
+import app.revanced.patches.shared.misc.spoof.spoofVideoStreamsPatch
+
+private const val EXTENSION_CLASS_DESCRIPTOR = "Lapp/revanced/extension/music/patches/spoof/SpoofVideoStreamsPatch;"
+
+val spoofVideoStreamsPatch = spoofVideoStreamsPatch(
+    fixMediaFetchHotConfigChanges = { true },
+    fixMediaFetchHotConfigAlternativeChanges = { is_8_11_or_greater && !is_8_15_or_greater },
+    fixParsePlaybackResponseFeatureFlag = { is_7_33_or_greater },
+    block = {
+        compatibleWith(
+            "com.google.android.apps.youtube.music"(
+                "7.29.52"
+            )
+        )
+
+        dependsOn(sharedExtensionPatch, versionCheckPatch, userAgentClientSpoofPatch)
+    },
+    executeBlock = {
+        musicActivityOnCreateFingerprint.method.addInstruction(
+            1, // Must use 1 index so context is set by extension patch.
+            "invoke-static { }, $EXTENSION_CLASS_DESCRIPTOR->setClientOrderToUse()V"
+        )
+    }
+)

patches/src/main/kotlin/app/revanced/patches/music/playservice/VersionCheckPatch.kt

@@ -0,0 +1,28 @@
+@file:Suppress("ktlint:standard:property-naming")
+
+package app.revanced.patches.music.playservice
+
+import app.revanced.patcher.patch.resourcePatch
+import app.revanced.util.findPlayStoreServicesVersion
+
+var is_7_33_or_greater = false
+    private set
+var is_8_11_or_greater = false
+    private set
+var is_8_15_or_greater = false
+    private set
+
+val versionCheckPatch = resourcePatch(
+    description = "Uses the Play Store service version to find the major/minor version of the YouTube Music target app.",
+) {
+    execute {
+        // The app version is missing from the decompiled manifest,
+        // so instead use the Google Play services version and compare against specific releases.
+        val playStoreServicesVersion = findPlayStoreServicesVersion()
+
+        // All bug fix releases always seem to use the same play store version as the minor version.
+        is_7_33_or_greater = 245199000 <= playStoreServicesVersion
+        is_8_11_or_greater = 251199000 <= playStoreServicesVersion
+        is_8_15_or_greater = 251530000 <= playStoreServicesVersion
+    }
+}

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

@@ -14,7 +14,7 @@ val hideAdsPatch = bytecodePatch(
     name = "Hide ads",
     description = "Hide ads and sponsored articles in list pages and remove pre-roll ads on videos.",
 ) {
-    compatibleWith("nl.sanomamedia.android.nu"("11.3.0"))
+    compatibleWith("nl.sanomamedia.android.nu")
 
     dependsOn(sharedExtensionPatch("nunl", mainActivityOnCreateHook))
 

patches/src/main/kotlin/app/revanced/patches/nunl/ads/Hooks.kt

@@ -4,6 +4,6 @@ import app.revanced.patches.shared.misc.extension.extensionHook
 
 internal val mainActivityOnCreateHook = extensionHook {
     custom { method, classDef ->
-        classDef.type == "Lnl/sanomamedia/android/nu/main/NUMainActivity;" && method.name == "onCreate"
+        classDef.endsWith("/NUApplication;") && method.name == "onCreate"
     }
 }

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

@@ -1,21 +1,15 @@
 package app.revanced.patches.pixiv.ads
 
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.util.returnEarly
 
 @Suppress("unused")
 val hideAdsPatch = bytecodePatch(
     name = "Hide ads",
 ) {
-    compatibleWith("jp.pxv.android")
+    compatibleWith("jp.pxv.android"("6.141.1"))
 
     execute {
-        shouldShowAdsFingerprint.method.addInstructions(
-            0,
-            """
-                const/4 v0, 0x0
-                return v0
-            """,
-        )
+        shouldShowAdsFingerprint.method.returnEarly(false)
     }
 }

patches/src/main/kotlin/app/revanced/patches/protonmail/account/RemoveFreeAccountsLimitPatch.kt

@@ -8,7 +8,7 @@ val removeFreeAccountsLimitPatch = resourcePatch(
     name = "Remove free accounts limit",
     description = "Removes the limit for maximum free accounts logged in.",
 ) {
-    compatibleWith("ch.protonmail.android")
+    compatibleWith("ch.protonmail.android"("4.15.0"))
 
     execute {
         document("res/values/integers.xml").use { document ->

patches/src/main/kotlin/app/revanced/patches/protonmail/signature/RemoveSentFromSignaturePatch.kt

@@ -10,7 +10,7 @@ val removeSentFromSignaturePatch = resourcePatch(
     name = "Remove 'Sent from' signature",
     description = "Removes the 'Sent from Proton Mail mobile' signature from emails.",
 ) {
-    compatibleWith("ch.protonmail.android")
+    compatibleWith("ch.protonmail.android"("4.15.0"))
 
     execute {
         val stringResourceFiles = mutableListOf<File>()

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

@@ -0,0 +1,17 @@
+package app.revanced.patches.reddit.customclients
+
+import app.revanced.patcher.patch.BytecodePatchBuilder
+import app.revanced.patcher.patch.Patch
+import app.revanced.patcher.patch.bytecodePatch
+
+const val INSTALL_NEW_CLIENT_METHOD = "install(Lokhttp3/OkHttpClient${'$'}Builder;)Lokhttp3/OkHttpClient;"
+const val CREATE_NEW_CLIENT_METHOD = "createClient()Lokhttp3/OkHttpClient;"
+
+fun fixRedgifsApiPatch(
+    extensionPatch: Patch<*>,
+    block: BytecodePatchBuilder.() -> Unit = {},
+) = bytecodePatch(name = "Fix Redgifs API") {
+    dependsOn(extensionPatch)
+
+    block()
+}

patches/src/main/kotlin/app/revanced/patches/reddit/customclients/baconreader/fix/redgifs/Fingerprints.kt

@@ -0,0 +1,13 @@
+package app.revanced.patches.reddit.customclients.baconreader.fix.redgifs
+
+import app.revanced.patcher.fingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+
+internal val getOkHttpClientFingerprint = fingerprint {
+    returns("Lokhttp3/OkHttpClient;")
+    parameters()
+    custom { method, classDef ->
+        classDef.type == "Lcom/onelouder/baconreader/media/gfycat/RedGifsManager;" && method.name == "getOkhttpClient"
+    }
+}

patches/src/main/kotlin/app/revanced/patches/reddit/customclients/baconreader/fix/redgifs/FixRedgifsApiPatch.kt

@@ -0,0 +1,53 @@
+package app.revanced.patches.reddit.customclients.baconreader.fix.redgifs
+
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.removeInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patches.reddit.customclients.INSTALL_NEW_CLIENT_METHOD
+import app.revanced.patches.reddit.customclients.baconreader.misc.extension.sharedExtensionPatch
+import app.revanced.patches.reddit.customclients.fixRedgifsApiPatch
+import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstructionOrThrow
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+import com.android.tools.smali.dexlib2.iface.reference.TypeReference
+
+internal const val EXTENSION_CLASS_DESCRIPTOR = "Lapp/revanced/extension/baconreader/FixRedgifsApiPatch;"
+
+@Suppress("unused")
+val fixRedgifsApi = fixRedgifsApiPatch(
+    extensionPatch = sharedExtensionPatch
+) {
+    compatibleWith(
+        "com.onelouder.baconreader",
+        "com.onelouder.baconreader.premium",
+    )
+
+    execute {
+        // region Patch Redgifs OkHttp3 client.
+
+        getOkHttpClientFingerprint.method.apply {
+            // Remove conflicting OkHttp interceptors.
+            val originalInterceptorInstallIndex = indexOfFirstInstructionOrThrow {
+                opcode == Opcode.NEW_INSTANCE && getReference<TypeReference>()?.type == "Lcom/onelouder/baconreader/media/gfycat/RedGifsManager\$HeaderInterceptor;"
+            }
+            removeInstructions(originalInterceptorInstallIndex, 5)
+
+            val index = indexOfFirstInstructionOrThrow {
+                val reference = getReference<MethodReference>()
+                reference?.name == "build" && reference.definingClass == "Lokhttp3/OkHttpClient\$Builder;"
+            }
+            val register = getInstruction<FiveRegisterInstruction>(index).registerC
+            replaceInstruction(
+                index,
+                """
+                invoke-static       { v$register }, $EXTENSION_CLASS_DESCRIPTOR->$INSTALL_NEW_CLIENT_METHOD
+                """
+            )
+        }
+
+        // endregion
+    }
+}

patches/src/main/kotlin/app/revanced/patches/reddit/customclients/baconreader/misc/extension/SharedExtensionPatch.kt

@@ -0,0 +1,6 @@
+package app.revanced.patches.reddit.customclients.baconreader.misc.extension
+
+import app.revanced.patches.reddit.customclients.baconreader.misc.extension.hooks.initHook
+import app.revanced.patches.shared.misc.extension.sharedExtensionPatch
+
+val sharedExtensionPatch = sharedExtensionPatch("baconreader", initHook)

patches/src/main/kotlin/app/revanced/patches/reddit/customclients/baconreader/misc/extension/hooks/InitHook.kt

@@ -0,0 +1,9 @@
+package app.revanced.patches.reddit.customclients.baconreader.misc.extension.hooks
+
+import app.revanced.patches.shared.misc.extension.extensionHook
+
+internal val initHook = extensionHook {
+    custom { method, _ ->
+        method.definingClass == "Lcom/onelouder/baconreader/BaconReader;" && method.name == "onCreate"
+    }
+}

patches/src/main/kotlin/app/revanced/patches/reddit/customclients/boostforreddit/fix/redgifs/Fingerprints.kt

@@ -0,0 +1,20 @@
+package app.revanced.patches.reddit.customclients.boostforreddit.fix.redgifs
+
+import app.revanced.patcher.fingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+
+internal val createOkHttpClientFingerprint = fingerprint {
+    accessFlags(AccessFlags.PRIVATE)
+    opcodes(
+        Opcode.NEW_INSTANCE,
+        Opcode.INVOKE_DIRECT,
+        Opcode.NEW_INSTANCE,
+        Opcode.INVOKE_DIRECT,
+        Opcode.NEW_INSTANCE,
+        Opcode.INVOKE_DIRECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT
+    )
+    custom { _, classDef -> classDef.sourceFile == "RedGifsAPIv2.java" }
+}

patches/src/main/kotlin/app/revanced/patches/reddit/customclients/boostforreddit/fix/redgifs/FixRedgifsApiPatch.kt

@@ -0,0 +1,38 @@
+package app.revanced.patches.reddit.customclients.boostforreddit.fix.redgifs
+
+import app.revanced.patcher.extensions.InstructionExtensions.instructions
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patches.reddit.customclients.CREATE_NEW_CLIENT_METHOD
+import app.revanced.patches.reddit.customclients.boostforreddit.misc.extension.sharedExtensionPatch
+import app.revanced.patches.reddit.customclients.fixRedgifsApiPatch
+import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstructionOrThrow
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+
+private const val EXTENSION_CLASS_DESCRIPTOR = "Lapp/revanced/extension/boostforreddit/FixRedgifsApiPatch;"
+
+@Suppress("unused")
+val fixRedgifsApi = fixRedgifsApiPatch(
+    extensionPatch = sharedExtensionPatch
+) {
+    compatibleWith("com.rubenmayayo.reddit")
+
+    execute {
+        // region Patch Redgifs OkHttp3 client.
+
+        createOkHttpClientFingerprint.method.apply {
+            val index = indexOfFirstInstructionOrThrow {
+                val reference = getReference<MethodReference>()
+                reference?.name == "build" && reference.definingClass == "Lokhttp3/OkHttpClient\$Builder;"
+            }
+            replaceInstruction(
+                index,
+                """
+                invoke-static       { }, ${EXTENSION_CLASS_DESCRIPTOR}->$CREATE_NEW_CLIENT_METHOD
+                """
+            )
+        }
+
+        // endregion
+    }
+}

patches/src/main/kotlin/app/revanced/patches/reddit/customclients/sync/syncforreddit/fix/redgifs/Fingerprints.kt

@@ -0,0 +1,39 @@
+package app.revanced.patches.reddit.customclients.sync.syncforreddit.fix.redgifs
+
+import app.revanced.patcher.extensions.InstructionExtensions.instructions
+import app.revanced.patcher.fingerprint
+import app.revanced.util.indexOfFirstInstruction
+import app.revanced.util.writeRegister
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction11n
+
+
+internal val createOkHttpClientFingerprint = fingerprint {
+    accessFlags(AccessFlags.PRIVATE, AccessFlags.STATIC)
+    returns("V")
+    parameters()
+    custom { method, classDef ->
+        // There are four functions (each creating a client) defined in this file with very similar fingerprints.
+        // We're looking for the one that only creates one object (the builder) and sets client options true
+        // (thus never reloading the register with a 0).
+        classDef.sourceFile == "OkHttpHelper.java" &&
+        method.instructions.count { it.opcode == Opcode.NEW_INSTANCE } == 1 &&
+        method.indexOfFirstInstruction {
+            opcode == Opcode.CONST_4 && writeRegister == 1 && (this as Instruction11n).narrowLiteral == 0
+        } == -1
+    }
+}
+
+internal val getDefaultUserAgentFingerprint = fingerprint {
+    custom { method, classDef ->
+        method.name == "getDefaultUserAgent" && classDef.type == EXTENSION_CLASS_DESCRIPTOR
+    }
+}
+
+internal val getOriginalUserAgentFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.STATIC)
+    returns("Ljava/lang/String;")
+    parameters()
+    custom { _, classDef -> classDef.sourceFile == "AccountSingleton.java" }
+}

patches/src/main/kotlin/app/revanced/patches/reddit/customclients/sync/syncforreddit/fix/redgifs/FixRedgifsApiPatch.kt

@@ -0,0 +1,56 @@
+package app.revanced.patches.reddit.customclients.sync.syncforreddit.fix.redgifs
+
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patches.reddit.customclients.INSTALL_NEW_CLIENT_METHOD
+import app.revanced.patches.reddit.customclients.fixRedgifsApiPatch
+import app.revanced.patches.reddit.customclients.sync.syncforreddit.extension.sharedExtensionPatch
+import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstructionOrThrow
+import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+
+internal const val EXTENSION_CLASS_DESCRIPTOR = "Lapp/revanced/extension/syncforreddit/FixRedgifsApiPatch;"
+
+@Suppress("unused")
+val fixRedgifsApi = fixRedgifsApiPatch(
+    extensionPatch = sharedExtensionPatch
+) {
+    compatibleWith(
+        "com.laurencedawson.reddit_sync",
+        "com.laurencedawson.reddit_sync.pro",
+        "com.laurencedawson.reddit_sync.dev",
+    )
+
+    execute {
+        // region Patch Redgifs OkHttp3 client.
+
+        createOkHttpClientFingerprint.method.apply {
+            val index = indexOfFirstInstructionOrThrow {
+                val reference = getReference<MethodReference>()
+                reference?.name == "build" && reference.definingClass == "Lokhttp3/OkHttpClient\$Builder;"
+            }
+            val register = getInstruction<FiveRegisterInstruction>(index).registerC
+            replaceInstruction(
+                index,
+                """
+                invoke-static       { v$register }, $EXTENSION_CLASS_DESCRIPTOR->$INSTALL_NEW_CLIENT_METHOD
+                """
+            )
+        }
+
+        getDefaultUserAgentFingerprint.method.apply {
+            addInstructions(
+                0,
+                """
+                invoke-static { }, ${getOriginalUserAgentFingerprint.method}
+                move-result-object v0
+                return-object v0
+                """
+            )
+        }
+
+        // endregion
+    }
+}

patches/src/main/kotlin/app/revanced/patches/shared/misc/spoof/Fingerprints.kt

@@ -1,9 +1,12 @@
 package app.revanced.patches.shared.misc.spoof
 
 import app.revanced.patcher.fingerprint
+import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstruction
 import app.revanced.util.literal
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 
 internal val buildInitPlaybackRequestFingerprint = fingerprint {
     returns("Lorg/chromium/net/UrlRequest\$Builder;")
@@ -35,8 +38,15 @@ internal val buildPlayerRequestURIFingerprint = fingerprint {
 
 internal val buildRequestFingerprint = fingerprint {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.STATIC)
-    returns("Lorg/chromium/net/UrlRequest;")
+    returns("Lorg/chromium/net/UrlRequest") // UrlRequest; or UrlRequest$Builder;
     custom { methodDef, _ ->
+        if (methodDef.indexOfFirstInstruction {
+                val reference = getReference<MethodReference>()
+                reference?.name == "newUrlRequestBuilder"
+            } < 0) {
+            return@custom false
+        }
+
         // Different targets have slightly different parameters
 
         // Earlier targets have parameters:
@@ -58,12 +68,22 @@ internal val buildRequestFingerprint = fingerprint {
         // Lorg/chromium/net/UrlRequest\$Callback;
         // L
 
+        // 20.16+ uses a refactored and extracted method:
+        // L
+        // Ljava/util/Map;
+        // [B
+        // L
+        // Lorg/chromium/net/UrlRequest$Callback;
+        // L
+
         val parameterTypes = methodDef.parameterTypes
-        (parameterTypes.size == 7 || parameterTypes.size == 8) &&
-            parameterTypes[1] == "Ljava/util/Map;" // URL headers.
+        val parameterTypesSize = parameterTypes.size
+        (parameterTypesSize == 6 || parameterTypesSize == 7 || parameterTypesSize == 8) &&
+                parameterTypes[1] == "Ljava/util/Map;" // URL headers.
     }
 }
 
+
 internal val protobufClassParseByteBufferFingerprint = fingerprint {
     accessFlags(AccessFlags.PROTECTED, AccessFlags.STATIC)
     returns("L")
@@ -148,7 +168,8 @@ internal val mediaFetchHotConfigFingerprint = fingerprint {
     literal { MEDIA_FETCH_HOT_CONFIG_FEATURE_FLAG }
 }
 
-// 20.10+
+// YT 20.10+, YT Music 8.11 - 8.14.
+// Flag is missing in YT Music 8.15+, and it is not known if a replacement flag/feature exists.
 internal const val MEDIA_FETCH_HOT_CONFIG_ALTERNATIVE_FEATURE_FLAG = 45683169L
 
 internal val mediaFetchHotConfigAlternativeFingerprint = fingerprint {
@@ -162,7 +183,6 @@ internal val mediaFetchHotConfigAlternativeFingerprint = fingerprint {
 internal const val PLAYBACK_START_CHECK_ENDPOINT_USED_FEATURE_FLAG = 45665455L
 
 internal val playbackStartDescriptorFeatureFlagFingerprint = fingerprint {
-    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
     parameters()
     returns("Z")
     literal { PLAYBACK_START_CHECK_ENDPOINT_USED_FEATURE_FLAG }

patches/src/main/kotlin/app/revanced/patches/shared/misc/spoof/SpoofVideoStreamsPatch.kt

@@ -10,6 +10,7 @@ import app.revanced.patcher.patch.BytecodePatchContext
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
 import app.revanced.patches.all.misc.resources.addResourcesPatch
+import app.revanced.patches.music.misc.extension.sharedExtensionPatch
 import app.revanced.util.findFreeRegister
 import app.revanced.util.findInstructionIndicesReversedOrThrow
 import app.revanced.util.getReference
@@ -53,9 +54,8 @@ fun spoofVideoStreamsPatch(
 
         // region Block /initplayback requests to fall back to /get_watch requests.
 
-        val moveUriStringIndex = buildInitPlaybackRequestFingerprint.patternMatch!!.startIndex
-
         buildInitPlaybackRequestFingerprint.method.apply {
+            val moveUriStringIndex = buildInitPlaybackRequestFingerprint.patternMatch!!.startIndex
             val targetRegister = getInstruction<OneRegisterInstruction>(moveUriStringIndex).registerA
 
             addInstructions(
@@ -63,7 +63,7 @@ fun spoofVideoStreamsPatch(
                 """
                     invoke-static { v$targetRegister }, $EXTENSION_CLASS_DESCRIPTOR->blockInitPlaybackRequest(Ljava/lang/String;)Ljava/lang/String;
                     move-result-object v$targetRegister
-                """,
+                """
             )
         }
 
@@ -71,9 +71,8 @@ fun spoofVideoStreamsPatch(
 
         // region Block /get_watch requests to fall back to /player requests.
 
-        val invokeToStringIndex = buildPlayerRequestURIFingerprint.patternMatch!!.startIndex
-
         buildPlayerRequestURIFingerprint.method.apply {
+            val invokeToStringIndex = buildPlayerRequestURIFingerprint.patternMatch!!.startIndex
             val uriRegister = getInstruction<FiveRegisterInstruction>(invokeToStringIndex).registerC
 
             addInstructions(
@@ -81,7 +80,7 @@ fun spoofVideoStreamsPatch(
                 """
                     invoke-static { v$uriRegister }, $EXTENSION_CLASS_DESCRIPTOR->blockGetWatchRequest(Landroid/net/Uri;)Landroid/net/Uri;
                     move-result-object v$uriRegister
-                """,
+                """
             )
         }
 
@@ -178,9 +177,9 @@ fun spoofVideoStreamsPatch(
                             
                             :disabled
                             return-void
-                        """,
+                        """
                     )
-                },
+                }
             )
         }
 
@@ -199,17 +198,17 @@ fun spoofVideoStreamsPatch(
             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 }, $EXTENSION_CLASS_DESCRIPTOR->removeVideoPlaybackPostBody(Landroid/net/Uri;I[B)[B
-                        move-result-object v1
-                        iput-object v1, v0, $definingClass->d:[B
-                    """,
+                    # 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 }, $EXTENSION_CLASS_DESCRIPTOR->removeVideoPlaybackPostBody(Landroid/net/Uri;I[B)[B
+                    move-result-object v1
+                    iput-object v1, v0, $definingClass->d:[B
+                """
             )
         }
 

patches/src/main/kotlin/app/revanced/patches/spotify/layout/theme/CustomThemePatch.kt

@@ -187,11 +187,16 @@ val customThemePatch = resourcePatch(
         }
 
         // Login screen gradient.
-        document("res/drawable/start_screen_gradient.xml").use { document ->
-            val gradientNode = document.getElementsByTagName("gradient").item(0) as Element
+        try {
+            document("res/drawable/start_screen_gradient.xml").use { document ->
+                val gradientNode = document.getElementsByTagName("gradient").item(0) as Element
 
-            gradientNode.setAttribute("android:startColor", "@color/gray_7")
-            gradientNode.setAttribute("android:endColor", "@color/gray_7")
+                gradientNode.setAttribute("android:startColor", "@color/gray_7")
+                gradientNode.setAttribute("android:endColor", "@color/gray_7")
+            }
+        } catch (_: Exception) {
+            // Fails for 9.0.66+
+            // printWarn("Failed to locate start_screen_gradient.xml, skipping modification.")
         }
     }
 }

patches/src/main/kotlin/app/revanced/patches/spotify/misc/Fingerprints.kt

@@ -1,145 +0,0 @@
-package app.revanced.patches.spotify.misc
-
-import app.revanced.patcher.fingerprint
-import app.revanced.patcher.patch.BytecodePatchContext
-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.reference.FieldReference
-import com.android.tools.smali.dexlib2.iface.reference.MethodReference
-import com.android.tools.smali.dexlib2.iface.reference.TypeReference
-
-context(BytecodePatchContext)
-internal val accountAttributeFingerprint get() = fingerprint {
-    custom { _, classDef -> classDef.type == "Lcom/spotify/remoteconfig/internal/AccountAttribute;" }
-}
-
-context(BytecodePatchContext)
-internal val productStateProtoGetMapFingerprint get() = fingerprint {
-    returns("Ljava/util/Map;")
-    custom { _, classDef -> classDef.type == "Lcom/spotify/remoteconfig/internal/ProductStateProto;" }
-}
-
-internal val buildQueryParametersFingerprint = fingerprint {
-    strings("trackRows", "device_type:tablet")
-}
-
-internal val contextMenuViewModelClassFingerprint = fingerprint {
-    strings("ContextMenuViewModel(header=")
-}
-
-/**
- * Used in versions older than "9.0.60.128".
- */
-internal val oldContextMenuViewModelAddItemFingerprint = fingerprint {
-    parameters("L")
-    returns("V")
-    custom { method, _ ->
-        method.indexOfFirstInstruction {
-            getReference<MethodReference>()?.name == "add"
-        } >= 0
-    }
-}
-
-internal val contextMenuViewModelConstructorFingerprint = fingerprint {
-    accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR)
-}
-
-/**
- * Used to find the interface name of a context menu item.
- */
-internal val removeAdsContextMenuItemClassFingerprint = fingerprint {
-    strings("remove_ads_item", "ui_navigate")
-}
-
-internal const val CONTEXT_MENU_ITEM_CLASS_DESCRIPTOR_PLACEHOLDER = "Lapp/revanced/ContextMenuItemPlaceholder;"
-internal val extensionFilterContextMenuItemsFingerprint = fingerprint {
-    accessFlags(AccessFlags.PUBLIC, AccessFlags.STATIC)
-    returns("Ljava/util/List;")
-    parameters("Ljava/util/List;")
-    custom { method, classDef ->
-        method.name == "filterContextMenuItems" && classDef.type == EXTENSION_CLASS_DESCRIPTOR
-    }
-}
-
-internal val getViewModelFingerprint = fingerprint {
-    custom { method, _ -> method.name == "getViewModel" }
-}
-
-internal val contextFromJsonFingerprint = fingerprint {
-    opcodes(
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_STATIC
-    )
-    custom { method, classDef ->
-        method.name == "fromJson" &&
-                classDef.type.endsWith("voiceassistants/playermodels/ContextJsonAdapter;")
-    }
-}
-
-internal val readPlayerOptionOverridesFingerprint = fingerprint {
-    custom { method, classDef ->
-        method.name == "readPlayerOptionOverrides" &&
-                classDef.type.endsWith("voiceassistants/playermodels/PreparePlayOptionsJsonAdapter;")
-    }
-}
-
-internal val protobufListsFingerprint = fingerprint {
-    accessFlags(AccessFlags.PUBLIC, AccessFlags.STATIC)
-    custom { method, _ -> method.name == "emptyProtobufList" }
-}
-
-internal val abstractProtobufListEnsureIsMutableFingerprint = fingerprint {
-    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
-    parameters()
-    returns("V")
-    custom { method, _ ->
-    	method.indexOfFirstInstruction {
-            getReference<TypeReference>()?.type == "Ljava/lang/UnsupportedOperationException;"
-        } >= 0
-    }
-}
-
-internal fun structureGetSectionsFingerprint(className: String) = fingerprint {
-    custom { method, classDef ->
-        classDef.type.endsWith(className) && method.indexOfFirstInstruction {
-            opcode == Opcode.IGET_OBJECT && getReference<FieldReference>()?.name == "sections_"
-        } >= 0
-    }
-}
-
-internal val homeSectionFingerprint = fingerprint {
-    custom { _, classDef -> classDef.type.endsWith("homeapi/proto/Section;") }
-}
-
-internal val homeStructureGetSectionsFingerprint =
-    structureGetSectionsFingerprint("homeapi/proto/HomeStructure;")
-
-internal val browseSectionFingerprint = fingerprint {
-    custom { _, classDef-> classDef.type.endsWith("browsita/v1/resolved/Section;") }
-}
-
-internal val browseStructureGetSectionsFingerprint =
-    structureGetSectionsFingerprint("browsita/v1/resolved/BrowseStructure;")
-
-internal fun reactivexFunctionApplyWithClassInitFingerprint(className: String) = fingerprint {
-    returns("Ljava/lang/Object;")
-    parameters("Ljava/lang/Object;")
-    custom { method, _ ->
-        method.name == "apply" && method.indexOfFirstInstruction {
-            opcode == Opcode.NEW_INSTANCE && getReference<TypeReference>()?.type?.endsWith(className) == true
-        } >= 0
-    }
-}
-
-internal const val PENDRAGON_JSON_FETCH_MESSAGE_REQUEST_CLASS_NAME = "FetchMessageRequest;"
-internal val pendragonJsonFetchMessageRequestFingerprint =
-    reactivexFunctionApplyWithClassInitFingerprint(PENDRAGON_JSON_FETCH_MESSAGE_REQUEST_CLASS_NAME)
-
-internal const val PENDRAGON_PROTO_FETCH_MESSAGE_LIST_REQUEST_CLASS_NAME = "FetchMessageListRequest;"
-internal val pendragonProtoFetchMessageListRequestFingerprint =
-    reactivexFunctionApplyWithClassInitFingerprint(PENDRAGON_PROTO_FETCH_MESSAGE_LIST_REQUEST_CLASS_NAME)

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

@@ -12,9 +12,9 @@ import app.revanced.util.returnEarly
 
 internal const val EXTENSION_CLASS_DESCRIPTOR = "Lapp/revanced/extension/spotify/misc/fix/SpoofClientPatch;"
 
+@Deprecated("Patch no longer functions")
 @Suppress("unused")
 val spoofClientPatch = bytecodePatch(
-    name = "Spoof client",
     description = "Spoofs the client to fix various functions of the app.",
 ) {
     val requestListenerPort by intOption(

patches/src/main/kotlin/app/revanced/patches/spotify/navbar/PremiumNavbarTabPatch.kt

@@ -1,12 +1,9 @@
 package app.revanced.patches.spotify.navbar
 
 import app.revanced.patcher.patch.bytecodePatch
-import app.revanced.patches.spotify.misc.unlockPremiumPatch
 
-@Deprecated("Superseded by unlockPremiumPatch", ReplaceWith("unlockPremiumPatch"))
+@Deprecated("Obsolete and will be deleted soon")
 @Suppress("unused")
 val premiumNavbarTabPatch = bytecodePatch(
     description = "Hides the premium tab from the navigation bar.",
-) {
-    dependsOn(unlockPremiumPatch)
-}
+)

patches/src/main/kotlin/app/revanced/patches/viber/ads/Fingerprints.kt

@@ -0,0 +1,13 @@
+package app.revanced.patches.viber.ads
+
+import app.revanced.patcher.fingerprint
+
+internal val adsFreeFingerprint = fingerprint {
+    returns("I")
+    parameters()
+    custom { method, classDef ->
+        classDef.type.contains("com/viber/voip/feature/viberplus") &&
+        classDef.superclass?.contains("com/viber/voip/core/feature") == true &&  // Must extend com.viber.voip.core.feature.?
+        classDef.methods.count() == 1
+    }
+}