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

# [5.33.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.33.0-dev.2...v5.33.0-dev.3) (2025-07-30)

### Bug Fixes

* **YouTube - Playback speed:** Use old speed menu for player button if enabled ([a4817df](a4817dfdd0))

.github/workflows/build_pull_request.yml

@@ -13,8 +13,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - name: Setup Java
         uses: actions/setup-java@v4

.github/workflows/pull_strings.yml

@@ -17,7 +17,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: dev
-          fetch-depth: 0
           clean: true
 
       - name: Pull strings

.github/workflows/push_strings.yml

@@ -15,8 +15,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - name: Preprocess strings
         env:

.github/workflows/release.yml

@@ -19,8 +19,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - name: Setup Java
         uses: actions/setup-java@v4

CHANGELOG.md

@@ -1,3 +1,290 @@
+# [5.33.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.33.0-dev.2...v5.33.0-dev.3) (2025-07-30)
+
+
+### Bug Fixes
+
+* **YouTube - Playback speed:** Use old speed menu for player button if enabled ([1e8f436](https://github.com/ReVanced/revanced-patches/commit/1e8f4368e117f4b278c24709231cb32546e46dc0))
+
+# [5.33.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.33.0-dev.1...v5.33.0-dev.2) (2025-07-29)
+
+
+### Features
+
+* **ORF ON:** Add `Remove root detection` patch ([#5551](https://github.com/ReVanced/revanced-patches/issues/5551)) ([6c6aa35](https://github.com/ReVanced/revanced-patches/commit/6c6aa35411a139dddc3a15dd757fbeded5d1a0a3))
+
+# [5.33.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.32.0...v5.33.0-dev.1) (2025-07-28)
+
+
+### Features
+
+* **YouTube - Playback speed:** Add "Restore old playback speed menu" option ([#5552](https://github.com/ReVanced/revanced-patches/issues/5552)) ([b01f15b](https://github.com/ReVanced/revanced-patches/commit/b01f15b9acb0427aed99b0141ae271831b7936bf))
+
+# [5.32.0](https://github.com/ReVanced/revanced-patches/compare/v5.31.2...v5.32.0) (2025-07-27)
+
+
+### Bug Fixes
+
+* **Messenger - Hide inbox ads:** Support the latest app version ([2959c02](https://github.com/ReVanced/revanced-patches/commit/2959c0214dfa703ee623ef1f89bded7f78c9d252))
+* **YouTube  - Hide layout components:** Fix "Hide ticket shelf" ([#5516](https://github.com/ReVanced/revanced-patches/issues/5516)) ([3b85c71](https://github.com/ReVanced/revanced-patches/commit/3b85c71433325fff49e01c77c7b9ff8ddd0a7068))
+* **YouTube - GmsCore support:** Fix search suggestions when logged out by using correct search provider ([#5483](https://github.com/ReVanced/revanced-patches/issues/5483)) ([e86fdc8](https://github.com/ReVanced/revanced-patches/commit/e86fdc86b161a6077960b85149e83bacbac664e7))
+
+
+### Features
+
+* **Prime Video:** Add `Playback speed` patch ([#5444](https://github.com/ReVanced/revanced-patches/issues/5444)) ([22cf313](https://github.com/ReVanced/revanced-patches/commit/22cf313a7b99b69e17b9d488c514802043a5dc10))
+* **YouTube - External downloads:** Improve the selection of the external downloader package ([#5504](https://github.com/ReVanced/revanced-patches/issues/5504)) ([5de9aa9](https://github.com/ReVanced/revanced-patches/commit/5de9aa9fad4f24186da045fb188f8718d6f63d7a))
+* **YT Music:** Support latest versions ([#5524](https://github.com/ReVanced/revanced-patches/issues/5524)) ([551dcf0](https://github.com/ReVanced/revanced-patches/commit/551dcf01ca9c489a779196b49c8744727d79d6bc))
+
+# [5.32.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v5.32.0-dev.4...v5.32.0-dev.5) (2025-07-26)
+
+
+### Features
+
+* **YT Music:** Support latest versions ([#5524](https://github.com/ReVanced/revanced-patches/issues/5524)) ([551dcf0](https://github.com/ReVanced/revanced-patches/commit/551dcf01ca9c489a779196b49c8744727d79d6bc))
+
+# [5.32.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.32.0-dev.3...v5.32.0-dev.4) (2025-07-25)
+
+
+### Bug Fixes
+
+* **Messenger - Hide inbox ads:** Support the latest app version ([2959c02](https://github.com/ReVanced/revanced-patches/commit/2959c0214dfa703ee623ef1f89bded7f78c9d252))
+
+# [5.32.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.32.0-dev.2...v5.32.0-dev.3) (2025-07-24)
+
+
+### Features
+
+* **YouTube - External downloads:** Improve the selection of the external downloader package ([#5504](https://github.com/ReVanced/revanced-patches/issues/5504)) ([5de9aa9](https://github.com/ReVanced/revanced-patches/commit/5de9aa9fad4f24186da045fb188f8718d6f63d7a))
+
+# [5.32.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.32.0-dev.1...v5.32.0-dev.2) (2025-07-23)
+
+
+### Bug Fixes
+
+* **YouTube  - Hide layout components:** Fix "Hide ticket shelf" ([#5516](https://github.com/ReVanced/revanced-patches/issues/5516)) ([3b85c71](https://github.com/ReVanced/revanced-patches/commit/3b85c71433325fff49e01c77c7b9ff8ddd0a7068))
+
+# [5.32.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.31.3-dev.1...v5.32.0-dev.1) (2025-07-16)
+
+
+### Features
+
+* **Prime Video:** Add `Playback speed` patch ([#5444](https://github.com/ReVanced/revanced-patches/issues/5444)) ([22cf313](https://github.com/ReVanced/revanced-patches/commit/22cf313a7b99b69e17b9d488c514802043a5dc10))
+
+## [5.31.3-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.31.2...v5.31.3-dev.1) (2025-07-16)
+
+
+### Bug Fixes
+
+* **YouTube - GmsCore support:** Fix search suggestions when logged out by using correct search provider ([#5483](https://github.com/ReVanced/revanced-patches/issues/5483)) ([e86fdc8](https://github.com/ReVanced/revanced-patches/commit/e86fdc86b161a6077960b85149e83bacbac664e7))
+
+## [5.31.2](https://github.com/ReVanced/revanced-patches/compare/v5.31.1...v5.31.2) (2025-07-14)
+
+
+### Bug Fixes
+
+* **Spotify - Spoof client:** Fix login failing by spoofing login request in addition ([#5448](https://github.com/ReVanced/revanced-patches/issues/5448)) ([4e59ddc](https://github.com/ReVanced/revanced-patches/commit/4e59ddc62388d09f71b89593fc8b76933d9facea))
+* **YouTube - Disable double tap actions:** Remove old incompatible targets ([857053e](https://github.com/ReVanced/revanced-patches/commit/857053e29b72ded10a84b0ac693fa107705342d9))
+* **YouTube - Hide layout components:** Hide quick actions does not work ([#5423](https://github.com/ReVanced/revanced-patches/issues/5423)) ([9c66729](https://github.com/ReVanced/revanced-patches/commit/9c6672946d44001e106bdac9041e2d79ef3f6ab2))
+* **YouTube - Hide layout components:** Show correct custom header logo if 'Hide YouTube Doodles' is enabled ([#5431](https://github.com/ReVanced/revanced-patches/issues/5431)) ([20cc141](https://github.com/ReVanced/revanced-patches/commit/20cc141e61f75de1a1749247c4f4aed167dee8ea))
+* **YouTube - Settings:** Back button/gesture closes search instead of exiting ([#5418](https://github.com/ReVanced/revanced-patches/issues/5418)) ([134b278](https://github.com/ReVanced/revanced-patches/commit/134b278baa7b90d2c4b06200cabacabf55ebc055))
+
+## [5.31.2-dev.5](https://github.com/ReVanced/revanced-patches/compare/v5.31.2-dev.4...v5.31.2-dev.5) (2025-07-14)
+
+
+### Bug Fixes
+
+* **Spotify - Spoof client:** Fix login failing by spoofing login request in addition ([#5448](https://github.com/ReVanced/revanced-patches/issues/5448)) ([4e59ddc](https://github.com/ReVanced/revanced-patches/commit/4e59ddc62388d09f71b89593fc8b76933d9facea))
+
+## [5.31.2-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.31.2-dev.3...v5.31.2-dev.4) (2025-07-13)
+
+
+### Bug Fixes
+
+* **YouTube - Settings:** Back button/gesture closes search instead of exiting ([#5418](https://github.com/ReVanced/revanced-patches/issues/5418)) ([134b278](https://github.com/ReVanced/revanced-patches/commit/134b278baa7b90d2c4b06200cabacabf55ebc055))
+
+## [5.31.2-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.31.2-dev.2...v5.31.2-dev.3) (2025-07-13)
+
+
+### Bug Fixes
+
+* **YouTube - Disable double tap actions:** Remove old incompatible targets ([857053e](https://github.com/ReVanced/revanced-patches/commit/857053e29b72ded10a84b0ac693fa107705342d9))
+
+## [5.31.2-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.31.2-dev.1...v5.31.2-dev.2) (2025-07-12)
+
+
+### Bug Fixes
+
+* **YouTube - Hide layout components:** Show correct custom header logo if 'Hide YouTube Doodles' is enabled ([#5431](https://github.com/ReVanced/revanced-patches/issues/5431)) ([20cc141](https://github.com/ReVanced/revanced-patches/commit/20cc141e61f75de1a1749247c4f4aed167dee8ea))
+
+## [5.31.2-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.31.1...v5.31.2-dev.1) (2025-07-12)
+
+
+### Bug Fixes
+
+* **YouTube - Hide layout components:** Hide quick actions does not work ([#5423](https://github.com/ReVanced/revanced-patches/issues/5423)) ([9c66729](https://github.com/ReVanced/revanced-patches/commit/9c6672946d44001e106bdac9041e2d79ef3f6ab2))
+
+## [5.31.1](https://github.com/ReVanced/revanced-patches/compare/v5.31.0...v5.31.1) (2025-07-11)
+
+
+### Bug Fixes
+
+* **Spotify - Unlock Premium:** Fix hiding context menu ads for latest version ([#5415](https://github.com/ReVanced/revanced-patches/issues/5415)) ([dcde393](https://github.com/ReVanced/revanced-patches/commit/dcde3935bde3172576d0f9f5ff9eb62ecfff7dfe))
+
+## [5.31.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.31.0...v5.31.1-dev.1) (2025-07-11)
+
+
+### Bug Fixes
+
+* **Spotify - Unlock Premium:** Fix hiding context menu ads for latest version ([#5415](https://github.com/ReVanced/revanced-patches/issues/5415)) ([dcde393](https://github.com/ReVanced/revanced-patches/commit/dcde3935bde3172576d0f9f5ff9eb62ecfff7dfe))
+
+# [5.31.0](https://github.com/ReVanced/revanced-patches/compare/v5.30.0...v5.31.0) (2025-07-11)
+
+
+### Bug Fixes
+
+* **Bacon Reader - Spoof client:** Use www instead of ssl API to fix auth related issues  ([#5402](https://github.com/ReVanced/revanced-patches/issues/5402)) ([72459bb](https://github.com/ReVanced/revanced-patches/commit/72459bb2eaf4691e32822dfdd1db3240e2fe98dd))
+* Correctly name `Enable ROM signature spoofing` patch ([d85881a](https://github.com/ReVanced/revanced-patches/commit/d85881a6768232a999534677bebb248e640fe5ab))
+* Fix accidental changes ([e2ac841](https://github.com/ReVanced/revanced-patches/commit/e2ac8419756e3c7d62e2c0430a2918a3c1c63666))
+* Fix refactoring typo ([ec0ae42](https://github.com/ReVanced/revanced-patches/commit/ec0ae42496628cdeb2a639020fce94316b41b751))
+* Handle empty list of announcements ([de9d720](https://github.com/ReVanced/revanced-patches/commit/de9d7209f4e818a618a7fd9000013ae8ebd728f2))
+* **SoundCloud:** Constrain patches to last working app target ([e8ea89f](https://github.com/ReVanced/revanced-patches/commit/e8ea89fc1a3f0531a0af7529663f13328aca4fe7))
+* **Spotify - Unlock Premium:** Remove wrongfully hidden non ad browse sections ([#5403](https://github.com/ReVanced/revanced-patches/issues/5403)) ([8633544](https://github.com/ReVanced/revanced-patches/commit/8633544decc0814d7a548fbc5576b4bdd1d7eee0))
+* **Spotify:** Remove other ads type from the browse screen ([#5333](https://github.com/ReVanced/revanced-patches/issues/5333)) ([c68533a](https://github.com/ReVanced/revanced-patches/commit/c68533a33a399ca813380b5c9ccddce434ceadf8))
+* **Sync for Reddit - Spoof client:** Use www instead of ssl API to fix auth related issues ([#5392](https://github.com/ReVanced/revanced-patches/issues/5392)) ([47e6b62](https://github.com/ReVanced/revanced-patches/commit/47e6b62f3d8b07960cfb2963f441222d3e67df92))
+* **YouTube - Hide ads:** Hide new type of general ad ([#5345](https://github.com/ReVanced/revanced-patches/issues/5345)) ([f23716b](https://github.com/ReVanced/revanced-patches/commit/f23716bc52c03d8d0271bfe38b19247e6de7021d))
+* **YouTube - Hide layout components:** Do not hide playlist sort button if 'Hide AI comments summary' is on ([5f3e48e](https://github.com/ReVanced/revanced-patches/commit/5f3e48ec5853f6439800ef58239291c34bcab5f6))
+* **YouTube - Playback speed:** Allow custom speeds with 0.01x precision ([#5360](https://github.com/ReVanced/revanced-patches/issues/5360)) ([0eecef0](https://github.com/ReVanced/revanced-patches/commit/0eecef00fc93d2a217944978e29dce82e3134e35))
+* **YouTube - Slide to seek:** Show tap and hold 2x speed overlay when active ([#5398](https://github.com/ReVanced/revanced-patches/issues/5398)) ([dbc9c5f](https://github.com/ReVanced/revanced-patches/commit/dbc9c5f00c1f5bbb95f8822667cc1ac3c613fa00))
+
+
+### Features
+
+* **Cricbuzz - Hide ads:** Hide Cricbuzz11 UI elements ([#5381](https://github.com/ReVanced/revanced-patches/issues/5381)) ([a42c98f](https://github.com/ReVanced/revanced-patches/commit/a42c98f8b51fd37d815fd38b75a2b7ccc4fb049b))
+* **Lightroom:** Constrain patches to last working version ([#5335](https://github.com/ReVanced/revanced-patches/issues/5335)) ([32ce70e](https://github.com/ReVanced/revanced-patches/commit/32ce70e994f354b9a569376bb89eb38b3190e6f9))
+* **Spotify - Spoof client:** Fix issues like songs skipping by spoofing to iOS ([#5388](https://github.com/ReVanced/revanced-patches/issues/5388)) ([e36d4c1](https://github.com/ReVanced/revanced-patches/commit/e36d4c1986b58815c7659e6ef44011166873f9c8))
+* **Spotify:** Remove support for old versions ([#5404](https://github.com/ReVanced/revanced-patches/issues/5404)) ([9d31238](https://github.com/ReVanced/revanced-patches/commit/9d31238803a45e957472760fc40c3862da2cf3f0))
+* **YouTube - Change header:** Add in-app setting to change the app header ([#5346](https://github.com/ReVanced/revanced-patches/issues/5346)) ([9ba45b6](https://github.com/ReVanced/revanced-patches/commit/9ba45b6680595d732b47e8fa54bee98b7c7af179))
+* **YouTube - Hide layout components:** Add `Hide channel links preview` and `Hide 'Visit Community' button` in channel page ([#5320](https://github.com/ReVanced/revanced-patches/issues/5320)) ([9d9cce3](https://github.com/ReVanced/revanced-patches/commit/9d9cce3ec5550b2fea88df745f1700bb2f17eb9e))
+* **YouTube:** Disable two-finger tap gesture for skipping chapters ([#5374](https://github.com/ReVanced/revanced-patches/issues/5374)) ([71db0a2](https://github.com/ReVanced/revanced-patches/commit/71db0a2661b5f76eb5048cdeed83f26fbfdf4fee))
+
+# [5.31.0-dev.17](https://github.com/ReVanced/revanced-patches/compare/v5.31.0-dev.16...v5.31.0-dev.17) (2025-07-11)
+
+
+### Bug Fixes
+
+* **Spotify - Unlock Premium:** Remove wrongfully hidden non ad browse sections ([#5403](https://github.com/ReVanced/revanced-patches/issues/5403)) ([8633544](https://github.com/ReVanced/revanced-patches/commit/8633544decc0814d7a548fbc5576b4bdd1d7eee0))
+
+
+### Features
+
+* **Spotify:** Remove support for old versions ([#5404](https://github.com/ReVanced/revanced-patches/issues/5404)) ([9d31238](https://github.com/ReVanced/revanced-patches/commit/9d31238803a45e957472760fc40c3862da2cf3f0))
+
+# [5.31.0-dev.16](https://github.com/ReVanced/revanced-patches/compare/v5.31.0-dev.15...v5.31.0-dev.16) (2025-07-11)
+
+
+### Features
+
+* **Spotify - Spoof client:** Fix issues like songs skipping by spoofing to iOS ([#5388](https://github.com/ReVanced/revanced-patches/issues/5388)) ([e36d4c1](https://github.com/ReVanced/revanced-patches/commit/e36d4c1986b58815c7659e6ef44011166873f9c8))
+* **YouTube:** Disable two-finger tap gesture for skipping chapters ([#5374](https://github.com/ReVanced/revanced-patches/issues/5374)) ([71db0a2](https://github.com/ReVanced/revanced-patches/commit/71db0a2661b5f76eb5048cdeed83f26fbfdf4fee))
+
+# [5.31.0-dev.15](https://github.com/ReVanced/revanced-patches/compare/v5.31.0-dev.14...v5.31.0-dev.15) (2025-07-11)
+
+
+### Bug Fixes
+
+* Handle empty list of announcements ([de9d720](https://github.com/ReVanced/revanced-patches/commit/de9d7209f4e818a618a7fd9000013ae8ebd728f2))
+
+# [5.31.0-dev.14](https://github.com/ReVanced/revanced-patches/compare/v5.31.0-dev.13...v5.31.0-dev.14) (2025-07-10)
+
+
+### Bug Fixes
+
+* **Bacon Reader - Spoof client:** Use www instead of ssl API to fix auth related issues  ([#5402](https://github.com/ReVanced/revanced-patches/issues/5402)) ([72459bb](https://github.com/ReVanced/revanced-patches/commit/72459bb2eaf4691e32822dfdd1db3240e2fe98dd))
+
+# [5.31.0-dev.13](https://github.com/ReVanced/revanced-patches/compare/v5.31.0-dev.12...v5.31.0-dev.13) (2025-07-10)
+
+
+### Bug Fixes
+
+* **YouTube - Slide to seek:** Show tap and hold 2x speed overlay when active ([#5398](https://github.com/ReVanced/revanced-patches/issues/5398)) ([dbc9c5f](https://github.com/ReVanced/revanced-patches/commit/dbc9c5f00c1f5bbb95f8822667cc1ac3c613fa00))
+
+# [5.31.0-dev.12](https://github.com/ReVanced/revanced-patches/compare/v5.31.0-dev.11...v5.31.0-dev.12) (2025-07-09)
+
+
+### Bug Fixes
+
+* **Sync for Reddit - Spoof client:** Use www instead of ssl API to fix auth related issues ([#5392](https://github.com/ReVanced/revanced-patches/issues/5392)) ([47e6b62](https://github.com/ReVanced/revanced-patches/commit/47e6b62f3d8b07960cfb2963f441222d3e67df92))
+
+# [5.31.0-dev.11](https://github.com/ReVanced/revanced-patches/compare/v5.31.0-dev.10...v5.31.0-dev.11) (2025-07-09)
+
+
+### Features
+
+* **Cricbuzz - Hide ads:** Hide Cricbuzz11 UI elements ([#5381](https://github.com/ReVanced/revanced-patches/issues/5381)) ([a42c98f](https://github.com/ReVanced/revanced-patches/commit/a42c98f8b51fd37d815fd38b75a2b7ccc4fb049b))
+
+# [5.31.0-dev.10](https://github.com/ReVanced/revanced-patches/compare/v5.31.0-dev.9...v5.31.0-dev.10) (2025-07-09)
+
+
+### Bug Fixes
+
+* **YouTube - Hide layout components:** Do not hide playlist sort button if 'Hide AI comments summary' is on ([5f3e48e](https://github.com/ReVanced/revanced-patches/commit/5f3e48ec5853f6439800ef58239291c34bcab5f6))
+
+# [5.31.0-dev.9](https://github.com/ReVanced/revanced-patches/compare/v5.31.0-dev.8...v5.31.0-dev.9) (2025-07-07)
+
+
+### Bug Fixes
+
+* Fix accidental changes ([e2ac841](https://github.com/ReVanced/revanced-patches/commit/e2ac8419756e3c7d62e2c0430a2918a3c1c63666))
+
+# [5.31.0-dev.8](https://github.com/ReVanced/revanced-patches/compare/v5.31.0-dev.7...v5.31.0-dev.8) (2025-07-07)
+
+
+### Bug Fixes
+
+* Correctly name `Enable ROM signature spoofing` patch ([d85881a](https://github.com/ReVanced/revanced-patches/commit/d85881a6768232a999534677bebb248e640fe5ab))
+
+# [5.31.0-dev.7](https://github.com/ReVanced/revanced-patches/compare/v5.31.0-dev.6...v5.31.0-dev.7) (2025-07-06)
+
+
+### Bug Fixes
+
+* Fix refactoring typo ([ec0ae42](https://github.com/ReVanced/revanced-patches/commit/ec0ae42496628cdeb2a639020fce94316b41b751))
+
+# [5.31.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v5.31.0-dev.5...v5.31.0-dev.6) (2025-07-06)
+
+
+### Bug Fixes
+
+* **YouTube - Playback speed:** Allow custom speeds with 0.01x precision ([#5360](https://github.com/ReVanced/revanced-patches/issues/5360)) ([0eecef0](https://github.com/ReVanced/revanced-patches/commit/0eecef00fc93d2a217944978e29dce82e3134e35))
+
+# [5.31.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v5.31.0-dev.4...v5.31.0-dev.5) (2025-07-05)
+
+
+### Features
+
+* **YouTube - Change header:** Add in-app setting to change the app header ([#5346](https://github.com/ReVanced/revanced-patches/issues/5346)) ([9ba45b6](https://github.com/ReVanced/revanced-patches/commit/9ba45b6680595d732b47e8fa54bee98b7c7af179))
+
+# [5.31.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.31.0-dev.3...v5.31.0-dev.4) (2025-07-04)
+
+
+### Bug Fixes
+
+* **YouTube - Hide ads:** Hide new type of general ad ([#5345](https://github.com/ReVanced/revanced-patches/issues/5345)) ([f23716b](https://github.com/ReVanced/revanced-patches/commit/f23716bc52c03d8d0271bfe38b19247e6de7021d))
+
+# [5.31.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.31.0-dev.2...v5.31.0-dev.3) (2025-07-04)
+
+
+### Bug Fixes
+
+* **Spotify:** Remove other ads type from the browse screen ([#5333](https://github.com/ReVanced/revanced-patches/issues/5333)) ([c68533a](https://github.com/ReVanced/revanced-patches/commit/c68533a33a399ca813380b5c9ccddce434ceadf8))
+
+# [5.31.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.31.0-dev.1...v5.31.0-dev.2) (2025-07-04)
+
+
+### Features
+
+* **YouTube - Hide layout components:** Add `Hide channel links preview` and `Hide 'Visit Community' button` in channel page ([#5320](https://github.com/ReVanced/revanced-patches/issues/5320)) ([9d9cce3](https://github.com/ReVanced/revanced-patches/commit/9d9cce3ec5550b2fea88df745f1700bb2f17eb9e))
+
 # [5.31.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.30.0...v5.31.0-dev.1) (2025-07-04)
 
 

extensions/cricbuzz/build.gradle.kts

@@ -0,0 +1,4 @@
+dependencies {
+    compileOnly(project(":extensions:shared:library"))
+    compileOnly(project(":extensions:cricbuzz:stub"))
+}

extensions/cricbuzz/src/main/AndroidManifest.xml

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

extensions/cricbuzz/src/main/java/app/revanced/extension/cricbuzz/HideAdsPatch.java

@@ -0,0 +1,28 @@
+package app.revanced.extension.cricbuzz.ads;
+
+import com.cricbuzz.android.data.rest.model.BottomBar;
+import java.util.List;
+import java.util.Iterator;
+import app.revanced.extension.shared.Logger;
+
+@SuppressWarnings("unused")
+public class HideAdsPatch {
+
+    /**
+     * Injection point.
+     */
+    public static void filterCb11(List<BottomBar> list) {
+        try {
+            Iterator<BottomBar> iterator = list.iterator();
+            while (iterator.hasNext()) {
+                BottomBar bar = iterator.next();
+                if (bar.getName().equals("Cricbuzz11")) {
+                    Logger.printInfo(() -> "Removing Cricbuzz11 bar: " + bar);
+                    iterator.remove();
+                }
+            }
+        } catch (Exception ex) {
+            Logger.printException(() -> "filterCb11 failure", ex);
+        }
+    }
+}

extensions/cricbuzz/stub/build.gradle.kts

@@ -0,0 +1,17 @@
+plugins {
+    alias(libs.plugins.android.library)
+}
+
+android {
+    namespace = "app.revanced.extension"
+    compileSdk = 34
+
+    defaultConfig {
+        minSdk = 21
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+}

extensions/cricbuzz/stub/src/main/AndroidManifest.xml

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

extensions/cricbuzz/stub/src/main/java/com/cricbuzz/android/data/rest/model/BottomBar.java

@@ -0,0 +1,5 @@
+package com.cricbuzz.android.data.rest.model;
+
+public final class BottomBar {
+    public final String getName() { throw new UnsupportedOperationException(); }
+}

extensions/primevideo/src/main/java/app/revanced/extension/primevideo/videoplayer/PlaybackSpeedPatch.java

@@ -0,0 +1,207 @@
+package app.revanced.extension.primevideo.videoplayer;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.graphics.RectF;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.graphics.Color;
+import android.graphics.drawable.Drawable;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.ColorFilter;
+import android.graphics.PixelFormat;
+import java.util.Arrays;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+
+import com.amazon.video.sdk.player.Player;
+
+public class PlaybackSpeedPatch {
+    private static Player player;
+    private static final float[] SPEED_VALUES = {0.5f, 0.7f, 0.8f, 0.9f, 0.95f, 1.0f, 1.05f, 1.1f, 1.2f, 1.3f, 1.5f, 2.0f};
+    private static final String SPEED_BUTTON_TAG = "speed_overlay";
+
+    public static void setPlayer(Player playerInstance) {
+        player = playerInstance;
+        if (player != null) {
+            // Reset playback rate when switching between episodes to ensure correct display.
+            player.setPlaybackRate(1.0f);
+        }
+    }
+
+    public static void initializeSpeedOverlay(View userControlsView) {
+        try {
+            LinearLayout buttonContainer = Utils.getChildViewByResourceName(userControlsView, "ButtonContainerPlayerTop");
+
+            // If the speed overlay exists we should return early.
+            if (Utils.getChildView(buttonContainer, false, child ->
+                    child instanceof ImageView && SPEED_BUTTON_TAG.equals(child.getTag())) != null) {
+                return;
+            }
+
+            ImageView speedButton = createSpeedButton(userControlsView.getContext());
+            speedButton.setOnClickListener(v -> changePlaybackSpeed(speedButton));
+            buttonContainer.addView(speedButton, 0);
+
+        } catch (IllegalArgumentException e) {
+            Logger.printException(() -> "initializeSpeedOverlay, no button container found", e);
+        } catch (Exception e) {
+            Logger.printException(() -> "initializeSpeedOverlay failure", e);
+        }
+    }
+
+    private static ImageView createSpeedButton(Context context) {
+        ImageView speedButton = new ImageView(context);
+        speedButton.setContentDescription("Playback Speed");
+        speedButton.setTag(SPEED_BUTTON_TAG);
+        speedButton.setClickable(true);
+        speedButton.setFocusable(true);
+        speedButton.setScaleType(ImageView.ScaleType.CENTER);
+
+        SpeedIconDrawable speedIcon = new SpeedIconDrawable();
+        speedButton.setImageDrawable(speedIcon);
+
+        int buttonSize = Utils.dipToPixels(48);
+        speedButton.setMinimumWidth(buttonSize);
+        speedButton.setMinimumHeight(buttonSize);
+
+        return speedButton;
+    }
+
+    private static String[] getSpeedOptions() {
+        String[] options = new String[SPEED_VALUES.length];
+        for (int i = 0; i < SPEED_VALUES.length; i++) {
+            options[i] = SPEED_VALUES[i] + "x";
+        }
+        return options;
+    }
+
+    private static void changePlaybackSpeed(ImageView imageView) {
+        if (player == null) {
+            Logger.printException(() -> "Player not available");
+            return;
+        }
+
+        try {
+            player.pause();
+            AlertDialog dialog = createSpeedPlaybackDialog(imageView);
+            dialog.setOnDismissListener(dialogInterface -> player.play());
+            dialog.show();
+
+        } catch (Exception e) {
+            Logger.printException(() -> "changePlaybackSpeed", e);
+        }
+    }
+
+    private static AlertDialog createSpeedPlaybackDialog(ImageView imageView) {
+        Context context = imageView.getContext();
+        int currentSelection = getCurrentSpeedSelection();
+
+        return new AlertDialog.Builder(context)
+                .setTitle("Select Playback Speed")
+                .setSingleChoiceItems(getSpeedOptions(), currentSelection,
+                        PlaybackSpeedPatch::handleSpeedSelection)
+                .create();
+    }
+
+    private static int getCurrentSpeedSelection() {
+        try {
+            float currentRate = player.getPlaybackRate();
+            int index = Arrays.binarySearch(SPEED_VALUES, currentRate);
+            return Math.max(index, 0); // Use slowest speed if not found.
+        } catch (Exception e) {
+            Logger.printException(() -> "getCurrentSpeedSelection error getting current playback speed", e);
+            return 0;
+        }
+    }
+
+    private static void handleSpeedSelection(android.content.DialogInterface dialog, int selectedIndex) {
+        try {
+            float selectedSpeed = SPEED_VALUES[selectedIndex];
+            player.setPlaybackRate(selectedSpeed);
+            player.play();
+        } catch (Exception e) {
+            Logger.printException(() -> "handleSpeedSelection error setting playback speed", e);
+        } finally {
+            dialog.dismiss();
+        }
+    }
+}
+
+class SpeedIconDrawable extends Drawable {
+    private final Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG);
+
+    @Override
+    public void draw(Canvas canvas) {
+        int w = getBounds().width();
+        int h = getBounds().height();
+        float centerX = w / 2f;
+        // Position gauge in lower portion.
+        float centerY = h * 0.7f;
+        float radius = Math.min(w, h) / 2f * 0.8f;
+
+        paint.setColor(Color.WHITE);
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(radius * 0.1f);
+
+        // Draw semicircle.
+        RectF oval = new RectF(centerX - radius, centerY - radius, centerX + radius, centerY + radius);
+        canvas.drawArc(oval, 180, 180, false, paint);
+
+        // Draw three tick marks.
+        paint.setStrokeWidth(radius * 0.06f);
+        for (int i = 0; i < 3; i++) {
+            float angle = 180 + (i * 45); // 180°, 225°, 270°.
+            float angleRad = (float) Math.toRadians(angle);
+
+            float startX = centerX + (radius * 0.8f) * (float) Math.cos(angleRad);
+            float startY = centerY + (radius * 0.8f) * (float) Math.sin(angleRad);
+            float endX = centerX + radius * (float) Math.cos(angleRad);
+            float endY = centerY + radius * (float) Math.sin(angleRad);
+
+            canvas.drawLine(startX, startY, endX, endY, paint);
+        }
+
+        // Draw needle.
+        paint.setStrokeWidth(radius * 0.08f);
+        float needleAngle = 200; // Slightly right of center.
+        float needleAngleRad = (float) Math.toRadians(needleAngle);
+
+        float needleEndX = centerX + (radius * 0.6f) * (float) Math.cos(needleAngleRad);
+        float needleEndY = centerY + (radius * 0.6f) * (float) Math.sin(needleAngleRad);
+
+        canvas.drawLine(centerX, centerY, needleEndX, needleEndY, paint);
+
+        // Center dot.
+        paint.setStyle(Paint.Style.FILL);
+        canvas.drawCircle(centerX, centerY, radius * 0.06f, paint);
+    }
+
+    @Override
+    public void setAlpha(int alpha) {
+        paint.setAlpha(alpha);
+    }
+
+    @Override
+    public void setColorFilter(ColorFilter colorFilter) {
+        paint.setColorFilter(colorFilter);
+    }
+
+    @Override
+    public int getOpacity() {
+        return PixelFormat.TRANSLUCENT;
+    }
+
+    @Override
+    public int getIntrinsicWidth() {
+        return Utils.dipToPixels(32);
+    }
+
+    @Override
+    public int getIntrinsicHeight() {
+        return Utils.dipToPixels(32);
+    }
+}

extensions/primevideo/stub/src/main/java/com/amazon/avod/media/playback/VideoPlayer.java

@@ -4,4 +4,10 @@ public interface VideoPlayer {
     long getCurrentPosition();
 
     void seekTo(long positionMs);
+    
+    void pause();
+    
+    void play();
+    
+    boolean isPlaying();
 }

extensions/primevideo/stub/src/main/java/com/amazon/video/sdk/player/Player.java

@@ -0,0 +1,11 @@
+package com.amazon.video.sdk.player;
+
+public interface Player {
+    float getPlaybackRate();
+    
+    void setPlaybackRate(float rate);
+
+    void play();
+    
+    void pause();
+} 

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

@@ -1438,6 +1438,28 @@ public class Utils {
         );
     }
 
+    /**
+     * Converts a percentage of the screen height to actual device pixels.
+     *
+     * @param percentage The percentage of the screen height (e.g., 30 for 30%).
+     * @return The device pixel value corresponding to the percentage of screen height.
+     */
+    public static int percentageHeightToPixels(int percentage) {
+        DisplayMetrics metrics = context.getResources().getDisplayMetrics();
+        return (int) (metrics.heightPixels * (percentage / 100.0f));
+    }
+
+    /**
+     * Converts a percentage of the screen width to actual device pixels.
+     *
+     * @param percentage The percentage of the screen width (e.g., 30 for 30%).
+     * @return The device pixel value corresponding to the percentage of screen width.
+     */
+    public static int percentageWidthToPixels(int percentage) {
+        DisplayMetrics metrics = context.getResources().getDisplayMetrics();
+        return (int) (metrics.widthPixels * (percentage / 100.0f));
+    }
+
     /**
      * Adjusts the brightness of a color by lightening or darkening it based on the given factor.
      * <p>

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

@@ -1,7 +1,5 @@
 package app.revanced.extension.shared.settings.preference;
 
-import static app.revanced.extension.shared.Utils.dipToPixels;
-
 import android.app.Dialog;
 import android.content.Context;
 import android.os.Bundle;
@@ -26,7 +24,7 @@ public class CustomDialogListPreference extends ListPreference {
     /**
      * Custom ArrayAdapter to handle checkmark visibility.
      */
-    private static class ListPreferenceArrayAdapter extends ArrayAdapter<CharSequence> {
+    public static class ListPreferenceArrayAdapter extends ArrayAdapter<CharSequence> {
         private static class SubViewDataContainer {
             ImageView checkIcon;
             View placeholder;

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

@@ -1,28 +1,15 @@
 package app.revanced.extension.shared.settings.preference;
 
 import static app.revanced.extension.shared.StringRef.str;
-import static app.revanced.extension.shared.Utils.dipToPixels;
 
 import android.app.Dialog;
 import android.content.Context;
-import android.graphics.Color;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.LayerDrawable;
-import android.graphics.drawable.shapes.RectShape;
-import android.graphics.drawable.shapes.RoundRectShape;
-import android.graphics.drawable.ShapeDrawable;
-import android.graphics.Paint.Style;
 import android.os.Bundle;
 import android.preference.EditTextPreference;
-import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Pair;
-import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
-import android.widget.LinearLayout;
-import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 

extensions/spotify/build.gradle.kts

@@ -7,7 +7,6 @@ dependencies {
     compileOnly(project(":extensions:spotify:stub"))
     compileOnly(libs.annotation)
 
-    implementation(project(":extensions:spotify:utils"))
     implementation(libs.nanohttpd)
     implementation(libs.protobuf.javalite)
 }

extensions/spotify/src/main/java/app/revanced/extension/spotify/layout/hide/createbutton/HideCreateButtonPatch.java

@@ -1,9 +1,11 @@
 package app.revanced.extension.spotify.layout.hide.createbutton;
 
-import java.util.List;
-
 import app.revanced.extension.shared.Logger;
-import app.revanced.extension.spotify.shared.ComponentFilters.*;
+import app.revanced.extension.spotify.shared.ComponentFilters.ComponentFilter;
+import app.revanced.extension.spotify.shared.ComponentFilters.ResourceIdComponentFilter;
+import app.revanced.extension.spotify.shared.ComponentFilters.StringComponentFilter;
+
+import java.util.List;
 
 @SuppressWarnings("unused")
 public final class HideCreateButtonPatch {
@@ -53,7 +55,9 @@ public final class HideCreateButtonPatch {
                     return null;
                 }
             }
-        } catch (Exception ex) {
+        } catch (Throwable ex) {
+            // Catch Throwable as calling toString can cause crashes with wrongfully generated code that throws
+            // NoSuchMethod errors.
             Logger.printException(() -> "returnNullIfIsCreateButton failure", ex);
         }
 

extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/fix/ClientTokenService.java

@@ -0,0 +1,115 @@
+package app.revanced.extension.spotify.misc.fix;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.spotify.misc.fix.clienttoken.data.v0.ClienttokenHttp.*;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+import static app.revanced.extension.spotify.misc.fix.Constants.*;
+
+class ClientTokenService {
+    private static final String IOS_CLIENT_ID = "58bd3c95768941ea9eb4350aaa033eb3";
+    private static final String IOS_USER_AGENT;
+
+    static {
+        String clientVersion = getClientVersion();
+        int commitHashIndex = clientVersion.lastIndexOf(".");
+        String version = clientVersion.substring(
+                clientVersion.indexOf("-") + 1,
+                clientVersion.lastIndexOf(".", commitHashIndex - 1)
+        );
+
+        IOS_USER_AGENT = "Spotify/" + version + " iOS/" + getSystemVersion() + " (" + getHardwareMachine() + ")";
+    }
+
+    private static final ConnectivitySdkData.Builder IOS_CONNECTIVITY_SDK_DATA =
+            ConnectivitySdkData.newBuilder()
+                    .setPlatformSpecificData(PlatformSpecificData.newBuilder()
+                            .setIos(NativeIOSData.newBuilder()
+                                    .setHwMachine(getHardwareMachine())
+                                    .setSystemVersion(getSystemVersion())
+                            )
+                    );
+
+    private static final ClientDataRequest.Builder IOS_CLIENT_DATA_REQUEST =
+            ClientDataRequest.newBuilder()
+                    .setClientVersion(getClientVersion())
+                    .setClientId(IOS_CLIENT_ID);
+
+    private static final ClientTokenRequest.Builder IOS_CLIENT_TOKEN_REQUEST =
+            ClientTokenRequest.newBuilder()
+                    .setRequestType(ClientTokenRequestType.REQUEST_CLIENT_DATA_REQUEST);
+
+
+    @NonNull
+    static ClientTokenRequest newIOSClientTokenRequest(String deviceId) {
+        Logger.printInfo(() -> "Creating new iOS client token request with device ID: " + deviceId);
+
+        return IOS_CLIENT_TOKEN_REQUEST
+                .setClientData(IOS_CLIENT_DATA_REQUEST
+                        .setConnectivitySdkData(IOS_CONNECTIVITY_SDK_DATA
+                                .setDeviceId(deviceId)
+                        )
+                )
+                .build();
+    }
+
+    @Nullable
+    static ClientTokenResponse getClientTokenResponse(@NonNull ClientTokenRequest request) {
+        if (request.getRequestType() == ClientTokenRequestType.REQUEST_CLIENT_DATA_REQUEST) {
+            Logger.printInfo(() -> "Requesting iOS client token");
+            String deviceId = request.getClientData().getConnectivitySdkData().getDeviceId();
+            request = newIOSClientTokenRequest(deviceId);
+        }
+
+        ClientTokenResponse response;
+        try {
+            response = requestClientToken(request);
+        } catch (IOException ex) {
+            Logger.printException(() -> "Failed to handle request", ex);
+            return null;
+        }
+
+        return response;
+    }
+
+    @NonNull
+    private static ClientTokenResponse requestClientToken(@NonNull ClientTokenRequest request) throws IOException {
+        HttpURLConnection urlConnection = (HttpURLConnection) new URL(CLIENT_TOKEN_API_URL).openConnection();
+        urlConnection.setRequestMethod("POST");
+        urlConnection.setDoOutput(true);
+        urlConnection.setRequestProperty("Content-Type", "application/x-protobuf");
+        urlConnection.setRequestProperty("Accept", "application/x-protobuf");
+        urlConnection.setRequestProperty("User-Agent", IOS_USER_AGENT);
+
+        byte[] requestArray = request.toByteArray();
+        urlConnection.setFixedLengthStreamingMode(requestArray.length);
+        urlConnection.getOutputStream().write(requestArray);
+
+        try (InputStream inputStream = urlConnection.getInputStream()) {
+            return ClientTokenResponse.parseFrom(inputStream);
+        }
+    }
+
+    @Nullable
+    static ClientTokenResponse serveClientTokenRequest(@NonNull InputStream inputStream) {
+        ClientTokenRequest request;
+        try {
+            request = ClientTokenRequest.parseFrom(inputStream);
+        } catch (IOException ex) {
+            Logger.printException(() -> "Failed to parse request from input stream", ex);
+            return null;
+        }
+        Logger.printInfo(() -> "Request of type: " + request.getRequestType());
+
+        ClientTokenResponse response = getClientTokenResponse(request);
+        if (response != null) Logger.printInfo(() -> "Response of type: " + response.getResponseType());
+
+        return response;
+    }
+}

extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/fix/Constants.java

@@ -0,0 +1,26 @@
+package app.revanced.extension.spotify.misc.fix;
+
+import androidx.annotation.NonNull;
+
+class Constants {
+    static final String CLIENT_TOKEN_API_PATH = "/v1/clienttoken";
+    static final String CLIENT_TOKEN_API_URL = "https://clienttoken.spotify.com" + CLIENT_TOKEN_API_PATH;
+
+    // Modified by a patch. Do not touch.
+    @NonNull
+    static String getClientVersion() {
+        return "";
+    }
+
+    // Modified by a patch. Do not touch.
+    @NonNull
+    static String getSystemVersion() {
+        return "";
+    }
+
+    // Modified by a patch. Do not touch.
+    @NonNull
+    static String getHardwareMachine() {
+        return "";
+    }
+}

extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/fix/LoginRequestListener.java

@@ -1,158 +0,0 @@
-package app.revanced.extension.spotify.misc.fix;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import app.revanced.extension.shared.Logger;
-import app.revanced.extension.spotify.login5.v4.proto.Login5.*;
-import com.google.protobuf.ByteString;
-import com.google.protobuf.MessageLite;
-import fi.iki.elonen.NanoHTTPD;
-
-import java.io.ByteArrayInputStream;
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Objects;
-
-import static app.revanced.extension.spotify.misc.fix.Session.FAILED_TO_RENEW_SESSION;
-import static fi.iki.elonen.NanoHTTPD.Response.Status.INTERNAL_ERROR;
-
-class LoginRequestListener extends NanoHTTPD {
-    LoginRequestListener(int port) {
-        super(port);
-
-        try {
-            start();
-        } catch (IOException ex) {
-            Logger.printException(() -> "Failed to start login request listener on port " + port, ex);
-            throw new RuntimeException(ex);
-        }
-    }
-
-    @NonNull
-    @Override
-    public Response serve(IHTTPSession request) {
-        Logger.printInfo(() -> "Serving request for URI: " + request.getUri());
-
-        InputStream requestBodyInputStream = getRequestBodyInputStream(request);
-
-        LoginRequest loginRequest;
-        try {
-            loginRequest = LoginRequest.parseFrom(requestBodyInputStream);
-        } catch (IOException ex) {
-            Logger.printException(() -> "Failed to parse LoginRequest", ex);
-            return newResponse(INTERNAL_ERROR);
-        }
-
-        MessageLite loginResponse;
-
-        // A request may be made concurrently by Spotify,
-        // however a webview can only handle one request at a time due to singleton cookie manager.
-        // Therefore, synchronize to ensure that only one webview handles the request at a time.
-        synchronized (this) {
-            try {
-                loginResponse = getLoginResponse(loginRequest);
-            } catch (Exception ex) {
-                Logger.printException(() -> "Failed to get login response", ex);
-                return newResponse(INTERNAL_ERROR);
-            }
-        }
-
-        return newResponse(Response.Status.OK, loginResponse);
-    }
-
-
-    private static LoginResponse getLoginResponse(@NonNull LoginRequest loginRequest) {
-        Session session;
-
-        if (!loginRequest.hasStoredCredential()) {
-            Logger.printInfo(() -> "Received request for initial login");
-            session = WebApp.currentSession; // Session obtained from WebApp.launchLogin, can be null if still in progress.
-        } else {
-            Logger.printInfo(() -> "Received request to restore saved session");
-            session = Session.read(loginRequest.getStoredCredential().getUsername());
-        }
-
-        return toLoginResponse(session);
-    }
-
-    private static LoginResponse toLoginResponse(@Nullable Session session) {
-        LoginResponse.Builder builder = LoginResponse.newBuilder();
-
-        if (session == null) {
-            Logger.printException(() -> "Session is null. An initial login may still be in progress, returning try again later error");
-            builder.setError(LoginError.TRY_AGAIN_LATER);
-        } else if (session.accessTokenExpired()) {
-            Logger.printInfo(() -> "Access token expired, renewing session");
-            WebApp.renewSessionBlocking(session.cookies);
-            return toLoginResponse(WebApp.currentSession);
-        } else if (session.username == null) {
-            Logger.printException(() -> "Session username is null, likely caused by invalid cookies, returning invalid credentials error");
-            session.delete();
-            builder.setError(LoginError.INVALID_CREDENTIALS);
-        } else if (session == FAILED_TO_RENEW_SESSION) {
-            Logger.printException(() -> "Failed to renew session, likely caused by a timeout, returning try again later error");
-            builder.setError(LoginError.TRY_AGAIN_LATER);
-        } else {
-            session.save();
-            Logger.printInfo(() -> "Returning session for username: " + session.username);
-            builder.setOk(LoginOk.newBuilder()
-                    .setUsername(session.username)
-                    .setAccessToken(session.accessToken)
-                    .setStoredCredential(ByteString.fromHex("00")) // Placeholder, as it cannot be null or empty.
-                    .setAccessTokenExpiresIn(session.accessTokenExpiresInSeconds())
-                    .build());
-        }
-
-        return builder.build();
-    }
-
-    @NonNull
-    private static InputStream limitedInputStream(InputStream inputStream, long contentLength) {
-        return new FilterInputStream(inputStream) {
-            private long remaining = contentLength;
-
-            @Override
-            public int read() throws IOException {
-                if (remaining <= 0) return -1;
-                int result = super.read();
-                if (result != -1) remaining--;
-                return result;
-            }
-
-            @Override
-            public int read(byte[] b, int off, int len) throws IOException {
-                if (remaining <= 0) return -1;
-                len = (int) Math.min(len, remaining);
-                int result = super.read(b, off, len);
-                if (result != -1) remaining -= result;
-                return result;
-            }
-        };
-    }
-
-    @NonNull
-    private static InputStream getRequestBodyInputStream(@NonNull IHTTPSession request) {
-        long requestContentLength =
-                Long.parseLong(Objects.requireNonNull(request.getHeaders().get("content-length")));
-        return limitedInputStream(request.getInputStream(), requestContentLength);
-    }
-
-
-    @SuppressWarnings("SameParameterValue")
-    @NonNull
-    private static Response newResponse(Response.Status status) {
-        return newResponse(status, null);
-    }
-
-    @NonNull
-    private static Response newResponse(Response.IStatus status, MessageLite messageLite) {
-        if (messageLite == null) {
-            return newFixedLengthResponse(status, "application/x-protobuf", null);
-        }
-
-        byte[] messageBytes = messageLite.toByteArray();
-        InputStream stream = new ByteArrayInputStream(messageBytes);
-        return newFixedLengthResponse(status, "application/x-protobuf", stream, messageBytes.length);
-    }
-}

extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/fix/RequestListener.java

@@ -0,0 +1,94 @@
+package app.revanced.extension.spotify.misc.fix;
+
+import androidx.annotation.NonNull;
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.spotify.misc.fix.clienttoken.data.v0.ClienttokenHttp.ClientTokenResponse;
+import com.google.protobuf.MessageLite;
+import fi.iki.elonen.NanoHTTPD;
+
+import java.io.ByteArrayInputStream;
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Objects;
+
+import static app.revanced.extension.spotify.misc.fix.ClientTokenService.serveClientTokenRequest;
+import static app.revanced.extension.spotify.misc.fix.Constants.CLIENT_TOKEN_API_PATH;
+import static fi.iki.elonen.NanoHTTPD.Response.Status.INTERNAL_ERROR;
+
+class RequestListener extends NanoHTTPD {
+    RequestListener(int port) {
+        super(port);
+
+        try {
+            start();
+        } catch (IOException ex) {
+            Logger.printException(() -> "Failed to start request listener on port " + port, ex);
+            throw new RuntimeException(ex);
+        }
+    }
+
+    @NonNull
+    @Override
+    public Response serve(@NonNull IHTTPSession session) {
+        String uri = session.getUri();
+        if (!uri.equals(CLIENT_TOKEN_API_PATH)) return INTERNAL_ERROR_RESPONSE;
+
+        Logger.printInfo(() -> "Serving request for URI: " + uri);
+
+        ClientTokenResponse response = serveClientTokenRequest(getInputStream(session));
+        if (response != null) return newResponse(Response.Status.OK, response);
+
+        Logger.printException(() -> "Failed to serve client token request");
+        return INTERNAL_ERROR_RESPONSE;
+    }
+
+    @NonNull
+    private static InputStream newLimitedInputStream(InputStream inputStream, long contentLength) {
+        return new FilterInputStream(inputStream) {
+            private long remaining = contentLength;
+
+            @Override
+            public int read() throws IOException {
+                if (remaining <= 0) return -1;
+                int result = super.read();
+                if (result != -1) remaining--;
+                return result;
+            }
+
+            @Override
+            public int read(byte[] b, int off, int len) throws IOException {
+                if (remaining <= 0) return -1;
+                len = (int) Math.min(len, remaining);
+                int result = super.read(b, off, len);
+                if (result != -1) remaining -= result;
+                return result;
+            }
+        };
+    }
+
+    @NonNull
+    private static InputStream getInputStream(@NonNull IHTTPSession session) {
+        long requestContentLength = Long.parseLong(Objects.requireNonNull(session.getHeaders().get("content-length")));
+        return newLimitedInputStream(session.getInputStream(), requestContentLength);
+    }
+
+    private static final Response INTERNAL_ERROR_RESPONSE = newResponse(INTERNAL_ERROR);
+
+    @SuppressWarnings("SameParameterValue")
+    @NonNull
+    private static Response newResponse(Response.Status status) {
+        return newResponse(status, null);
+    }
+
+    @NonNull
+    private static Response newResponse(Response.IStatus status, MessageLite messageLite) {
+        if (messageLite == null) {
+            return newFixedLengthResponse(status, "application/x-protobuf", null);
+        }
+
+        byte[] messageBytes = messageLite.toByteArray();
+        InputStream stream = new ByteArrayInputStream(messageBytes);
+        return newFixedLengthResponse(status, "application/x-protobuf", stream, messageBytes.length);
+    }
+}

extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/fix/Session.java

@@ -1,136 +0,0 @@
-package app.revanced.extension.spotify.misc.fix;
-
-import android.content.SharedPreferences;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import app.revanced.extension.shared.Logger;
-import app.revanced.extension.shared.Utils;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import static android.content.Context.MODE_PRIVATE;
-
-class Session {
-    /**
-     * Username of the account. Null if this session does not have an authenticated user.
-     */
-    @Nullable
-    final String username;
-    /**
-     * Access token for this session.
-     */
-    final String accessToken;
-    /**
-     * Session expiration timestamp in milliseconds.
-     */
-    final Long expirationTime;
-    /**
-     * Authentication cookies for this session.
-     */
-    final String cookies;
-
-    /**
-     * Session that represents a failed attempt to renew the session.
-     */
-    static final Session FAILED_TO_RENEW_SESSION = new Session("", "", "");
-
-    /**
-     * @param username    Username of the account. Empty if this session does not have an authenticated user.
-     * @param accessToken Access token for this session.
-     * @param cookies     Authentication cookies for this session.
-     */
-    Session(@Nullable String username, String accessToken, String cookies) {
-        this(username, accessToken, System.currentTimeMillis() + 60 * 60 * 1000, cookies);
-    }
-
-    private Session(@Nullable String username, String accessToken, long expirationTime, String cookies) {
-        this.username = username;
-        this.accessToken = accessToken;
-        this.expirationTime = expirationTime;
-        this.cookies = cookies;
-    }
-
-    /**
-     * @return The number of milliseconds until the access token expires.
-     */
-    long accessTokenExpiresInMillis() {
-        long currentTime = System.currentTimeMillis();
-        return expirationTime - currentTime;
-    }
-
-    /**
-     * @return The number of seconds until the access token expires.
-     */
-    int accessTokenExpiresInSeconds() {
-        return (int) accessTokenExpiresInMillis() / 1000;
-    }
-
-    /**
-     * @return True if the access token has expired, false otherwise.
-     */
-    boolean accessTokenExpired() {
-        return accessTokenExpiresInMillis() <= 0;
-    }
-
-    void save() {
-        Logger.printInfo(() -> "Saving session: " + this);
-
-        SharedPreferences.Editor editor = Utils.getContext().getSharedPreferences("revanced", MODE_PRIVATE).edit();
-
-        String json;
-        try {
-            json = new JSONObject()
-                    .put("accessToken", accessToken)
-                    .put("expirationTime", expirationTime)
-                    .put("cookies", cookies).toString();
-        } catch (JSONException ex) {
-            Logger.printException(() -> "Failed to convert session to stored credential", ex);
-            return;
-        }
-
-        editor.putString("session_" + username, json);
-        editor.apply();
-    }
-
-    void delete() {
-        Logger.printInfo(() -> "Deleting saved session for username: " + username);
-        SharedPreferences.Editor editor = Utils.getContext().getSharedPreferences("revanced", MODE_PRIVATE).edit();
-        editor.remove("session_" + username);
-        editor.apply();
-    }
-
-    @Nullable
-    static Session read(String username) {
-        Logger.printInfo(() -> "Reading saved session for username: " + username);
-
-        SharedPreferences sharedPreferences = Utils.getContext().getSharedPreferences("revanced", MODE_PRIVATE);
-        String savedJson = sharedPreferences.getString("session_" + username, null);
-        if (savedJson == null) {
-            Logger.printInfo(() -> "No session found in shared preferences");
-            return null;
-        }
-
-        try {
-            JSONObject json = new JSONObject(savedJson);
-            String accessToken = json.getString("accessToken");
-            long expirationTime = json.getLong("expirationTime");
-            String cookies = json.getString("cookies");
-
-            return new Session(username, accessToken, expirationTime, cookies);
-        } catch (JSONException ex) {
-            Logger.printException(() -> "Failed to read session from shared preferences", ex);
-            return null;
-        }
-    }
-
-    @NonNull
-    @Override
-    public String toString() {
-        return "Session(" +
-                "username=" + username +
-                ", accessToken=" + accessToken +
-                ", expirationTime=" + expirationTime +
-                ", cookies=" + cookies +
-                ')';
-    }
-}

extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/fix/SpoofClientPatch.java

@@ -1,19 +1,15 @@
 package app.revanced.extension.spotify.misc.fix;
 
-import android.view.LayoutInflater;
-import android.view.View;
 import app.revanced.extension.shared.Logger;
 
 @SuppressWarnings("unused")
 public class SpoofClientPatch {
-    private static LoginRequestListener listener;
+    private static RequestListener listener;
 
     /**
-     * Injection point.
-     * <br>
-     * Launch login server.
+     * Injection point. Launch requests listener server.
      */
-    public static void launchListener(int port) {
+    public synchronized static void launchListener(int port) {
         if (listener != null) {
             Logger.printInfo(() -> "Listener already running on port " + port);
             return;
@@ -21,34 +17,9 @@ public class SpoofClientPatch {
 
         try {
             Logger.printInfo(() -> "Launching listener on port " + port);
-            listener = new LoginRequestListener(port);
+            listener = new RequestListener(port);
         } catch (Exception ex) {
             Logger.printException(() -> "launchListener failure", ex);
         }
     }
-
-    /**
-     * Injection point.
-     * <br>
-     * Launch login web view.
-     */
-    public static void launchLogin(LayoutInflater inflater) {
-        try {
-            WebApp.launchLogin(inflater.getContext());
-        } catch (Exception ex) {
-            Logger.printException(() -> "launchLogin failure", ex);
-        }
-    }
-
-    /**
-     * Injection point.
-     * <br>
-     * Set handler to call the native login after the webview login.
-     */
-    public static void setNativeLoginHandler(View startLoginButton) {
-        WebApp.nativeLoginHandler = (() -> {
-            startLoginButton.setSoundEffectsEnabled(false);
-            startLoginButton.performClick();
-        });
-    }
 }

extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/fix/WebApp.java

@@ -1,297 +0,0 @@
-package app.revanced.extension.spotify.misc.fix;
-
-import android.annotation.SuppressLint;
-import android.app.Dialog;
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.os.Build;
-import android.view.Window;
-import android.view.WindowInsets;
-import android.webkit.*;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import app.revanced.extension.shared.Logger;
-import app.revanced.extension.shared.Utils;
-import app.revanced.extension.spotify.UserAgent;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import static app.revanced.extension.spotify.misc.fix.Session.FAILED_TO_RENEW_SESSION;
-
-class WebApp {
-    private static final String OPEN_SPOTIFY_COM = "open.spotify.com";
-    private static final String OPEN_SPOTIFY_COM_URL = "https://" + OPEN_SPOTIFY_COM;
-    private static final String OPEN_SPOTIFY_COM_PREFERENCES_URL = OPEN_SPOTIFY_COM_URL + "/preferences";
-    private static final String ACCOUNTS_SPOTIFY_COM_LOGIN_URL = "https://accounts.spotify.com/login?allow_password=1"
-            + "&continue=https%3A%2F%2Fopen.spotify.com%2Fpreferences";
-
-    private static final int GET_SESSION_TIMEOUT_SECONDS = 10;
-    private static final String JAVASCRIPT_INTERFACE_NAME = "androidInterface";
-    private static final String USER_AGENT = getWebUserAgent();
-
-    /**
-     * A session obtained from the webview after logging in.
-     */
-    @Nullable
-    static volatile Session currentSession = null;
-
-    /**
-     * Current webview in use. Any use of the object must be done on the main thread.
-     */
-    @SuppressLint("StaticFieldLeak")
-    private static volatile WebView currentWebView;
-
-    interface NativeLoginHandler {
-        void login();
-    }
-
-    static NativeLoginHandler nativeLoginHandler;
-
-    static void launchLogin(Context context) {
-        final Dialog dialog = newDialog(context);
-
-        Utils.runOnBackgroundThread(() -> {
-            Logger.printInfo(() -> "Launching login");
-
-            // A session must be obtained from a login. Repeat until a session is acquired.
-            boolean isAcquired = false;
-            do {
-                CountDownLatch onLoggedInLatch = new CountDownLatch(1);
-                CountDownLatch getSessionLatch = new CountDownLatch(1);
-
-                // Can't use Utils.getContext() here, because autofill won't work.
-                // See https://stackoverflow.com/a/79182053/11213244.
-                launchWebView(context, ACCOUNTS_SPOTIFY_COM_LOGIN_URL, new WebViewCallback() {
-                    @Override
-                    void onInitialized(WebView webView) {
-                        super.onInitialized(webView);
-
-                        dialog.setContentView(webView);
-                        dialog.show();
-                    }
-
-                    @Override
-                    void onLoggedIn(String cookies) {
-                        onLoggedInLatch.countDown();
-                    }
-
-                    @Override
-                    void onReceivedSession(Session session) {
-                        super.onReceivedSession(session);
-
-                        getSessionLatch.countDown();
-                        dialog.dismiss();
-
-                        try {
-                            nativeLoginHandler.login();
-                        } catch (Exception ex) {
-                            Logger.printException(() -> "nativeLoginHandler failure", ex);
-                        }
-                    }
-                });
-
-                try {
-                    // Wait indefinitely until the user logs in.
-                    onLoggedInLatch.await();
-                    // Wait until the session is received, or timeout.
-                    isAcquired = getSessionLatch.await(GET_SESSION_TIMEOUT_SECONDS, TimeUnit.SECONDS);
-                } catch (InterruptedException ex) {
-                    Logger.printException(() -> "Login interrupted", ex);
-                    Thread.currentThread().interrupt();
-                }
-            } while (!isAcquired);
-        });
-    }
-
-    static void renewSessionBlocking(String cookies) {
-        Logger.printInfo(() -> "Renewing session with cookies: " + cookies);
-
-        CountDownLatch getSessionLatch = new CountDownLatch(1);
-
-        launchWebView(Utils.getContext(), OPEN_SPOTIFY_COM_PREFERENCES_URL, new WebViewCallback() {
-            @Override
-            public void onInitialized(WebView webView) {
-                setCookies(cookies);
-                super.onInitialized(webView);
-            }
-
-            public void onReceivedSession(Session session) {
-                super.onReceivedSession(session);
-                getSessionLatch.countDown();
-            }
-        });
-
-        boolean isAcquired = false;
-        try {
-            isAcquired = getSessionLatch.await(GET_SESSION_TIMEOUT_SECONDS, TimeUnit.SECONDS);
-        } catch (InterruptedException ex) {
-            Logger.printException(() -> "Session renewal interrupted", ex);
-            Thread.currentThread().interrupt();
-        }
-
-        if (!isAcquired) {
-            Logger.printException(() -> "Failed to retrieve session within " + GET_SESSION_TIMEOUT_SECONDS + " seconds");
-            currentSession = FAILED_TO_RENEW_SESSION;
-            destructWebView();
-        }
-    }
-
-    /**
-     * All methods are called on the main thread.
-     */
-    abstract static class WebViewCallback {
-        void onInitialized(WebView webView) {
-            currentWebView = webView;
-            currentSession = null; // Reset current session.
-        }
-
-        void onLoggedIn(String cookies) {
-        }
-
-        void onReceivedSession(Session session) {
-            Logger.printInfo(() -> "Received session: " + session);
-            currentSession = session;
-
-            destructWebView();
-        }
-    }
-
-    @SuppressLint("SetJavaScriptEnabled")
-    private static void launchWebView(
-            Context context,
-            String initialUrl,
-            WebViewCallback webViewCallback
-    ) {
-        Utils.runOnMainThreadNowOrLater(() -> {
-            WebView webView = new WebView(context);
-            WebSettings settings = webView.getSettings();
-            settings.setDomStorageEnabled(true);
-            settings.setJavaScriptEnabled(true);
-            settings.setUserAgentString(USER_AGENT);
-
-            // WebViewClient is always called off the main thread,
-            // but callback interface methods are called on the main thread.
-            webView.setWebViewClient(new WebViewClient() {
-                @Override
-                public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) {
-                    if (OPEN_SPOTIFY_COM.equals(request.getUrl().getHost())) {
-                        Utils.runOnMainThread(() -> webViewCallback.onLoggedIn(getCurrentCookies()));
-                    }
-
-                    return super.shouldInterceptRequest(view, request);
-                }
-
-                @Override
-                public void onPageStarted(WebView view, String url, Bitmap favicon) {
-                    Logger.printInfo(() -> "Page started loading: " + url);
-
-                    if (!url.startsWith(OPEN_SPOTIFY_COM_URL)) {
-                        return;
-                    }
-
-                    Logger.printInfo(() -> "Evaluating script to get session on url: " + url);
-                    String getSessionScript = "Object.defineProperty(Object.prototype, \"_username\", {" +
-                            "   configurable: true," +
-                            "   set(username) {" +
-                            "       accessToken = this._builder?.accessToken;" +
-                            "       if (accessToken) {" +
-                            "           " + JAVASCRIPT_INTERFACE_NAME + ".getSession(username, accessToken);" +
-                            "           delete Object.prototype._username;" +
-                            "       }" +
-                            "       " +
-                            "       Object.defineProperty(this, \"_username\", {" +
-                            "           configurable: true," +
-                            "           enumerable: true," +
-                            "           writable: true," +
-                            "           value: username" +
-                            "       })" +
-                            "       " +
-                            "   }" +
-                            "});" +
-                            "if (new URLSearchParams(window.location.search).get('_authfailed') != null) {" +
-                            "   " + JAVASCRIPT_INTERFACE_NAME + ".getSession(null, null);" +
-                            "}";
-
-                    view.evaluateJavascript(getSessionScript, null);
-                }
-            });
-
-            webView.addJavascriptInterface(new Object() {
-                @SuppressWarnings("unused")
-                @JavascriptInterface
-                public void getSession(String username, String accessToken) {
-                    Session session = new Session(username, accessToken, getCurrentCookies());
-                    Utils.runOnMainThread(() -> webViewCallback.onReceivedSession(session));
-                }
-            }, JAVASCRIPT_INTERFACE_NAME);
-
-            CookieManager.getInstance().removeAllCookies((anyRemoved) -> {
-                Logger.printInfo(() -> "Loading URL: " + initialUrl);
-                webView.loadUrl(initialUrl);
-
-                Logger.printInfo(() -> "WebView initialized with user agent: " + USER_AGENT);
-                webViewCallback.onInitialized(webView);
-            });
-        });
-    }
-
-    private static void destructWebView() {
-        Utils.runOnMainThreadNowOrLater(() -> {
-            currentWebView.stopLoading();
-            currentWebView.destroy();
-            currentWebView = null;
-        });
-    }
-
-    private static String getWebUserAgent() {
-        String userAgentString = WebSettings.getDefaultUserAgent(Utils.getContext());
-        try {
-            return new UserAgent(userAgentString)
-                    .withCommentReplaced("Android", "Windows NT 10.0; Win64; x64")
-                    .withoutProduct("Mobile")
-                    .toString();
-        } catch (IllegalArgumentException ex) {
-            userAgentString = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) " +
-                    "AppleWebKit/537.36 (KHTML, like Gecko) Chrome/137.0.0.0 Safari/537.36 Edge/137.0.0.0";
-            String fallback = userAgentString;
-            Logger.printException(() -> "Failed to get user agent, falling back to " + fallback, ex);
-        }
-
-        return userAgentString;
-    }
-
-    @NonNull
-    private static Dialog newDialog(Context context) {
-        Dialog dialog = new Dialog(context, android.R.style.Theme_Black_NoTitleBar_Fullscreen);
-        dialog.setCancelable(false);
-
-        // Ensure that the keyboard does not cover the webview content.
-        Window window = dialog.getWindow();
-        //noinspection StatementWithEmptyBody
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            window.getDecorView().setOnApplyWindowInsetsListener((v, insets) -> {
-                v.setPadding(0, 0, 0, insets.getInsets(WindowInsets.Type.ime()).bottom);
-
-                return WindowInsets.CONSUMED;
-            });
-        } else {
-            // TODO: Implement for lower Android versions.
-        }
-        return dialog;
-    }
-
-    private static String getCurrentCookies() {
-        CookieManager cookieManager = CookieManager.getInstance();
-        return cookieManager.getCookie(OPEN_SPOTIFY_COM_URL);
-    }
-
-    private static void setCookies(@NonNull String cookies) {
-        CookieManager cookieManager = CookieManager.getInstance();
-
-        String[] cookiesList = cookies.split(";");
-        for (String cookie : cookiesList) {
-            cookieManager.setCookie(OPEN_SPOTIFY_COM_URL, cookie);
-        }
-    }
-}

extensions/spotify/src/main/proto/app/revanced/extension/spotify/misc/fix/clienttoken_http.proto

@@ -0,0 +1,73 @@
+syntax = "proto3";
+
+package spotify.clienttoken.data.v0;
+
+option optimize_for = LITE_RUNTIME;
+option java_package = "app.revanced.extension.spotify.misc.fix.clienttoken.data.v0";
+
+message ClientTokenRequest {
+    ClientTokenRequestType request_type = 1;
+
+    oneof request {
+        ClientDataRequest client_data = 2;
+    }
+}
+
+enum ClientTokenRequestType {
+    REQUEST_UNKNOWN = 0;
+    REQUEST_CLIENT_DATA_REQUEST = 1;
+    REQUEST_CHALLENGE_ANSWERS_REQUEST = 2;
+}
+
+message ClientDataRequest {
+    string client_version = 1;
+    string client_id = 2;
+
+    oneof data {
+        ConnectivitySdkData connectivity_sdk_data = 3;
+    }
+}
+
+message ConnectivitySdkData {
+    PlatformSpecificData platform_specific_data = 1;
+    string device_id = 2;
+}
+
+message PlatformSpecificData {
+    oneof data {
+        NativeIOSData ios = 2;
+    }
+}
+
+message NativeIOSData {
+    int32 user_interface_idiom = 1;
+    bool target_iphone_simulator = 2;
+    string hw_machine = 3;
+    string system_version = 4;
+    string simulator_model_identifier = 5;
+}
+
+message ClientTokenResponse {
+    ClientTokenResponseType response_type = 1;
+
+    oneof response {
+        GrantedTokenResponse granted_token = 2;
+    }
+}
+
+enum ClientTokenResponseType {
+    RESPONSE_UNKNOWN = 0;
+    RESPONSE_GRANTED_TOKEN_RESPONSE = 1;
+    RESPONSE_CHALLENGES_RESPONSE = 2;
+}
+
+message GrantedTokenResponse {
+    string token = 1;
+    int32 expires_after_seconds = 2;
+    int32 refresh_after_seconds = 3;
+    repeated TokenDomain domains = 4;
+}
+
+message TokenDomain {
+    string domain = 1;
+}

extensions/spotify/src/main/proto/login5.proto

@@ -1,43 +0,0 @@
-syntax = "proto3";
-
-package spotify.login5.v4;
-
-option optimize_for = LITE_RUNTIME;
-option java_package = "app.revanced.extension.spotify.login5.v4.proto";
-
-message StoredCredential {
-    string username = 1;
-    bytes data = 2;
-}
-
-message LoginRequest {
-    oneof login_method {
-        StoredCredential stored_credential = 100;
-    }
-}
-
-message LoginOk {
-    string username = 1;
-    string access_token = 2;
-    bytes stored_credential = 3;
-    int32 access_token_expires_in = 4;
-}
-
-message LoginResponse {
-    oneof response {
-        LoginOk ok = 1;
-        LoginError error = 2;
-    }
-}
-
-enum LoginError {
-    UNKNOWN_ERROR = 0;
-    INVALID_CREDENTIALS = 1;
-    BAD_REQUEST = 2;
-    UNSUPPORTED_LOGIN_PROTOCOL = 3;
-    TIMEOUT = 4;
-    UNKNOWN_IDENTIFIER = 5;
-    TOO_MANY_ATTEMPTS = 6;
-    INVALID_PHONENUMBER = 7;
-    TRY_AGAIN_LATER = 8;
-}

extensions/spotify/stub/src/main/java/com/spotify/useraccount/v1/AccountAttribute.java

@@ -1,8 +0,0 @@
-package com.spotify.useraccount.v1;
-
-/**
- * Used for target 8.6.98.900. Class is still present in newer app targets.
- */
-public class AccountAttribute {
-    public Object value_;
-}

extensions/spotify/utils/build.gradle.kts

@@ -1,19 +0,0 @@
-plugins {
-    java
-    antlr
-}
-
-dependencies {
-    antlr(libs.antlr4)
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}
-
-tasks {
-    generateGrammarSource {
-        arguments = listOf("-visitor")
-    }
-}

extensions/spotify/utils/src/main/antlr/app/revanced/extension/spotify/UserAgent.g4

@@ -1,35 +0,0 @@
-grammar UserAgent;
-
-@header { package app.revanced.extension.spotify; }
-
-userAgent
-    : product (WS product)* EOF
-    ;
-
-product
-    : name ('/' version)? (WS comment)?
-    ;
-
-name
-    : STRING
-    ;
-
-version
-    : STRING ('.' STRING)*
-    ;
-
-comment
-    : COMMENT
-    ;
-
-COMMENT
-    : '(' ~ ')'* ')'
-    ;
-
-STRING
-    : [a-zA-Z0-9]+
-    ;
-
-WS
-    : [ \r\n]+
-    ;

extensions/spotify/utils/src/main/java/app/revanced/extension/spotify/UserAgent.java

@@ -1,60 +0,0 @@
-package app.revanced.extension.spotify;
-
-import org.antlr.v4.runtime.CharStream;
-import org.antlr.v4.runtime.CharStreams;
-import org.antlr.v4.runtime.CommonTokenStream;
-import org.antlr.v4.runtime.TokenStreamRewriter;
-import org.antlr.v4.runtime.tree.ParseTreeWalker;
-
-public class UserAgent {
-    private final UserAgentParser.UserAgentContext tree;
-    private final TokenStreamRewriter rewriter;
-    private final ParseTreeWalker walker;
-
-    public UserAgent(String userAgentString) {
-        CharStream input = CharStreams.fromString(userAgentString);
-        UserAgentLexer lexer = new UserAgentLexer(input);
-        CommonTokenStream tokens = new CommonTokenStream(lexer);
-
-        tree = new UserAgentParser(tokens).userAgent();
-        walker = new ParseTreeWalker();
-        rewriter = new TokenStreamRewriter(tokens);
-    }
-
-    public UserAgent withoutProduct(String name) {
-        walker.walk(new UserAgentBaseListener() {
-            @Override
-            public void exitProduct(UserAgentParser.ProductContext ctx) {
-                if (!ctx.name().getText().contains(name)) return;
-
-                int startIndex = ctx.getStart().getTokenIndex();
-                if (startIndex != 0) startIndex -= 1; // Also remove the preceding whitespace.
-
-                int stopIndex = ctx.getStop().getTokenIndex();
-
-                
-                rewriter.delete(startIndex, stopIndex);
-            }
-        }, tree);
-
-        return new UserAgent(rewriter.getText().trim());
-    }
-
-    public UserAgent withCommentReplaced(String containing, String replacement) {
-        walker.walk(new UserAgentBaseListener() {
-            @Override
-            public void exitComment(UserAgentParser.CommentContext ctx) {
-                if (ctx.getText().contains(containing)) {
-                    rewriter.replace(ctx.getStart(), ctx.getStop(), "(" + replacement + ")");
-                }
-            }
-        }, tree);
-
-        return new UserAgent(rewriter.getText());
-    }
-
-    @Override
-    public String toString() {
-        return rewriter.getText();
-    }
-}

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

@@ -0,0 +1,101 @@
+package app.revanced.extension.youtube.patches;
+
+import android.graphics.drawable.Drawable;
+
+import androidx.annotation.Nullable;
+
+import java.util.Objects;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.youtube.settings.Settings;
+
+@SuppressWarnings("unused")
+public class ChangeHeaderPatch {
+
+    public enum HeaderLogo {
+        DEFAULT(null, null),
+        REGULAR("ytWordmarkHeader", "yt_ringo2_wordmark_header"),
+        PREMIUM("ytPremiumWordmarkHeader", "yt_ringo2_premium_wordmark_header"),
+        REVANCED("revanced_header_logo", "revanced_header_logo"),
+        REVANCED_MINIMAL("revanced_header_logo_minimal", "revanced_header_logo_minimal"),
+        CUSTOM("custom_header", "custom_header");
+
+        @Nullable
+        private final String attributeName;
+        @Nullable
+        private final String drawableName;
+
+        HeaderLogo(@Nullable String attributeName, @Nullable String drawableName) {
+            this.attributeName = attributeName;
+            this.drawableName = drawableName;
+        }
+
+        /**
+         * @return The attribute id of this header logo, or NULL if the logo should not be replaced.
+         */
+        @Nullable
+        private Integer getAttributeId() {
+            if (attributeName == null) {
+                return null;
+            }
+
+            final int identifier = Utils.getResourceIdentifier(attributeName, "attr");
+            if (identifier == 0) {
+                // Identifier is zero if custom header setting was included in imported settings
+                // and a custom image was not included during patching.
+                Logger.printDebug(() -> "Could not find attribute: " + drawableName);
+                Settings.HEADER_LOGO.resetToDefault();
+                return null;
+            }
+
+            return identifier;
+        }
+
+        @Nullable
+        public Drawable getDrawable() {
+            if (drawableName == null) {
+                return null;
+            }
+
+            String drawableFullName = drawableName + (Utils.isDarkModeEnabled()
+                    ? "_dark"
+                    : "_light");
+
+            final int identifier = Utils.getResourceIdentifier(drawableFullName, "drawable");
+            if (identifier == 0) {
+                Logger.printDebug(() -> "Could not find drawable: " + drawableFullName);
+                Settings.HEADER_LOGO.resetToDefault();
+                return null;
+            }
+            return Utils.getContext().getDrawable(identifier);
+        }
+    }
+
+    /**
+     * Injection point.
+     */
+    public static int getHeaderAttributeId(int original) {
+        return Objects.requireNonNullElse(Settings.HEADER_LOGO.get().getAttributeId(), original);
+    }
+
+    public static Drawable getDrawable(Drawable original) {
+        Drawable logo = Settings.HEADER_LOGO.get().getDrawable();
+        if (logo != null) {
+            return logo;
+        }
+
+        // TODO: If 'Hide Doodles' is enabled, this will force the regular logo regardless
+        //       what account the user has. This can be improved the next time a Doodle is
+        //       active and the attribute id is passed to this method so the correct
+        //       regular/premium logo is returned.
+        logo = HeaderLogo.REGULAR.getDrawable();
+        if (logo != null) {
+            return logo;
+        }
+
+        // Should never happen.
+        Logger.printException(() -> "Could not find regular header logo resource");
+        return original;
+    }
+}

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

@@ -0,0 +1,16 @@
+package app.revanced.extension.youtube.patches;
+
+import app.revanced.extension.youtube.settings.Settings;
+
+@SuppressWarnings("unused")
+public final class DisableDoubleTapActionsPatch {
+
+    /**
+     * Injection point.
+     *
+     * @return If "should skip to chapter start" flag is set.
+     */
+    public static boolean disableDoubleTapChapters(boolean original) {
+        return original && !Settings.DISABLE_CHAPTER_SKIP_DOUBLE_TAP.get();
+    }
+}

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

@@ -1,17 +1,15 @@
 package app.revanced.extension.youtube.patches;
 
+import static app.revanced.extension.youtube.settings.preference.ExternalDownloaderPreference.showDialogIfAppIsNotInstalled;
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageManager;
-
-import androidx.annotation.NonNull;
 
 import java.lang.ref.WeakReference;
 import java.util.Objects;
 
 import app.revanced.extension.shared.Logger;
-import app.revanced.extension.shared.StringRef;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.youtube.settings.Settings;
 
@@ -36,7 +34,7 @@ public final class DownloadsPatch {
      *
      * Appears to always be called from the main thread.
      */
-    public static boolean inAppDownloadButtonOnClick(@NonNull String videoId) {
+    public static boolean inAppDownloadButtonOnClick(String videoId) {
         try {
             if (!Settings.EXTERNAL_DOWNLOADER_ACTION_BUTTON.get()) {
                 return false;
@@ -48,6 +46,9 @@ public final class DownloadsPatch {
             boolean isActivityContext = true;
             if (context == null) {
                 // Utils context is the application context, and not an activity context.
+                //
+                // Edit: This check may no longer be needed since YT can now
+                // only be launched from the main Activity (embedded usage in other apps no longer works).
                 context = Utils.getContext();
                 isActivityContext = false;
             }
@@ -64,8 +65,7 @@ public final class DownloadsPatch {
      * @param isActivityContext If the context parameter is for an Activity.  If this is false, then
      *                          the downloader is opened as a new task (which forces YT to minimize).
      */
-    public static void launchExternalDownloader(@NonNull String videoId,
-                                                @NonNull Context context, boolean isActivityContext) {
+    public static void launchExternalDownloader(String videoId, Context context, boolean isActivityContext) {
         try {
             Objects.requireNonNull(videoId);
             Logger.printDebug(() -> "Launching external downloader with context: " + context);
@@ -73,16 +73,8 @@ public final class DownloadsPatch {
             // Trim string to avoid any accidental whitespace.
             var downloaderPackageName = Settings.EXTERNAL_DOWNLOADER_PACKAGE_NAME.get().trim();
 
-            boolean packageEnabled = false;
-            try {
-                packageEnabled = context.getPackageManager().getApplicationInfo(downloaderPackageName, 0).enabled;
-            } catch (PackageManager.NameNotFoundException error) {
-                Logger.printDebug(() -> "External downloader could not be found: " + error);
-            }
-
-            // If the package is not installed, show the toast
-            if (!packageEnabled) {
-                Utils.showToastLong(StringRef.str("revanced_external_downloader_not_installed_warning", downloaderPackageName));
+            // If the package is not installed, show a dialog.
+            if (showDialogIfAppIsNotInstalled(context, downloaderPackageName)) {
                 return;
             }
 

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

@@ -8,6 +8,6 @@ public final class HideRelatedVideoOverlayPatch {
      * Injection point.
      */
     public static boolean hideRelatedVideoOverlay() {
-        return Settings.HIDE_RELATED_VIDEO_OVERLAY.get();
+        return Settings.HIDE_RELATED_VIDEOS_OVERLAY.get();
     }
 }

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

@@ -16,7 +16,7 @@ import java.util.Objects;
 
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
-import app.revanced.extension.youtube.patches.components.ReturnYouTubeDislikeFilterPatch;
+import app.revanced.extension.youtube.patches.components.ReturnYouTubeDislikeFilter;
 import app.revanced.extension.youtube.returnyoutubedislike.ReturnYouTubeDislike;
 import app.revanced.extension.youtube.settings.Settings;
 import app.revanced.extension.youtube.shared.PlayerType;
@@ -55,7 +55,7 @@ public class ReturnYouTubeDislikePatch {
     private static volatile ReturnYouTubeDislike lastLithoShortsVideoData;
 
     /**
-     * Because litho Shorts spans are created offscreen after {@link ReturnYouTubeDislikeFilterPatch}
+     * Because litho Shorts spans are created offscreen after {@link ReturnYouTubeDislikeFilter}
      * detects the video ids, but the current Short can arbitrarily reload the same span,
      * then use the {@link #lastLithoShortsVideoData} if this value is greater than zero.
      */

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/announcements/AnnouncementsPatch.java

@@ -59,10 +59,11 @@ public final class AnnouncementsPatch {
         int id = Settings.ANNOUNCEMENT_LAST_ID.defaultValue;
         try {
             final var announcementIds = new JSONArray(jsonString);
+            if (announcementIds.length() == 0) return true;
+            
             id = announcementIds.getJSONObject(0).getInt("id");
-
         } catch (Throwable ex) {
-            Logger.printException(() -> "Failed to parse announcement IDs", ex);
+            Logger.printException(() -> "Failed to parse announcement ID", ex);
         }
 
         // Do not show the announcement, if the last announcement id is the same as the current one.

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/announcements/requests/AnnouncementsRoutes.java

@@ -10,8 +10,8 @@ import static app.revanced.extension.shared.requests.Route.Method.GET;
 
 public class AnnouncementsRoutes {
     private static final String ANNOUNCEMENTS_PROVIDER = "https://api.revanced.app/v4";
-    public static final Route GET_LATEST_ANNOUNCEMENT_IDS = new Route(GET, "/announcements/latest/id?tag=youtube");
-    public static final Route GET_LATEST_ANNOUNCEMENTS = new Route(GET, "/announcements/latest?tag=youtube");
+    public static final Route GET_LATEST_ANNOUNCEMENT_IDS = new Route(GET, "/announcements/latest/id?tag=\uD83C\uDF9E\uFE0F%20YouTube");
+    public static final Route GET_LATEST_ANNOUNCEMENTS = new Route(GET, "/announcements/latest?tag=\uD83C\uDF9E\uFE0F%20YouTube");
 
     private AnnouncementsRoutes() {
     }

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

@@ -34,10 +34,6 @@ public final class AdsFilter extends Filter {
     private final StringFilterGroup playerShoppingShelf;
     private final ByteArrayFilterGroup playerShoppingShelfBuffer;
 
-    private final StringFilterGroup channelProfile;
-    private final ByteArrayFilterGroup visitStoreButton;
-
-    private final StringFilterGroup shoppingLinks;
 
     public AdsFilter() {
         exceptions.addPatterns(
@@ -91,6 +87,7 @@ public final class AdsFilter extends Filter {
                 "text_image_no_button_layout", // Tablet layout search results.
                 "video_display_button_group_layout",
                 "video_display_carousel_button_group_layout",
+                "video_display_carousel_buttoned_short_dr_layout",
                 "video_display_full_buttoned_short_dr_layout",
                 "video_display_full_layout",
                 "watch_metadata_app_promo"
@@ -113,18 +110,13 @@ public final class AdsFilter extends Filter {
                 "shopping_overlay.eml" // Video player overlay shopping links.
         );
 
-        shoppingLinks = new StringFilterGroup(
-                Settings.HIDE_TAGGED_PRODUCTS,
-                "expandable_list"
-        );
-
-        final var storeProductsShelf = new StringFilterGroup(
-                Settings.HIDE_CREATOR_STORE_SHELVES,
+        final var shoppingLinks = new StringFilterGroup(
+                Settings.HIDE_SHOPPING_LINKS,
                 "shopping_description_shelf.eml"
         );
 
         playerShoppingShelf = new StringFilterGroup(
-                Settings.HIDE_CREATOR_STORE_SHELVES,
+                Settings.HIDE_CREATOR_STORE_SHELF,
                 "horizontal_shelf.eml"
         );
 
@@ -133,17 +125,6 @@ public final class AdsFilter extends Filter {
                 "shopping_item_card_list"
         );
 
-        channelProfile = new StringFilterGroup(
-                Settings.HIDE_VISIT_STORE_BUTTON,
-                "channel_profile.eml",
-                "page_header.eml"
-        );
-
-        visitStoreButton = new ByteArrayFilterGroup(
-                null,
-                "header_store_button"
-        );
-
         final var webLinkPanel = new StringFilterGroup(
                 Settings.HIDE_WEB_SEARCH_RESULTS,
                 "web_link_panel"
@@ -161,7 +142,6 @@ public final class AdsFilter extends Filter {
         );
 
         addPathCallbacks(
-                channelProfile,
                 fullscreenAd,
                 generalAds,
                 merchandise,
@@ -169,7 +149,6 @@ public final class AdsFilter extends Filter {
                 playerShoppingShelf,
                 selfSponsor,
                 shoppingLinks,
-                storeProductsShelf,
                 viewProducts,
                 webLinkPanel
         );
@@ -182,11 +161,6 @@ public final class AdsFilter extends Filter {
             return contentIndex == 0 && playerShoppingShelfBuffer.check(protobufBufferArray).isFiltered();
         }
 
-        // Check for the index because of likelihood of false positives.
-        if (contentIndex != 0 && matchedGroup == shoppingLinks) {
-            return false;
-        }
-
         if (exceptions.matches(path)) {
             return false;
         }
@@ -198,10 +172,6 @@ public final class AdsFilter extends Filter {
             return false;
         }
 
-        if (matchedGroup == channelProfile) {
-            return visitStoreButton.check(protobufBufferArray).isFiltered();
-        }
-
         return true;
     }
 

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

@@ -3,11 +3,12 @@ package app.revanced.extension.youtube.patches.components;
 import androidx.annotation.Nullable;
 
 import app.revanced.extension.youtube.settings.Settings;
+import app.revanced.extension.youtube.shared.PlayerType;
 
 @SuppressWarnings("unused")
 final class CommentsFilter extends Filter {
 
-    private final StringFilterGroup filterChipBar;
+    private final StringFilterGroup chipBar;
     private final ByteArrayFilterGroup aiCommentsSummary;
     
     public CommentsFilter() {
@@ -16,6 +17,21 @@ final class CommentsFilter extends Filter {
                 "live_chat_summary_banner.eml"
         );
 
+        chipBar = new StringFilterGroup(
+                Settings.HIDE_COMMENTS_AI_SUMMARY,
+                "chip_bar.eml"
+        );
+
+        aiCommentsSummary = new ByteArrayFilterGroup(
+                null,
+                "yt_fill_spark_"
+        );
+
+        var channelGuidelines = new StringFilterGroup(
+                Settings.HIDE_COMMENTS_CHANNEL_GUIDELINES,
+                "channel_guidelines_entry_banner"
+        );
+
         var commentsByMembers = new StringFilterGroup(
                 Settings.HIDE_COMMENTS_BY_MEMBERS_HEADER,
                 "sponsorships_comments_header.eml",
@@ -28,6 +44,11 @@ final class CommentsFilter extends Filter {
                 "_comments"
         );
 
+        var communityGuidelines = new StringFilterGroup(
+                Settings.HIDE_COMMENTS_COMMUNITY_GUIDELINES,
+                "community_guidelines"
+        );
+
         var createAShort = new StringFilterGroup(
                 Settings.HIDE_COMMENTS_CREATE_A_SHORT_BUTTON,
                 "composer_short_creation_button.eml"
@@ -50,33 +71,28 @@ final class CommentsFilter extends Filter {
                 "composer_timestamp_button.eml"
         );
 
-        filterChipBar = new StringFilterGroup(
-                Settings.HIDE_COMMENTS_AI_SUMMARY,
-                "chip_bar.eml"
-        );
-
-        aiCommentsSummary = new ByteArrayFilterGroup(
-                null,
-                "yt_fill_spark_"
-        );
-
         addPathCallbacks(
+                channelGuidelines,
                 chatSummary,
+                chipBar,
                 commentsByMembers,
                 comments,
+                communityGuidelines,
                 createAShort,
                 previewComment,
                 thanksButton,
-                timestampButton,
-                filterChipBar
+                timestampButton
+
         );
     }
 
     @Override
     boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
                        StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
-        if (matchedGroup == filterChipBar) {
-            return aiCommentsSummary.check(protobufBufferArray).isFiltered();
+        if (matchedGroup == chipBar) {
+            // Playlist sort button uses same components and must only filter if the player is opened.
+            return PlayerType.getCurrent().isMaximizedOrFullscreen()
+                    && aiCommentsSummary.check(protobufBufferArray).isFiltered();
         }
 
         return true;

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

@@ -3,9 +3,9 @@ package app.revanced.extension.youtube.patches.components;
 import app.revanced.extension.youtube.settings.Settings;
 
 @SuppressWarnings("unused")
-public final class HideInfoCardsFilterPatch extends Filter {
+public final class HideInfoCardsFilter extends Filter {
 
-    public HideInfoCardsFilterPatch() {
+    public HideInfoCardsFilter() {
         addIdentifierCallbacks(
                 new StringFilterGroup(
                         Settings.HIDE_INFO_CARDS,

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

@@ -4,12 +4,14 @@ import static app.revanced.extension.youtube.shared.NavigationBar.NavigationButt
 
 import android.graphics.drawable.Drawable;
 import android.view.View;
+import android.widget.ImageView;
 
 import androidx.annotation.Nullable;
 
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.youtube.StringTrieSearch;
+import app.revanced.extension.youtube.patches.ChangeHeaderPatch;
 import app.revanced.extension.youtube.settings.Settings;
 import app.revanced.extension.youtube.shared.NavigationBar;
 import app.revanced.extension.youtube.shared.PlayerType;
@@ -30,7 +32,7 @@ public final class LayoutComponentsFilter extends Filter {
     );
 
     private final StringTrieSearch exceptions = new StringTrieSearch();
-    private final StringFilterGroup inFeedSurvey;
+    private final StringFilterGroup surveys;
     private final StringFilterGroup notifyMe;
     private final StringFilterGroup singleItemInformationPanel;
     private final StringFilterGroup expandableMetadata;
@@ -40,6 +42,8 @@ public final class LayoutComponentsFilter extends Filter {
     private final StringFilterGroup horizontalShelves;
     private final ByteArrayFilterGroup ticketShelf;
     private final StringFilterGroup chipBar;
+    private final StringFilterGroup channelProfile;
+    private final ByteArrayFilterGroupList channelProfileBuffer;
 
     public LayoutComponentsFilter() {
         exceptions.addPatterns(
@@ -81,18 +85,13 @@ public final class LayoutComponentsFilter extends Filter {
                 "poll_post_responsive_root.eml"
         );
 
-        final var communityGuidelines = new StringFilterGroup(
-                Settings.HIDE_COMMUNITY_GUIDELINES,
-                "community_guidelines"
-        );
-
         final var subscribersCommunityGuidelines = new StringFilterGroup(
                 Settings.HIDE_SUBSCRIBERS_COMMUNITY_GUIDELINES,
                 "sponsorships_comments_upsell"
         );
 
-        final var channelMemberShelf = new StringFilterGroup(
-                Settings.HIDE_CHANNEL_MEMBER_SHELF,
+        final var channelMembersShelf = new StringFilterGroup(
+                Settings.HIDE_MEMBERS_SHELF,
                 "member_recognition_shelf"
         );
 
@@ -111,8 +110,8 @@ public final class LayoutComponentsFilter extends Filter {
                 "chip_bar"
         );
 
-        inFeedSurvey = new StringFilterGroup(
-                Settings.HIDE_FEED_SURVEY,
+        surveys = new StringFilterGroup(
+                Settings.HIDE_SURVEYS,
                 "in_feed_survey",
                 "slimline_survey",
                 "feed_nudge"
@@ -139,13 +138,13 @@ public final class LayoutComponentsFilter extends Filter {
         );
 
         final var latestPosts = new StringFilterGroup(
-                Settings.HIDE_HIDE_LATEST_POSTS,
+                Settings.HIDE_LATEST_POSTS,
                 "post_shelf"
         );
 
-        final var channelGuidelines = new StringFilterGroup(
-                Settings.HIDE_HIDE_CHANNEL_GUIDELINES,
-                "channel_guidelines_entry_banner"
+        final var channelLinksPreview = new StringFilterGroup(
+                Settings.HIDE_LINKS_PREVIEW,
+                "attribution.eml"
         );
 
         final var emergencyBox = new StringFilterGroup(
@@ -170,7 +169,7 @@ public final class LayoutComponentsFilter extends Filter {
         );
 
         expandableMetadata = new StringFilterGroup(
-                Settings.HIDE_EXPANDABLE_CHIP,
+                Settings.HIDE_EXPANDABLE_CARD,
                 "inline_expander"
         );
 
@@ -200,7 +199,6 @@ public final class LayoutComponentsFilter extends Filter {
                 "image_shelf"
         );
 
-
         final var timedReactions = new StringFilterGroup(
                 Settings.HIDE_TIMED_REACTIONS,
                 "emoji_control_panel",
@@ -227,7 +225,6 @@ public final class LayoutComponentsFilter extends Filter {
                 "sponsorships"
         );
 
-
         final var channelWatermark = new StringFilterGroup(
                 Settings.HIDE_VIDEO_CHANNEL_WATERMARK,
                 "featured_channel_watermark_overlay"
@@ -238,11 +235,27 @@ public final class LayoutComponentsFilter extends Filter {
                 "mixed_content_shelf"
         );
 
-        final var searchResultRecommendationLabels = new StringFilterGroup(
-                Settings.HIDE_SEARCH_RESULT_RECOMMENDATION_LABELS,
+        final var videoRecommendationLabels = new StringFilterGroup(
+                Settings.HIDE_VIDEO_RECOMMENDATION_LABELS,
                 "endorsement_header_footer.eml"
         );
 
+        channelProfile = new StringFilterGroup(
+                null,
+                "channel_profile.eml",
+                "page_header.eml"
+        );
+        channelProfileBuffer = new ByteArrayFilterGroupList();
+        channelProfileBuffer.addAll(new ByteArrayFilterGroup(
+                        Settings.HIDE_VISIT_STORE_BUTTON,
+                        "header_store_button"
+                ),
+                new ByteArrayFilterGroup(
+                        Settings.HIDE_VISIT_COMMUNITY_BUTTON,
+                        "community_button"
+                )
+        );
+
         horizontalShelves = new StringFilterGroup(
                 Settings.HIDE_HORIZONTAL_SHELVES,
                 "horizontal_video_shelf.eml",
@@ -253,40 +266,40 @@ public final class LayoutComponentsFilter extends Filter {
 
         ticketShelf = new ByteArrayFilterGroup(
                 Settings.HIDE_TICKET_SHELF,
-                "ticket.eml"
+                "ticket_item.eml"
         );
 
         addPathCallbacks(
-                expandableMetadata,
-                inFeedSurvey,
-                notifyMe,
-                compactChannelBar,
-                communityPosts,
-                paidPromotion,
-                searchResultRecommendationLabels,
-                latestPosts,
+                artistCard,
+                audioTrackButton,
+                channelLinksPreview,
+                channelMembersShelf,
+                channelProfile,
                 channelWatermark,
-                communityGuidelines,
+                chipBar,
+                compactBanner,
+                compactChannelBar,
+                compactChannelBarInner,
+                communityPosts,
+                emergencyBox,
+                expandableMetadata,
+                forYouShelf,
+                horizontalShelves,
+                imageShelf,
+                infoPanel,
+                latestPosts,
+                medicalPanel,
+                notifyMe,
+                paidPromotion,
                 playables,
                 quickActions,
                 relatedVideos,
-                compactBanner,
-                compactChannelBarInner,
-                medicalPanel,
-                infoPanel,
                 singleItemInformationPanel,
-                emergencyBox,
                 subscribersCommunityGuidelines,
                 subscriptionsChipBar,
-                chipBar,
-                channelGuidelines,
-                audioTrackButton,
-                artistCard,
+                surveys,
                 timedReactions,
-                imageShelf,
-                channelMemberShelf,
-                forYouShelf,
-                horizontalShelves
+                videoRecommendationLabels
         );
     }
 
@@ -304,10 +317,14 @@ public final class LayoutComponentsFilter extends Filter {
 
         // The groups are excluded from the filter due to the exceptions list below.
         // Filter them separately here.
-        if (matchedGroup == notifyMe || matchedGroup == inFeedSurvey || matchedGroup == expandableMetadata) {
+        if (matchedGroup == notifyMe || matchedGroup == surveys || matchedGroup == expandableMetadata) {
             return true;
         }
 
+        if (matchedGroup == channelProfile) {
+            return channelProfileBuffer.check(protobufBufferArray).isFiltered();
+        }
+
         if (exceptions.matches(path)) return false; // Exceptions are not filtered.
 
         if (matchedGroup == compactChannelBarInner) {
@@ -332,7 +349,7 @@ public final class LayoutComponentsFilter extends Filter {
      * Injection point.
      * Called from a different place then the other filters.
      */
-    public static boolean filterMixPlaylists(final Object conversionContext, @Nullable final byte[] bytes) {
+    public static boolean filterMixPlaylists(Object conversionContext, @Nullable final byte[] bytes) {
         try {
             if (!Settings.HIDE_MIX_PLAYLISTS.get()) {
                 return false;
@@ -422,13 +439,11 @@ public final class LayoutComponentsFilter extends Filter {
     /**
      * Injection point.
      */
-    @Nullable
-    public static Drawable hideYoodles(Drawable animatedYoodle) {
-        if (HIDE_DOODLES_ENABLED) {
-            return null;
-        }
-
-        return animatedYoodle;
+    public static void setDoodleDrawable(ImageView imageView, Drawable original) {
+        Drawable replacement = HIDE_DOODLES_ENABLED
+                ? ChangeHeaderPatch.getDrawable(original)
+                : original;
+        imageView.setImageDrawable(replacement);
     }
 
     private static final boolean HIDE_SHOW_MORE_BUTTON_ENABLED = Settings.HIDE_SHOW_MORE_BUTTON.get();

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

@@ -8,27 +8,43 @@ import app.revanced.extension.youtube.settings.Settings;
 /**
  * Abuse LithoFilter for {@link CustomPlaybackSpeedPatch}.
  */
-public final class PlaybackSpeedMenuFilterPatch extends Filter {
+public final class PlaybackSpeedMenuFilter extends Filter {
+
+    /**
+     * Old litho based speed selection menu.
+     */
+    public static volatile boolean isOldPlaybackSpeedMenuVisible;
 
     /**
      * 0.05x speed selection menu.
      */
     public static volatile boolean isPlaybackRateSelectorMenuVisible;
 
-    public PlaybackSpeedMenuFilterPatch() {
+    private final StringFilterGroup oldPlaybackMenuGroup;
+
+    public PlaybackSpeedMenuFilter() {
         // 0.05x litho speed menu.
         var playbackRateSelectorGroup = new StringFilterGroup(
                 Settings.CUSTOM_SPEED_MENU,
                 "playback_rate_selector_menu_sheet.eml-js"
         );
 
-        addPathCallbacks(playbackRateSelectorGroup);
+        // Old litho based speed menu.
+        oldPlaybackMenuGroup = new StringFilterGroup(
+                Settings.CUSTOM_SPEED_MENU,
+                "playback_speed_sheet_content.eml-js");
+
+        addPathCallbacks(playbackRateSelectorGroup, oldPlaybackMenuGroup);
     }
 
     @Override
     boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
                        StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
-        isPlaybackRateSelectorMenuVisible = true;
+        if (matchedGroup == oldPlaybackMenuGroup) {
+            isOldPlaybackSpeedMenuVisible = true;
+        } else {
+            isPlaybackRateSelectorMenuVisible = true;
+        }
 
         return false;
     }

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

@@ -26,7 +26,7 @@ import app.revanced.extension.youtube.TrieSearch;
  *
  * Once a way to asynchronously update litho text is found, this strategy will no longer be needed.
  */
-public final class ReturnYouTubeDislikeFilterPatch extends Filter {
+public final class ReturnYouTubeDislikeFilter extends Filter {
 
     /**
      * Last unique video id's loaded.  Value is ignored and Map is treated as a Set.
@@ -67,7 +67,7 @@ public final class ReturnYouTubeDislikeFilterPatch extends Filter {
 
     private final ByteArrayFilterGroupList videoIdFilterGroup = new ByteArrayFilterGroupList();
 
-    public ReturnYouTubeDislikeFilterPatch() {
+    public ReturnYouTubeDislikeFilter() {
         // When a new Short is opened, the like buttons always seem to load before the dislike.
         // But if swiping back to a previous video and liking/disliking, then only that single button reloads.
         // So must check for both buttons.

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

@@ -23,7 +23,6 @@ import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ViewParent;
 import android.view.Window;
 import android.view.WindowManager;
 import android.view.animation.Animation;
@@ -42,7 +41,7 @@ import java.util.function.Function;
 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.components.PlaybackSpeedMenuFilterPatch;
+import app.revanced.extension.youtube.patches.components.PlaybackSpeedMenuFilter;
 import app.revanced.extension.youtube.settings.Settings;
 import app.revanced.extension.youtube.shared.PlayerType;
 import kotlin.Unit;
@@ -60,6 +59,11 @@ public class CustomPlaybackSpeedPatch {
      */
     public static final float PLAYBACK_SPEED_MAXIMUM = 8;
 
+    /**
+     * How much +/- speed adjustment buttons change the current speed.
+     */
+    private static final double SPEED_ADJUSTMENT_CHANGE = 0.05;
+
     /**
      * Scale used to convert user speed to {@link android.widget.ProgressBar#setProgress(int)}.
      */
@@ -75,6 +79,16 @@ public class CustomPlaybackSpeedPatch {
      */
     public static final float[] customPlaybackSpeeds;
 
+    /**
+     * Minimum and maximum custom playback speeds of {@link #customPlaybackSpeeds}.
+     */
+    private static final float customPlaybackSpeedsMin, customPlaybackSpeedsMax;
+
+    /**
+     * The last time the old playback menu was forcefully called.
+     */
+    private static volatile long lastTimeOldPlaybackMenuInvoked;
+
     /**
      * Formats speeds to UI strings.
      */
@@ -85,11 +99,6 @@ public class CustomPlaybackSpeedPatch {
      */
     private static WeakReference<Dialog> currentDialog = new WeakReference<>(null);
 
-    /**
-     * Minimum and maximum custom playback speeds of {@link #customPlaybackSpeeds}.
-     */
-    private static final float customPlaybackSpeedsMin, customPlaybackSpeedsMax;
-
     static {
         // Cap at 2 decimals (rounds automatically).
         speedFormatter.setMaximumFractionDigits(2);
@@ -169,25 +178,33 @@ public class CustomPlaybackSpeedPatch {
     public static void onFlyoutMenuCreate(RecyclerView recyclerView) {
         recyclerView.getViewTreeObserver().addOnDrawListener(() -> {
             try {
-                if (PlaybackSpeedMenuFilterPatch.isPlaybackRateSelectorMenuVisible) {
-                    if (hideLithoMenuAndShowCustomSpeedMenu(recyclerView, 5)) {
-                        PlaybackSpeedMenuFilterPatch.isPlaybackRateSelectorMenuVisible = false;
+                if (PlaybackSpeedMenuFilter.isPlaybackRateSelectorMenuVisible) {
+                    if (hideLithoMenuAndShowSpeedMenu(recyclerView, 5)) {
+                        PlaybackSpeedMenuFilter.isPlaybackRateSelectorMenuVisible = false;
                     }
                 }
             } catch (Exception ex) {
-                Logger.printException(() -> "onFlyoutMenuCreate failure", ex);
+                Logger.printException(() -> "isPlaybackRateSelectorMenuVisible failure", ex);
+            }
+
+            try {
+                if (PlaybackSpeedMenuFilter.isOldPlaybackSpeedMenuVisible) {
+                    if (hideLithoMenuAndShowSpeedMenu(recyclerView, 8)) {
+                        PlaybackSpeedMenuFilter.isOldPlaybackSpeedMenuVisible = false;
+                    }
+                }
+            } catch (Exception ex) {
+                Logger.printException(() -> "isOldPlaybackSpeedMenuVisible failure", ex);
             }
         });
     }
 
-    @SuppressWarnings("SameParameterValue")
-    private static boolean hideLithoMenuAndShowCustomSpeedMenu(RecyclerView recyclerView, int expectedChildCount) {
+    private static boolean hideLithoMenuAndShowSpeedMenu(RecyclerView recyclerView, int expectedChildCount) {
         if (recyclerView.getChildCount() == 0) {
             return false;
         }
 
-        View firstChild = recyclerView.getChildAt(0);
-        if (!(firstChild instanceof ViewGroup playbackSpeedParentView)) {
+        if (!(recyclerView.getChildAt(0) instanceof ViewGroup playbackSpeedParentView)) {
             return false;
         }
 
@@ -195,33 +212,49 @@ public class CustomPlaybackSpeedPatch {
             return false;
         }
 
-        ViewParent parentView3rd = Utils.getParentView(recyclerView, 3);
-        if (!(parentView3rd instanceof ViewGroup)) {
-            return true;
+        if (!(Utils.getParentView(recyclerView, 3) instanceof ViewGroup parentView3rd)) {
+            return false;
         }
 
-        ViewParent parentView4th = parentView3rd.getParent();
-        if (!(parentView4th instanceof ViewGroup)) {
-            return true;
+        if (!(parentView3rd.getParent() instanceof ViewGroup parentView4th)) {
+            return false;
         }
 
         // Dismiss View [R.id.touch_outside] is the 1st ChildView of the 4th ParentView.
         // This only shows in phone layout.
-        final var touchInsidedView = ((ViewGroup) parentView4th).getChildAt(0);
+        var touchInsidedView = parentView4th.getChildAt(0);
         touchInsidedView.setSoundEffectsEnabled(false);
         touchInsidedView.performClick();
 
         // In tablet layout there is no Dismiss View, instead we just hide all two parent views.
-        ((ViewGroup) parentView3rd).setVisibility(View.GONE);
-        ((ViewGroup) parentView4th).setVisibility(View.GONE);
+        parentView3rd.setVisibility(View.GONE);
+        parentView4th.setVisibility(View.GONE);
 
-        // Close the litho speed menu and show the modern custom speed dialog.
-        showModernCustomPlaybackSpeedDialog(recyclerView.getContext());
-        Logger.printDebug(() -> "Modern playback speed dialog shown");
+        // Close the litho speed menu and show the custom speeds.
+        if (Settings.RESTORE_OLD_SPEED_MENU.get()) {
+            showOldPlaybackSpeedMenu();
+            Logger.printDebug(() -> "Old playback speed dialog shown");
+        } else {
+            showModernCustomPlaybackSpeedDialog(recyclerView.getContext());
+            Logger.printDebug(() -> "Modern playback speed dialog shown");
+        }
 
         return true;
     }
 
+    public static void showOldPlaybackSpeedMenu() {
+        // This method is sometimes used multiple times.
+        // To prevent this, ignore method reuse within 1 second.
+        final long now = System.currentTimeMillis();
+        if (now - lastTimeOldPlaybackMenuInvoked < 1000) {
+            Logger.printDebug(() -> "Ignoring call to showOldPlaybackSpeedMenu");
+            return;
+        }
+        lastTimeOldPlaybackMenuInvoked = now;
+
+        // Rest of the implementation added by patch.
+    }
+
     /**
      * Displays a modern custom dialog for adjusting video playback speed.
      * <p>
@@ -390,9 +423,9 @@ public class CustomPlaybackSpeedPatch {
         });
 
         minusButton.setOnClickListener(v -> userSelectedSpeed.apply(
-                VideoInformation.getPlaybackSpeed() - 0.05f));
+                (float) (VideoInformation.getPlaybackSpeed() - SPEED_ADJUSTMENT_CHANGE)));
         plusButton.setOnClickListener(v -> userSelectedSpeed.apply(
-                VideoInformation.getPlaybackSpeed() + 0.05f));
+                (float) (VideoInformation.getPlaybackSpeed() + SPEED_ADJUSTMENT_CHANGE)));
 
         // Create GridLayout for preset speed buttons.
         GridLayout gridLayout = new GridLayout(context);
@@ -611,15 +644,21 @@ public class CustomPlaybackSpeedPatch {
     }
 
     /**
-     * Rounds the given playback speed to the nearest 0.05 increment and ensures it is within valid bounds.
+     * Rounds the given playback speed to the nearest 0.05 increment,
+     * unless the speed exactly matches a preset custom speed.
      *
      * @param speed The playback speed to round.
      * @return The rounded speed, constrained to the specified bounds.
      */
     private static float roundSpeedToNearestIncrement(float speed) {
+        // Allow speed as-is if it exactly matches a speed preset such as 1.03x.
+        if (arrayContains(customPlaybackSpeeds, speed)) {
+            return speed;
+        }
+
         // Round to nearest 0.05 speed.  Must use double precision otherwise rounding error can occur.
-        final double roundedSpeed = Math.round(speed / 0.05) * 0.05;
-        return Utils.clamp((float) roundedSpeed, 0.05f, PLAYBACK_SPEED_MAXIMUM);
+        final double roundedSpeed = Math.round(speed / SPEED_ADJUSTMENT_CHANGE) * SPEED_ADJUSTMENT_CHANGE;
+        return Utils.clamp((float) roundedSpeed, (float) SPEED_ADJUSTMENT_CHANGE, PLAYBACK_SPEED_MAXIMUM);
     }
 
     /**

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

@@ -5,7 +5,9 @@ import static app.revanced.extension.shared.Utils.getResourceIdentifier;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
+import android.content.res.Configuration;
 import android.preference.PreferenceFragment;
+import android.util.TypedValue;
 import android.view.ViewGroup;
 import android.widget.TextView;
 import android.widget.Toolbar;
@@ -24,12 +26,15 @@ import app.revanced.extension.youtube.settings.preference.ReVancedPreferenceFrag
  * This class is responsible for injecting our own fragment by replacing the LicenseActivity.
  */
 @SuppressWarnings("unused")
-public class LicenseActivityHook {
+public class LicenseActivityHook extends Activity {
 
     private static int currentThemeValueOrdinal = -1; // Must initially be a non-valid enum ordinal value.
 
     private static ViewGroup.LayoutParams toolbarLayoutParams;
 
+    @SuppressLint("StaticFieldLeak")
+    public static SearchViewController searchViewController;
+
     public static void setToolbarLayoutParams(Toolbar toolbar) {
         if (toolbarLayoutParams != null) {
             toolbar.setLayoutParams(toolbarLayoutParams);
@@ -126,12 +131,13 @@ public class LicenseActivityHook {
                 view -> view instanceof TextView);
         if (toolbarTextView != null) {
             toolbarTextView.setTextColor(Utils.getAppForegroundColor());
+            toolbarTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20);
         }
         setToolbarLayoutParams(toolbar);
 
-        // Add Search Icon and EditText for ReVancedPreferenceFragment only.
+        // Add Search bar only for ReVancedPreferenceFragment.
         if (fragment instanceof ReVancedPreferenceFragment) {
-            SearchViewController.addSearchViewComponents(activity, toolbar, (ReVancedPreferenceFragment) fragment);
+            searchViewController = SearchViewController.addSearchViewComponents(activity, toolbar, (ReVancedPreferenceFragment) fragment);
         }
 
         toolBarParent.addView(toolbar, 0);
@@ -166,4 +172,10 @@ public class LicenseActivityHook {
             Utils.setIsDarkModeEnabled(themeOrdinal == 1);
         }
     }
+
+    public static void handleConfigurationChanged(Activity activity, Configuration newConfig) {
+        if (searchViewController != null) {
+            searchViewController.handleOrientationChange(newConfig.orientation);
+        }
+    }
 }

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

@@ -10,6 +10,7 @@ import android.graphics.drawable.GradientDrawable;
 import android.util.Pair;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
@@ -51,6 +52,7 @@ public class SearchViewController {
     private final Deque<String> searchHistory;
     private final AutoCompleteTextView autoCompleteTextView;
     private final boolean showSettingsSearchHistory;
+    private int currentOrientation;
 
     /**
      * Creates a background drawable for the SearchView with rounded corners.
@@ -83,8 +85,8 @@ public class SearchViewController {
     /**
      * Adds search view components to the activity.
      */
-    public static void addSearchViewComponents(Activity activity, Toolbar toolbar, ReVancedPreferenceFragment fragment) {
-        new SearchViewController(activity, toolbar, fragment);
+    public static SearchViewController addSearchViewComponents(Activity activity, Toolbar toolbar, ReVancedPreferenceFragment fragment) {
+        return new SearchViewController(activity, toolbar, fragment);
     }
 
     private SearchViewController(Activity activity, Toolbar toolbar, ReVancedPreferenceFragment fragment) {
@@ -93,6 +95,7 @@ public class SearchViewController {
         this.originalTitle = toolbar.getTitle();
         this.showSettingsSearchHistory = Settings.SETTINGS_SEARCH_HISTORY.get();
         this.searchHistory = new LinkedList<>();
+        this.currentOrientation = activity.getResources().getConfiguration().orientation;
         StringSetting searchEntries = Settings.SETTINGS_SEARCH_ENTRIES;
         if (showSettingsSearchHistory) {
             String entries = searchEntries.get();
@@ -115,6 +118,9 @@ public class SearchViewController {
                 searchView.getContext().getResources().getIdentifier(
                         "android:id/search_src_text", null, null));
 
+        // Disable fullscreen keyboard mode.
+        autoCompleteTextView.setImeOptions(autoCompleteTextView.getImeOptions() | EditorInfo.IME_FLAG_NO_EXTRACT_UI);
+
         // Set background and query hint.
         searchView.setBackground(createBackgroundDrawable(toolbar.getContext()));
         searchView.setQueryHint(str("revanced_settings_search_hint"));
@@ -197,7 +203,7 @@ public class SearchViewController {
                 if (isSearchActive) {
                     closeSearch();
                 } else {
-                    activity.onBackPressed();
+                    activity.finish();
                 }
             } catch (Exception ex) {
                 Logger.printException(() -> "navigation click failure", ex);
@@ -285,6 +291,16 @@ public class SearchViewController {
         }
     }
 
+    public void handleOrientationChange(int newOrientation) {
+        if (newOrientation != currentOrientation) {
+            currentOrientation = newOrientation;
+            if (autoCompleteTextView != null) {
+                autoCompleteTextView.dismissDropDown();
+                Logger.printDebug(() -> "Orientation changed, search history dismissed");
+            }
+        }
+    }
+
     /**
      * Opens the search view and shows the keyboard.
      */
@@ -313,7 +329,7 @@ public class SearchViewController {
     /**
      * Closes the search view and hides the keyboard.
      */
-    private void closeSearch() {
+    public void closeSearch() {
         isSearchActive = false;
         toolbar.getMenu().findItem(getResourceIdentifier(
                 "action_search", "id")).setVisible(true);
@@ -326,6 +342,19 @@ public class SearchViewController {
         imm.hideSoftInputFromWindow(searchView.getWindowToken(), 0);
     }
 
+    public static boolean handleBackPress() {
+        if (LicenseActivityHook.searchViewController != null
+                && LicenseActivityHook.searchViewController.isSearchActive()) {
+            LicenseActivityHook.searchViewController.closeSearch();
+            return true;
+        }
+        return false;
+    }
+
+    public boolean isSearchActive() {
+        return isSearchActive;
+    }
+
     /**
      * Custom ArrayAdapter for search history.
      */

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

@@ -8,6 +8,7 @@ import static app.revanced.extension.shared.settings.Setting.parent;
 import static app.revanced.extension.shared.settings.Setting.parentsAll;
 import static app.revanced.extension.shared.settings.Setting.parentsAny;
 import static app.revanced.extension.youtube.patches.ChangeFormFactorPatch.FormFactor;
+import static app.revanced.extension.youtube.patches.ChangeHeaderPatch.HeaderLogo;
 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;
@@ -61,32 +62,34 @@ public class Settings extends BaseSettings {
             parentsAny(REMEMBER_VIDEO_QUALITY_LAST_SELECTED, REMEMBER_SHORTS_QUALITY_LAST_SELECTED));
     public static final BooleanSetting ADVANCED_VIDEO_QUALITY_MENU = new BooleanSetting("revanced_advanced_video_quality_menu", TRUE);
     public static final BooleanSetting DISABLE_HDR_VIDEO = new BooleanSetting("revanced_disable_hdr_video", FALSE);
+
     // Speed
     public static final FloatSetting SPEED_TAP_AND_HOLD = new FloatSetting("revanced_speed_tap_and_hold", 2.0f, true);
     public static final BooleanSetting REMEMBER_PLAYBACK_SPEED_LAST_SELECTED = new BooleanSetting("revanced_remember_playback_speed_last_selected", FALSE);
     public static final BooleanSetting REMEMBER_PLAYBACK_SPEED_LAST_SELECTED_TOAST = new BooleanSetting("revanced_remember_playback_speed_last_selected_toast", TRUE, false,
             parent(REMEMBER_PLAYBACK_SPEED_LAST_SELECTED));
-    public static final BooleanSetting CUSTOM_SPEED_MENU = new BooleanSetting("revanced_custom_speed_menu", TRUE);
     public static final FloatSetting PLAYBACK_SPEED_DEFAULT = new FloatSetting("revanced_playback_speed_default", -2.0f);
+    public static final BooleanSetting CUSTOM_SPEED_MENU = new BooleanSetting("revanced_custom_speed_menu", TRUE);
+    public static final BooleanSetting RESTORE_OLD_SPEED_MENU = new BooleanSetting("revanced_restore_old_speed_menu", FALSE, parent(CUSTOM_SPEED_MENU));
     public static final StringSetting CUSTOM_PLAYBACK_SPEEDS = new StringSetting("revanced_custom_playback_speeds",
             "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());
 
     // Ads
-    public static final BooleanSetting HIDE_CREATOR_STORE_SHELVES = new BooleanSetting("revanced_hide_creator_store_shelves", TRUE);
+    public static final BooleanSetting HIDE_CREATOR_STORE_SHELF = new BooleanSetting("revanced_hide_creator_store_shelf", TRUE);
     public static final BooleanSetting HIDE_END_SCREEN_STORE_BANNER = new BooleanSetting("revanced_hide_end_screen_store_banner", TRUE, true);
     public static final BooleanSetting HIDE_FULLSCREEN_ADS = new BooleanSetting("revanced_hide_fullscreen_ads", TRUE);
     public static final BooleanSetting HIDE_GENERAL_ADS = new BooleanSetting("revanced_hide_general_ads", TRUE);
     public static final BooleanSetting HIDE_GET_PREMIUM = new BooleanSetting("revanced_hide_get_premium", TRUE);
-    public static final BooleanSetting HIDE_HIDE_LATEST_POSTS = new BooleanSetting("revanced_hide_latest_posts_ads", TRUE);
+    public static final BooleanSetting HIDE_LATEST_POSTS = new BooleanSetting("revanced_hide_latest_posts", TRUE);
     public static final BooleanSetting HIDE_MERCHANDISE_BANNERS = new BooleanSetting("revanced_hide_merchandise_banners", TRUE);
     public static final BooleanSetting HIDE_PAID_PROMOTION_LABEL = new BooleanSetting("revanced_hide_paid_promotion_label", TRUE);
     public static final BooleanSetting HIDE_SELF_SPONSOR = new BooleanSetting("revanced_hide_self_sponsor_ads", TRUE);
-    public static final BooleanSetting HIDE_TAGGED_PRODUCTS = new BooleanSetting("revanced_hide_tagged_products", TRUE);
+    public static final BooleanSetting HIDE_SHOPPING_LINKS = new BooleanSetting("revanced_hide_shopping_links", TRUE);
     public static final BooleanSetting HIDE_VIDEO_ADS = new BooleanSetting("revanced_hide_video_ads", TRUE, true);
     public static final BooleanSetting HIDE_VIEW_PRODUCTS_BANNER = new BooleanSetting("revanced_hide_view_products_banner", TRUE);
-    public static final BooleanSetting HIDE_VISIT_STORE_BUTTON = new BooleanSetting("revanced_hide_visit_store_button", TRUE);
     public static final BooleanSetting HIDE_WEB_SEARCH_RESULTS = new BooleanSetting("revanced_hide_web_search_results", TRUE);
 
     // Feed
@@ -97,23 +100,23 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting HIDE_COMPACT_BANNER = new BooleanSetting("revanced_hide_compact_banner", TRUE);
     public static final BooleanSetting HIDE_CROWDFUNDING_BOX = new BooleanSetting("revanced_hide_crowdfunding_box", FALSE, true);
     public static final BooleanSetting HIDE_DOODLES = new BooleanSetting("revanced_hide_doodles", FALSE, true, "revanced_hide_doodles_user_dialog_message");
-    public static final BooleanSetting HIDE_EXPANDABLE_CHIP = new BooleanSetting("revanced_hide_expandable_chip", TRUE);
-    public static final BooleanSetting HIDE_FEED_SURVEY = new BooleanSetting("revanced_hide_feed_survey", TRUE);
+    public static final BooleanSetting HIDE_EXPANDABLE_CARD = new BooleanSetting("revanced_hide_expandable_card", TRUE);
     public static final BooleanSetting HIDE_FILTER_BAR_FEED_IN_FEED = new BooleanSetting("revanced_hide_filter_bar_feed_in_feed", FALSE, true);
     public static final BooleanSetting HIDE_FILTER_BAR_FEED_IN_HISTORY = new BooleanSetting("revanced_hide_filter_bar_feed_in_history", FALSE);
     public static final BooleanSetting HIDE_FILTER_BAR_FEED_IN_RELATED_VIDEOS = new BooleanSetting("revanced_hide_filter_bar_feed_in_related_videos", FALSE, true);
     public static final BooleanSetting HIDE_FILTER_BAR_FEED_IN_SEARCH = new BooleanSetting("revanced_hide_filter_bar_feed_in_search", FALSE, true);
     public static final BooleanSetting HIDE_FLOATING_MICROPHONE_BUTTON = new BooleanSetting("revanced_hide_floating_microphone_button", TRUE, true);
-    public static final BooleanSetting HIDE_FOR_YOU_SHELF = new BooleanSetting("revanced_hide_for_you_shelf", TRUE);
     public static final BooleanSetting HIDE_HORIZONTAL_SHELVES = new BooleanSetting("revanced_hide_horizontal_shelves", TRUE);
     public static final BooleanSetting HIDE_IMAGE_SHELF = new BooleanSetting("revanced_hide_image_shelf", TRUE);
     public static final BooleanSetting HIDE_MIX_PLAYLISTS = new BooleanSetting("revanced_hide_mix_playlists", TRUE);
     public static final BooleanSetting HIDE_MOVIES_SECTION = new BooleanSetting("revanced_hide_movies_section", TRUE);
     public static final BooleanSetting HIDE_NOTIFY_ME_BUTTON = new BooleanSetting("revanced_hide_notify_me_button", TRUE);
     public static final BooleanSetting HIDE_PLAYABLES = new BooleanSetting("revanced_hide_playables", TRUE);
-    public static final BooleanSetting HIDE_SEARCH_RESULT_RECOMMENDATION_LABELS = new BooleanSetting("revanced_hide_search_result_recommendation_labels", TRUE);
     public static final BooleanSetting HIDE_SHOW_MORE_BUTTON = new BooleanSetting("revanced_hide_show_more_button", TRUE, true);
+    public static final BooleanSetting HIDE_SURVEYS = new BooleanSetting("revanced_hide_surveys", TRUE);
     public static final BooleanSetting HIDE_TICKET_SHELF = new BooleanSetting("revanced_hide_ticket_shelf", FALSE);
+    public static final BooleanSetting HIDE_VIDEO_RECOMMENDATION_LABELS = new BooleanSetting("revanced_hide_video_recommendation_labels", TRUE);
+
     // Alternative thumbnails
     public static final EnumSetting<ThumbnailOption> ALT_THUMBNAIL_HOME = new EnumSetting<>("revanced_alt_thumbnail_home", ThumbnailOption.ORIGINAL);
     public static final EnumSetting<ThumbnailOption> ALT_THUMBNAIL_SUBSCRIPTIONS = new EnumSetting<>("revanced_alt_thumbnail_subscription", ThumbnailOption.ORIGINAL);
@@ -125,6 +128,7 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting ALT_THUMBNAIL_DEARROW_CONNECTION_TOAST = new BooleanSetting("revanced_alt_thumbnail_dearrow_connection_toast", TRUE, new DeArrowAvailability());
     public static final EnumSetting<ThumbnailStillTime> ALT_THUMBNAIL_STILLS_TIME = new EnumSetting<>("revanced_alt_thumbnail_stills_time", ThumbnailStillTime.MIDDLE, new StillImagesAvailability());
     public static final BooleanSetting ALT_THUMBNAIL_STILLS_FAST = new BooleanSetting("revanced_alt_thumbnail_stills_fast", FALSE, new StillImagesAvailability());
+
     // Hide keyword content
     public static final BooleanSetting HIDE_KEYWORD_CONTENT_HOME = new BooleanSetting("revanced_hide_keyword_content_home", FALSE);
     public static final BooleanSetting HIDE_KEYWORD_CONTENT_SUBSCRIPTIONS = new BooleanSetting("revanced_hide_keyword_content_subscriptions", FALSE);
@@ -132,31 +136,36 @@ public class Settings extends BaseSettings {
     public static final StringSetting HIDE_KEYWORD_CONTENT_PHRASES = new StringSetting("revanced_hide_keyword_content_phrases", "",
             parentsAny(HIDE_KEYWORD_CONTENT_HOME, HIDE_KEYWORD_CONTENT_SUBSCRIPTIONS, HIDE_KEYWORD_CONTENT_SEARCH));
 
+    // Channel page
+    public static final BooleanSetting HIDE_FOR_YOU_SHELF = new BooleanSetting("revanced_hide_for_you_shelf", FALSE);
+    public static final BooleanSetting HIDE_LINKS_PREVIEW = new BooleanSetting("revanced_hide_links_preview", TRUE);
+    public static final BooleanSetting HIDE_MEMBERS_SHELF = new BooleanSetting("revanced_hide_members_shelf", TRUE);
+    public static final BooleanSetting HIDE_VISIT_COMMUNITY_BUTTON = new BooleanSetting("revanced_hide_visit_community_button", TRUE);
+    public static final BooleanSetting HIDE_VISIT_STORE_BUTTON = new BooleanSetting("revanced_hide_visit_store_button", TRUE);
+
     // Player
     public static final BooleanSetting COPY_VIDEO_URL = new BooleanSetting("revanced_copy_video_url", FALSE);
     public static final BooleanSetting COPY_VIDEO_URL_TIMESTAMP = new BooleanSetting("revanced_copy_video_url_timestamp", TRUE);
     public static final BooleanSetting DISABLE_AUTO_CAPTIONS = new BooleanSetting("revanced_disable_auto_captions", FALSE, true);
+    public static final BooleanSetting DISABLE_CHAPTER_SKIP_DOUBLE_TAP = new BooleanSetting("revanced_disable_chapter_skip_double_tap", FALSE);
     public static final BooleanSetting DISABLE_FULLSCREEN_AMBIENT_MODE = new BooleanSetting("revanced_disable_fullscreen_ambient_mode", TRUE, true);
     public static final BooleanSetting DISABLE_ROLLING_NUMBER_ANIMATIONS = new BooleanSetting("revanced_disable_rolling_number_animations", FALSE);
     public static final EnumSetting<FullscreenMode> EXIT_FULLSCREEN = new EnumSetting<>("revanced_exit_fullscreen", FullscreenMode.DISABLED);
     public static final BooleanSetting HIDE_AUTOPLAY_BUTTON = new BooleanSetting("revanced_hide_autoplay_button", TRUE, true);
     public static final BooleanSetting HIDE_CAPTIONS_BUTTON = new BooleanSetting("revanced_hide_captions_button", FALSE);
     public static final BooleanSetting HIDE_CAST_BUTTON = new BooleanSetting("revanced_hide_cast_button", TRUE, true);
-    public static final BooleanSetting HIDE_PLAYER_CONTROL_BUTTONS_BACKGROUND = new BooleanSetting("revanced_hide_player_control_buttons_background", FALSE, true);
     public static final BooleanSetting HIDE_CHANNEL_BAR = new BooleanSetting("revanced_hide_channel_bar", FALSE);
-    public static final BooleanSetting HIDE_CHANNEL_MEMBER_SHELF = new BooleanSetting("revanced_hide_channel_member_shelf", TRUE);
-    public static final BooleanSetting HIDE_COMMUNITY_GUIDELINES = new BooleanSetting("revanced_hide_community_guidelines", TRUE);
     public static final BooleanSetting HIDE_EMERGENCY_BOX = new BooleanSetting("revanced_hide_emergency_box", TRUE);
     public static final BooleanSetting HIDE_ENDSCREEN_CARDS = new BooleanSetting("revanced_hide_endscreen_cards", FALSE);
     public static final BooleanSetting HIDE_END_SCREEN_SUGGESTED_VIDEO = new BooleanSetting("revanced_end_screen_suggested_video", FALSE, true);
-    public static final BooleanSetting HIDE_RELATED_VIDEO_OVERLAY = new BooleanSetting("revanced_hide_related_video_overlay", FALSE, true);
-    public static final BooleanSetting HIDE_HIDE_CHANNEL_GUIDELINES = new BooleanSetting("revanced_hide_channel_guidelines", TRUE);
-    public static final BooleanSetting HIDE_INFO_PANELS = new BooleanSetting("revanced_hide_info_panels", TRUE);
     public static final BooleanSetting HIDE_INFO_CARDS = new BooleanSetting("revanced_hide_info_cards", FALSE);
+    public static final BooleanSetting HIDE_INFO_PANELS = new BooleanSetting("revanced_hide_info_panels", TRUE);
     public static final BooleanSetting HIDE_JOIN_MEMBERSHIP_BUTTON = new BooleanSetting("revanced_hide_join_membership_button", TRUE);
     public static final BooleanSetting HIDE_MEDICAL_PANELS = new BooleanSetting("revanced_hide_medical_panels", TRUE);
+    public static final BooleanSetting HIDE_PLAYER_CONTROL_BUTTONS_BACKGROUND = new BooleanSetting("revanced_hide_player_control_buttons_background", FALSE, true);
     public static final BooleanSetting HIDE_PLAYER_PREVIOUS_NEXT_BUTTONS = new BooleanSetting("revanced_hide_player_previous_next_buttons", FALSE, true);
     public static final BooleanSetting HIDE_QUICK_ACTIONS = new BooleanSetting("revanced_hide_quick_actions", FALSE);
+    public static final BooleanSetting HIDE_RELATED_VIDEOS_OVERLAY = new BooleanSetting("revanced_hide_related_videos_overlay", FALSE, true);
     public static final BooleanSetting HIDE_RELATED_VIDEOS = new BooleanSetting("revanced_hide_related_videos", FALSE);
     public static final BooleanSetting HIDE_SUBSCRIBERS_COMMUNITY_GUIDELINES = new BooleanSetting("revanced_hide_subscribers_community_guidelines", TRUE);
     public static final BooleanSetting HIDE_TIMED_REACTIONS = new BooleanSetting("revanced_hide_timed_reactions", TRUE);
@@ -165,6 +174,7 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting PLAYBACK_SPEED_DIALOG_BUTTON = new BooleanSetting("revanced_playback_speed_dialog_button", FALSE);
     public static final IntegerSetting PLAYER_OVERLAY_OPACITY = new IntegerSetting("revanced_player_overlay_opacity", 100, true);
     public static final BooleanSetting PLAYER_POPUP_PANELS = new BooleanSetting("revanced_hide_player_popup_panels", FALSE);
+
     // Miniplayer
     public static final EnumSetting<MiniplayerType> MINIPLAYER_TYPE = new EnumSetting<>("revanced_miniplayer_type", MiniplayerType.DEFAULT, true);
     private static final Availability MINIPLAYER_ANY_MODERN = MINIPLAYER_TYPE.availability(MODERN_1, MODERN_2, MODERN_3, MODERN_4);
@@ -177,20 +187,25 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting MINIPLAYER_ROUNDED_CORNERS = new BooleanSetting("revanced_miniplayer_rounded_corners", TRUE, true, MINIPLAYER_ANY_MODERN);
     public static final IntegerSetting MINIPLAYER_WIDTH_DIP = new IntegerSetting("revanced_miniplayer_width_dip", 192, true, MINIPLAYER_ANY_MODERN);
     public static final IntegerSetting MINIPLAYER_OPACITY = new IntegerSetting("revanced_miniplayer_opacity", 100, true, MINIPLAYER_TYPE.availability(MODERN_1));
+
     // External downloader
     public static final BooleanSetting EXTERNAL_DOWNLOADER = new BooleanSetting("revanced_external_downloader", FALSE);
     public static final BooleanSetting EXTERNAL_DOWNLOADER_ACTION_BUTTON = new BooleanSetting("revanced_external_downloader_action_button", FALSE);
     public static final StringSetting EXTERNAL_DOWNLOADER_PACKAGE_NAME = new StringSetting("revanced_external_downloader_name",
-            "org.schabi.newpipe" /* NewPipe */, parentsAny(EXTERNAL_DOWNLOADER, EXTERNAL_DOWNLOADER_ACTION_BUTTON));
+            "com.deniscerri.ytdl" /* YTDLnis */, parentsAny(EXTERNAL_DOWNLOADER, EXTERNAL_DOWNLOADER_ACTION_BUTTON));
+
     // Comments
     public static final BooleanSetting HIDE_COMMENTS_AI_CHAT_SUMMARY = new BooleanSetting("revanced_hide_comments_ai_chat_summary", FALSE);
     public static final BooleanSetting HIDE_COMMENTS_AI_SUMMARY = new BooleanSetting("revanced_hide_comments_ai_summary", FALSE);
     public static final BooleanSetting HIDE_COMMENTS_BY_MEMBERS_HEADER = new BooleanSetting("revanced_hide_comments_by_members_header", FALSE);
+    public static final BooleanSetting HIDE_COMMENTS_CHANNEL_GUIDELINES = new BooleanSetting("revanced_hide_comments_channel_guidelines", TRUE);
+    public static final BooleanSetting HIDE_COMMENTS_COMMUNITY_GUIDELINES = new BooleanSetting("revanced_hide_comments_community_guidelines", TRUE);
     public static final BooleanSetting HIDE_COMMENTS_CREATE_A_SHORT_BUTTON = new BooleanSetting("revanced_hide_comments_create_a_short_button", TRUE);
     public static final BooleanSetting HIDE_COMMENTS_PREVIEW_COMMENT = new BooleanSetting("revanced_hide_comments_preview_comment", FALSE);
     public static final BooleanSetting HIDE_COMMENTS_SECTION = new BooleanSetting("revanced_hide_comments_section", FALSE);
     public static final BooleanSetting HIDE_COMMENTS_THANKS_BUTTON = new BooleanSetting("revanced_hide_comments_thanks_button", TRUE);
     public static final BooleanSetting HIDE_COMMENTS_TIMESTAMP_BUTTON = new BooleanSetting("revanced_hide_comments_timestamp_button", FALSE);
+
     // Description
     public static final BooleanSetting HIDE_AI_GENERATED_VIDEO_SUMMARY_SECTION = new BooleanSetting("revanced_hide_ai_generated_video_summary_section", FALSE);
     public static final BooleanSetting HIDE_ASK_SECTION = new BooleanSetting("revanced_hide_ask_section", FALSE);
@@ -201,6 +216,7 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting HIDE_KEY_CONCEPTS_SECTION = new BooleanSetting("revanced_hide_key_concepts_section", FALSE);
     public static final BooleanSetting HIDE_PODCAST_SECTION = new BooleanSetting("revanced_hide_podcast_section", TRUE);
     public static final BooleanSetting HIDE_TRANSCRIPT_SECTION = new BooleanSetting("revanced_hide_transcript_section", TRUE);
+
     // Action buttons
     public static final BooleanSetting DISABLE_LIKE_SUBSCRIBE_GLOW = new BooleanSetting("revanced_disable_like_subscribe_glow", FALSE);
     public static final BooleanSetting HIDE_ASK_BUTTON = new BooleanSetting("revanced_hide_ask_button", FALSE);
@@ -213,6 +229,7 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting HIDE_SHARE_BUTTON = new BooleanSetting("revanced_hide_share_button", FALSE);
     public static final BooleanSetting HIDE_STOP_ADS_BUTTON = new BooleanSetting("revanced_hide_stop_ads_button", TRUE);
     public static final BooleanSetting HIDE_THANKS_BUTTON = new BooleanSetting("revanced_hide_thanks_button", TRUE);
+
     // Player flyout menu items
     public static final BooleanSetting HIDE_PLAYER_FLYOUT_ADDITIONAL_SETTINGS = new BooleanSetting("revanced_hide_player_flyout_additional_settings", FALSE);
     public static final BooleanSetting HIDE_PLAYER_FLYOUT_AMBIENT_MODE = new BooleanSetting("revanced_hide_player_flyout_ambient_mode", FALSE);
@@ -235,7 +252,8 @@ public class Settings extends BaseSettings {
     public static final EnumSetting<FormFactor> CHANGE_FORM_FACTOR = new EnumSetting<>("revanced_change_form_factor", FormFactor.DEFAULT, true, "revanced_change_form_factor_user_dialog_message");
     public static final BooleanSetting BYPASS_IMAGE_REGION_RESTRICTIONS = new BooleanSetting("revanced_bypass_image_region_restrictions", FALSE, true);
     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<>("splash_screen_animation_style", SplashScreenAnimationStyle.FPS_60_ONE_SECOND, 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 REMOVE_VIEWER_DISCRETION_DIALOG = new BooleanSetting("revanced_remove_viewer_discretion_dialog", FALSE,
             "revanced_remove_viewer_discretion_dialog_user_dialog_message");
@@ -245,9 +263,11 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting CHANGE_START_PAGE_ALWAYS = new BooleanSetting("revanced_change_start_page_always", FALSE, true,
             new ChangeStartPageTypeAvailability());
     public static final StringSetting SPOOF_APP_VERSION_TARGET = new StringSetting("revanced_spoof_app_version_target", "19.01.34", true, parent(SPOOF_APP_VERSION));
+
     // Custom filter
     public static final BooleanSetting CUSTOM_FILTER = new BooleanSetting("revanced_custom_filter", FALSE);
     public static final StringSetting CUSTOM_FILTER_STRINGS = new StringSetting("revanced_custom_filter_strings", "", true, parent(CUSTOM_FILTER));
+
     // Navigation buttons
     public static final BooleanSetting HIDE_HOME_BUTTON = new BooleanSetting("revanced_hide_home_button", FALSE, true);
     public static final BooleanSetting HIDE_CREATE_BUTTON = new BooleanSetting("revanced_hide_create_button", TRUE, true);
@@ -283,12 +303,12 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting HIDE_SHORTS_LOCATION_LABEL = new BooleanSetting("revanced_hide_shorts_location_label", FALSE);
     public static final BooleanSetting HIDE_SHORTS_NAVIGATION_BAR = new BooleanSetting("revanced_hide_shorts_navigation_bar", FALSE, true);
     public static final BooleanSetting HIDE_SHORTS_PAUSED_OVERLAY_BUTTONS = new BooleanSetting("revanced_hide_shorts_paused_overlay_buttons", FALSE);
+    public static final BooleanSetting HIDE_SHORTS_PREVIEW_COMMENT = new BooleanSetting("revanced_hide_shorts_preview_comment", TRUE);
     public static final BooleanSetting HIDE_SHORTS_REMIX_BUTTON = new BooleanSetting("revanced_hide_shorts_remix_button", TRUE);
     public static final BooleanSetting HIDE_SHORTS_SAVE_SOUND_BUTTON = new BooleanSetting("revanced_hide_shorts_save_sound_button", TRUE);
     public static final BooleanSetting HIDE_SHORTS_SEARCH = new BooleanSetting("revanced_hide_shorts_search", FALSE);
     public static final BooleanSetting HIDE_SHORTS_SEARCH_SUGGESTIONS = new BooleanSetting("revanced_hide_shorts_search_suggestions", TRUE);
     public static final BooleanSetting HIDE_SHORTS_SHARE_BUTTON = new BooleanSetting("revanced_hide_shorts_share_button", FALSE);
-    public static final BooleanSetting HIDE_SHORTS_PREVIEW_COMMENT = new BooleanSetting("revanced_hide_shorts_preview_comment", TRUE);
     public static final BooleanSetting HIDE_SHORTS_SHOP_BUTTON = new BooleanSetting("revanced_hide_shorts_shop_button", TRUE);
     public static final BooleanSetting HIDE_SHORTS_SOUND_BUTTON = new BooleanSetting("revanced_hide_shorts_sound_button", FALSE);
     public static final BooleanSetting HIDE_SHORTS_SOUND_METADATA_LABEL = new BooleanSetting("revanced_hide_shorts_sound_metadata_label", FALSE);
@@ -318,7 +338,7 @@ public class Settings extends BaseSettings {
     public static final StringSetting SEEKBAR_CUSTOM_COLOR_PRIMARY = new StringSetting("revanced_seekbar_custom_color_primary", "#FF0033", true, parent(SEEKBAR_CUSTOM_COLOR));
     public static final StringSetting SEEKBAR_CUSTOM_COLOR_ACCENT = new StringSetting("revanced_seekbar_custom_color_accent", "#FF2791", true, parent(SEEKBAR_CUSTOM_COLOR));
 
-    // Misc
+    // Miscellaneous
     public static final BooleanSetting ANNOUNCEMENTS = new BooleanSetting("revanced_announcements", TRUE);
     public static final IntegerSetting ANNOUNCEMENT_LAST_ID = new IntegerSetting("revanced_announcement_last_id", -1, false, false);
     public static final BooleanSetting AUTO_REPEAT = new BooleanSetting("revanced_auto_repeat", FALSE);

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

@@ -16,10 +16,8 @@ import app.revanced.extension.youtube.settings.Settings;
 @SuppressWarnings({"unused", "deprecation"})
 public final class CustomVideoSpeedListPreference extends CustomDialogListPreference {
 
-    /**
-     * Initialize a settings preference list with the available playback speeds.
-     */
-    private void initializeEntryValues() {
+    {
+        // Initialize a settings preference list with the available playback speeds.
         float[] customPlaybackSpeeds = CustomPlaybackSpeedPatch.customPlaybackSpeeds;
         final int numberOfEntries = customPlaybackSpeeds.length + 1;
         String[] preferenceListEntries = new String[numberOfEntries];
@@ -41,10 +39,6 @@ public final class CustomVideoSpeedListPreference extends CustomDialogListPrefer
         setEntryValues(preferenceListEntryValues);
     }
 
-    {
-        initializeEntryValues();
-    }
-
     public CustomVideoSpeedListPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
     }

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

@@ -0,0 +1,444 @@
+package app.revanced.extension.youtube.settings.preference;
+
+import static app.revanced.extension.shared.StringRef.sf;
+import static app.revanced.extension.shared.StringRef.str;
+import static app.revanced.extension.shared.Utils.dipToPixels;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.graphics.drawable.ShapeDrawable;
+import android.graphics.drawable.shapes.RoundRectShape;
+import android.net.Uri;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.util.AttributeSet;
+import android.util.DisplayMetrics;
+import android.util.Pair;
+import android.util.TypedValue;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.ListAdapter;
+import android.widget.ListView;
+
+import androidx.annotation.Nullable;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Function;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.preference.CustomDialogListPreference;
+import app.revanced.extension.youtube.settings.Settings;
+
+/**
+ * A custom ListPreference for selecting an external downloader package with checkmarks and EditText for custom package names.
+ */
+@SuppressWarnings({"unused", "deprecation"})
+public class ExternalDownloaderPreference extends CustomDialogListPreference {
+
+    /**
+     * Enum representing supported external downloaders with their display names, package names, and download URLs.
+     */
+    private enum Downloader {
+        YTDLNIS("YTDLnis",
+                "com.deniscerri.ytdl",
+                "https://ytdlnis.org",
+                true),
+        SEAL("Seal",
+                "com.junkfood.seal",
+                "https://github.com/JunkFood02/Seal/releases/latest",
+                true),
+        GRAYJAY("Grayjay",
+                "com.futo.platformplayer",
+                "https://grayjay.app"),
+        LIBRETUBE("LibreTube",
+                "com.github.libretube",
+                "https://libretube.dev"),
+        NEWPIPE("NewPipe",
+                "org.schabi.newpipe",
+                "https://newpipe.net"),
+        PIPEPIPE("PipePipe",
+                "InfinityLoop1309.NewPipeEnhanced",
+                "https://pipepipe.dev"),
+        TUBULAR("Tubular",
+                "org.polymorphicshade.tubular",
+                "https://github.com/polymorphicshade/Tubular/releases/latest"),
+        OTHER(sf("revanced_external_downloader_other_item").toString(),
+                null,
+                null,
+                true);
+
+        private static final Map<String, Downloader> PACKAGE_TO_ENUM = new HashMap<>();
+
+        static {
+            for (Downloader downloader : values()) {
+                String packageName = downloader.packageName;
+                if (packageName != null) {
+                    PACKAGE_TO_ENUM.put(packageName, downloader);
+                }
+            }
+        }
+
+        /**
+         * Finds a Downloader by its package name. This method can never return {@link #OTHER}.
+         * @return The Downloader enum or null if not found.
+         */
+        @Nullable
+        public static Downloader findByPackageName(String packageName) {
+            return PACKAGE_TO_ENUM.get(Objects.requireNonNull(packageName));
+        }
+
+        public final String name;
+        @Nullable
+        public final String packageName;
+        @Nullable
+        public final String downloadUrl;
+        /**
+         * If a downloader app should be shown in the preference settings
+         * if the app is not currently installed.
+         */
+        public final boolean isPreferred;
+
+        Downloader(String name, String packageName, String downloadUrl) {
+            this(name, packageName, downloadUrl, false);
+        }
+
+        Downloader(String name, @Nullable String packageName, @Nullable String downloadUrl, boolean isPreferred) {
+            this.name = name;
+            this.packageName = packageName;
+            this.downloadUrl = downloadUrl;
+            this.isPreferred = isPreferred;
+        }
+
+        public boolean isInstalled() {
+            return packageName != null && isAppInstalledAndEnabled(packageName);
+        }
+    }
+
+    private static boolean isAppInstalledAndEnabled(String packageName) {
+        try {
+            if (Utils.getContext().getPackageManager().getApplicationInfo(packageName, 0).enabled) {
+                Logger.printDebug(() -> "App installed: " + packageName);
+                return true;
+            }
+        } catch (PackageManager.NameNotFoundException error) {
+            Logger.printDebug(() -> "App not installed: " + packageName);
+        }
+        return false;
+    }
+
+    private EditText editText;
+    private CustomDialogListPreference.ListPreferenceArrayAdapter adapter;
+
+    public ExternalDownloaderPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    public ExternalDownloaderPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public ExternalDownloaderPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public ExternalDownloaderPreference(Context context) {
+        super(context);
+    }
+
+    private void updateEntries() {
+        List<CharSequence> entries = new ArrayList<>();
+        List<CharSequence> entryValues = new ArrayList<>();
+
+        for (Downloader downloader : Downloader.values()) {
+            if (downloader.isPreferred || downloader.isInstalled()) {
+                String packageName = downloader.packageName;
+
+                entries.add(downloader.name);
+                entryValues.add(packageName != null
+                        ? packageName
+                        : Downloader.OTHER.name);
+            }
+        }
+
+        setEntries(entries.toArray(new CharSequence[0]));
+        setEntryValues(entryValues.toArray(new CharSequence[0]));
+    }
+
+    /**
+     * Sets the summary for this ListPreference.
+     */
+    @Override
+    public void setSummary(CharSequence summary) {
+        // Ignore calls to set the summary.
+        // Summary is always the description of the category.
+        //
+        // This is required otherwise the ReVanced preference fragment
+        // sets all ListPreference summaries to show the current selection.
+    }
+
+    /**
+     * Shows a custom dialog with a ListView for predefined downloader packages and EditText for custom package input.
+     */
+    @Override
+    protected void showDialog(@Nullable Bundle state) {
+        // Must set entries before showing the dialog, to handle if
+        // an app is installed while the settings are open in the background.
+        updateEntries();
+
+        Context context = getContext();
+        String packageName = Settings.EXTERNAL_DOWNLOADER_PACKAGE_NAME.get();
+
+        // Create the main layout for the dialog content.
+        LinearLayout contentLayout = new LinearLayout(context);
+        contentLayout.setOrientation(LinearLayout.VERTICAL);
+
+        // Create ListView for predefined downloader apps.
+        ListView listView = new ListView(context);
+        listView.setId(android.R.id.list);
+        listView.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
+
+        // Create custom adapter for the ListView.
+        final boolean usingCustomDownloader = Downloader.findByPackageName(packageName) == null;
+        adapter = new CustomDialogListPreference.ListPreferenceArrayAdapter(
+                context,
+                Utils.getResourceIdentifier("revanced_custom_list_item_checked", "layout"),
+                getEntries(),
+                getEntryValues(),
+                usingCustomDownloader
+                        ? Downloader.OTHER.name
+                        : packageName
+        );
+        listView.setAdapter(adapter);
+
+        Function<String, Void> updateListViewSelection = (updatedPackageName) -> {
+            String entryValueName = Downloader.findByPackageName(updatedPackageName) == null
+                    ? Downloader.OTHER.name
+                    : updatedPackageName;
+            CharSequence[] entryValues = getEntryValues();
+
+            for (int i = 0, length = entryValues.length; i < length; i++) {
+                String entryString = entryValues[i].toString();
+                if (entryString.equals(entryValueName)) {
+                    listView.setItemChecked(i, true);
+                    listView.setSelection(i);
+                    adapter.setSelectedValue(entryString);
+                    adapter.notifyDataSetChanged();
+                    break;
+                }
+            }
+            return null;
+        };
+        updateListViewSelection.apply(packageName);
+
+        // Handle item click to select value.
+        listView.setOnItemClickListener((parent, view, position, id) -> {
+            String selectedValue = getEntryValues()[position].toString();
+            Downloader selectedApp = Downloader.findByPackageName(selectedValue);
+
+            if (selectedApp != null) {
+                editText.setText(selectedApp.packageName);
+                editText.setEnabled(false); // Disable editing for predefined options.
+            } else {
+                String savedPackageName = Settings.EXTERNAL_DOWNLOADER_PACKAGE_NAME.get();
+                editText.setText(Downloader.findByPackageName(savedPackageName) == null
+                        ? savedPackageName // If the user is clicking thru options then retain existing other app.
+                        : ""
+                );
+                editText.setEnabled(true); // Enable editing for Custom.
+                editText.requestFocus();
+            }
+            editText.setSelection(editText.getText().length());
+            adapter.setSelectedValue(selectedValue);
+            adapter.notifyDataSetChanged();
+        });
+
+        // Add ListView to content layout with initial height.
+        LinearLayout.LayoutParams listViewParams = new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                0 // Initial height, will be updated.
+        );
+        listViewParams.bottomMargin = dipToPixels(16);
+        contentLayout.addView(listView, listViewParams);
+
+        // Add EditText for custom package name.
+        editText = new EditText(context);
+        editText.setText(packageName);
+        editText.setSelection(packageName.length());
+        editText.setHint(str("revanced_external_downloader_other_item_hint"));
+        editText.setSingleLine(true); // Restrict EditText to a single line.
+        editText.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16);
+        // Set initial EditText state based on selected downloader.
+        editText.setEnabled(usingCustomDownloader);
+        editText.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {}
+
+            @Override
+            public void afterTextChanged(Editable edit) {
+                String updatedPackageName = edit.toString().trim();
+                updateListViewSelection.apply(updatedPackageName);
+            }
+        });
+
+        ShapeDrawable editTextBackground = new ShapeDrawable(new RoundRectShape(
+                Utils.createCornerRadii(10), null, null));
+        editTextBackground.getPaint().setColor(Utils.getEditTextBackground());
+        final int dip8 = dipToPixels(8);
+        editText.setPadding(dip8, dip8, dip8, dip8);
+        editText.setBackground(editTextBackground);
+        editText.setClipToOutline(true);
+        contentLayout.addView(editText);
+
+        // Create the custom dialog.
+        Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+                context,
+                getTitle() != null ? getTitle().toString() : "",
+                null,
+                null,
+                null,
+                () -> {
+                    String newValue = editText.getText().toString().trim();
+                    if (newValue.isEmpty()) {
+                        // Show dialog if EditText is empty.
+                        Utils.createCustomDialog(
+                                context,
+                                str("revanced_external_downloader_name_title"),
+                                str("revanced_external_downloader_empty_warning"),
+                                null,
+                                null,
+                                () -> {}, // OK button does nothing (dismiss only).
+                                null,
+                                null,
+                                null,
+                                false
+                        ).first.show();
+                        return;
+                    }
+
+                    if (showDialogIfAppIsNotInstalled(getContext(), newValue)) {
+                        return; // Invalid package. Do not save.
+                    }
+
+                    // Save custom package name.
+                    if (callChangeListener(newValue)) {
+                        setValue(newValue);
+                    }
+                },
+                () -> {}, // Cancel button action (dismiss only).
+                str("revanced_settings_reset"),
+                () -> { // Reset action.
+                    String defaultValue = Settings.EXTERNAL_DOWNLOADER_PACKAGE_NAME.defaultValue;
+                    editText.setText(defaultValue);
+                    editText.setSelection(defaultValue.length());
+                    editText.setEnabled(false); // Disable editing on reset.
+                    updateListViewSelection.apply(defaultValue);
+                },
+                false
+        );
+
+        // Add the content layout directly to the dialog's main layout.
+        LinearLayout dialogMainLayout = dialogPair.second;
+        dialogMainLayout.addView(contentLayout, dialogMainLayout.getChildCount() - 1);
+
+        // Update ListView height dynamically based on orientation.
+        //noinspection ExtractMethodRecommender
+        Runnable updateListViewHeight = () -> {
+            int totalHeight = 0;
+            ListAdapter listAdapter = listView.getAdapter();
+            if (listAdapter != null) {
+                DisplayMetrics metrics = context.getResources().getDisplayMetrics();
+                final int listAdapterCount = listAdapter.getCount();
+                for (int i = 0; i < listAdapterCount; i++) {
+                    View item = listAdapter.getView(i, null, listView);
+                    item.measure(
+                            View.MeasureSpec.makeMeasureSpec(metrics.widthPixels, View.MeasureSpec.AT_MOST),
+                            View.MeasureSpec.UNSPECIFIED
+                    );
+                    totalHeight += item.getMeasuredHeight();
+                }
+                totalHeight += listView.getDividerHeight() * (listAdapterCount - 1);
+            }
+
+            final int orientation = context.getResources().getConfiguration().orientation;
+            if (orientation == android.content.res.Configuration.ORIENTATION_PORTRAIT) {
+                // In portrait orientation, use WRAP_CONTENT for ListView height.
+                listViewParams.height = LinearLayout.LayoutParams.WRAP_CONTENT;
+            } else {
+                // In landscape orientation, limit ListView height to 30% of screen height.
+                final int maxHeight = Utils.percentageHeightToPixels(30);
+                listViewParams.height = Math.min(totalHeight, maxHeight);
+            }
+            listView.setLayoutParams(listViewParams);
+        };
+
+        // Initial height calculation.
+        updateListViewHeight.run();
+
+        // Listen for configuration changes (e.g., orientation).
+        View dialogView = dialogPair.second;
+        // Recalculate height when layout changes (e.g., orientation change).
+        dialogView.getViewTreeObserver().addOnGlobalLayoutListener(updateListViewHeight::run);
+
+        // Show the dialog.
+        dialogPair.first.show();
+    }
+
+    /**
+     * @return If the app is not installed and a dialog was shown.
+     */
+    public static boolean showDialogIfAppIsNotInstalled(Context context, String packageName) {
+        if (isAppInstalledAndEnabled(packageName)) {
+            return false;
+        }
+
+        Downloader downloader = Downloader.findByPackageName(packageName);
+        String downloadUrl = downloader != null
+                ? downloader.downloadUrl
+                : null;
+        String okButtonText = downloadUrl != null
+                ? str("gms_core_dialog_open_website_text") // Open website.
+                : null; // Ok.
+        // Show a dialog if the recommended app is not installed or if the custom package cannot be found.
+        String message = downloader != null
+                ? str("revanced_external_downloader_not_installed_warning", downloader.name)
+                : str("revanced_external_downloader_package_not_found_warning", packageName);
+
+        Utils.createCustomDialog(
+                context,
+                str("revanced_external_downloader_not_found_title"),
+                message,
+                null,
+                okButtonText,
+                () -> {
+                    try {
+                        // OK button action: open the downloader's URL if available.
+                        if (downloadUrl != null) {
+                            Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(downloadUrl));
+                            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                            context.startActivity(intent);
+                        }
+                    } catch (Exception ex) {
+                        Logger.printException(() -> "Failed to open downloader URL: " + downloader, ex);
+                    }
+                },
+                () -> {}, // Cancel button action (dismiss only).
+                null,
+                null,
+                false
+        ).first.show();
+
+        return true;
+    }
+}

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

@@ -17,6 +17,7 @@ import android.preference.SwitchPreference;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.style.BackgroundColorSpan;
+import android.util.TypedValue;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowInsets;
@@ -248,7 +249,15 @@ public class ReVancedPreferenceFragment extends AbstractPreferenceFragment {
                                 rootView.setOnApplyWindowInsetsListener((v, insets) -> {
                                     Insets statusInsets = insets.getInsets(WindowInsets.Type.statusBars());
                                     Insets navInsets = insets.getInsets(WindowInsets.Type.navigationBars());
-                                    v.setPadding(0, statusInsets.top, 0, navInsets.bottom);
+                                    Insets cutoutInsets = insets.getInsets(WindowInsets.Type.displayCutout());
+
+                                    // Apply padding for display cutout in landscape.
+                                    int leftPadding = cutoutInsets.left;
+                                    int rightPadding = cutoutInsets.right;
+                                    int topPadding = statusInsets.top;
+                                    int bottomPadding = navInsets.bottom;
+
+                                    v.setPadding(leftPadding, topPadding, rightPadding, bottomPadding);
                                     return insets;
                                 });
                             }
@@ -265,10 +274,16 @@ public class ReVancedPreferenceFragment extends AbstractPreferenceFragment {
                                     true, TextView.class::isInstance);
                             if (toolbarTextView != null) {
                                 toolbarTextView.setTextColor(Utils.getAppForegroundColor());
+                                toolbarTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20);
                             }
 
                             LicenseActivityHook.setToolbarLayoutParams(toolbar);
 
+                            if (LicenseActivityHook.searchViewController != null
+                                    && LicenseActivityHook.searchViewController.isSearchActive()) {
+                                toolbar.post(() -> LicenseActivityHook.searchViewController.closeSearch());
+                            }
+
                             rootView.addView(toolbar, 0);
                             return false;
                         }

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

@@ -830,11 +830,10 @@ public class SegmentPlaybackController {
             WindowManager.LayoutParams params = window.getAttributes();
             params.gravity = Gravity.BOTTOM;
             params.y = dipToPixels(72);
-            DisplayMetrics displayMetrics = Resources.getSystem().getDisplayMetrics();
-            int portraitWidth = (int) (displayMetrics.widthPixels * 0.6);
+            int portraitWidth = Utils.percentageWidthToPixels(60); // 60% of the screen width.
 
             if (Resources.getSystem().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
-                portraitWidth = (int) Math.min(portraitWidth, displayMetrics.heightPixels * 0.6);
+                portraitWidth = Math.min(portraitWidth, Utils.percentageHeightToPixels(60)); // 60% of the screen height.
             }
             params.width = portraitWidth;
             params.dimAmount = 0.0f;

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

@@ -9,9 +9,6 @@ import app.revanced.extension.youtube.patches.VideoInformation;
 import app.revanced.extension.youtube.patches.playback.speed.CustomPlaybackSpeedPatch;
 import app.revanced.extension.youtube.settings.Settings;
 
-import static app.revanced.extension.shared.StringRef.str;
-import static app.revanced.extension.shared.Utils.showToastShort;
-
 @SuppressWarnings("unused")
 public class PlaybackSpeedDialogButton {
     @Nullable
@@ -29,7 +26,11 @@ public class PlaybackSpeedDialogButton {
                     Settings.PLAYBACK_SPEED_DIALOG_BUTTON::get,
                     view -> {
                         try {
-                            CustomPlaybackSpeedPatch.showModernCustomPlaybackSpeedDialog(view.getContext());
+                            if (Settings.RESTORE_OLD_SPEED_MENU.get()) {
+                                CustomPlaybackSpeedPatch.showOldPlaybackSpeedMenu();
+                            } else {
+                                CustomPlaybackSpeedPatch.showModernCustomPlaybackSpeedDialog(view.getContext());
+                            }
                         } catch (Exception ex) {
                             Logger.printException(() -> "speed button onClick failure", ex);
                         }

gradle.properties

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

patches/api/patches.api

@@ -116,8 +116,8 @@ public final class app/revanced/patches/all/misc/shortcut/sharetargets/RemoveSha
 	public static final fun getRemoveShareTargetsPatch ()Lapp/revanced/patcher/patch/ResourcePatch;
 }
 
-public final class app/revanced/patches/all/misc/spoof/SignatureSpoofPatchKt {
-	public static final fun getSignatureSpoofPatch ()Lapp/revanced/patcher/patch/ResourcePatch;
+public final class app/revanced/patches/all/misc/spoof/EnableRomSignatureSpoofingKt {
+	public static final fun getEnableRomSignatureSpoofing ()Lapp/revanced/patcher/patch/ResourcePatch;
 }
 
 public final class app/revanced/patches/all/misc/targetSdk/SetTargetSdkVersion34Kt {
@@ -168,6 +168,10 @@ public final class app/revanced/patches/cricbuzz/ads/DisableAdsPatchKt {
 	public static final fun getDisableAdsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/cricbuzz/misc/extension/ExtensionPatchKt {
+	public static final fun getSharedExtensionPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/crunchyroll/ads/HideAdsPatchKt {
 	public static final fun getHideAdsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -420,6 +424,10 @@ public final class app/revanced/patches/openinghours/misc/fix/crash/FixCrashPatc
 	public static final fun getFixCrashPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/orfon/detection/root/RemoveRootDetectionPatchKt {
+	public static final fun getRemoveRootDetectionPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/pandora/ads/DisableAudioAdsPatchKt {
 	public static final fun getDisableAudioAdsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -472,6 +480,10 @@ public final class app/revanced/patches/primevideo/misc/permissions/RenamePermis
 	public static final fun getRenamePermissionsPatch ()Lapp/revanced/patcher/patch/ResourcePatch;
 }
 
+public final class app/revanced/patches/primevideo/video/speed/PlaybackSpeedPatchKt {
+	public static final fun getPlaybackSpeedPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/protonmail/account/RemoveFreeAccountsLimitPatchKt {
 	public static final fun getRemoveFreeAccountsLimitPatch ()Lapp/revanced/patcher/patch/ResourcePatch;
 }
@@ -900,6 +912,10 @@ public final class app/revanced/patches/shared/misc/spoof/UserAgentClientSpoofPa
 	public static final fun userAgentClientSpoofPatch (Ljava/lang/String;)Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/shared/misc/string/ReplaceStringPatchKt {
+	public static final fun replaceStringPatch (Ljava/lang/String;Ljava/lang/String;)Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/solidexplorer2/functionality/filesize/RemoveFileSizeLimitPatchKt {
 	public static final fun getRemoveFileSizeLimitPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -1228,6 +1244,11 @@ public final class app/revanced/patches/youtube/interaction/dialog/RemoveViewerD
 	public static final fun getRemoveViewerDiscretionDialogPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/youtube/interaction/doubletap/DisableChapterSkipDoubleTapPatchKt {
+	public static final fun getDisableChapterSkipDoubleTapPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+	public static final fun getDisableDoubleTapActionsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/youtube/interaction/downloads/DownloadsPatchKt {
 	public static final fun getDownloadsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }

patches/src/main/kotlin/app/revanced/patches/all/misc/spoof/EnableRomSignatureSpoofing.kt

@@ -0,0 +1,92 @@
+package app.revanced.patches.all.misc.spoof
+
+import app.revanced.patcher.patch.resourcePatch
+import app.revanced.patcher.patch.stringOption
+import app.revanced.util.getNode
+import com.android.apksig.ApkVerifier
+import com.android.apksig.apk.ApkFormatException
+import org.w3c.dom.Element
+import java.io.File
+import java.io.IOException
+import java.nio.file.InvalidPathException
+import java.security.NoSuchAlgorithmException
+import java.security.cert.CertificateException
+import java.security.cert.CertificateFactory
+import java.util.*
+
+@Suppress("unused")
+val enableRomSignatureSpoofing = resourcePatch(
+    name = "Enable ROM signature spoofing",
+    description = "Spoofs the signature via the manifest meta-data \"fake-signature\". " +
+            "This patch only works with ROMs that support signature spoofing.",
+    use = false,
+) {
+    val signatureOrPath by stringOption(
+        key = "signatureOrApkFilePath",
+        title = "Signature or APK file path",
+        validator = validator@{ signature ->
+            signature ?: return@validator false
+
+            parseSignature(signature) != null
+        },
+        description = "The hex-encoded signature or path to an APK file with the desired signature.",
+        required = true,
+    )
+    execute {
+        document("AndroidManifest.xml").use { document ->
+            val permission = document.createElement("uses-permission").apply {
+                setAttribute("android:name", "android.permission.FAKE_PACKAGE_SIGNATURE")
+            }
+            val manifest = document.getNode("manifest").appendChild(permission)
+
+
+            val fakeSignatureMetadata = document.createElement("meta-data").apply {
+                setAttribute("android:name", "fake-signature")
+                setAttribute("android:value", parseSignature(signatureOrPath!!))
+            }
+            document.getNode("application").appendChild(fakeSignatureMetadata)
+        }
+    }
+}
+
+private fun parseSignature(optionValue: String): String? {
+    // Parse as a hex-encoded signature.
+    try {
+        // TODO: Replace with signature.hexToByteArray when stable in kotlin
+        val signatureBytes = HexFormat.of().parseHex(optionValue)
+        CertificateFactory.getInstance("X.509").generateCertificate(signatureBytes.inputStream())
+
+        return optionValue
+    } catch (_: IllegalArgumentException) {
+    } catch (_: CertificateException) {
+    }
+
+    // Parse as a path to an APK file.
+    try {
+        val apkFile = File(optionValue)
+        if (!apkFile.isFile) return null
+
+        val result = ApkVerifier.Builder(apkFile).build().verify()
+
+        val hexFormat = HexFormat.of()
+
+        val signature = (if (result.isVerifiedUsingV3Scheme) {
+            result.v3SchemeSigners[0].certificate
+        } else if (result.isVerifiedUsingV2Scheme) {
+            result.v2SchemeSigners[0].certificate
+        } else if (result.isVerifiedUsingV1Scheme) {
+            result.v1SchemeSigners[0].certificate
+        } else {
+            return null
+        }).encoded
+
+        return hexFormat.formatHex(signature)
+    } catch (_: IOException) {
+    } catch (_: InvalidPathException) {
+    } catch (_: ApkFormatException) {
+    } catch (_: NoSuchAlgorithmException) {
+    } catch (_: IllegalArgumentException) {
+    }
+
+    return null
+}

patches/src/main/kotlin/app/revanced/patches/all/misc/spoof/SignatureSpoofPatch.kt

@@ -1,95 +0,0 @@
-package app.revanced.patches.all.misc.spoof
-
-import app.revanced.patcher.patch.resourcePatch
-import app.revanced.patcher.patch.stringOption
-import app.revanced.util.getNode
-import com.android.apksig.ApkVerifier
-import com.android.apksig.apk.ApkFormatException
-import org.w3c.dom.Element
-import java.io.ByteArrayInputStream
-import java.io.IOException
-import java.nio.file.Files
-import java.nio.file.InvalidPathException
-import java.nio.file.attribute.BasicFileAttributes
-import java.security.NoSuchAlgorithmException
-import java.security.cert.CertificateException
-import java.security.cert.CertificateFactory
-import java.util.*
-import kotlin.io.path.Path
-
-val signatureSpoofPatch = resourcePatch(
-        name = "Spoof app signature",
-        description = "Spoofs the app signature via the \"fake-signature\" meta key. " +
-            "This patch only works with patched device roms.",
-        use = false,
-    ) {
-    val signature by stringOption(
-        key = "spoofedAppSignature",
-        title = "Signature",
-        validator = { signature ->
-            optionToSignature(signature) != null
-        },
-        description = "The hex-encoded signature or path to an apk file with the desired signature",
-        required = true,
-    )
-    execute {
-        document("AndroidManifest.xml").use { document ->
-            val manifest = document.getNode("manifest") as Element
-
-            val fakeSignaturePermission = document.createElement("uses-permission")
-            fakeSignaturePermission.setAttribute("android:name", "android.permission.FAKE_PACKAGE_SIGNATURE")
-            manifest.appendChild(fakeSignaturePermission)
-
-            val application = document.getNode("application") ?: {
-                val child = document.createElement("application")
-                manifest.appendChild(child)
-                child
-            } as Element;
-
-            val fakeSignatureMetadata = document.createElement("meta-data")
-            fakeSignatureMetadata.setAttribute("android:name", "fake-signature")
-            fakeSignatureMetadata.setAttribute("android:value", optionToSignature(signature))
-            application.appendChild(fakeSignatureMetadata)
-        }
-    }
-}
-
-internal fun optionToSignature(signature: String?): String? {
-    if (signature == null) {
-        return null;
-    }
-    try {
-        // TODO: Replace with signature.hexToByteArray when stable in kotlin
-        val signatureBytes = HexFormat.of()
-            .parseHex(signature)
-        val factory = CertificateFactory.getInstance("X.509")
-        factory.generateCertificate(ByteArrayInputStream(signatureBytes))
-        return signature;
-    } catch (_: IllegalArgumentException) {
-    } catch (_: CertificateException) {
-    }
-    try {
-        val signaturePath = Path(signature)
-        if (!Files.readAttributes(signaturePath, BasicFileAttributes::class.java).isRegularFile) {
-            return null;
-        }
-        val verifier = ApkVerifier.Builder(signaturePath.toFile())
-            .build()
-
-        val result = verifier.verify()
-        if (result.isVerifiedUsingV3Scheme) {
-            return HexFormat.of().formatHex(result.v3SchemeSigners[0].certificate.encoded)
-        } else if (result.isVerifiedUsingV2Scheme) {
-            return HexFormat.of().formatHex(result.v2SchemeSigners[0].certificate.encoded)
-        } else if (result.isVerifiedUsingV1Scheme) {
-            return HexFormat.of().formatHex(result.v1SchemeSigners[0].certificate.encoded)
-        }
-
-        return null;
-    } catch (_: IOException) {
-    } catch (_: InvalidPathException) {
-    } catch (_: ApkFormatException) {
-    } catch (_: NoSuchAlgorithmException) {
-    } catch (_: IllegalArgumentException) {}
-    return null;
-}

patches/src/main/kotlin/app/revanced/patches/cricbuzz/ads/DisableAdsPatch.kt

@@ -3,24 +3,38 @@ package app.revanced.patches.cricbuzz.ads
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patches.cricbuzz.misc.extension.sharedExtensionPatch
+import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionOrThrow
+import app.revanced.util.returnEarly
 import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.reference.FieldReference
+
+private const val EXTENSION_CLASS_DESCRIPTOR =
+    "Lapp/revanced/extension/cricbuzz/ads/HideAdsPatch;"
 
 @Suppress("unused")
 val disableAdsPatch = bytecodePatch (
     name = "Hide ads",
 ) {
-    compatibleWith("com.cricbuzz.android"("6.23.02"))
+    compatibleWith("com.cricbuzz.android"("6.24.01"))
+
+    dependsOn(sharedExtensionPatch)
 
     execute {
-        userStateSwitchFingerprint.method.apply {
-            val opcodeIndex = indexOfFirstInstructionOrThrow(Opcode.MOVE_RESULT_OBJECT)
-            val register = getInstruction<OneRegisterInstruction>(opcodeIndex).registerA
+        userStateSwitchFingerprint.method.returnEarly(true)
 
-            addInstruction(
-                opcodeIndex + 1,
-                "const-string v$register, \"ACTIVE\""
+        // Remove region-specific Cricbuzz11 elements.
+        cb11ConstructorFingerprint.method.addInstruction(0, "const/4 p7, 0x0")
+        getBottomBarFingerprint.method.apply {
+            val getIndex = indexOfFirstInstructionOrThrow() {
+                opcode == Opcode.IGET_OBJECT && getReference<FieldReference>()?.name == "bottomBar"
+            }
+            val getRegister = getInstruction<TwoRegisterInstruction>(getIndex).registerA
+
+            addInstruction(getIndex + 1,
+                "invoke-static { v$getRegister }, $EXTENSION_CLASS_DESCRIPTOR->filterCb11(Ljava/util/List;)V"
             )
         }
     }

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

@@ -4,6 +4,30 @@ import app.revanced.patcher.fingerprint
 import com.android.tools.smali.dexlib2.Opcode
 
 internal val userStateSwitchFingerprint = fingerprint {
-    strings("key.user.state", "NA")
     opcodes(Opcode.SPARSE_SWITCH)
+    strings("key.user.state", "NA")
 }
+
+internal val cb11ConstructorFingerprint = fingerprint {
+    parameters(
+        "Ljava/lang/String;",
+        "Ljava/lang/String;",
+        "Ljava/lang/String;",
+        "I",
+        "Ljava/lang/String;",
+        "Ljava/lang/String;",
+        "Z",
+        "Ljava/lang/String;",
+        "Ljava/lang/String;",
+        "L"
+    )
+    custom { _, classDef ->
+        classDef.endsWith("CB11Details;")
+    }
+}
+
+internal val getBottomBarFingerprint = fingerprint {
+    custom { method, classDef ->
+        method.name == "getBottomBar" && classDef.endsWith("HomeMenu;")
+    }
+}

patches/src/main/kotlin/app/revanced/patches/cricbuzz/misc/extension/ExtensionPatch.kt

@@ -0,0 +1,5 @@
+package app.revanced.patches.cricbuzz.misc.extension
+
+import app.revanced.patches.shared.misc.extension.sharedExtensionPatch
+
+val sharedExtensionPatch = sharedExtensionPatch("cricbuzz", applicationInitHook)

patches/src/main/kotlin/app/revanced/patches/cricbuzz/misc/extension/Hooks.kt

@@ -0,0 +1,9 @@
+package app.revanced.patches.cricbuzz.misc.extension
+
+import app.revanced.patches.shared.misc.extension.extensionHook
+
+internal val applicationInitHook = extensionHook {
+    custom { method, classDef ->
+        method.name == "onCreate" && classDef.endsWith("/NyitoActivity;")
+    }
+}

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

@@ -14,7 +14,7 @@ import com.android.tools.smali.dexlib2.iface.reference.FieldReference
 
 @Suppress("unused")
 val hideAdsPatch = bytecodePatch(
-    name = "Hide Ads"
+    name = "Hide ads"
 ) {
     compatibleWith("com.crunchyroll.crunchyroid")
 

patches/src/main/kotlin/app/revanced/patches/messenger/inbox/Fingerprints.kt

@@ -23,7 +23,6 @@ internal val createInboxSubTabsFingerprint = fingerprint {
 }
 
 internal val loadInboxAdsFingerprint = fingerprint {
-    accessFlags(AccessFlags.PUBLIC, AccessFlags.STATIC)
     returns("V")
     strings(
         "ads_load_begin",

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

@@ -8,12 +8,7 @@ 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"(
-            "7.16.53",
-            "8.05.51"
-        )
-    )
+    compatibleWith("com.google.android.apps.youtube.music")
 
     execute {
         navigate(showVideoAdsParentFingerprint.originalMethod)

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

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

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

@@ -11,12 +11,7 @@ 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"(
-            "7.16.53",
-            "8.05.51"
-        )
-    )
+    compatibleWith("com.google.android.apps.youtube.music")
 
     execute {
         val startIndex = repeatTrackFingerprint.patternMatch!!.endIndex

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

@@ -7,18 +7,9 @@ import app.revanced.patcher.patch.bytecodePatch
 @Suppress("unused")
 val permanentShufflePatch = bytecodePatch(
     description = "Permanently remember your shuffle preference " +
-        "even if the playlist ends or another track is played.",
-    use = false,
+        "even if the playlist ends or another track is played."
 ) {
-    compatibleWith(
-        "com.google.android.apps.youtube.music"(
-            "6.45.54",
-            "6.51.53",
-            "7.01.53",
-            "7.02.52",
-            "7.03.52",
-        ),
-    )
+    compatibleWith("com.google.android.apps.youtube.music")
 
     execute {
         disableShuffleFingerprint.method.addInstruction(0, "return-void")

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

@@ -11,12 +11,7 @@ val hideCategoryBar = bytecodePatch(
     description = "Hides the category bar at the top of the homepage.",
     use = false,
 ) {
-    compatibleWith(
-        "com.google.android.apps.youtube.music"(
-            "7.16.53",
-            "8.05.51"
-        )
-    )
+    compatibleWith("com.google.android.apps.youtube.music")
 
     execute {
         constructCategoryBarFingerprint.method.apply {

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

@@ -11,12 +11,7 @@ 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"(
-            "7.16.53",
-            "8.05.51"
-        )
-    )
+    compatibleWith("com.google.android.apps.youtube.music")
 
     execute {
         hideGetPremiumFingerprint.method.apply {

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

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

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

@@ -8,12 +8,7 @@ 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"(
-            "7.16.53",
-            "8.05.51"
-        )
-    )
+    compatibleWith("com.google.android.apps.youtube.music")
 
     execute {
         checkCertificateFingerprint.method.returnEarly(true)

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

@@ -8,12 +8,7 @@ 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"(
-            "7.16.53",
-            "8.05.51"
-        )
-    )
+    compatibleWith("com.google.android.apps.youtube.music")
 
     execute {
         kidsBackgroundPlaybackPolicyControllerFingerprint.method.addInstruction(

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

@@ -25,12 +25,7 @@ val spoofClientPatch = bytecodePatch(
     name = "Spoof client",
     description = "Spoofs the client to fix playback.",
 ) {
-    compatibleWith(
-        "com.google.android.apps.youtube.music"(
-            "7.16.53",
-            "8.05.51"
-        )
-    )
+    compatibleWith("com.google.android.apps.youtube.music")
 
     dependsOn(
         sharedExtensionPatch,

patches/src/main/kotlin/app/revanced/patches/orfon/detection/root/Fingerprints.kt

@@ -0,0 +1,13 @@
+package app.revanced.patches.orfon.detection.root
+
+import app.revanced.patcher.fingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+internal val isDeviceRootedFingeprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC)
+    returns("Z")
+    custom { method, classDef ->
+        method.name == "isDeviceRooted" &&
+            classDef.endsWith("/RootChecker;")
+    }
+}

patches/src/main/kotlin/app/revanced/patches/orfon/detection/root/RemoveRootDetectionPatch.kt

@@ -0,0 +1,16 @@
+package app.revanced.patches.orfon.detection.root
+
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.util.returnEarly
+
+@Suppress("unused")
+val removeRootDetectionPatch = bytecodePatch(
+    name = "Remove root detection",
+    description = "Removes the check for root permissions.",
+) {
+    compatibleWith("com.nousguide.android.orftvthek")
+
+    execute {
+        isDeviceRootedFingeprint.method.returnEarly(false)
+    }
+}

patches/src/main/kotlin/app/revanced/patches/primevideo/ads/SkipAdsPatch.kt

@@ -12,7 +12,7 @@ val skipAdsPatch = bytecodePatch(
     name = "Skip ads",
     description = "Automatically skips video stream ads.",
 ) {
-    compatibleWith("com.amazon.avod.thirdpartyclient"("3.0.403.257"))
+    compatibleWith("com.amazon.avod.thirdpartyclient"("3.0.412.2947"))
 
     dependsOn(sharedExtensionPatch)
 

patches/src/main/kotlin/app/revanced/patches/primevideo/video/speed/Fingerprints.kt

@@ -0,0 +1,23 @@
+package app.revanced.patches.primevideo.video.speed
+
+import app.revanced.patcher.fingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+internal val playbackUserControlsInitializeFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC)
+    parameters("Lcom/amazon/avod/playbackclient/PlaybackInitializationContext;")
+    returns("V")
+    custom { method, classDef ->
+        method.name == "initialize" && classDef.type == "Lcom/amazon/avod/playbackclient/activity/feature/PlaybackUserControlsFeature;"
+    }
+}
+
+internal val playbackUserControlsPrepareForPlaybackFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC)
+    parameters("Lcom/amazon/avod/playbackclient/PlaybackContext;")
+    returns("V")
+    custom { method, classDef ->
+        method.name == "prepareForPlayback" && 
+        classDef.type == "Lcom/amazon/avod/playbackclient/activity/feature/PlaybackUserControlsFeature;"
+    }
+}

patches/src/main/kotlin/app/revanced/patches/primevideo/video/speed/PlaybackSpeedPatch.kt

@@ -0,0 +1,56 @@
+package app.revanced.patches.primevideo.video.speed
+
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patches.primevideo.misc.extension.sharedExtensionPatch
+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.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.reference.FieldReference
+
+private const val EXTENSION_CLASS_DESCRIPTOR = 
+    "Lapp/revanced/extension/primevideo/videoplayer/PlaybackSpeedPatch;"
+
+val playbackSpeedPatch = bytecodePatch(
+    name = "Playback speed",
+    description = "Adds playback speed controls to the video player.",
+) {
+    dependsOn(
+        sharedExtensionPatch,
+    )
+
+    compatibleWith(
+        "com.amazon.avod.thirdpartyclient"("3.0.412.2947")
+    )
+
+    execute {
+        playbackUserControlsInitializeFingerprint.method.apply {
+            val getIndex = indexOfFirstInstructionOrThrow {
+                opcode == Opcode.IPUT_OBJECT && 
+                getReference<FieldReference>()?.name == "mUserControls"
+            }
+            
+            val getRegister = getInstruction<OneRegisterInstruction>(getIndex).registerA
+            
+            addInstructions(
+                getIndex + 1,
+                """
+                invoke-static { v$getRegister }, $EXTENSION_CLASS_DESCRIPTOR->initializeSpeedOverlay(Landroid/view/View;)V
+                """
+            )
+        }
+
+        playbackUserControlsPrepareForPlaybackFingerprint.method.apply {
+            addInstructions(
+                0,
+                """
+                invoke-virtual { p1 }, Lcom/amazon/avod/playbackclient/PlaybackContext;->getPlayer()Lcom/amazon/video/sdk/player/Player;
+                move-result-object v0
+                invoke-static { v0 }, $EXTENSION_CLASS_DESCRIPTOR->setPlayer(Lcom/amazon/video/sdk/player/Player;)V
+                """
+            )
+        }
+    }
+} 

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

@@ -4,9 +4,16 @@ import app.revanced.patcher.Fingerprint
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patches.reddit.customclients.spoofClientPatch
+import app.revanced.patches.shared.misc.string.replaceStringPatch
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 
 val spoofClientPatch = spoofClientPatch(redirectUri = "http://baconreader.com/auth") { clientIdOption ->
+    dependsOn(
+        // Redirects from SSL to WWW domain are bugged causing auth problems.
+        // Manually rewrite the URLs to fix this.
+        replaceStringPatch("ssl.reddit.com", "www.reddit.com")
+    )
+
     compatibleWith(
         "com.onelouder.baconreader",
         "com.onelouder.baconreader.premium",

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

@@ -61,7 +61,7 @@ val spoofClientPatch = spoofClientPatch(redirectUri = "redditisfun://auth") { cl
         // region Patch miscellaneous.
 
         // Reddit messed up and does not append a redirect uri to the authorization url to old.reddit.com/login.
-        // Replace old.reddit.com with ssl.reddit.com to fix this.
+        // Replace old.reddit.com with www.reddit.com to fix this.
         buildAuthorizationStringFingerprint.method.apply {
             val index = indexOfFirstInstructionOrThrow {
                 getReference<StringReference>()?.contains("old.reddit.com") == true
@@ -70,7 +70,7 @@ val spoofClientPatch = spoofClientPatch(redirectUri = "redditisfun://auth") { cl
             val targetRegister = getInstruction<OneRegisterInstruction>(index).registerA
             replaceInstruction(
                 index,
-                "const-string v$targetRegister, \"https://ssl.reddit.com/api/v1/authorize.compact\"",
+                "const-string v$targetRegister, \"https://www.reddit.com/api/v1/authorize.compact\"",
             )
         }
 

patches/src/main/kotlin/app/revanced/patches/reddit/customclients/sync/syncforreddit/api/SpoofClientPatch.kt

@@ -4,6 +4,7 @@ import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patches.reddit.customclients.spoofClientPatch
 import app.revanced.patches.reddit.customclients.sync.detection.piracy.disablePiracyDetectionPatch
+import app.revanced.patches.shared.misc.string.replaceStringPatch
 import app.revanced.util.returnEarly
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
@@ -13,7 +14,12 @@ import java.util.Base64
 val spoofClientPatch = spoofClientPatch(
     redirectUri = "http://redditsync/auth",
 ) { clientIdOption ->
-    dependsOn(disablePiracyDetectionPatch)
+    dependsOn(
+        disablePiracyDetectionPatch,
+        // Redirects from SSL to WWW domain are bugged causing auth problems.
+        // Manually rewrite the URLs to fix this.
+        replaceStringPatch("ssl.reddit.com", "www.reddit.com")
+    )
 
     compatibleWith(
         "com.laurencedawson.reddit_sync",

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

@@ -148,7 +148,7 @@ fun gmsCoreSupportPatch(
 
         fun packageNameTransform(fromPackageName: String, toPackageName: String): (String) -> String? = { string ->
             when (string) {
-                "$fromPackageName.SuggestionsProvider",
+                "$fromPackageName.SuggestionProvider",
                 "$fromPackageName.fileprovider",
                 -> string.replace(fromPackageName, toPackageName)
 

patches/src/main/kotlin/app/revanced/patches/shared/misc/string/ReplaceStringPatch.kt

@@ -0,0 +1,39 @@
+package app.revanced.patches.shared.misc.string
+
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patches.all.misc.transformation.transformInstructionsPatch
+import app.revanced.util.getReference
+import com.android.tools.smali.dexlib2.ReferenceType
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.reference.StringReference
+import kotlin.text.contains
+
+fun replaceStringPatch(
+    from: String,
+    to: String
+) = bytecodePatch(
+    description = "Replaces occurrences of '$from' with '$to' in string references.",
+) {
+    dependsOn(
+        transformInstructionsPatch(
+            filterMap = filterMap@{ _, _, instruction, instructionIndex ->
+                if (instruction.opcode.referenceType != ReferenceType.STRING) return@filterMap null
+
+                val stringReference = instruction.getReference<StringReference>()!!.string
+                if (from !in stringReference) return@filterMap null
+
+                Triple(instructionIndex, instruction as OneRegisterInstruction, stringReference)
+            },
+            transform = transform@{ mutableMethod, entry ->
+                val (instructionIndex, instruction, stringReference) = entry
+
+                val newString = stringReference.replace(from, to)
+                mutableMethod.replaceInstruction(
+                    instructionIndex,
+                    "${instruction.opcode.name} v${instruction.registerA}, \"$newString\"",
+                )
+            },
+        )
+    )
+}

patches/src/main/kotlin/app/revanced/patches/spotify/layout/hide/createbutton/HideCreateButtonPatch.kt

@@ -6,12 +6,10 @@ import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patches.spotify.misc.extension.sharedExtensionPatch
-import app.revanced.patches.spotify.shared.IS_SPOTIFY_LEGACY_APP_TARGET
 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
-import java.util.logging.Logger
 
 private const val EXTENSION_CLASS_DESCRIPTOR =
     "Lapp/revanced/extension/spotify/layout/hide/createbutton/HideCreateButtonPatch;"
@@ -26,13 +24,6 @@ val hideCreateButtonPatch = bytecodePatch(
     dependsOn(sharedExtensionPatch)
 
     execute {
-        if (IS_SPOTIFY_LEGACY_APP_TARGET) {
-            Logger.getLogger(this::class.java.name).warning(
-                "Create button does not exist in legacy app target.  No changes applied."
-            )
-            return@execute
-        }
-
         val oldNavigationBarAddItemMethod = oldNavigationBarAddItemFingerprint.originalMethodOrNull
         // Only throw the fingerprint error when oldNavigationBarAddItemMethod does not exist.
         val navigationBarItemSetClassDef = if (oldNavigationBarAddItemMethod == null) {

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

@@ -7,8 +7,8 @@ import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.patch.resourcePatch
 import app.revanced.patcher.patch.stringOption
 import app.revanced.patches.spotify.misc.extension.sharedExtensionPatch
-import app.revanced.patches.spotify.shared.IS_SPOTIFY_LEGACY_APP_TARGET
-import app.revanced.util.*
+import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstructionOrThrow
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 import org.w3c.dom.Element
@@ -19,12 +19,6 @@ private val customThemeBytecodePatch = bytecodePatch {
     dependsOn(sharedExtensionPatch)
 
     execute {
-        if (IS_SPOTIFY_LEGACY_APP_TARGET) {
-            // Bytecode changes are not needed for legacy app target.
-            // Player background color is changed with existing resource patch.
-            return@execute
-        }
-
         val colorSpaceUtilsClassDef = colorSpaceUtilsClassFingerprint.originalClassDef
 
         // Hook a util method that converts ARGB to RGBA in the sRGB color space to replace hardcoded accent colors.

patches/src/main/kotlin/app/revanced/patches/spotify/lite/ondemand/Fingerprints.kt

@@ -1,23 +0,0 @@
-package app.revanced.patches.spotify.lite.ondemand
-
-import com.android.tools.smali.dexlib2.Opcode
-import app.revanced.patcher.fingerprint
-
-internal val onDemandFingerprint = fingerprint(fuzzyPatternScanThreshold = 2) {
-    returns("L")
-    parameters()
-    opcodes(
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IF_EQZ,
-        Opcode.SGET_OBJECT,
-        Opcode.GOTO,
-        Opcode.SGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IPUT,
-        Opcode.RETURN_OBJECT,
-    )
-}

patches/src/main/kotlin/app/revanced/patches/spotify/lite/ondemand/OnDemandPatch.kt

@@ -1,21 +1,9 @@
 package app.revanced.patches.spotify.lite.ondemand
 
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.bytecodePatch
 
 @Deprecated("Patch no longer works and will be deleted soon")
 @Suppress("unused")
 val onDemandPatch = bytecodePatch(
     description = "Enables listening to songs on-demand, allowing to play any song from playlists, albums or artists without limitations. This does not remove ads.",
-) {
-    compatibleWith("com.spotify.lite")
-
-    execute {
-        // Spoof a premium account
-
-        onDemandFingerprint.method.addInstruction(
-            onDemandFingerprint.patternMatch!!.endIndex - 1,
-            "const/4 v0, 0x2",
-        )
-    }
-}
+)

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

@@ -2,7 +2,6 @@ package app.revanced.patches.spotify.misc
 
 import app.revanced.patcher.fingerprint
 import app.revanced.patcher.patch.BytecodePatchContext
-import app.revanced.patches.spotify.shared.IS_SPOTIFY_LEGACY_APP_TARGET
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstruction
 import com.android.tools.smali.dexlib2.AccessFlags
@@ -13,25 +12,13 @@ import com.android.tools.smali.dexlib2.iface.reference.TypeReference
 
 context(BytecodePatchContext)
 internal val accountAttributeFingerprint get() = fingerprint {
-    custom { _, classDef ->
-        classDef.type == if (IS_SPOTIFY_LEGACY_APP_TARGET) {
-            "Lcom/spotify/useraccount/v1/AccountAttribute;"
-        } else {
-            "Lcom/spotify/remoteconfig/internal/AccountAttribute;"
-        }
-    }
+    custom { _, classDef -> classDef.type == "Lcom/spotify/remoteconfig/internal/AccountAttribute;" }
 }
 
 context(BytecodePatchContext)
 internal val productStateProtoGetMapFingerprint get() = fingerprint {
     returns("Ljava/util/Map;")
-    custom { _, classDef ->
-        classDef.type == if (IS_SPOTIFY_LEGACY_APP_TARGET) {
-            "Lcom/spotify/ucs/proto/v0/UcsResponseWrapper${'$'}AccountAttributesResponse;"
-        } else {
-            "Lcom/spotify/remoteconfig/internal/ProductStateProto;"
-        }
-    }
+    custom { _, classDef -> classDef.type == "Lcom/spotify/remoteconfig/internal/ProductStateProto;" }
 }
 
 internal val buildQueryParametersFingerprint = fingerprint {
@@ -62,8 +49,8 @@ internal val contextMenuViewModelConstructorFingerprint = fingerprint {
 /**
  * Used to find the interface name of a context menu item.
  */
-internal val browsePodcastsContextMenuItemClassFingerprint = fingerprint {
-    strings("browse_podcast_item", "ui_navigate")
+internal val removeAdsContextMenuItemClassFingerprint = fingerprint {
+    strings("remove_ads_item", "ui_navigate")
 }
 
 internal const val CONTEXT_MENU_ITEM_CLASS_DESCRIPTOR_PLACEHOLDER = "Lapp/revanced/ContextMenuItemPlaceholder;"
@@ -90,14 +77,14 @@ internal val contextFromJsonFingerprint = fingerprint {
     )
     custom { method, classDef ->
         method.name == "fromJson" &&
-                classDef.endsWith("voiceassistants/playermodels/ContextJsonAdapter;")
+                classDef.type.endsWith("voiceassistants/playermodels/ContextJsonAdapter;")
     }
 }
 
 internal val readPlayerOptionOverridesFingerprint = fingerprint {
     custom { method, classDef ->
         method.name == "readPlayerOptionOverrides" &&
-                classDef.endsWith("voiceassistants/playermodels/PreparePlayOptionsJsonAdapter;")
+                classDef.type.endsWith("voiceassistants/playermodels/PreparePlayOptionsJsonAdapter;")
     }
 }
 
@@ -119,21 +106,21 @@ internal val abstractProtobufListEnsureIsMutableFingerprint = fingerprint {
 
 internal fun structureGetSectionsFingerprint(className: String) = fingerprint {
     custom { method, classDef ->
-        classDef.endsWith(className) && method.indexOfFirstInstruction {
+        classDef.type.endsWith(className) && method.indexOfFirstInstruction {
             opcode == Opcode.IGET_OBJECT && getReference<FieldReference>()?.name == "sections_"
         } >= 0
     }
 }
 
 internal val homeSectionFingerprint = fingerprint {
-    custom { _, classDef -> classDef.endsWith("homeapi/proto/Section;") }
+    custom { _, classDef -> classDef.type.endsWith("homeapi/proto/Section;") }
 }
 
 internal val homeStructureGetSectionsFingerprint =
     structureGetSectionsFingerprint("homeapi/proto/HomeStructure;")
 
 internal val browseSectionFingerprint = fingerprint {
-    custom { _, classDef-> classDef.endsWith("browsita/v1/resolved/Section;") }
+    custom { _, classDef-> classDef.type.endsWith("browsita/v1/resolved/Section;") }
 }
 
 internal val browseStructureGetSectionsFingerprint =

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

@@ -7,37 +7,28 @@ 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 getPackageInfoFingerprint = fingerprint {
-    strings(
-        "Failed to get the application signatures"
-    )
-}
-
 internal val loadOrbitLibraryFingerprint = fingerprint {
     strings("/liborbit-jni-spotify.so")
 }
 
-internal val startupPageLayoutInflateFingerprint = fingerprint {
-    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
-    returns("Landroid/view/View;")
-    parameters("Landroid/view/LayoutInflater;", "Landroid/view/ViewGroup;", "Landroid/os/Bundle;")
-    strings("blueprintContainer", "gradient", "valuePropositionTextView")
+internal val setClientIdFingerprint = fingerprint {
+    parameters("Ljava/lang/String;")
+    custom { method, classDef ->
+        classDef.type == "Lcom/spotify/connectivity/ApplicationScopeConfiguration;"
+                && method.name == "setClientId"
+    }
 }
 
-internal val renderStartLoginScreenFingerprint = fingerprint {
-    strings("authenticationButtonFactory", "MORE_OPTIONS")
+internal val setUserAgentFingerprint = fingerprint {
+    parameters("Ljava/lang/String;")
+    custom { method, classDef ->
+        classDef.type == "Lcom/spotify/connectivity/ApplicationScopeConfiguration;"
+                && method.name == "setDefaultHTTPUserAgent"
+    }
 }
 
-internal val renderSecondLoginScreenFingerprint = fingerprint {
-    strings("authenticationButtonFactory", "intent_login")
-}
-
-internal val renderThirdLoginScreenFingerprint = fingerprint {
-    strings("EMAIL_OR_USERNAME", "listener")
-}
-
-internal val thirdLoginScreenLoginOnClickFingerprint = fingerprint {
-    strings("login", "listener", "none")
+internal val extensionFixConstantsFingerprint = fingerprint {
+    custom { _, classDef -> classDef.type == "Lapp/revanced/extension/spotify/misc/fix/Constants;" }
 }
 
 internal val runIntegrityVerificationFingerprint = fingerprint {

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

@@ -2,18 +2,13 @@ package app.revanced.patches.spotify.misc.fix
 
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.patch.intOption
+import app.revanced.patcher.patch.stringOption
 import app.revanced.patches.shared.misc.hex.HexPatchBuilder
 import app.revanced.patches.shared.misc.hex.hexPatch
 import app.revanced.patches.spotify.misc.extension.sharedExtensionPatch
-import app.revanced.util.*
-import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
-import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
-import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+import app.revanced.util.returnEarly
 
 internal const val EXTENSION_CLASS_DESCRIPTOR = "Lapp/revanced/extension/spotify/misc/fix/SpoofClientPatch;"
 
@@ -25,16 +20,40 @@ val spoofClientPatch = bytecodePatch(
     val requestListenerPort by intOption(
         key = "requestListenerPort",
         default = 4345,
-        title = " Login request listener port",
-        description = "The port to use for the listener that intercepts and handles login requests. " +
-                "Port must be between 0 and 65535.",
-        required = true,
+        title = "Request listener port",
+        description = "The port to use for the listener that intercepts and handles spoofed requests. " +
+                "Port must be between 0 and 65535. " +
+                "Do not change this option, if you do not know what you are doing.",
         validator = {
             it!!
             !(it < 0 || it > 65535)
         }
     )
 
+    val clientVersion by stringOption(
+        key = "clientVersion",
+        default = "iphone-9.0.58.558.g200011c",
+        title = "Client version",
+        description = "The client version used for spoofing the client token. " +
+                "Do not change this option, if you do not know what you are doing."
+    )
+
+    val hardwareMachine by stringOption(
+        key = "hardwareMachine",
+        default = "iPhone16,1",
+        title = "Hardware machine",
+        description = "The hardware machine used for spoofing the client token. " +
+                "Do not change this option, if you do not know what you are doing."
+    )
+
+    val systemVersion by stringOption(
+        key = "systemVersion",
+        default = "17.7.2",
+        title = "System version",
+        description = "The system version used for spoofing the client token. " +
+                "Do not change this option, if you do not know what you are doing."
+    )
+
     dependsOn(
         sharedExtensionPatch,
         hexPatch(ignoreMissingTargetFiles = true, block = fun HexPatchBuilder.() {
@@ -44,10 +63,8 @@ val spoofClientPatch = bytecodePatch(
                 "x86",
                 "x86_64"
             ).forEach { architecture ->
-                "https://login5.spotify.com/v3/login" to "http://127.0.0.1:$requestListenerPort/v3/login" inFile
-                        "lib/$architecture/liborbit-jni-spotify.so"
-
-                "https://login5.spotify.com/v4/login" to "http://127.0.0.1:$requestListenerPort/v4/login" inFile
+                "https://clienttoken.spotify.com/v1/clienttoken" to
+                        "http://127.0.0.1:$requestListenerPort/v1/clienttoken" inFile
                         "lib/$architecture/liborbit-jni-spotify.so"
             }
         })
@@ -56,52 +73,29 @@ val spoofClientPatch = bytecodePatch(
     compatibleWith("com.spotify.music")
 
     execute {
-        // region Spoof package info.
+        val clientVersion = clientVersion!!
+        val hardwareMachine = hardwareMachine!!
+        val systemVersion = systemVersion!!
 
-        getPackageInfoFingerprint.method.apply {
-            // region Spoof signature.
+        // region Spoof login request.
+        
+        val version = clientVersion
+            .substringAfter('-')
+            .substringBeforeLast('.')
+            .substringBeforeLast('.')
+        
+        setUserAgentFingerprint.method.addInstruction(
+            0,
+            "const-string p1, \"Spotify/$version iOS/$systemVersion ($hardwareMachine)\""
+        )
 
-            val failedToGetSignaturesStringIndex =
-                getPackageInfoFingerprint.stringMatches!!.first().index
-
-            val concatSignaturesIndex = indexOfFirstInstructionReversedOrThrow(
-                failedToGetSignaturesStringIndex,
-                Opcode.MOVE_RESULT_OBJECT,
-            )
-
-            val signatureRegister = getInstruction<OneRegisterInstruction>(concatSignaturesIndex).registerA
-            val expectedSignature = "d6a6dced4a85f24204bf9505ccc1fce114cadb32"
-
-            replaceInstruction(concatSignaturesIndex, "const-string v$signatureRegister, \"$expectedSignature\"")
-
-            // endregion
-
-            // region Spoof installer name.
-
-            val expectedInstallerName = "com.android.vending"
-
-            findInstructionIndicesReversedOrThrow {
-                val reference = getReference<MethodReference>()
-                reference?.name == "getInstallerPackageName" || reference?.name == "getInstallingPackageName"
-            }.forEach { index ->
-                val returnObjectIndex = index + 1
-
-                val installerPackageNameRegister = getInstruction<OneRegisterInstruction>(
-                    returnObjectIndex
-                ).registerA
-
-                addInstruction(
-                    returnObjectIndex + 1,
-                    "const-string v$installerPackageNameRegister, \"$expectedInstallerName\""
-                )
-            }
-
-            // endregion
-        }
+        setClientIdFingerprint.method.addInstruction(
+            0, "const-string p1, \"58bd3c95768941ea9eb4350aaa033eb3\""
+        )
 
         // endregion
 
-        // region Spoof client.
+        // region Spoof client-token request.
 
         loadOrbitLibraryFingerprint.method.addInstructions(
             0,
@@ -111,72 +105,12 @@ val spoofClientPatch = bytecodePatch(
             """
         )
 
-        startupPageLayoutInflateFingerprint.method.apply {
-            val openLoginWebViewDescriptor =
-                "$EXTENSION_CLASS_DESCRIPTOR->launchLogin(Landroid/view/LayoutInflater;)V"
-
-            addInstructions(
-                0,
-                "invoke-static/range { p1 .. p1 }, $openLoginWebViewDescriptor"
-            )
-        }
-
-        renderStartLoginScreenFingerprint.method.apply {
-            val onEventIndex = indexOfFirstInstructionOrThrow {
-                opcode == Opcode.INVOKE_INTERFACE && getReference<MethodReference>()?.name == "getView"
-            }
-
-            val buttonRegister = getInstruction<OneRegisterInstruction>(onEventIndex + 1).registerA
-
-            addInstruction(
-                onEventIndex + 2,
-                "invoke-static { v$buttonRegister }, $EXTENSION_CLASS_DESCRIPTOR->setNativeLoginHandler(Landroid/view/View;)V"
-            )
-        }
-
-        renderSecondLoginScreenFingerprint.method.apply {
-            val getViewIndex = indexOfFirstInstructionOrThrow {
-                opcode == Opcode.INVOKE_INTERFACE && getReference<MethodReference>()?.name == "getView"
-            }
-
-            val buttonRegister = getInstruction<OneRegisterInstruction>(getViewIndex + 1).registerA
-
-            // Early return the render for loop since the first item of the loop is the login button.
-            addInstructions(
-                getViewIndex + 2,
-                """
-                    invoke-virtual { v$buttonRegister }, Landroid/view/View;->performClick()Z
-                    return-void
-                """
-            )
-        }
-
-        renderThirdLoginScreenFingerprint.method.apply {
-            val invokeSetListenerIndex = indexOfFirstInstructionOrThrow {
-                val reference = getReference<MethodReference>()
-                reference?.definingClass == "Landroid/view/View;" && reference.name == "setOnClickListener"
-            }
-
-            val buttonRegister = getInstruction<FiveRegisterInstruction>(invokeSetListenerIndex).registerC
-
-            addInstruction(
-                invokeSetListenerIndex + 1,
-                "invoke-virtual { v$buttonRegister }, Landroid/view/View;->performClick()Z"
-            )
-        }
-
-        thirdLoginScreenLoginOnClickFingerprint.method.apply {
-            // Use placeholder credentials to pass the login screen.
-            val loginActionIndex = indexOfFirstInstructionOrThrow(Opcode.RETURN_VOID) - 1
-            val loginActionInstruction = getInstruction<FiveRegisterInstruction>(loginActionIndex)
-
-            addInstructions(
-                loginActionIndex,
-                """
-                    const-string v${loginActionInstruction.registerD}, "placeholder"
-                    const-string v${loginActionInstruction.registerE}, "placeholder"
-                """
-            )
+        mapOf(
+            "getClientVersion" to clientVersion,
+            "getSystemVersion" to systemVersion,
+            "getHardwareMachine" to hardwareMachine
+        ).forEach { (methodName, value) ->
+            extensionFixConstantsFingerprint.classDef.methods.single { it.name == methodName }.returnEarly(value)
         }
 
         // endregion

patches/src/main/kotlin/app/revanced/patches/spotify/misc/lyrics/ChangeLyricsProviderPatch.kt

@@ -6,7 +6,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.patch.stringOption
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.spotify.shared.IS_SPOTIFY_LEGACY_APP_TARGET
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionOrThrow
 import app.revanced.util.indexOfFirstInstructionReversedOrThrow
@@ -57,16 +56,10 @@ val changeLyricsProviderPatch = bytecodePatch(
     }
 
     execute {
-        if (IS_SPOTIFY_LEGACY_APP_TARGET) {
-            Logger.getLogger(this::class.java.name).severe(
-                "Change lyrics provider patch is not supported for this target version."
-            )
-            return@execute
-        }
-
         val httpClientBuilderMethod = httpClientBuilderFingerprint.originalMethod
 
         // region Create a modified copy of the HTTP client builder method with the custom lyrics provider host.
+
         val patchedHttpClientBuilderMethod = with(httpClientBuilderMethod) {
             val invokeBuildUrlIndex = indexOfFirstInstructionOrThrow {
                 getReference<MethodReference>()?.returnType == "Lokhttp3/HttpUrl;"
@@ -89,9 +82,11 @@ val changeLyricsProviderPatch = bytecodePatch(
                 httpClientBuilderFingerprint.classDef.methods.add(this)
             }
         }
+
         //endregion
 
         // region Replace the call to the HTTP client builder method used exclusively for lyrics by the modified one.
+
         getLyricsHttpClientFingerprint(httpClientBuilderMethod).method.apply {
             val getLyricsHttpClientIndex = indexOfFirstInstructionOrThrow {
                 getReference<MethodReference>() == httpClientBuilderMethod
@@ -118,6 +113,7 @@ val changeLyricsProviderPatch = bytecodePatch(
                 )
             )
         }
+
         //endregion
     }
 }

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

@@ -14,7 +14,7 @@ internal val shareCopyUrlFingerprint = fingerprint {
     }
 }
 
-internal val shareCopyUrlLegacyFingerprint = fingerprint {
+internal val oldShareCopyUrlFingerprint = fingerprint {
     returns("Ljava/lang/Object;")
     parameters("Ljava/lang/Object;")
     strings("clipboard", "createNewSession failed")
@@ -38,7 +38,7 @@ internal val formatAndroidShareSheetUrlFingerprint = fingerprint {
     }
 }
 
-internal val formatAndroidShareSheetUrlLegacyFingerprint = fingerprint {
+internal val oldFormatAndroidShareSheetUrlFingerprint = fingerprint {
     accessFlags(AccessFlags.PUBLIC)
     returns("Ljava/lang/String;")
     parameters("Lcom/spotify/share/social/sharedata/ShareData;", "Ljava/lang/String;")

patches/src/main/kotlin/app/revanced/patches/spotify/misc/privacy/SanitizeSharingLinksPatch.kt

@@ -1,11 +1,9 @@
 package app.revanced.patches.spotify.misc.privacy
 
-import app.revanced.patcher.Fingerprint
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patches.spotify.misc.extension.sharedExtensionPatch
-import app.revanced.patches.spotify.shared.IS_SPOTIFY_LEGACY_APP_TARGET
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionOrThrow
 import com.android.tools.smali.dexlib2.AccessFlags
@@ -28,10 +26,10 @@ val sanitizeSharingLinksPatch = bytecodePatch(
         val extensionMethodDescriptor = "$EXTENSION_CLASS_DESCRIPTOR->" +
                 "sanitizeUrl(Ljava/lang/String;)Ljava/lang/String;"
 
-        val copyFingerprint = if (IS_SPOTIFY_LEGACY_APP_TARGET) {
-            shareCopyUrlLegacyFingerprint
-        } else {
+        val copyFingerprint = if (shareCopyUrlFingerprint.originalMethodOrNull != null) {
             shareCopyUrlFingerprint
+        } else {
+            oldShareCopyUrlFingerprint
         }
 
         copyFingerprint.method.apply {
@@ -50,15 +48,10 @@ val sanitizeSharingLinksPatch = bytecodePatch(
         }
 
         // Android native share sheet is used for all other quick share types (X, WhatsApp, etc).
-        val shareUrlParameter : String
-        val shareSheetFingerprint : Fingerprint
-        if (IS_SPOTIFY_LEGACY_APP_TARGET) {
-            shareSheetFingerprint = formatAndroidShareSheetUrlLegacyFingerprint
-            shareUrlParameter = "p2"
-        } else {
-            shareSheetFingerprint = formatAndroidShareSheetUrlFingerprint
-            val methodAccessFlags = formatAndroidShareSheetUrlFingerprint.originalMethod.accessFlags
-            shareUrlParameter = if (AccessFlags.STATIC.isSet(methodAccessFlags)) {
+        val shareUrlParameter: String
+        val shareSheetFingerprint = if (formatAndroidShareSheetUrlFingerprint.originalMethodOrNull != null) {
+            val methodAccessFlags = formatAndroidShareSheetUrlFingerprint.originalMethod
+            shareUrlParameter = if (AccessFlags.STATIC.isSet(methodAccessFlags.accessFlags)) {
                 // In newer implementations the method is static, so p0 is not `this`.
                 "p1"
             } else {
@@ -66,6 +59,11 @@ val sanitizeSharingLinksPatch = bytecodePatch(
                 // For that reason, add one to the parameter register.
                 "p2"
             }
+
+            formatAndroidShareSheetUrlFingerprint
+        } else {
+            shareUrlParameter = "p2"
+            oldFormatAndroidShareSheetUrlFingerprint
         }
 
         shareSheetFingerprint.method.addInstructions(

patches/src/main/kotlin/app/revanced/patches/spotify/misc/widgets/FixThirdPartyLaunchersWidgets.kt

@@ -1,9 +1,7 @@
 package app.revanced.patches.spotify.misc.widgets
 
 import app.revanced.patcher.patch.bytecodePatch
-import app.revanced.patches.spotify.shared.IS_SPOTIFY_LEGACY_APP_TARGET
 import app.revanced.util.returnEarly
-import java.util.logging.Logger
 
 @Suppress("unused")
 val fixThirdPartyLaunchersWidgets = bytecodePatch(
@@ -13,14 +11,6 @@ val fixThirdPartyLaunchersWidgets = bytecodePatch(
     compatibleWith("com.spotify.music")
 
     execute {
-        if (IS_SPOTIFY_LEGACY_APP_TARGET)  {
-            // The permission check does not exist in legacy versions.
-            Logger.getLogger(this::class.java.name).warning(
-                "Legacy app target does not have any third party launcher restrictions.  No changes applied."
-            )
-            return@execute
-        }
-
         // Only system app launchers are granted the BIND_APPWIDGET permission.
         // Override the method that checks for it to always return true, as this permission is not actually required
         // for the widgets to work.

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

@@ -1,38 +1,15 @@
 package app.revanced.patches.spotify.shared
 
 import app.revanced.patcher.fingerprint
-import app.revanced.patcher.patch.BytecodePatchContext
 import com.android.tools.smali.dexlib2.AccessFlags
 
 private const val SPOTIFY_MAIN_ACTIVITY = "Lcom/spotify/music/SpotifyMainActivity;"
 
-/**
- * Main activity of target 8.6.98.900.
- */
-internal const val SPOTIFY_MAIN_ACTIVITY_LEGACY = "Lcom/spotify/music/MainActivity;"
-
 internal val mainActivityOnCreateFingerprint = fingerprint {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
     returns("V")
     parameters("Landroid/os/Bundle;")
     custom { method, classDef ->
-        method.name == "onCreate" && (classDef.type == SPOTIFY_MAIN_ACTIVITY
-                || classDef.type == SPOTIFY_MAIN_ACTIVITY_LEGACY)
+        method.name == "onCreate" && classDef.type == SPOTIFY_MAIN_ACTIVITY
     }
 }
-
-private var isLegacyAppTarget: Boolean? = null
-
-/**
- * If patching a legacy 8.x target. This may also be set if patching slightly older/newer app targets,
- * but the only legacy target of interest is 8.6.98.900 as it's the last version that
- * supports Spotify integration on Kenwood/Pioneer car stereos.
- */
-context(BytecodePatchContext)
-internal val IS_SPOTIFY_LEGACY_APP_TARGET
-    get(): Boolean {
-        if (isLegacyAppTarget == null) {
-            isLegacyAppTarget = mainActivityOnCreateFingerprint.originalClassDef.type == SPOTIFY_MAIN_ACTIVITY_LEGACY
-        }
-        return isLegacyAppTarget!!
-    }

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

@@ -43,16 +43,15 @@ private val hideAdsResourcePatch = resourcePatch {
         addResources("youtube", "ad.general.hideAdsResourcePatch")
 
         PreferenceScreen.ADS.addPreferences(
-            SwitchPreference("revanced_hide_creator_store_shelves"),
+            SwitchPreference("revanced_hide_creator_store_shelf"),
             SwitchPreference("revanced_hide_end_screen_store_banner"),
             SwitchPreference("revanced_hide_fullscreen_ads"),
             SwitchPreference("revanced_hide_general_ads"),
             SwitchPreference("revanced_hide_merchandise_banners"),
             SwitchPreference("revanced_hide_paid_promotion_label"),
             SwitchPreference("revanced_hide_self_sponsor_ads"),
-            SwitchPreference("revanced_hide_tagged_products"),
+            SwitchPreference("revanced_hide_shopping_links"),
             SwitchPreference("revanced_hide_view_products_banner"),
-            SwitchPreference("revanced_hide_visit_store_button"),
             SwitchPreference("revanced_hide_web_search_results"),
         )
 

patches/src/main/kotlin/app/revanced/patches/youtube/interaction/doubletap/DisableChapterSkipDoubleTapPatch.kt

@@ -0,0 +1,84 @@
+package app.revanced.patches.youtube.interaction.doubletap
+
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.fingerprint
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patches.all.misc.resources.addResources
+import app.revanced.patches.all.misc.resources.addResourcesPatch
+import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
+import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
+import app.revanced.patches.youtube.misc.settings.PreferenceScreen
+import app.revanced.patches.youtube.misc.settings.settingsPatch
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+
+private const val EXTENSION_CLASS_DESCRIPTOR =
+    "Lapp/revanced/extension/youtube/patches/DisableDoubleTapActionsPatch;"
+
+@Suppress("unused")
+val disableDoubleTapActionsPatch = bytecodePatch(
+    name = "Disable double tap actions",
+    description = "Adds an option to disable player double tap gestures.",
+) {
+    dependsOn(
+        sharedExtensionPatch,
+        settingsPatch,
+        addResourcesPatch,
+    )
+
+    compatibleWith(
+        "com.google.android.youtube"(
+            "20.07.39",
+            "20.12.46",
+            "20.13.41",
+        )
+    )
+
+    execute {
+        addResources("youtube", "interaction.doubletap.disableDoubleTapActionsPatch")
+
+        PreferenceScreen.PLAYER.addPreferences(
+            SwitchPreference("revanced_disable_chapter_skip_double_tap"),
+        )
+
+        val doubleTapInfoGetSeekSourceFingerprint = fingerprint {
+            accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+            parameters("Z")
+            returns(seekTypeEnumFingerprint.originalClassDef.type)
+            opcodes(
+                Opcode.IF_EQZ,
+                Opcode.SGET_OBJECT,
+                Opcode.RETURN_OBJECT,
+                Opcode.SGET_OBJECT,
+                Opcode.RETURN_OBJECT,
+            )
+            custom { _, classDef ->
+                classDef.fields.count() == 4
+            }
+        }
+
+        // Force isChapterSeek flag to false.
+        doubleTapInfoGetSeekSourceFingerprint.method.addInstructions(
+            0,
+            """
+                invoke-static { p1 }, $EXTENSION_CLASS_DESCRIPTOR->disableDoubleTapChapters(Z)Z
+                move-result p1
+            """
+        )
+
+        doubleTapInfoCtorFingerprint.match(
+            doubleTapInfoGetSeekSourceFingerprint.classDef
+        ).method.addInstructions(
+            0,
+            """
+                invoke-static { p3 }, $EXTENSION_CLASS_DESCRIPTOR->disableDoubleTapChapters(Z)Z
+                move-result p3
+            """
+        )
+    }
+}
+
+@Deprecated("Patch was renamed", ReplaceWith("disableDoubleTapActionsPatch"))
+val disableChapterSkipDoubleTapPatch = bytecodePatch {
+    dependsOn(disableDoubleTapActionsPatch)
+}

patches/src/main/kotlin/app/revanced/patches/youtube/interaction/doubletap/Fingerprints.kt

@@ -0,0 +1,22 @@
+package app.revanced.patches.youtube.interaction.doubletap
+
+import app.revanced.patcher.fingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+internal val seekTypeEnumFingerprint = fingerprint {
+    accessFlags(AccessFlags.STATIC, AccessFlags.CONSTRUCTOR)
+    strings(
+        "SEEK_SOURCE_SEEK_TO_NEXT_CHAPTER",
+        "SEEK_SOURCE_SEEK_TO_PREVIOUS_CHAPTER"
+    )
+}
+
+internal val doubleTapInfoCtorFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR)
+    parameters(
+        "Landroid/view/MotionEvent;",
+        "I",
+        "Z",
+        "Lj\$/time/Duration;"
+    )
+}

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

@@ -6,7 +6,6 @@ import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.patch.resourcePatch
 import app.revanced.patches.all.misc.resources.addResources
 import app.revanced.patches.all.misc.resources.addResourcesPatch
-import app.revanced.patches.shared.misc.settings.preference.InputType
 import app.revanced.patches.shared.misc.settings.preference.PreferenceScreenPreference
 import app.revanced.patches.shared.misc.settings.preference.PreferenceScreenPreference.Sorting
 import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
@@ -40,7 +39,10 @@ private val downloadsResourcePatch = resourcePatch {
                 preferences = setOf(
                     SwitchPreference("revanced_external_downloader"),
                     SwitchPreference("revanced_external_downloader_action_button"),
-                    TextPreference("revanced_external_downloader_name", inputType = InputType.TEXT),
+                    TextPreference(
+                        "revanced_external_downloader_name",
+                        tag = "app.revanced.extension.youtube.settings.preference.ExternalDownloaderPreference",
+                    ),
                 ),
             ),
         )