diff --git a/.editorconfig b/.editorconfig
deleted file mode 100644
index 2d6d258f47..0000000000
--- a/.editorconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-[*.{kt,kts}]
-ktlint_code_style = intellij_idea
-ktlint_standard_no-wildcard-imports = disabled
\ No newline at end of file
diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml
index bb66d85266..32c03cbe64 100644
--- a/.github/workflows/build_pull_request.yml
+++ b/.github/workflows/build_pull_request.yml
@@ -2,6 +2,10 @@ name: Build pull request
on:
workflow_dispatch:
+ inputs:
+ pr:
+ description: "PR to build"
+ required: true
pull_request:
branches:
- dev
@@ -10,9 +14,14 @@ jobs:
release:
name: Build
runs-on: ubuntu-latest
+ permissions:
+ contents: read
+
steps:
- name: Checkout
- uses: actions/checkout@v5
+ uses: actions/checkout@v6
+ with:
+ ref: ${{ inputs.pr && format('refs/pull/{0}/merge', inputs.pr) || github.ref }}
- name: Setup Java
uses: actions/setup-java@v5
@@ -25,11 +34,13 @@ jobs:
- name: Build
env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ ORG_GRADLE_PROJECT_githubPackagesUsername: ${{ github.actor }}
+ ORG_GRADLE_PROJECT_githubPackagesPassword: ${{ secrets.GITHUB_TOKEN }}
run: ./gradlew :patches:buildAndroid --no-daemon
- name: Upload artifacts
- uses: actions/upload-artifact@v5
+ uses: actions/upload-artifact@v7
with:
name: revanced-patches
path: patches/build/libs
+ archive: false
diff --git a/.github/workflows/open_pull_request.yml b/.github/workflows/open_pull_request.yml
index 6e3eddd18b..c1402f5490 100644
--- a/.github/workflows/open_pull_request.yml
+++ b/.github/workflows/open_pull_request.yml
@@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
- uses: actions/checkout@v5
+ uses: actions/checkout@v6
- name: Open pull request
uses: repo-sync/pull-request@v2
diff --git a/.github/workflows/pull_strings.yml b/.github/workflows/pull_strings.yml
index be27b06872..f2da51ec74 100644
--- a/.github/workflows/pull_strings.yml
+++ b/.github/workflows/pull_strings.yml
@@ -1,8 +1,6 @@
name: Pull strings
on:
- schedule:
- - cron: "0 */12 * * *"
workflow_dispatch:
jobs:
@@ -14,10 +12,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
- uses: actions/checkout@v5
+ uses: actions/checkout@v6
with:
ref: dev
- clean: true
+ persist-credentials: true
- name: Pull strings
uses: crowdin/github-action@v2
@@ -25,16 +23,29 @@ jobs:
config: crowdin.yml
upload_sources: false
download_translations: true
+ push_translations: false
skip_ref_checkout: true
- localization_branch_name: feat/translations
- create_pull_request: false
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
+ - name: Process strings
+ run: |
+ chmod -R 777 patches/src/main/resources
+ ./gradlew processStringsFromCrowdin
+ env:
+ ORG_GRADLE_PROJECT_githubPackagesUsername: ${{ github.actor }}
+ ORG_GRADLE_PROJECT_githubPackagesPassword: ${{ secrets.GITHUB_TOKEN }}
+
+ - name: Commit changes
+ uses: stefanzweifel/git-auto-commit-action@v7
+ with:
+ commit_message: "chore: Sync translations from Crowdin"
+ push_options: '--force'
+ branch: feat/translations
+
- name: Open pull request
- if: github.event_name == 'workflow_dispatch'
uses: repo-sync/pull-request@v2
with:
source_branch: feat/translations
diff --git a/.github/workflows/push_strings.yml b/.github/workflows/push_strings.yml
index c51254f756..d13f88573d 100644
--- a/.github/workflows/push_strings.yml
+++ b/.github/workflows/push_strings.yml
@@ -14,12 +14,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
- uses: actions/checkout@v5
+ uses: actions/checkout@v6
- - name: Preprocess strings
+ - name: Process strings
env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- run: ./gradlew clean preprocessCrowdinStrings
+ ORG_GRADLE_PROJECT_githubPackagesUsername: ${{ github.actor }}
+ ORG_GRADLE_PROJECT_githubPackagesPassword: ${{ secrets.GITHUB_TOKEN }}
+ run: ./gradlew processStringsForCrowdin
- name: Push strings
uses: crowdin/github-action@v2
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 946dc93806..27a19a17c1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,10 +15,11 @@ jobs:
packages: write
id-token: write
attestations: write
+ artifact-metadata: write
runs-on: ubuntu-latest
steps:
- name: Checkout
- uses: actions/checkout@v5
+ uses: actions/checkout@v6
- name: Setup Java
uses: actions/setup-java@v5
@@ -31,7 +32,8 @@ jobs:
- name: Build
env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ ORG_GRADLE_PROJECT_githubPackagesUsername: ${{ github.actor }}
+ ORG_GRADLE_PROJECT_githubPackagesPassword: ${{ secrets.GITHUB_TOKEN }}
run: ./gradlew :patches:buildAndroid clean
- name: Setup Node.js
@@ -55,10 +57,12 @@ jobs:
id: release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ ORG_GRADLE_PROJECT_githubPackagesUsername: ${{ github.actor }}
+ ORG_GRADLE_PROJECT_githubPackagesPassword: ${{ secrets.GITHUB_TOKEN }}
- name: Attest
if: steps.release.outputs.new_release_published == 'true'
- uses: actions/attest-build-provenance@v3
+ uses: actions/attest@v4
with:
subject-name: 'ReVanced Patches ${{ steps.release.outputs.new_release_git_tag }}'
subject-path: patches/build/libs/patches-*.rvp
diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
index 765927aaff..f02668b990 100644
--- a/.github/workflows/update-gradle-wrapper.yml
+++ b/.github/workflows/update-gradle-wrapper.yml
@@ -10,9 +10,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
- uses: actions/checkout@v5
+ uses: actions/checkout@v6
- name: Update Gradle Wrapper
- uses: gradle-update/update-gradle-wrapper-action@v1
+ uses: gradle-update/update-gradle-wrapper-action@v2
with:
target-branch: dev
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf13039133..bfebce7e69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,840 @@
+# [6.1.0](https://github.com/ReVanced/revanced-patches/compare/v6.0.1...v6.1.0) (2026-03-18)
+
+
+### Bug Fixes
+
+* **Export internal data documents provider:** Correct S_IFLNK constant and symlink detection mask ([#6819](https://github.com/ReVanced/revanced-patches/issues/6819)) ([252617b](https://github.com/ReVanced/revanced-patches/commit/252617b8dd3f24e1ff9a04ba1d91b43dc29bd757))
+* **YouTube - Custom branding:** Fix double icons and change default branding to ReVanced ([#6806](https://github.com/ReVanced/revanced-patches/issues/6806)) ([e51c529](https://github.com/ReVanced/revanced-patches/commit/e51c5292c171325e7cfa0f5ee85474d9b3961a34))
+
+
+### Features
+
+* Add `Spoof root of trust` and `Spoof keystore security level` patch ([#6751](https://github.com/ReVanced/revanced-patches/issues/6751)) ([4bc8c7c](https://github.com/ReVanced/revanced-patches/commit/4bc8c7c0f60a095533f07dc281f0320f8eb22f3c))
+* **Announcements:** Support ReVanced API v5 announcements ([a05386e](https://github.com/ReVanced/revanced-patches/commit/a05386e8bc24c085b5c74f3674c402c5dd5ad468))
+* Change contact email in patches about ([df1c3a4](https://github.com/ReVanced/revanced-patches/commit/df1c3a4a70fd2595d77b539299f1f7301bc60d24))
+* **Instagram:** Add `Enable location sticker redesign` patch ([#6808](https://github.com/ReVanced/revanced-patches/issues/6808)) ([4b699da](https://github.com/ReVanced/revanced-patches/commit/4b699da220e5d1527c390792b6228e2d9cffedb7))
+* **Spoof video streams:** Add Android Reel client to fix playback issues ([#6830](https://github.com/ReVanced/revanced-patches/issues/6830)) ([4b6c3e3](https://github.com/ReVanced/revanced-patches/commit/4b6c3e312328fbf6a1c7065e27d8ff04573e58be))
+
+# [6.1.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v6.1.0-dev.3...v6.1.0-dev.4) (2026-03-18)
+
+
+### Bug Fixes
+
+* **YouTube - Custom branding:** Fix double icons and change default branding to ReVanced ([#6806](https://github.com/ReVanced/revanced-patches/issues/6806)) ([e51c529](https://github.com/ReVanced/revanced-patches/commit/e51c5292c171325e7cfa0f5ee85474d9b3961a34))
+
+
+### Features
+
+* Add `Spoof root of trust` and `Spoof keystore security level` patch ([#6751](https://github.com/ReVanced/revanced-patches/issues/6751)) ([4bc8c7c](https://github.com/ReVanced/revanced-patches/commit/4bc8c7c0f60a095533f07dc281f0320f8eb22f3c))
+* **Instagram:** Add `Enable location sticker redesign` patch ([#6808](https://github.com/ReVanced/revanced-patches/issues/6808)) ([4b699da](https://github.com/ReVanced/revanced-patches/commit/4b699da220e5d1527c390792b6228e2d9cffedb7))
+
+# [6.1.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v6.1.0-dev.2...v6.1.0-dev.3) (2026-03-18)
+
+
+### Features
+
+* **Spoof video streams:** Add Android Reel client to fix playback issues ([#6830](https://github.com/ReVanced/revanced-patches/issues/6830)) ([4b6c3e3](https://github.com/ReVanced/revanced-patches/commit/4b6c3e312328fbf6a1c7065e27d8ff04573e58be))
+
+# [6.1.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v6.1.0-dev.1...v6.1.0-dev.2) (2026-03-17)
+
+
+### Features
+
+* **Announcements:** Support ReVanced API v5 announcements ([a05386e](https://github.com/ReVanced/revanced-patches/commit/a05386e8bc24c085b5c74f3674c402c5dd5ad468))
+
+# [6.1.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v6.0.2-dev.1...v6.1.0-dev.1) (2026-03-16)
+
+
+### Features
+
+* Change contact email in patches about ([df1c3a4](https://github.com/ReVanced/revanced-patches/commit/df1c3a4a70fd2595d77b539299f1f7301bc60d24))
+
+## [6.0.2-dev.1](https://github.com/ReVanced/revanced-patches/compare/v6.0.1...v6.0.2-dev.1) (2026-03-16)
+
+
+### Bug Fixes
+
+* **Export internal data documents provider:** Correct S_IFLNK constant and symlink detection mask ([#6819](https://github.com/ReVanced/revanced-patches/issues/6819)) ([252617b](https://github.com/ReVanced/revanced-patches/commit/252617b8dd3f24e1ff9a04ba1d91b43dc29bd757))
+
+## [6.0.1](https://github.com/ReVanced/revanced-patches/compare/v6.0.0...v6.0.1) (2026-03-15)
+
+
+### Bug Fixes
+
+* **GmsCore support:** use `prefixOrReplace` for non-matching APP_AUTHORITIES in content URL transformation ([#6801](https://github.com/ReVanced/revanced-patches/issues/6801)) ([8f6f128](https://github.com/ReVanced/revanced-patches/commit/8f6f128d718c20c56668ed3801b434a5cbb04dfd))
+* **YouTube Music - Hide buttons:** Crashes on startup due to null LayoutParams ([#6799](https://github.com/ReVanced/revanced-patches/issues/6799)) ([3e32c38](https://github.com/ReVanced/revanced-patches/commit/3e32c387328b061f33b361ed022ae18e447a7904))
+* **YouTube:** Use correct query parameters for DeArrow requests ([#6780](https://github.com/ReVanced/revanced-patches/issues/6780)) ([02a48e7](https://github.com/ReVanced/revanced-patches/commit/02a48e7a5f2b1ffd64a80651b49666de27ab7014))
+
+## [6.0.1-dev.3](https://github.com/ReVanced/revanced-patches/compare/v6.0.1-dev.2...v6.0.1-dev.3) (2026-03-15)
+
+
+### Bug Fixes
+
+* **GmsCore support:** use `prefixOrReplace` for non-matching APP_AUTHORITIES in content URL transformation ([#6801](https://github.com/ReVanced/revanced-patches/issues/6801)) ([8f6f128](https://github.com/ReVanced/revanced-patches/commit/8f6f128d718c20c56668ed3801b434a5cbb04dfd))
+
+## [6.0.1-dev.2](https://github.com/ReVanced/revanced-patches/compare/v6.0.1-dev.1...v6.0.1-dev.2) (2026-03-15)
+
+
+### Bug Fixes
+
+* **YouTube Music - Hide buttons:** Crashes on startup due to null LayoutParams ([#6799](https://github.com/ReVanced/revanced-patches/issues/6799)) ([3e32c38](https://github.com/ReVanced/revanced-patches/commit/3e32c387328b061f33b361ed022ae18e447a7904))
+
+## [6.0.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v6.0.0...v6.0.1-dev.1) (2026-03-15)
+
+
+### Bug Fixes
+
+* **YouTube:** Use correct query parameters for DeArrow requests ([#6780](https://github.com/ReVanced/revanced-patches/issues/6780)) ([02a48e7](https://github.com/ReVanced/revanced-patches/commit/02a48e7a5f2b1ffd64a80651b49666de27ab7014))
+
+# [6.0.0](https://github.com/ReVanced/revanced-patches/compare/v5.50.2...v6.0.0) (2026-03-14)
+
+
+* build(Needs bump)!: Update to ReVanced Patcher v22 ([#6542](https://github.com/ReVanced/revanced-patches/issues/6542)) ([ab2ac36](https://github.com/ReVanced/revanced-patches/commit/ab2ac36e3041cda87b659924ea2b75089f0bdb6e))
+
+
+### Bug Fixes
+
+* Add minSdk to all extension projects ([#6778](https://github.com/ReVanced/revanced-patches/issues/6778)) ([7517f57](https://github.com/ReVanced/revanced-patches/commit/7517f57ac7a54e1c914e8dd8cc3e1aa908e28e54))
+* **Check environment:** Use another (also more suitable) API to circumvent a bug ([393700f](https://github.com/ReVanced/revanced-patches/commit/393700f74ac141bfa109988202707b40d35a64ea))
+* **Custom branding:** Fix defaults ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([3e00a99](https://github.com/ReVanced/revanced-patches/commit/3e00a99c1bb3af24f9e8420e8c7c2bbaeb003c6c))
+* **Custom branding:** Resolve background playback crash with custom branded root installation ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([6aba2d1](https://github.com/ReVanced/revanced-patches/commit/6aba2d127472643c346108d481513442fa9a3fde))
+* **Enable debugging:** Add missing preference to log protocol buffer ([26d8a9e](https://github.com/ReVanced/revanced-patches/commit/26d8a9e5f891e08fe3c23601e8238de6a301b8df))
+* Fix return type check to match method successfully ([0a73452](https://github.com/ReVanced/revanced-patches/commit/0a734528dc4407571ae1dba3e80347bc9f236e3e))
+* **GmsCore support:** Handle GmsCore flavors when checking for updates ([2aa19f5](https://github.com/ReVanced/revanced-patches/commit/2aa19f5995fd050c40b15331a77d58144a5a1f69))
+* **GmsCore support:** Insert check after another missing necessary context hook ([3c0c5a8](https://github.com/ReVanced/revanced-patches/commit/3c0c5a86d8e24b47b1c30bc5a7fe994240014e2d))
+* **GmsCore support:** Insert check after necessary context hook ([03e8e3d](https://github.com/ReVanced/revanced-patches/commit/03e8e3d75cb3b03987299885cea5eb615a5cef23))
+* **GmsCore support:** Rename MicroG GmsCore specific strings as well and rename app specific strings correctly ([c2ac1f0](https://github.com/ReVanced/revanced-patches/commit/c2ac1f04a0ac180555a9d19e7ff41525487fbc6d))
+* **GmsCore support:** Try replacing in strings before prefixing to handle more edge cases ([4d94a41](https://github.com/ReVanced/revanced-patches/commit/4d94a41c46f2d4e1bf33debc95b8aa84a64964bb))
+* **Hex patch:** Fix bug in implementation of Boyer-Moore algorithm ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([f59323c](https://github.com/ReVanced/revanced-patches/commit/f59323c87d8da36b39e19936c8ed5c07d3903b16))
+* **Hex:** Add back name, which was accidentally removed from the patch ([6a547a9](https://github.com/ReVanced/revanced-patches/commit/6a547a97e52b7914bb6602f3ecc2c6cecd50e946))
+* **Instagram:** Update fingerprints for version `417.0.0.54.77` ([#6734](https://github.com/ReVanced/revanced-patches/issues/6734)) ([55f510d](https://github.com/ReVanced/revanced-patches/commit/55f510dbedd28678411b4f11d9bbdd303fa68a0d))
+* Move strings to correct patch ([4dfe3fb](https://github.com/ReVanced/revanced-patches/commit/4dfe3fb08812ed572e01e58a8604c1be9e989438))
+* **ProtonVPN - Remove delay:** Make it work on latest version by patching the correct class ([#6757](https://github.com/ReVanced/revanced-patches/issues/6757)) ([e0dc009](https://github.com/ReVanced/revanced-patches/commit/e0dc009780afea9c2f393c4f348cda5ca9c3cbbf))
+* **Reddit clients:** Fix patching broken during patcher migration by searching for strings with contains([#6681](https://github.com/ReVanced/revanced-patches/issues/6681)) ([00da402](https://github.com/ReVanced/revanced-patches/commit/00da4027707068f06ee7041b53d1316a7b218d5d))
+* Rename string keys correctly ([16e00ab](https://github.com/ReVanced/revanced-patches/commit/16e00ab4c0ff10e58adea40c7de72658788fcd97))
+* **Spotify - Sanitize sharing links:** Update patch to latest app versions ([#6685](https://github.com/ReVanced/revanced-patches/issues/6685)) ([bb7448b](https://github.com/ReVanced/revanced-patches/commit/bb7448bc9d789843371d16bfccc9815662913333))
+* Use correct string key ([9d55d00](https://github.com/ReVanced/revanced-patches/commit/9d55d00ff46a2cd18111a91a98dbc8e3137dd0ed))
+* Use custom comparison block for strings in `anyOf` ([56a087d](https://github.com/ReVanced/revanced-patches/commit/56a087dbacf331ccadfe753cbc1ced77e318fc27))
+* Use positional substitutes in strings where multiple are present ([aa8c87f](https://github.com/ReVanced/revanced-patches/commit/aa8c87f8650bd5def5f726f02be5d62d72a3007b))
+* **YouTube - Enable Debugging Patch:** Use correct Protocolbuffer setting name ([#6711](https://github.com/ReVanced/revanced-patches/issues/6711)) ([f934022](https://github.com/ReVanced/revanced-patches/commit/f934022f37ba178ac23abfa9bcd59a0c12abe43f))
+* **YouTube - Exit fullscreen mode:** Handle exiting fullscreen on first opened video ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([88724d4](https://github.com/ReVanced/revanced-patches/commit/88724d47b13d56a90384b0a2588ba82ccdd5b101))
+* **YouTube - Hide ads:** Empty space left when ads are hidden on tablets ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([c1c2aa9](https://github.com/ReVanced/revanced-patches/commit/c1c2aa98b2d7ce900eb152bc736f3c1a5558d9fc))
+* **YouTube - Hide ads:** Fix "Hide YouTube Premium promotions" hiding YouTube Doodles ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([d26e352](https://github.com/ReVanced/revanced-patches/commit/d26e352850c2659a65b13ff1ba50dcd18278603a))
+* **YouTube - Hide ads:** Hide new type of general ad, movie ad and web search result ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([9b12dd1](https://github.com/ReVanced/revanced-patches/commit/9b12dd106546d94004c971b887ffa7627ae5a8d4))
+* **YouTube - Hide ads:** Hide new type of player ad ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([c97aefc](https://github.com/ReVanced/revanced-patches/commit/c97aefc272b83b522e5ac393ec41d03630cee6fb))
+* **YouTube - Hide ads:** Hide video ads does not hide Shorts ads ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([8d274a7](https://github.com/ReVanced/revanced-patches/commit/8d274a7afc3abfafc2b702b27f022316c854dae6))
+* **YouTube - Hide ads:** Support Hide fullscreen ads on Android 13+ devices ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([02b405e](https://github.com/ReVanced/revanced-patches/commit/02b405e6ac5beeff81c7705379e6c6eb1561270d))
+* **YouTube - Hide ads:** YouTube Doodles unclickable when Hide ads is enabled ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([5d45b6d](https://github.com/ReVanced/revanced-patches/commit/5d45b6da74165ca69a336aa36e90daafaaf87411))
+* **YouTube - Hide end screen cards:** Resolve patching 20.31.4x ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([3ff303f](https://github.com/ReVanced/revanced-patches/commit/3ff303f045c4fbda0331e3f1e9fbba50f97dedab))
+* **YouTube - Hide layout components:** Ensure featured places also hide watch history shelf ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([d639faf](https://github.com/ReVanced/revanced-patches/commit/d639faf71f476bcd7fffa08bfbb0e77c02450c9f))
+* **YouTube - Hide layout components:** Fix certain description components not working ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([1bf64eb](https://github.com/ReVanced/revanced-patches/commit/1bf64eb8b06435dea9cd292376c5feda6683e0a6))
+* **YouTube - Hide layout components:** Fix empty space issues (subscribed channels bar, show more button, landscape mode) ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([22ef700](https://github.com/ReVanced/revanced-patches/commit/22ef7002e07df919c30e9274a2479925a4be69c0))
+* **YouTube - Hide layout components:** Fix side effect of Disable translucent status bar ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([5760c58](https://github.com/ReVanced/revanced-patches/commit/5760c5860ac2dc6a41821cc66f849a58e44bf3e7))
+* **YouTube - Hide layout components:** Resolve "Hide community posts" not working in search results ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([3153222](https://github.com/ReVanced/revanced-patches/commit/315322220d6a09814406394414bcfcff61ead786))
+* **YouTube - Hide layout components:** Resolve community posts sometimes showing in player suggestions ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([828df77](https://github.com/ReVanced/revanced-patches/commit/828df77810b551c70e03d888dc0fe1555c488f51))
+* **YouTube - Hide Shorts components:** Action buttons not hidden in 20.22+ ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([a90a0b1](https://github.com/ReVanced/revanced-patches/commit/a90a0b1199e66cace3eb1b8c827314ceaf514ecf))
+* **YouTube - Hide Shorts components:** Do not hide channel page headers when hiding shorts ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([1246e43](https://github.com/ReVanced/revanced-patches/commit/1246e430f2104bc4a33881fa4dbb188201c02202))
+* **YouTube - Hide Shorts components:** Find resource id only for 21.05+ ([63161e9](https://github.com/ReVanced/revanced-patches/commit/63161e9fb357387685294e4a80de94cb351c6713))
+* **YouTube - Hide Shorts components:** Fix sound metadata label hiding other components ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([49d1f65](https://github.com/ReVanced/revanced-patches/commit/49d1f65fcae5b6732b768f6184969a6c796bc5e3))
+* **YouTube - Hide Shorts components:** Hide new type of sound metadata label ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([a6b8d2f](https://github.com/ReVanced/revanced-patches/commit/a6b8d2f1039b7896b21826a46f3f13b32d16b51d))
+* **YouTube - Hide Shorts components:** Resolve hiding Shorts not working ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([ae69bdc](https://github.com/ReVanced/revanced-patches/commit/ae69bdc1d376a05b6854401586408cb6a9bda7eb))
+* **YouTube - Loop video:** Enable loop video not working in playlist ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([06dbf7e](https://github.com/ReVanced/revanced-patches/commit/06dbf7ee80c836404e3698c9db6176da9a2ab8e1))
+* **YouTube - Loop video:** Fix looping button state ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([14d0135](https://github.com/ReVanced/revanced-patches/commit/14d0135b3c41bb0c06fb8cd6569a489c41e51105))
+* **YouTube - Loop video:** Wrong icon applied ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([b34adf6](https://github.com/ReVanced/revanced-patches/commit/b34adf6437294b0b28500c207b5f29ddd2ed294d))
+* **YouTube - Open Shorts in regular player:** Fix back behavior with 20.51 ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([46ec3d3](https://github.com/ReVanced/revanced-patches/commit/46ec3d3bdd7d0368e1503a1b1be815eaf9b56525))
+* **YouTube - Open Shorts in regular player:** Resolve back button closing app instead of exiting fullscreen ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([b787c46](https://github.com/ReVanced/revanced-patches/commit/b787c469fd856dff74870fcb61bb3fc3dc5514b7))
+* **YouTube - Playback speed:** Use correct extension method name ([b8b4cfb](https://github.com/ReVanced/revanced-patches/commit/b8b4cfbd016058a158364f4549e7ef6ed4d154e0))
+* **YouTube - Remove background playback restrictions:** Fix background playback not working with certain offline videos ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([2d098f2](https://github.com/ReVanced/revanced-patches/commit/2d098f2352b7dc1f0dc185ac65074443289ef2de))
+* **YouTube - Remove viewer discretion dialog:** Not working on 20.14.43+ ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([64c397e](https://github.com/ReVanced/revanced-patches/commit/64c397eb1c46bdd77f2b05d03c22a841971bea81))
+* **YouTube - Return YouTube Dislike:** Fix incorrect dislike counts after cancel ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([ad10d76](https://github.com/ReVanced/revanced-patches/commit/ad10d760354dba1e8f470972955a706da9b85c02))
+* **YouTube - ReturnYouTubeDislike:** Fix dislikes not showing with 20.31+ ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([2033883](https://github.com/ReVanced/revanced-patches/commit/203388329484616cc83aef2c3bda38a3069839ca))
+* **YouTube - Settings:** Icon not drawn correctly on some systems ([#6683](https://github.com/ReVanced/revanced-patches/issues/6683)) ([ddb6396](https://github.com/ReVanced/revanced-patches/commit/ddb6396b3f3f7a2c29b9fa171e189f9931ba0e02))
+* **YouTube - SponsorBlock:** Do not show context toast when auto skipping in feed ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([88157ac](https://github.com/ReVanced/revanced-patches/commit/88157ac5b791d4d56e8347203a02f5c78014235b))
+* **YouTube - SponsorBlock:** Resolve segments not fetching on experimental app targets ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([2067799](https://github.com/ReVanced/revanced-patches/commit/206779942d9b4e8131c4df1acb1e7eab63ec75a0))
+* **YouTube - SponsorBlock:** Show correct nested skip segment when seeking ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([f5ef68b](https://github.com/ReVanced/revanced-patches/commit/f5ef68b61a5880a574f6d0f06e4b96c00daf11bb))
+* **YouTube - Spoof app version:** Remove target `19.35.36` no longer supported by YouTube ([#6717](https://github.com/ReVanced/revanced-patches/issues/6717)) ([46fb366](https://github.com/ReVanced/revanced-patches/commit/46fb3669ee59534327d7c3d78e07b813d8a2badb))
+* **YouTube - Spoof video streams:** Make it work on 21.x ([#6705](https://github.com/ReVanced/revanced-patches/issues/6705)) ([fdfed3c](https://github.com/ReVanced/revanced-patches/commit/fdfed3c9dd46f477c1cc1b9db0f08054ffa32293))
+* **YouTube Music - Navigation bar:** Hide library tab with 8.24+ ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([cfcae43](https://github.com/ReVanced/revanced-patches/commit/cfcae434652b747345cb31b66748f0cc3220eb4a))
+* **YouTube Music:** Prevent crash on bold icons loading ([#6712](https://github.com/ReVanced/revanced-patches/issues/6712)) ([e9bfb7c](https://github.com/ReVanced/revanced-patches/commit/e9bfb7ca9bcd1499f1abe8872999aefff10cd187))
+* **YouTube:** Add back missing custom filter by adding the preference to the correct screen ([2a10489](https://github.com/ReVanced/revanced-patches/commit/2a10489a869cbab1ed01502bc6fe9330c4052e06))
+* **YouTube:** Change recommended version to 20.37.48 ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([3dd305c](https://github.com/ReVanced/revanced-patches/commit/3dd305ca5d092144a924e150a668443b8f7ec3d8))
+* **YouTube:** Changes the default values for some settings ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([dce204b](https://github.com/ReVanced/revanced-patches/commit/dce204b41beb13b675d04afea3129df73a182172))
+* **YouTube:** Do not show bold icons if old settings menus is enabled ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([30bd852](https://github.com/ReVanced/revanced-patches/commit/30bd852ba5236ca25a7cc49fc23f987def27d23a))
+* **YouTube:** Fix patching unsupported 20.13.41 ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([ed45375](https://github.com/ReVanced/revanced-patches/commit/ed453751057310a053600c4d50c87532a3f94989))
+* **YouTube:** Ignore cairo flag in debug flag manager ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([093497c](https://github.com/ReVanced/revanced-patches/commit/093497c34f7d6c431ce7958d6b0f85b9dd0373cd))
+* **YouTube:** Remove 19.43.41 that YouTube no longer supports ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([a8526dc](https://github.com/ReVanced/revanced-patches/commit/a8526dc8ae325b3b3d386ad1d23670b05a48da51))
+
+
+### Features
+
+* Add overlay buttons animation ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([f6fc6aa](https://github.com/ReVanced/revanced-patches/commit/f6fc6aa5ac6364dc2806e62618c300a8542b3cb0))
+* **Check environment patch:** Support another ReVanced Manager debug variant package name ([e4dea68](https://github.com/ReVanced/revanced-patches/commit/e4dea682c6640ce817d5e30cfddec953fe85436f))
+* **Custom branding:** Default to user-provided icon and name when provided ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([f19c35e](https://github.com/ReVanced/revanced-patches/commit/f19c35e21cc77e8f6f746f7f910d520f86981dd5))
+* **Enable debugging:** Allow overriding String/long/double flags in debug flag manager ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([1f91bc8](https://github.com/ReVanced/revanced-patches/commit/1f91bc8a20134c5519b8e031badfa741f7cac7a7))
+* **GMX Mail:** Add `Force enable Freephone` patch ([#6650](https://github.com/ReVanced/revanced-patches/issues/6650)) ([997b5d6](https://github.com/ReVanced/revanced-patches/commit/997b5d63d1fc1684bea9e5b265f3aca53ad5fd88))
+* **GMX Mail:** Add `Hide ads` and `Hide Premium upgrade button` patches ([#6583](https://github.com/ReVanced/revanced-patches/issues/6583)) ([2976ea3](https://github.com/ReVanced/revanced-patches/commit/2976ea3ddd09d26eeedf646f0a1020fa582d0ec0))
+* Handle multiple branch conditionals jumping to the same instruction index ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([2f7b57d](https://github.com/ReVanced/revanced-patches/commit/2f7b57d071d316985a1fec215045b6b78ede6212))
+* **Instagram:** Add `Disable Reels auto-scroll` patch ([#6736](https://github.com/ReVanced/revanced-patches/issues/6736)) ([806d6c7](https://github.com/ReVanced/revanced-patches/commit/806d6c799fb67c0fb630ae954ef615ff01597b1f))
+* Perform full search of free registers ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([01ef43a](https://github.com/ReVanced/revanced-patches/commit/01ef43ababdf015f1ad3edaf45445da0e72199f2))
+* **Photoshop Mix:** Add `Bypass login` patch ([#6745](https://github.com/ReVanced/revanced-patches/issues/6745)) ([24caae9](https://github.com/ReVanced/revanced-patches/commit/24caae98b7b4d61b388f644cc1512438e408e6b1))
+* Update YouTube & YouTube Music patches ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([88d33b8](https://github.com/ReVanced/revanced-patches/commit/88d33b847de4d2ad834a4940ee257e06e3c3ad31))
+* Use more informative patch error if the same APK is patched twice ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([26e5ce1](https://github.com/ReVanced/revanced-patches/commit/26e5ce1a325c2a6e78a5486d661f7750ecc792a3))
+* **YouTube - Disable haptic feedback:** Add Disable tap and hold haptics setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([f135122](https://github.com/ReVanced/revanced-patches/commit/f135122df1a5e6a8b822652abb2451ea4e4a3d08))
+* **YouTube - Hide ads:** Add Hide player popup ads setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([487a95d](https://github.com/ReVanced/revanced-patches/commit/487a95d3efa878d9b41f1b719924c5504e0a1d0a))
+* **YouTube - Hide layout components:** Add "Hide channel tab filter" setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([0adcd8c](https://github.com/ReVanced/revanced-patches/commit/0adcd8c62e12619d5adaac5ee9886613deb53ca4))
+* **YouTube - Hide layout components:** Add "Hide collapse button" setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([1554fd9](https://github.com/ReVanced/revanced-patches/commit/1554fd916d1bcc9c67319d55b21072423926fc32))
+* **YouTube - Hide layout components:** Add "Hide comments section in Home feed" setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([5278434](https://github.com/ReVanced/revanced-patches/commit/5278434534653ea741e67cc1e5258abb7ca0e21e))
+* **YouTube - Hide layout components:** Add "Hide course progress" setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([1927564](https://github.com/ReVanced/revanced-patches/commit/192756443a1b2ede413e2d4ae55eed2bd9d57aac))
+* **YouTube - Hide layout components:** Add "Hide explore this course" setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([3e24762](https://github.com/ReVanced/revanced-patches/commit/3e24762c1847dfc467a5d6bf65cc1c3c0931ca0f))
+* **YouTube - Hide layout components:** Add "Hide featured links", "Hide featured videos", "Hide join button", and "Hide subscribe button" options ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([f9e843d](https://github.com/ReVanced/revanced-patches/commit/f9e843d75641d4a87dfbe05fa8fd407ccc0345d6))
+* **YouTube - Hide layout components:** Add "Hide feed flyout menu filter" setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([a93de46](https://github.com/ReVanced/revanced-patches/commit/a93de46572a7bd1ff30a1fb653e3f7afb1c67571))
+* **YouTube - Hide layout components:** Add "Hide fullscreen button" setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([b07b160](https://github.com/ReVanced/revanced-patches/commit/b07b1609e4bd9341611d6aa0194c9764616719b4))
+* **YouTube - Hide layout components:** Add "Hide latest videos button" setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([ebfdd8d](https://github.com/ReVanced/revanced-patches/commit/ebfdd8df2c5323290f6e655ebf0dd1db683f33dd))
+* **YouTube - Hide layout components:** Add "Hide live chat replay button" setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([a6bd311](https://github.com/ReVanced/revanced-patches/commit/a6bd3116f97e539482c752e8e4e1b1e8e90ed464))
+* **YouTube - Hide layout components:** Add "Hide quizzes" setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([70b9e10](https://github.com/ReVanced/revanced-patches/commit/70b9e103aea817bed1d0972444c7b0726214c69c))
+* **YouTube - Hide layout components:** Add "Hide search box trending results" setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([21bf455](https://github.com/ReVanced/revanced-patches/commit/21bf455c3f61e5fd19f97a1580ecb26ac40dcdce))
+* **YouTube - Hide layout components:** Add "Hide subscribed channels bar" setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([e41a40f](https://github.com/ReVanced/revanced-patches/commit/e41a40f0d754397f9cea09f387cc901f0397787e))
+* **YouTube - Hide layout components:** Add "Hide video title" setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([2cfbe08](https://github.com/ReVanced/revanced-patches/commit/2cfbe08b2137b2520dd37927202a4586af8326ff))
+* **YouTube - Hide layout components:** Apply hide search suggestions only to more recent app targets ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([a43c0e1](https://github.com/ReVanced/revanced-patches/commit/a43c0e111bfe290f7dec3c9b75b882ea9dc5630f))
+* **YouTube - Hide layout components:** Replace "Hide search suggestions" with "Hide You may like section" ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([80f6b01](https://github.com/ReVanced/revanced-patches/commit/80f6b01c64971881bb9144cada0e91bb78b9f38d))
+* **YouTube - Hide Shorts components:** Add "Hide AI button" setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([99aace4](https://github.com/ReVanced/revanced-patches/commit/99aace4178ccc9aeaaeb0b19cd6f520c10ef7df2))
+* **YouTube - Hide Shorts components:** Add "Hide in video description" setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([e0a8b7b](https://github.com/ReVanced/revanced-patches/commit/e0a8b7bc59113ce57e5b8b358bad9171a4ea1f99))
+* **YouTube - Navigation bar:** Add settings to hide toolbar buttons ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([d72e39f](https://github.com/ReVanced/revanced-patches/commit/d72e39f2a8fc0894667546826ef07cb3edf78e50))
+* **YouTube - Navigation buttons:** Add setting to use narrow navigation bar buttons ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([e48a5d7](https://github.com/ReVanced/revanced-patches/commit/e48a5d76f7651b0edcdb5a9b27e596df41e9c6af))
+* **YouTube - SponsorBlock:** Show skip button if player overlay controls are active ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([35ec655](https://github.com/ReVanced/revanced-patches/commit/35ec655f83ffe7ab661dca07107a74f2f9617037))
+* **YouTube - Theme:** Add "Hide splash screen" setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([ca6e184](https://github.com/ReVanced/revanced-patches/commit/ca6e184172e67cca48ea4c70cfe6371e806dd793))
+* **YouTube - Video quality:** Add Hide Premium video quality setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([50a2b67](https://github.com/ReVanced/revanced-patches/commit/50a2b67ef6e6382894636acdc1c2fcf7236ab4ee))
+* **YouTube Music:** Add experimental support for 9.02.50 ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([50a102d](https://github.com/ReVanced/revanced-patches/commit/50a102d8afc573936f790991381b0a8d2f8dd54d))
+* **YouTube Music:** Add experimental support for 9.03.52 ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([d5b9c0c](https://github.com/ReVanced/revanced-patches/commit/d5b9c0c03d334ff31c9601a48a3beb1a4db98310))
+* **YouTube Music:** Change recommended version to 8.37.56 ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([d1e7900](https://github.com/ReVanced/revanced-patches/commit/d1e7900793ceef7b53b140ba9efe25025a8aac01))
+* **YouTube Music:** Support version 8.40.54 ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([62f130c](https://github.com/ReVanced/revanced-patches/commit/62f130cc883d69d40c364cac45158012dd01272f))
+* **YouTube Music:** Unofficial support of 8.50.51 ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([c1d7cae](https://github.com/ReVanced/revanced-patches/commit/c1d7caeee2cfa425769571b0ebff2da86e709ef9))
+* **YouTube:** Add experimental support for 21.02.32 ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([7904b60](https://github.com/ReVanced/revanced-patches/commit/7904b60dbea526af45b4a69dc349c6250453b385))
+* **YouTube:** Add experimental support for 21.03.34 ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([1ae36a1](https://github.com/ReVanced/revanced-patches/commit/1ae36a1cc72f0fb29d592206f74fcd40e37acaba))
+* **YouTube:** Add experimental support for 21.04.221 ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([66e113a](https://github.com/ReVanced/revanced-patches/commit/66e113a96639d0c99126749125adf234a9b10cab))
+* **YouTube:** Add experimental support for 21.05.264 ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([f646c82](https://github.com/ReVanced/revanced-patches/commit/f646c820d7d6027cf013e0968189a1e2cfd9e641))
+* **YouTube:** Add experimental support for 21.06.251 ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([44b17d4](https://github.com/ReVanced/revanced-patches/commit/44b17d47588251b9fab5c801a49ace2ce371fa99))
+* **YouTube:** Add experimental support for 21.06.257 ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([abb703d](https://github.com/ReVanced/revanced-patches/commit/abb703dcb2ac96f30e699a33d3a896b775bb0851))
+* **YouTube:** Add experimental support for 21.07.240 ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([79b0c1f](https://github.com/ReVanced/revanced-patches/commit/79b0c1f72ff5b52b162f3f861d5e10c657efa097))
+* **YouTube:** Add Hide autoplay preview patch ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([79e3955](https://github.com/ReVanced/revanced-patches/commit/79e3955fde7068eac90ae404b3869c27f17bd5f7))
+* **YouTube:** Add more double tap to seek length options ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([fb04071](https://github.com/ReVanced/revanced-patches/commit/fb04071528683d38913c57f628cbab64bf0ef6a4))
+* **YouTube:** Remove obsolete seekbar thumbnail patch ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([9909fc1](https://github.com/ReVanced/revanced-patches/commit/9909fc1e5d490e9edb59894d66c6a929fbaebb3b))
+* **YouTube:** Support version 20.40.45 ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([96c85d0](https://github.com/ReVanced/revanced-patches/commit/96c85d03712e79217dc8f97bcda5f38c0e47f064))
+
+
+### BREAKING CHANGES
+
+* Deprecated APIs have been removed, and various APIs now use the updated ReVanced Patcher v22 APIs.
+
+# [6.0.0-dev.26](https://github.com/ReVanced/revanced-patches/compare/v6.0.0-dev.25...v6.0.0-dev.26) (2026-03-14)
+
+
+### Bug Fixes
+
+* Add minSdk to all extension projects ([#6778](https://github.com/ReVanced/revanced-patches/issues/6778)) ([7517f57](https://github.com/ReVanced/revanced-patches/commit/7517f57ac7a54e1c914e8dd8cc3e1aa908e28e54))
+
+# [6.0.0-dev.25](https://github.com/ReVanced/revanced-patches/compare/v6.0.0-dev.24...v6.0.0-dev.25) (2026-03-14)
+
+
+### Features
+
+* **Instagram:** Add `Disable Reels auto-scroll` patch ([#6736](https://github.com/ReVanced/revanced-patches/issues/6736)) ([806d6c7](https://github.com/ReVanced/revanced-patches/commit/806d6c799fb67c0fb630ae954ef615ff01597b1f))
+
+# [6.0.0-dev.24](https://github.com/ReVanced/revanced-patches/compare/v6.0.0-dev.23...v6.0.0-dev.24) (2026-03-09)
+
+
+### Features
+
+* **Photoshop Mix:** Add `Bypass login` patch ([#6745](https://github.com/ReVanced/revanced-patches/issues/6745)) ([24caae9](https://github.com/ReVanced/revanced-patches/commit/24caae98b7b4d61b388f644cc1512438e408e6b1))
+
+# [6.0.0-dev.23](https://github.com/ReVanced/revanced-patches/compare/v6.0.0-dev.22...v6.0.0-dev.23) (2026-03-09)
+
+
+### Bug Fixes
+
+* **ProtonVPN - Remove delay:** Make it work on latest version by patching the correct class ([#6757](https://github.com/ReVanced/revanced-patches/issues/6757)) ([e0dc009](https://github.com/ReVanced/revanced-patches/commit/e0dc009780afea9c2f393c4f348cda5ca9c3cbbf))
+
+# [6.0.0-dev.22](https://github.com/ReVanced/revanced-patches/compare/v6.0.0-dev.21...v6.0.0-dev.22) (2026-03-08)
+
+
+### Bug Fixes
+
+* **YouTube - Settings:** Icon not drawn correctly on some systems ([#6683](https://github.com/ReVanced/revanced-patches/issues/6683)) ([ddb6396](https://github.com/ReVanced/revanced-patches/commit/ddb6396b3f3f7a2c29b9fa171e189f9931ba0e02))
+
+# [6.0.0-dev.21](https://github.com/ReVanced/revanced-patches/compare/v6.0.0-dev.20...v6.0.0-dev.21) (2026-03-08)
+
+
+### Bug Fixes
+
+* **Instagram:** Update fingerprints for version `417.0.0.54.77` ([#6734](https://github.com/ReVanced/revanced-patches/issues/6734)) ([55f510d](https://github.com/ReVanced/revanced-patches/commit/55f510dbedd28678411b4f11d9bbdd303fa68a0d))
+* **Spotify - Sanitize sharing links:** Update patch to latest app versions ([#6685](https://github.com/ReVanced/revanced-patches/issues/6685)) ([bb7448b](https://github.com/ReVanced/revanced-patches/commit/bb7448bc9d789843371d16bfccc9815662913333))
+
+# [6.0.0-dev.20](https://github.com/ReVanced/revanced-patches/compare/v6.0.0-dev.19...v6.0.0-dev.20) (2026-03-08)
+
+
+### Bug Fixes
+
+* **YouTube - Enable Debugging Patch:** Use correct Protocolbuffer setting name ([#6711](https://github.com/ReVanced/revanced-patches/issues/6711)) ([f934022](https://github.com/ReVanced/revanced-patches/commit/f934022f37ba178ac23abfa9bcd59a0c12abe43f))
+
+# [6.0.0-dev.19](https://github.com/ReVanced/revanced-patches/compare/v6.0.0-dev.18...v6.0.0-dev.19) (2026-03-06)
+
+
+### Bug Fixes
+
+* **Hex:** Add back name, which was accidentally removed from the patch ([6a547a9](https://github.com/ReVanced/revanced-patches/commit/6a547a97e52b7914bb6602f3ecc2c6cecd50e946))
+
+# [6.0.0-dev.18](https://github.com/ReVanced/revanced-patches/compare/v6.0.0-dev.17...v6.0.0-dev.18) (2026-03-06)
+
+
+### Bug Fixes
+
+* **YouTube - Hide Shorts components:** Find resource id only for 21.05+ ([63161e9](https://github.com/ReVanced/revanced-patches/commit/63161e9fb357387685294e4a80de94cb351c6713))
+
+# [6.0.0-dev.17](https://github.com/ReVanced/revanced-patches/compare/v6.0.0-dev.16...v6.0.0-dev.17) (2026-03-06)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof video streams:** Make it work on 21.x ([#6705](https://github.com/ReVanced/revanced-patches/issues/6705)) ([fdfed3c](https://github.com/ReVanced/revanced-patches/commit/fdfed3c9dd46f477c1cc1b9db0f08054ffa32293))
+
+# [6.0.0-dev.16](https://github.com/ReVanced/revanced-patches/compare/v6.0.0-dev.15...v6.0.0-dev.16) (2026-03-05)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof app version:** Remove target `19.35.36` no longer supported by YouTube ([#6717](https://github.com/ReVanced/revanced-patches/issues/6717)) ([46fb366](https://github.com/ReVanced/revanced-patches/commit/46fb3669ee59534327d7c3d78e07b813d8a2badb))
+* **YouTube Music:** Prevent crash on bold icons loading ([#6712](https://github.com/ReVanced/revanced-patches/issues/6712)) ([e9bfb7c](https://github.com/ReVanced/revanced-patches/commit/e9bfb7ca9bcd1499f1abe8872999aefff10cd187))
+
+# [6.0.0-dev.15](https://github.com/ReVanced/revanced-patches/compare/v6.0.0-dev.14...v6.0.0-dev.15) (2026-03-05)
+
+
+### Bug Fixes
+
+* **Check environment:** Use another (also more suitable) API to circumvent a bug ([393700f](https://github.com/ReVanced/revanced-patches/commit/393700f74ac141bfa109988202707b40d35a64ea))
+
+# [6.0.0-dev.14](https://github.com/ReVanced/revanced-patches/compare/v6.0.0-dev.13...v6.0.0-dev.14) (2026-03-03)
+
+
+### Bug Fixes
+
+* **YouTube - Playback speed:** Use correct extension method name ([b8b4cfb](https://github.com/ReVanced/revanced-patches/commit/b8b4cfbd016058a158364f4549e7ef6ed4d154e0))
+
+# [6.0.0-dev.13](https://github.com/ReVanced/revanced-patches/compare/v6.0.0-dev.12...v6.0.0-dev.13) (2026-03-02)
+
+
+### Bug Fixes
+
+* Use custom comparison block for strings in `anyOf` ([56a087d](https://github.com/ReVanced/revanced-patches/commit/56a087dbacf331ccadfe753cbc1ced77e318fc27))
+
+# [6.0.0-dev.12](https://github.com/ReVanced/revanced-patches/compare/v6.0.0-dev.11...v6.0.0-dev.12) (2026-03-02)
+
+
+### Bug Fixes
+
+* Fix return type check to match method successfully ([0a73452](https://github.com/ReVanced/revanced-patches/commit/0a734528dc4407571ae1dba3e80347bc9f236e3e))
+
+
+### Features
+
+* **Check environment patch:** Support another ReVanced Manager debug variant package name ([e4dea68](https://github.com/ReVanced/revanced-patches/commit/e4dea682c6640ce817d5e30cfddec953fe85436f))
+
+# [6.0.0-dev.11](https://github.com/ReVanced/revanced-patches/compare/v6.0.0-dev.10...v6.0.0-dev.11) (2026-03-02)
+
+
+### Bug Fixes
+
+* Use correct string key ([9d55d00](https://github.com/ReVanced/revanced-patches/commit/9d55d00ff46a2cd18111a91a98dbc8e3137dd0ed))
+
+# [6.0.0-dev.10](https://github.com/ReVanced/revanced-patches/compare/v6.0.0-dev.9...v6.0.0-dev.10) (2026-03-01)
+
+
+### Bug Fixes
+
+* **Enable debugging:** Add missing preference to log protocol buffer ([26d8a9e](https://github.com/ReVanced/revanced-patches/commit/26d8a9e5f891e08fe3c23601e8238de6a301b8df))
+
+# [6.0.0-dev.9](https://github.com/ReVanced/revanced-patches/compare/v6.0.0-dev.8...v6.0.0-dev.9) (2026-02-28)
+
+
+### Bug Fixes
+
+* **YouTube:** Add back missing custom filter by adding the preference to the correct screen ([2a10489](https://github.com/ReVanced/revanced-patches/commit/2a10489a869cbab1ed01502bc6fe9330c4052e06))
+
+# [6.0.0-dev.8](https://github.com/ReVanced/revanced-patches/compare/v6.0.0-dev.7...v6.0.0-dev.8) (2026-02-28)
+
+
+### Bug Fixes
+
+* **GmsCore support:** Try replacing in strings before prefixing to handle more edge cases ([4d94a41](https://github.com/ReVanced/revanced-patches/commit/4d94a41c46f2d4e1bf33debc95b8aa84a64964bb))
+
+# [6.0.0-dev.7](https://github.com/ReVanced/revanced-patches/compare/v6.0.0-dev.6...v6.0.0-dev.7) (2026-02-28)
+
+
+### Bug Fixes
+
+* Rename string keys correctly ([16e00ab](https://github.com/ReVanced/revanced-patches/commit/16e00ab4c0ff10e58adea40c7de72658788fcd97))
+
+# [6.0.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v6.0.0-dev.5...v6.0.0-dev.6) (2026-02-28)
+
+
+### Bug Fixes
+
+* Move strings to correct patch ([4dfe3fb](https://github.com/ReVanced/revanced-patches/commit/4dfe3fb08812ed572e01e58a8604c1be9e989438))
+
+# [6.0.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v6.0.0-dev.4...v6.0.0-dev.5) (2026-02-28)
+
+
+### Bug Fixes
+
+* **Reddit clients:** Fix patching broken during patcher migration by searching for strings with contains([#6681](https://github.com/ReVanced/revanced-patches/issues/6681)) ([00da402](https://github.com/ReVanced/revanced-patches/commit/00da4027707068f06ee7041b53d1316a7b218d5d))
+
+# [6.0.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v6.0.0-dev.3...v6.0.0-dev.4) (2026-02-27)
+
+
+### Bug Fixes
+
+* **Custom branding:** Fix defaults ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([3e00a99](https://github.com/ReVanced/revanced-patches/commit/3e00a99c1bb3af24f9e8420e8c7c2bbaeb003c6c))
+* **Custom branding:** Resolve background playback crash with custom branded root installation ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([6aba2d1](https://github.com/ReVanced/revanced-patches/commit/6aba2d127472643c346108d481513442fa9a3fde))
+* **Hex patch:** Fix bug in implementation of Boyer-Moore algorithm ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([f59323c](https://github.com/ReVanced/revanced-patches/commit/f59323c87d8da36b39e19936c8ed5c07d3903b16))
+* **YouTube - Exit fullscreen mode:** Handle exiting fullscreen on first opened video ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([88724d4](https://github.com/ReVanced/revanced-patches/commit/88724d47b13d56a90384b0a2588ba82ccdd5b101))
+* **YouTube - Hide ads:** Empty space left when ads are hidden on tablets ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([c1c2aa9](https://github.com/ReVanced/revanced-patches/commit/c1c2aa98b2d7ce900eb152bc736f3c1a5558d9fc))
+* **YouTube - Hide ads:** Fix "Hide YouTube Premium promotions" hiding YouTube Doodles ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([d26e352](https://github.com/ReVanced/revanced-patches/commit/d26e352850c2659a65b13ff1ba50dcd18278603a))
+* **YouTube - Hide ads:** Hide new type of general ad, movie ad and web search result ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([9b12dd1](https://github.com/ReVanced/revanced-patches/commit/9b12dd106546d94004c971b887ffa7627ae5a8d4))
+* **YouTube - Hide ads:** Hide new type of player ad ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([c97aefc](https://github.com/ReVanced/revanced-patches/commit/c97aefc272b83b522e5ac393ec41d03630cee6fb))
+* **YouTube - Hide ads:** Hide video ads does not hide Shorts ads ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([8d274a7](https://github.com/ReVanced/revanced-patches/commit/8d274a7afc3abfafc2b702b27f022316c854dae6))
+* **YouTube - Hide ads:** Support Hide fullscreen ads on Android 13+ devices ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([02b405e](https://github.com/ReVanced/revanced-patches/commit/02b405e6ac5beeff81c7705379e6c6eb1561270d))
+* **YouTube - Hide ads:** YouTube Doodles unclickable when Hide ads is enabled ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([5d45b6d](https://github.com/ReVanced/revanced-patches/commit/5d45b6da74165ca69a336aa36e90daafaaf87411))
+* **YouTube - Hide end screen cards:** Resolve patching 20.31.4x ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([3ff303f](https://github.com/ReVanced/revanced-patches/commit/3ff303f045c4fbda0331e3f1e9fbba50f97dedab))
+* **YouTube - Hide layout components:** Ensure featured places also hide watch history shelf ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([d639faf](https://github.com/ReVanced/revanced-patches/commit/d639faf71f476bcd7fffa08bfbb0e77c02450c9f))
+* **YouTube - Hide layout components:** Fix certain description components not working ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([1bf64eb](https://github.com/ReVanced/revanced-patches/commit/1bf64eb8b06435dea9cd292376c5feda6683e0a6))
+* **YouTube - Hide layout components:** Fix empty space issues (subscribed channels bar, show more button, landscape mode) ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([22ef700](https://github.com/ReVanced/revanced-patches/commit/22ef7002e07df919c30e9274a2479925a4be69c0))
+* **YouTube - Hide layout components:** Fix side effect of Disable translucent status bar ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([5760c58](https://github.com/ReVanced/revanced-patches/commit/5760c5860ac2dc6a41821cc66f849a58e44bf3e7))
+* **YouTube - Hide layout components:** Resolve "Hide community posts" not working in search results ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([3153222](https://github.com/ReVanced/revanced-patches/commit/315322220d6a09814406394414bcfcff61ead786))
+* **YouTube - Hide layout components:** Resolve community posts sometimes showing in player suggestions ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([828df77](https://github.com/ReVanced/revanced-patches/commit/828df77810b551c70e03d888dc0fe1555c488f51))
+* **YouTube - Hide Shorts components:** Action buttons not hidden in 20.22+ ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([a90a0b1](https://github.com/ReVanced/revanced-patches/commit/a90a0b1199e66cace3eb1b8c827314ceaf514ecf))
+* **YouTube - Hide Shorts components:** Do not hide channel page headers when hiding shorts ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([1246e43](https://github.com/ReVanced/revanced-patches/commit/1246e430f2104bc4a33881fa4dbb188201c02202))
+* **YouTube - Hide Shorts components:** Fix sound metadata label hiding other components ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([49d1f65](https://github.com/ReVanced/revanced-patches/commit/49d1f65fcae5b6732b768f6184969a6c796bc5e3))
+* **YouTube - Hide Shorts components:** Hide new type of sound metadata label ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([a6b8d2f](https://github.com/ReVanced/revanced-patches/commit/a6b8d2f1039b7896b21826a46f3f13b32d16b51d))
+* **YouTube - Hide Shorts components:** Resolve hiding Shorts not working ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([ae69bdc](https://github.com/ReVanced/revanced-patches/commit/ae69bdc1d376a05b6854401586408cb6a9bda7eb))
+* **YouTube - Loop video:** Enable loop video not working in playlist ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([06dbf7e](https://github.com/ReVanced/revanced-patches/commit/06dbf7ee80c836404e3698c9db6176da9a2ab8e1))
+* **YouTube - Loop video:** Fix looping button state ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([14d0135](https://github.com/ReVanced/revanced-patches/commit/14d0135b3c41bb0c06fb8cd6569a489c41e51105))
+* **YouTube - Loop video:** Wrong icon applied ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([b34adf6](https://github.com/ReVanced/revanced-patches/commit/b34adf6437294b0b28500c207b5f29ddd2ed294d))
+* **YouTube - Open Shorts in regular player:** Fix back behavior with 20.51 ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([46ec3d3](https://github.com/ReVanced/revanced-patches/commit/46ec3d3bdd7d0368e1503a1b1be815eaf9b56525))
+* **YouTube - Open Shorts in regular player:** Resolve back button closing app instead of exiting fullscreen ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([b787c46](https://github.com/ReVanced/revanced-patches/commit/b787c469fd856dff74870fcb61bb3fc3dc5514b7))
+* **YouTube - Remove background playback restrictions:** Fix background playback not working with certain offline videos ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([2d098f2](https://github.com/ReVanced/revanced-patches/commit/2d098f2352b7dc1f0dc185ac65074443289ef2de))
+* **YouTube - Remove viewer discretion dialog:** Not working on 20.14.43+ ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([64c397e](https://github.com/ReVanced/revanced-patches/commit/64c397eb1c46bdd77f2b05d03c22a841971bea81))
+* **YouTube - Return YouTube Dislike:** Fix incorrect dislike counts after cancel ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([ad10d76](https://github.com/ReVanced/revanced-patches/commit/ad10d760354dba1e8f470972955a706da9b85c02))
+* **YouTube - ReturnYouTubeDislike:** Fix dislikes not showing with 20.31+ ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([2033883](https://github.com/ReVanced/revanced-patches/commit/203388329484616cc83aef2c3bda38a3069839ca))
+* **YouTube - SponsorBlock:** Do not show context toast when auto skipping in feed ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([88157ac](https://github.com/ReVanced/revanced-patches/commit/88157ac5b791d4d56e8347203a02f5c78014235b))
+* **YouTube - SponsorBlock:** Resolve segments not fetching on experimental app targets ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([2067799](https://github.com/ReVanced/revanced-patches/commit/206779942d9b4e8131c4df1acb1e7eab63ec75a0))
+* **YouTube - SponsorBlock:** Show correct nested skip segment when seeking ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([f5ef68b](https://github.com/ReVanced/revanced-patches/commit/f5ef68b61a5880a574f6d0f06e4b96c00daf11bb))
+* **YouTube Music - Navigation bar:** Hide library tab with 8.24+ ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([cfcae43](https://github.com/ReVanced/revanced-patches/commit/cfcae434652b747345cb31b66748f0cc3220eb4a))
+* **YouTube:** Change recommended version to 20.37.48 ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([3dd305c](https://github.com/ReVanced/revanced-patches/commit/3dd305ca5d092144a924e150a668443b8f7ec3d8))
+* **YouTube:** Changes the default values for some settings ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([dce204b](https://github.com/ReVanced/revanced-patches/commit/dce204b41beb13b675d04afea3129df73a182172))
+* **YouTube:** Do not show bold icons if old settings menus is enabled ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([30bd852](https://github.com/ReVanced/revanced-patches/commit/30bd852ba5236ca25a7cc49fc23f987def27d23a))
+* **YouTube:** Fix patching unsupported 20.13.41 ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([ed45375](https://github.com/ReVanced/revanced-patches/commit/ed453751057310a053600c4d50c87532a3f94989))
+* **YouTube:** Ignore cairo flag in debug flag manager ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([093497c](https://github.com/ReVanced/revanced-patches/commit/093497c34f7d6c431ce7958d6b0f85b9dd0373cd))
+* **YouTube:** Remove 19.43.41 that YouTube no longer supports ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([a8526dc](https://github.com/ReVanced/revanced-patches/commit/a8526dc8ae325b3b3d386ad1d23670b05a48da51))
+
+
+### Features
+
+* Add overlay buttons animation ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([f6fc6aa](https://github.com/ReVanced/revanced-patches/commit/f6fc6aa5ac6364dc2806e62618c300a8542b3cb0))
+* **Custom branding:** Default to user-provided icon and name when provided ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([f19c35e](https://github.com/ReVanced/revanced-patches/commit/f19c35e21cc77e8f6f746f7f910d520f86981dd5))
+* **Enable debugging:** Allow overriding String/long/double flags in debug flag manager ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([1f91bc8](https://github.com/ReVanced/revanced-patches/commit/1f91bc8a20134c5519b8e031badfa741f7cac7a7))
+* Handle multiple branch conditionals jumping to the same instruction index ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([2f7b57d](https://github.com/ReVanced/revanced-patches/commit/2f7b57d071d316985a1fec215045b6b78ede6212))
+* Perform full search of free registers ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([01ef43a](https://github.com/ReVanced/revanced-patches/commit/01ef43ababdf015f1ad3edaf45445da0e72199f2))
+* Update YouTube & YouTube Music patches ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([88d33b8](https://github.com/ReVanced/revanced-patches/commit/88d33b847de4d2ad834a4940ee257e06e3c3ad31))
+* Use more informative patch error if the same APK is patched twice ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([26e5ce1](https://github.com/ReVanced/revanced-patches/commit/26e5ce1a325c2a6e78a5486d661f7750ecc792a3))
+* **YouTube - Disable haptic feedback:** Add Disable tap and hold haptics setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([f135122](https://github.com/ReVanced/revanced-patches/commit/f135122df1a5e6a8b822652abb2451ea4e4a3d08))
+* **YouTube - Hide ads:** Add Hide player popup ads setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([487a95d](https://github.com/ReVanced/revanced-patches/commit/487a95d3efa878d9b41f1b719924c5504e0a1d0a))
+* **YouTube - Hide layout components:** Add "Hide channel tab filter" setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([0adcd8c](https://github.com/ReVanced/revanced-patches/commit/0adcd8c62e12619d5adaac5ee9886613deb53ca4))
+* **YouTube - Hide layout components:** Add "Hide collapse button" setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([1554fd9](https://github.com/ReVanced/revanced-patches/commit/1554fd916d1bcc9c67319d55b21072423926fc32))
+* **YouTube - Hide layout components:** Add "Hide comments section in Home feed" setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([5278434](https://github.com/ReVanced/revanced-patches/commit/5278434534653ea741e67cc1e5258abb7ca0e21e))
+* **YouTube - Hide layout components:** Add "Hide course progress" setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([1927564](https://github.com/ReVanced/revanced-patches/commit/192756443a1b2ede413e2d4ae55eed2bd9d57aac))
+* **YouTube - Hide layout components:** Add "Hide explore this course" setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([3e24762](https://github.com/ReVanced/revanced-patches/commit/3e24762c1847dfc467a5d6bf65cc1c3c0931ca0f))
+* **YouTube - Hide layout components:** Add "Hide featured links", "Hide featured videos", "Hide join button", and "Hide subscribe button" options ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([f9e843d](https://github.com/ReVanced/revanced-patches/commit/f9e843d75641d4a87dfbe05fa8fd407ccc0345d6))
+* **YouTube - Hide layout components:** Add "Hide feed flyout menu filter" setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([a93de46](https://github.com/ReVanced/revanced-patches/commit/a93de46572a7bd1ff30a1fb653e3f7afb1c67571))
+* **YouTube - Hide layout components:** Add "Hide fullscreen button" setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([b07b160](https://github.com/ReVanced/revanced-patches/commit/b07b1609e4bd9341611d6aa0194c9764616719b4))
+* **YouTube - Hide layout components:** Add "Hide latest videos button" setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([ebfdd8d](https://github.com/ReVanced/revanced-patches/commit/ebfdd8df2c5323290f6e655ebf0dd1db683f33dd))
+* **YouTube - Hide layout components:** Add "Hide live chat replay button" setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([a6bd311](https://github.com/ReVanced/revanced-patches/commit/a6bd3116f97e539482c752e8e4e1b1e8e90ed464))
+* **YouTube - Hide layout components:** Add "Hide quizzes" setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([70b9e10](https://github.com/ReVanced/revanced-patches/commit/70b9e103aea817bed1d0972444c7b0726214c69c))
+* **YouTube - Hide layout components:** Add "Hide search box trending results" setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([21bf455](https://github.com/ReVanced/revanced-patches/commit/21bf455c3f61e5fd19f97a1580ecb26ac40dcdce))
+* **YouTube - Hide layout components:** Add "Hide subscribed channels bar" setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([e41a40f](https://github.com/ReVanced/revanced-patches/commit/e41a40f0d754397f9cea09f387cc901f0397787e))
+* **YouTube - Hide layout components:** Add "Hide video title" setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([2cfbe08](https://github.com/ReVanced/revanced-patches/commit/2cfbe08b2137b2520dd37927202a4586af8326ff))
+* **YouTube - Hide layout components:** Apply hide search suggestions only to more recent app targets ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([a43c0e1](https://github.com/ReVanced/revanced-patches/commit/a43c0e111bfe290f7dec3c9b75b882ea9dc5630f))
+* **YouTube - Hide layout components:** Replace "Hide search suggestions" with "Hide You may like section" ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([80f6b01](https://github.com/ReVanced/revanced-patches/commit/80f6b01c64971881bb9144cada0e91bb78b9f38d))
+* **YouTube - Hide Shorts components:** Add "Hide AI button" setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([99aace4](https://github.com/ReVanced/revanced-patches/commit/99aace4178ccc9aeaaeb0b19cd6f520c10ef7df2))
+* **YouTube - Hide Shorts components:** Add "Hide in video description" setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([e0a8b7b](https://github.com/ReVanced/revanced-patches/commit/e0a8b7bc59113ce57e5b8b358bad9171a4ea1f99))
+* **YouTube - Navigation bar:** Add settings to hide toolbar buttons ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([d72e39f](https://github.com/ReVanced/revanced-patches/commit/d72e39f2a8fc0894667546826ef07cb3edf78e50))
+* **YouTube - Navigation buttons:** Add setting to use narrow navigation bar buttons ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([e48a5d7](https://github.com/ReVanced/revanced-patches/commit/e48a5d76f7651b0edcdb5a9b27e596df41e9c6af))
+* **YouTube - SponsorBlock:** Show skip button if player overlay controls are active ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([35ec655](https://github.com/ReVanced/revanced-patches/commit/35ec655f83ffe7ab661dca07107a74f2f9617037))
+* **YouTube - Theme:** Add "Hide splash screen" setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([ca6e184](https://github.com/ReVanced/revanced-patches/commit/ca6e184172e67cca48ea4c70cfe6371e806dd793))
+* **YouTube - Video quality:** Add Hide Premium video quality setting ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([50a2b67](https://github.com/ReVanced/revanced-patches/commit/50a2b67ef6e6382894636acdc1c2fcf7236ab4ee))
+* **YouTube Music:** Add experimental support for 9.02.50 ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([50a102d](https://github.com/ReVanced/revanced-patches/commit/50a102d8afc573936f790991381b0a8d2f8dd54d))
+* **YouTube Music:** Add experimental support for 9.03.52 ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([d5b9c0c](https://github.com/ReVanced/revanced-patches/commit/d5b9c0c03d334ff31c9601a48a3beb1a4db98310))
+* **YouTube Music:** Change recommended version to 8.37.56 ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([d1e7900](https://github.com/ReVanced/revanced-patches/commit/d1e7900793ceef7b53b140ba9efe25025a8aac01))
+* **YouTube Music:** Support version 8.40.54 ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([62f130c](https://github.com/ReVanced/revanced-patches/commit/62f130cc883d69d40c364cac45158012dd01272f))
+* **YouTube Music:** Unofficial support of 8.50.51 ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([c1d7cae](https://github.com/ReVanced/revanced-patches/commit/c1d7caeee2cfa425769571b0ebff2da86e709ef9))
+* **YouTube:** Add experimental support for 21.02.32 ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([7904b60](https://github.com/ReVanced/revanced-patches/commit/7904b60dbea526af45b4a69dc349c6250453b385))
+* **YouTube:** Add experimental support for 21.03.34 ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([1ae36a1](https://github.com/ReVanced/revanced-patches/commit/1ae36a1cc72f0fb29d592206f74fcd40e37acaba))
+* **YouTube:** Add experimental support for 21.04.221 ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([66e113a](https://github.com/ReVanced/revanced-patches/commit/66e113a96639d0c99126749125adf234a9b10cab))
+* **YouTube:** Add experimental support for 21.05.264 ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([f646c82](https://github.com/ReVanced/revanced-patches/commit/f646c820d7d6027cf013e0968189a1e2cfd9e641))
+* **YouTube:** Add experimental support for 21.06.251 ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([44b17d4](https://github.com/ReVanced/revanced-patches/commit/44b17d47588251b9fab5c801a49ace2ce371fa99))
+* **YouTube:** Add experimental support for 21.06.257 ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([abb703d](https://github.com/ReVanced/revanced-patches/commit/abb703dcb2ac96f30e699a33d3a896b775bb0851))
+* **YouTube:** Add experimental support for 21.07.240 ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([79b0c1f](https://github.com/ReVanced/revanced-patches/commit/79b0c1f72ff5b52b162f3f861d5e10c657efa097))
+* **YouTube:** Add Hide autoplay preview patch ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([79e3955](https://github.com/ReVanced/revanced-patches/commit/79e3955fde7068eac90ae404b3869c27f17bd5f7))
+* **YouTube:** Add more double tap to seek length options ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([fb04071](https://github.com/ReVanced/revanced-patches/commit/fb04071528683d38913c57f628cbab64bf0ef6a4))
+* **YouTube:** Remove obsolete seekbar thumbnail patch ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([9909fc1](https://github.com/ReVanced/revanced-patches/commit/9909fc1e5d490e9edb59894d66c6a929fbaebb3b))
+* **YouTube:** Support version 20.40.45 ([#6571](https://github.com/ReVanced/revanced-patches/issues/6571)) ([96c85d0](https://github.com/ReVanced/revanced-patches/commit/96c85d03712e79217dc8f97bcda5f38c0e47f064))
+
+# [6.0.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.51.0-dev.2...v6.0.0-dev.1) (2026-02-27)
+
+
+* build(Needs bump)!: Update to ReVanced Patcher v22 ([#6542](https://github.com/ReVanced/revanced-patches/issues/6542)) ([ab2ac36](https://github.com/ReVanced/revanced-patches/commit/ab2ac36e3041cda87b659924ea2b75089f0bdb6e))
+
+
+### BREAKING CHANGES
+
+* Deprecated APIs have been removed, and various APIs now use the updated ReVanced Patcher v22 APIs.
+
+# [5.51.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.51.0-dev.1...v5.51.0-dev.2) (2026-02-26)
+
+
+### Features
+
+* **GMX Mail:** Add `Hide ads` and `Hide Premium upgrade button` patches ([#6583](https://github.com/ReVanced/revanced-patches/issues/6583)) ([2976ea3](https://github.com/ReVanced/revanced-patches/commit/2976ea3ddd09d26eeedf646f0a1020fa582d0ec0))
+
+# [5.51.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.50.3-dev.4...v5.51.0-dev.1) (2026-02-26)
+
+
+### Features
+
+* **GMX Mail:** Add `Force enable Freephone` patch ([#6650](https://github.com/ReVanced/revanced-patches/issues/6650)) ([997b5d6](https://github.com/ReVanced/revanced-patches/commit/997b5d63d1fc1684bea9e5b265f3aca53ad5fd88))
+
+## [5.50.3-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.50.3-dev.3...v5.50.3-dev.4) (2026-02-23)
+
+
+### Bug Fixes
+
+* **GmsCore support:** Insert check after another missing necessary context hook ([3c0c5a8](https://github.com/ReVanced/revanced-patches/commit/3c0c5a86d8e24b47b1c30bc5a7fe994240014e2d))
+
+## [5.50.3-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.50.3-dev.2...v5.50.3-dev.3) (2026-02-20)
+
+
+### Bug Fixes
+
+* **GmsCore support:** Insert check after necessary context hook ([03e8e3d](https://github.com/ReVanced/revanced-patches/commit/03e8e3d75cb3b03987299885cea5eb615a5cef23))
+
+## [5.50.3-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.50.3-dev.1...v5.50.3-dev.2) (2026-02-16)
+
+
+### Bug Fixes
+
+* **GmsCore support:** Handle GmsCore flavors when checking for updates ([2aa19f5](https://github.com/ReVanced/revanced-patches/commit/2aa19f5995fd050c40b15331a77d58144a5a1f69))
+* Use positional substitutes in strings where multiple are present ([aa8c87f](https://github.com/ReVanced/revanced-patches/commit/aa8c87f8650bd5def5f726f02be5d62d72a3007b))
+
+## [5.50.3-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.50.2...v5.50.3-dev.1) (2026-02-16)
+
+
+### Bug Fixes
+
+* **GmsCore support:** Rename MicroG GmsCore specific strings as well and rename app specific strings correctly ([c2ac1f0](https://github.com/ReVanced/revanced-patches/commit/c2ac1f04a0ac180555a9d19e7ff41525487fbc6d))
+
+## [5.50.2](https://github.com/ReVanced/revanced-patches/compare/v5.50.1...v5.50.2) (2026-02-15)
+
+
+### Bug Fixes
+
+* Add missing patch option descriptions ([16e42a7](https://github.com/ReVanced/revanced-patches/commit/16e42a75ecbf51e06432f1f6c96758f8d9bdb771))
+
+## [5.50.1](https://github.com/ReVanced/revanced-patches/compare/v5.50.0...v5.50.1) (2026-02-15)
+
+
+### Bug Fixes
+
+* Fix broken release by bumping to v5.50.1 ([d416609](https://github.com/ReVanced/revanced-patches/commit/d4166092571b542925a59328d3d59fbc42eb29e3))
+
+## [5.50.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.50.0...v5.50.1-dev.1) (2026-02-15)
+
+
+### Bug Fixes
+
+* Fix broken release by bumping to v5.50.1 ([d416609](https://github.com/ReVanced/revanced-patches/commit/d4166092571b542925a59328d3d59fbc42eb29e3))
+
+# [5.49.0](https://github.com/ReVanced/revanced-patches/compare/v5.48.0...v5.49.0) (2026-02-15)
+
+
+### Bug Fixes
+
+* Disable `Prevent screenshot detection` by default ([#6511](https://github.com/ReVanced/revanced-patches/issues/6511)) ([5b5c502](https://github.com/ReVanced/revanced-patches/commit/5b5c50254d533faa0e04d542f4859cbef610713e))
+* **Instagram - Open links externally:** Fix patch by handling >4-bit register ([#6538](https://github.com/ReVanced/revanced-patches/issues/6538)) ([f681a6f](https://github.com/ReVanced/revanced-patches/commit/f681a6ffd45f05a61743e7d272cd68c4b743be42))
+* **Instagram:** Make `Change link sharing domain` and `Sanitize sharing links` work with latest versions again ([#6518](https://github.com/ReVanced/revanced-patches/issues/6518)) ([85a9079](https://github.com/ReVanced/revanced-patches/commit/85a9079c25760d0329e518e379eeefe3beeea143))
+* **Letterboxd - Hide ads:** Fix patch by returning the correct return type ([#6527](https://github.com/ReVanced/revanced-patches/issues/6527)) ([80c34b9](https://github.com/ReVanced/revanced-patches/commit/80c34b9d74a42018a0cd52b4a584ee71206bf963))
+* Process strings from Crowdin to strip the app/patch prefixes again ([e566efc](https://github.com/ReVanced/revanced-patches/commit/e566efc51fca45c6284406245a360685a8e90d74))
+* **Strava:** Fix `Add media download` patch ([#6526](https://github.com/ReVanced/revanced-patches/issues/6526)) ([dc9e68b](https://github.com/ReVanced/revanced-patches/commit/dc9e68ba574dd9f35cd742cb63193c5d875addde))
+
+
+### Features
+
+* **FotMob:** Add `Hide ads` patch ([#6566](https://github.com/ReVanced/revanced-patches/issues/6566)) ([4b0b737](https://github.com/ReVanced/revanced-patches/commit/4b0b7374f21d13599ef2f1e2f5880e7589b0874e))
+* **GmsCore support:** Reduce amount of necessary changes and add update check ([#6582](https://github.com/ReVanced/revanced-patches/issues/6582)) ([650e6a2](https://github.com/ReVanced/revanced-patches/commit/650e6a271075b57368432cd9d4294fd1ce26cceb))
+* **Instagram:** Add `Disable analytics` patch ([#6531](https://github.com/ReVanced/revanced-patches/issues/6531)) ([ad92864](https://github.com/ReVanced/revanced-patches/commit/ad92864483a21d7eae7952c8f8429cde3d44e848))
+* **Kleinanzeigen:** Add `Hide ads` patch ([#6533](https://github.com/ReVanced/revanced-patches/issues/6533)) ([bd6e544](https://github.com/ReVanced/revanced-patches/commit/bd6e544007d539ac2eb890d9bdcb6850435f96cb))
+* **Kleinanzeigen:** Add `Hide PUR` patch ([#6558](https://github.com/ReVanced/revanced-patches/issues/6558)) ([4958ecf](https://github.com/ReVanced/revanced-patches/commit/4958ecf10c880e9e7f15dd2e58ebaefbf49e417a))
+* **Microsoft Lens:** Remove migration to OneDrive ([#6551](https://github.com/ReVanced/revanced-patches/issues/6551)) ([e389632](https://github.com/ReVanced/revanced-patches/commit/e389632afd52403aba26b6981d098b93cea45e00))
+* **Nothing X:** Add `Show K1 token(s)` patch ([#6490](https://github.com/ReVanced/revanced-patches/issues/6490)) ([421cb28](https://github.com/ReVanced/revanced-patches/commit/421cb2899ef5c0f100fb8007bae8b89137d0e41c))
+* **Strava:** Add `Hide distractions` patch ([#6479](https://github.com/ReVanced/revanced-patches/issues/6479)) ([66b0852](https://github.com/ReVanced/revanced-patches/commit/66b0852f8fa57c82b09997337a304374883d8ba5))
+* **YouTube Music:** Add `Hide layout components` patch ([#6365](https://github.com/ReVanced/revanced-patches/issues/6365)) ([71ce823](https://github.com/ReVanced/revanced-patches/commit/71ce8230a959dcaf2d8cd5dad1a4f21b88819aa0))
+* **YouTube Music:** Add `Unlock Android Auto Media Browser` patch ([#6477](https://github.com/ReVanced/revanced-patches/issues/6477)) ([5edd9dc](https://github.com/ReVanced/revanced-patches/commit/5edd9dccae3b1ab4edf19771a771812e3c9ccf80))
+
+# [5.50.0-dev.8](https://github.com/ReVanced/revanced-patches/compare/v5.50.0-dev.7...v5.50.0-dev.8) (2026-02-15)
+
+
+### Features
+
+* **GmsCore support:** Reduce amount of necessary changes and add update check ([#6582](https://github.com/ReVanced/revanced-patches/issues/6582)) ([650e6a2](https://github.com/ReVanced/revanced-patches/commit/650e6a271075b57368432cd9d4294fd1ce26cceb))
+
+# [5.50.0-dev.7](https://github.com/ReVanced/revanced-patches/compare/v5.50.0-dev.6...v5.50.0-dev.7) (2026-02-12)
+
+
+### Bug Fixes
+
+* **Instagram:** Make `Change link sharing domain` and `Sanitize sharing links` work with latest versions again ([#6518](https://github.com/ReVanced/revanced-patches/issues/6518)) ([85a9079](https://github.com/ReVanced/revanced-patches/commit/85a9079c25760d0329e518e379eeefe3beeea143))
+
+
+### Features
+
+* **Instagram:** Add `Disable analytics` patch ([#6531](https://github.com/ReVanced/revanced-patches/issues/6531)) ([ad92864](https://github.com/ReVanced/revanced-patches/commit/ad92864483a21d7eae7952c8f8429cde3d44e848))
+* **Kleinanzeigen:** Add `Hide PUR` patch ([#6558](https://github.com/ReVanced/revanced-patches/issues/6558)) ([4958ecf](https://github.com/ReVanced/revanced-patches/commit/4958ecf10c880e9e7f15dd2e58ebaefbf49e417a))
+* **Microsoft Lens:** Remove migration to OneDrive ([#6551](https://github.com/ReVanced/revanced-patches/issues/6551)) ([e389632](https://github.com/ReVanced/revanced-patches/commit/e389632afd52403aba26b6981d098b93cea45e00))
+
+# [5.50.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v5.50.0-dev.5...v5.50.0-dev.6) (2026-02-06)
+
+
+### Features
+
+* **FotMob:** Add `Hide ads` patch ([#6566](https://github.com/ReVanced/revanced-patches/issues/6566)) ([4b0b737](https://github.com/ReVanced/revanced-patches/commit/4b0b7374f21d13599ef2f1e2f5880e7589b0874e))
+
+# [5.50.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v5.50.0-dev.4...v5.50.0-dev.5) (2026-02-01)
+
+
+### Bug Fixes
+
+* Process strings from Crowdin to strip the app/patch prefixes again ([e566efc](https://github.com/ReVanced/revanced-patches/commit/e566efc51fca45c6284406245a360685a8e90d74))
+
+# [5.50.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.50.0-dev.3...v5.50.0-dev.4) (2026-01-27)
+
+
+### Bug Fixes
+
+* **Instagram - Open links externally:** Fix patch by handling >4-bit register ([#6538](https://github.com/ReVanced/revanced-patches/issues/6538)) ([f681a6f](https://github.com/ReVanced/revanced-patches/commit/f681a6ffd45f05a61743e7d272cd68c4b743be42))
+
+# [5.50.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.50.0-dev.2...v5.50.0-dev.3) (2026-01-26)
+
+
+### Features
+
+* **Kleinanzeigen:** Add `Hide ads` patch ([#6533](https://github.com/ReVanced/revanced-patches/issues/6533)) ([bd6e544](https://github.com/ReVanced/revanced-patches/commit/bd6e544007d539ac2eb890d9bdcb6850435f96cb))
+
+# [5.50.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.50.0-dev.1...v5.50.0-dev.2) (2026-01-25)
+
+
+### Bug Fixes
+
+* **Letterboxd - Hide ads:** Fix patch by returning the correct return type ([#6527](https://github.com/ReVanced/revanced-patches/issues/6527)) ([80c34b9](https://github.com/ReVanced/revanced-patches/commit/80c34b9d74a42018a0cd52b4a584ee71206bf963))
+
+# [5.50.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.49.0-dev.1...v5.50.0-dev.1) (2026-01-25)
+
+
+### Bug Fixes
+
+* **Strava:** Fix `Add media download` patch ([#6526](https://github.com/ReVanced/revanced-patches/issues/6526)) ([dc9e68b](https://github.com/ReVanced/revanced-patches/commit/dc9e68ba574dd9f35cd742cb63193c5d875addde))
+
+
+### Features
+
+* **Nothing X:** Add `Show K1 token(s)` patch ([#6490](https://github.com/ReVanced/revanced-patches/issues/6490)) ([421cb28](https://github.com/ReVanced/revanced-patches/commit/421cb2899ef5c0f100fb8007bae8b89137d0e41c))
+* **Strava:** Add `Hide distractions` patch ([#6479](https://github.com/ReVanced/revanced-patches/issues/6479)) ([66b0852](https://github.com/ReVanced/revanced-patches/commit/66b0852f8fa57c82b09997337a304374883d8ba5))
+* **YouTube Music:** Add `Unlock Android Auto Media Browser` patch ([#6477](https://github.com/ReVanced/revanced-patches/issues/6477)) ([5edd9dc](https://github.com/ReVanced/revanced-patches/commit/5edd9dccae3b1ab4edf19771a771812e3c9ccf80))
+
+# [5.50.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.49.0-dev.1...v5.50.0-dev.1) (2026-01-22)
+
+
+### Features
+
+* **Nothing X:** Add `Show K1 token(s)` patch ([#6490](https://github.com/ReVanced/revanced-patches/issues/6490)) ([421cb28](https://github.com/ReVanced/revanced-patches/commit/421cb2899ef5c0f100fb8007bae8b89137d0e41c))
+* **Strava:** Add `Hide distractions` patch ([#6479](https://github.com/ReVanced/revanced-patches/issues/6479)) ([66b0852](https://github.com/ReVanced/revanced-patches/commit/66b0852f8fa57c82b09997337a304374883d8ba5))
+* **YouTube Music:** Add `Unlock Android Auto Media Browser` patch ([#6477](https://github.com/ReVanced/revanced-patches/issues/6477)) ([5edd9dc](https://github.com/ReVanced/revanced-patches/commit/5edd9dccae3b1ab4edf19771a771812e3c9ccf80))
+
+# [5.50.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.48.0...v5.50.0-dev.1) (2026-01-22)
+
+
+### Features
+
+* **YouTube Music:** Add `Unlock Android Auto Media Browser` patch ([#6477](https://github.com/ReVanced/revanced-patches/issues/6477)) ([89645dc](https://github.com/ReVanced/revanced-patches/commit/89645dcc2e13603b8f2fedb5e16231cb396e5965))
+
+# [5.49.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.48.1-dev.1...v5.49.0-dev.1) (2026-01-22)
+
+
+### Features
+
+* **YouTube Music:** Add `Hide layout components` patch ([#6365](https://github.com/ReVanced/revanced-patches/issues/6365)) ([71ce823](https://github.com/ReVanced/revanced-patches/commit/71ce8230a959dcaf2d8cd5dad1a4f21b88819aa0))
+
+## [5.48.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.48.0...v5.48.1-dev.1) (2026-01-21)
+
+
+### Bug Fixes
+
+* Disable `Prevent screenshot detection` by default ([#6511](https://github.com/ReVanced/revanced-patches/issues/6511)) ([5b5c502](https://github.com/ReVanced/revanced-patches/commit/5b5c50254d533faa0e04d542f4859cbef610713e))
+
+# [5.48.0](https://github.com/ReVanced/revanced-patches/compare/v5.47.0...v5.48.0) (2026-01-19)
+
+
+### Bug Fixes
+
+* **Boost for Reddit - Fix missing audio in video downloads:** Make it work again by reflecting Reddits latest changes ([#6500](https://github.com/ReVanced/revanced-patches/issues/6500)) ([eecc44b](https://github.com/ReVanced/revanced-patches/commit/eecc44b9567bf2ca72ac99e0dafa483a6803c0f9))
+* **Disney+ - Skip ads:** Remove unsupported package names ([#6422](https://github.com/ReVanced/revanced-patches/issues/6422)) ([44e7dbc](https://github.com/ReVanced/revanced-patches/commit/44e7dbcf4d7eaf94dd0164baba847d3e19250154))
+* Fix build error introduced in `4046bee` ([#6417](https://github.com/ReVanced/revanced-patches/issues/6417)) ([789f0a5](https://github.com/ReVanced/revanced-patches/commit/789f0a562861825065633d172445ebf35a1ba8d8))
+* Fix compilation error introduced in `6bb6281` ([#6409](https://github.com/ReVanced/revanced-patches/issues/6409)) ([71c6cb5](https://github.com/ReVanced/revanced-patches/commit/71c6cb569ebf7b93cf73ee391839e5220557ce7c))
+* Fix compilation error introduced in dc69f243 ([#6392](https://github.com/ReVanced/revanced-patches/issues/6392)) ([a429824](https://github.com/ReVanced/revanced-patches/commit/a429824bb77b49aea14b0b54f2204ae24d5209a1))
+* **Instagram:** `Sanitize sharing links` ([#6483](https://github.com/ReVanced/revanced-patches/issues/6483)) ([8724759](https://github.com/ReVanced/revanced-patches/commit/87247590de3db74680cb02ba1d87bf683b2269e2))
+* **YouTube - Hide layout components:** Hide new type of crowdfunding box ([#6380](https://github.com/ReVanced/revanced-patches/issues/6380)) ([dc69f24](https://github.com/ReVanced/revanced-patches/commit/dc69f2433e2650654e2dffdd76b0b0c8a52bf515))
+
+
+### Features
+
+* Add `Disable Sentry telemetry` patch ([#6416](https://github.com/ReVanced/revanced-patches/issues/6416)) ([4cc3159](https://github.com/ReVanced/revanced-patches/commit/4cc315952db557c565872de9e8484805f2e42305))
+* Add `Prevent screenshot detection` patch ([#6482](https://github.com/ReVanced/revanced-patches/issues/6482)) ([83c0127](https://github.com/ReVanced/revanced-patches/commit/83c0127ebb8f53ab8a067758619faaac5596c145))
+* Disable Play Integrity patch ([#6412](https://github.com/ReVanced/revanced-patches/issues/6412)) ([6312fe8](https://github.com/ReVanced/revanced-patches/commit/6312fe8d60da24465c0c1b0fa4e94ceb79873d9c))
+* **Instagram - Hides navigation buttons:** Add more buttons to hide ([#6390](https://github.com/ReVanced/revanced-patches/issues/6390)) ([6bb6281](https://github.com/ReVanced/revanced-patches/commit/6bb62811493da04812cc3e392e68d874f95cbef9))
+* **Instagram:** Add `Hide highlights tray` patch ([#6489](https://github.com/ReVanced/revanced-patches/issues/6489)) ([8725a49](https://github.com/ReVanced/revanced-patches/commit/8725a49ba3a06fee0280ffcf4be62cd960cd301e))
+* **Instagram:** Add `Remove build expired popup` patch ([#6488](https://github.com/ReVanced/revanced-patches/issues/6488)) ([18c0b04](https://github.com/ReVanced/revanced-patches/commit/18c0b04f0cd1bf8cd78b05af3b8ebe3a6a5f9e48))
+* **Instagram:** Disable `Disable Reels scrolling` by default ([3401467](https://github.com/ReVanced/revanced-patches/commit/3401467a6d49fc75b6757a15e5c848330c1b7307))
+* **Letterboxd:** Add `Unlock app icons` patch ([#6415](https://github.com/ReVanced/revanced-patches/issues/6415)) ([d25dcfe](https://github.com/ReVanced/revanced-patches/commit/d25dcfe49ac331c9b3dca739ba0be95dbab669cc))
+* **ProtonVPN:** Add `Unlock split tunneling` patch ([#6353](https://github.com/ReVanced/revanced-patches/issues/6353)) ([e0f3346](https://github.com/ReVanced/revanced-patches/commit/e0f33468e6e96b9f10cf35ec67622d6488528c90))
+* **SBS On Demand:** Add `Remove ads` patch ([#6378](https://github.com/ReVanced/revanced-patches/issues/6378)) ([315931c](https://github.com/ReVanced/revanced-patches/commit/315931cbf8f61cd4b3a54ace1ff03685d748614c))
+* **Strava:** Add `Add 'Give Kudos' button to 'Group Activity'` patch ([#6475](https://github.com/ReVanced/revanced-patches/issues/6475)) ([4c4ba1c](https://github.com/ReVanced/revanced-patches/commit/4c4ba1c78c9f4568a2b572f5c69e9c6c734e1a7f))
+* **Strava:** Add `Add media download` patch ([#6449](https://github.com/ReVanced/revanced-patches/issues/6449)) ([778d13c](https://github.com/ReVanced/revanced-patches/commit/778d13ce8b28ca6df3a665530320e4a21a27ae44))
+* **Strava:** Add `Block Snowplow tracking` patch ([#6413](https://github.com/ReVanced/revanced-patches/issues/6413)) ([c47beae](https://github.com/ReVanced/revanced-patches/commit/c47beae21376dd17ab8bc09afe73e9094481bde9))
+* **Strava:** Add `Disable Quick Edit` patch ([#6452](https://github.com/ReVanced/revanced-patches/issues/6452)) ([f5cbb31](https://github.com/ReVanced/revanced-patches/commit/f5cbb31724d15f7e939b96ee0186fd0a108f9fdc))
+* **Strava:** Add `Enable password login` patch ([#6396](https://github.com/ReVanced/revanced-patches/issues/6396)) ([8f3f4c9](https://github.com/ReVanced/revanced-patches/commit/8f3f4c95bb8f151fc9a2c272bf7d0e905c2f01fc))
+* **Strava:** Add `Overwrite media upload parameters` patch ([#6410](https://github.com/ReVanced/revanced-patches/issues/6410)) ([b42ae27](https://github.com/ReVanced/revanced-patches/commit/b42ae27ce66ebad9e9cfc5b70fc121df5bad7567))
+* **YouTube:** Add `Pause on audio interrupt` patch ([#6464](https://github.com/ReVanced/revanced-patches/issues/6464)) ([19f146c](https://github.com/ReVanced/revanced-patches/commit/19f146c01dc381b3cccd61e61ba4901872ff12d8))
+
+# [5.48.0-dev.13](https://github.com/ReVanced/revanced-patches/compare/v5.48.0-dev.12...v5.48.0-dev.13) (2026-01-19)
+
+
+### Features
+
+* Add `Prevent screenshot detection` patch ([#6482](https://github.com/ReVanced/revanced-patches/issues/6482)) ([83c0127](https://github.com/ReVanced/revanced-patches/commit/83c0127ebb8f53ab8a067758619faaac5596c145))
+
+# [5.48.0-dev.12](https://github.com/ReVanced/revanced-patches/compare/v5.48.0-dev.11...v5.48.0-dev.12) (2026-01-19)
+
+
+### Features
+
+* **Instagram:** Add `Remove build expired popup` patch ([#6488](https://github.com/ReVanced/revanced-patches/issues/6488)) ([18c0b04](https://github.com/ReVanced/revanced-patches/commit/18c0b04f0cd1bf8cd78b05af3b8ebe3a6a5f9e48))
+* **Strava:** Add `Add 'Give Kudos' button to 'Group Activity'` patch ([#6475](https://github.com/ReVanced/revanced-patches/issues/6475)) ([4c4ba1c](https://github.com/ReVanced/revanced-patches/commit/4c4ba1c78c9f4568a2b572f5c69e9c6c734e1a7f))
+
+# [5.48.0-dev.11](https://github.com/ReVanced/revanced-patches/compare/v5.48.0-dev.10...v5.48.0-dev.11) (2026-01-19)
+
+
+### Features
+
+* **Instagram:** Add `Hide highlights tray` patch ([#6489](https://github.com/ReVanced/revanced-patches/issues/6489)) ([8725a49](https://github.com/ReVanced/revanced-patches/commit/8725a49ba3a06fee0280ffcf4be62cd960cd301e))
+
+# [5.48.0-dev.10](https://github.com/ReVanced/revanced-patches/compare/v5.48.0-dev.9...v5.48.0-dev.10) (2026-01-19)
+
+
+### Bug Fixes
+
+* **Boost for Reddit - Fix missing audio in video downloads:** Make it work again by reflecting Reddits latest changes ([#6500](https://github.com/ReVanced/revanced-patches/issues/6500)) ([eecc44b](https://github.com/ReVanced/revanced-patches/commit/eecc44b9567bf2ca72ac99e0dafa483a6803c0f9))
+* **Instagram:** `Sanitize sharing links` ([#6483](https://github.com/ReVanced/revanced-patches/issues/6483)) ([8724759](https://github.com/ReVanced/revanced-patches/commit/87247590de3db74680cb02ba1d87bf683b2269e2))
+
+
+### Features
+
+* **Instagram:** Disable `Disable Reels scrolling` by default ([3401467](https://github.com/ReVanced/revanced-patches/commit/3401467a6d49fc75b6757a15e5c848330c1b7307))
+* **Strava:** Add `Add media download` patch ([#6449](https://github.com/ReVanced/revanced-patches/issues/6449)) ([778d13c](https://github.com/ReVanced/revanced-patches/commit/778d13ce8b28ca6df3a665530320e4a21a27ae44))
+* **YouTube:** Add `Pause on audio interrupt` patch ([#6464](https://github.com/ReVanced/revanced-patches/issues/6464)) ([19f146c](https://github.com/ReVanced/revanced-patches/commit/19f146c01dc381b3cccd61e61ba4901872ff12d8))
+
+# [5.48.0-dev.9](https://github.com/ReVanced/revanced-patches/compare/v5.48.0-dev.8...v5.48.0-dev.9) (2026-01-08)
+
+
+### Features
+
+* Add `Disable Sentry telemetry` patch ([#6416](https://github.com/ReVanced/revanced-patches/issues/6416)) ([4cc3159](https://github.com/ReVanced/revanced-patches/commit/4cc315952db557c565872de9e8484805f2e42305))
+* Disable Play Integrity patch ([#6412](https://github.com/ReVanced/revanced-patches/issues/6412)) ([6312fe8](https://github.com/ReVanced/revanced-patches/commit/6312fe8d60da24465c0c1b0fa4e94ceb79873d9c))
+
+# [5.48.0-dev.8](https://github.com/ReVanced/revanced-patches/compare/v5.48.0-dev.7...v5.48.0-dev.8) (2026-01-04)
+
+
+### Features
+
+* **Letterboxd:** Add `Unlock app icons` patch ([#6415](https://github.com/ReVanced/revanced-patches/issues/6415)) ([d25dcfe](https://github.com/ReVanced/revanced-patches/commit/d25dcfe49ac331c9b3dca739ba0be95dbab669cc))
+
+# [5.48.0-dev.7](https://github.com/ReVanced/revanced-patches/compare/v5.48.0-dev.6...v5.48.0-dev.7) (2026-01-04)
+
+
+### Features
+
+* **Strava:** Add `Disable Quick Edit` patch ([#6452](https://github.com/ReVanced/revanced-patches/issues/6452)) ([f5cbb31](https://github.com/ReVanced/revanced-patches/commit/f5cbb31724d15f7e939b96ee0186fd0a108f9fdc))
+* **Strava:** Add `Overwrite media upload parameters` patch ([#6410](https://github.com/ReVanced/revanced-patches/issues/6410)) ([b42ae27](https://github.com/ReVanced/revanced-patches/commit/b42ae27ce66ebad9e9cfc5b70fc121df5bad7567))
+
+# [5.48.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v5.48.0-dev.5...v5.48.0-dev.6) (2026-01-04)
+
+
+### Bug Fixes
+
+* Fix build error introduced in `4046bee` ([#6417](https://github.com/ReVanced/revanced-patches/issues/6417)) ([789f0a5](https://github.com/ReVanced/revanced-patches/commit/789f0a562861825065633d172445ebf35a1ba8d8))
+
+# [5.48.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v5.48.0-dev.4...v5.48.0-dev.5) (2025-12-30)
+
+
+### Bug Fixes
+
+* **Disney+ - Skip ads:** Remove unsupported package names ([#6422](https://github.com/ReVanced/revanced-patches/issues/6422)) ([44e7dbc](https://github.com/ReVanced/revanced-patches/commit/44e7dbcf4d7eaf94dd0164baba847d3e19250154))
+
+# [5.48.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.48.0-dev.3...v5.48.0-dev.4) (2025-12-29)
+
+
+### Features
+
+* **Strava:** Add `Block Snowplow tracking` patch ([#6413](https://github.com/ReVanced/revanced-patches/issues/6413)) ([c47beae](https://github.com/ReVanced/revanced-patches/commit/c47beae21376dd17ab8bc09afe73e9094481bde9))
+
+# [5.48.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.48.0-dev.2...v5.48.0-dev.3) (2025-12-28)
+
+
+### Bug Fixes
+
+* Fix compilation error introduced in `6bb6281` ([#6409](https://github.com/ReVanced/revanced-patches/issues/6409)) ([71c6cb5](https://github.com/ReVanced/revanced-patches/commit/71c6cb569ebf7b93cf73ee391839e5220557ce7c))
+
+
+### Features
+
+* **Instagram - Hides navigation buttons:** Add more buttons to hide ([#6390](https://github.com/ReVanced/revanced-patches/issues/6390)) ([6bb6281](https://github.com/ReVanced/revanced-patches/commit/6bb62811493da04812cc3e392e68d874f95cbef9))
+
+# [5.48.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.48.0-dev.1...v5.48.0-dev.2) (2025-12-27)
+
+
+### Features
+
+* **Strava:** Add `Enable password login` patch ([#6396](https://github.com/ReVanced/revanced-patches/issues/6396)) ([8f3f4c9](https://github.com/ReVanced/revanced-patches/commit/8f3f4c95bb8f151fc9a2c272bf7d0e905c2f01fc))
+
+# [5.48.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.47.0...v5.48.0-dev.1) (2025-12-23)
+
+
+### Bug Fixes
+
+* Fix compilation error introduced in dc69f243 ([#6392](https://github.com/ReVanced/revanced-patches/issues/6392)) ([a429824](https://github.com/ReVanced/revanced-patches/commit/a429824bb77b49aea14b0b54f2204ae24d5209a1))
+* **YouTube - Hide layout components:** Hide new type of crowdfunding box ([#6380](https://github.com/ReVanced/revanced-patches/issues/6380)) ([dc69f24](https://github.com/ReVanced/revanced-patches/commit/dc69f2433e2650654e2dffdd76b0b0c8a52bf515))
+
+
+### Features
+
+* **ProtonVPN:** Add `Unlock split tunneling` patch ([#6353](https://github.com/ReVanced/revanced-patches/issues/6353)) ([e0f3346](https://github.com/ReVanced/revanced-patches/commit/e0f33468e6e96b9f10cf35ec67622d6488528c90))
+* **SBS On Demand:** Add `Remove ads` patch ([#6378](https://github.com/ReVanced/revanced-patches/issues/6378)) ([315931c](https://github.com/ReVanced/revanced-patches/commit/315931cbf8f61cd4b3a54ace1ff03685d748614c))
+
# [5.47.0](https://github.com/ReVanced/revanced-patches/compare/v5.46.0...v5.47.0) (2025-12-18)
diff --git a/crowdin.yml b/crowdin.yml
index 148f321cd2..81022c88c4 100644
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -1,8 +1,9 @@
project_id_env: "CROWDIN_PROJECT_ID"
api_token_env: "CROWDIN_PERSONAL_TOKEN"
-preserve_hierarchy: false
+preserve_hierarchy: true
files:
- source: patches/src/main/resources/addresources/values/strings.xml
+ dest: patches.xml
translation: patches/src/main/resources/addresources/values-%android_code%/strings.xml
skip_untranslated_strings: true
diff --git a/extensions/all/misc/adb/hide-adb/build.gradle.kts b/extensions/all/misc/adb/hide-adb/build.gradle.kts
index 18568df5c5..42eb9984c0 100644
--- a/extensions/all/misc/adb/hide-adb/build.gradle.kts
+++ b/extensions/all/misc/adb/hide-adb/build.gradle.kts
@@ -1,14 +1,7 @@
android {
- namespace = "app.revanced.extension"
-
defaultConfig {
minSdk = 21
}
-
- compileOptions {
- sourceCompatibility = JavaVersion.VERSION_11
- targetCompatibility = JavaVersion.VERSION_11
- }
}
dependencies {
diff --git a/extensions/all/misc/connectivity/wifi/spoof/spoof-wifi/build.gradle.kts b/extensions/all/misc/connectivity/wifi/spoof/spoof-wifi/build.gradle.kts
index 61ff628c75..c269c9862f 100644
--- a/extensions/all/misc/connectivity/wifi/spoof/spoof-wifi/build.gradle.kts
+++ b/extensions/all/misc/connectivity/wifi/spoof/spoof-wifi/build.gradle.kts
@@ -1,9 +1,6 @@
android {
- namespace = "app.revanced.extension"
-
- compileOptions {
- sourceCompatibility = JavaVersion.VERSION_11
- targetCompatibility = JavaVersion.VERSION_11
+ defaultConfig {
+ minSdk = 23
}
}
diff --git a/extensions/all/misc/directory/documentsprovider/export-internal-data-documents-provider/build.gradle.kts b/extensions/all/misc/directory/documentsprovider/export-internal-data-documents-provider/build.gradle.kts
index 18568df5c5..42eb9984c0 100644
--- a/extensions/all/misc/directory/documentsprovider/export-internal-data-documents-provider/build.gradle.kts
+++ b/extensions/all/misc/directory/documentsprovider/export-internal-data-documents-provider/build.gradle.kts
@@ -1,14 +1,7 @@
android {
- namespace = "app.revanced.extension"
-
defaultConfig {
minSdk = 21
}
-
- compileOptions {
- sourceCompatibility = JavaVersion.VERSION_11
- targetCompatibility = JavaVersion.VERSION_11
- }
}
dependencies {
diff --git a/extensions/all/misc/directory/documentsprovider/export-internal-data-documents-provider/src/main/java/app/revanced/extension/all/misc/directory/documentsprovider/InternalDataDocumentsProvider.java b/extensions/all/misc/directory/documentsprovider/export-internal-data-documents-provider/src/main/java/app/revanced/extension/all/misc/directory/documentsprovider/InternalDataDocumentsProvider.java
index f4e3a8e031..ad9d48f6ec 100644
--- a/extensions/all/misc/directory/documentsprovider/export-internal-data-documents-provider/src/main/java/app/revanced/extension/all/misc/directory/documentsprovider/InternalDataDocumentsProvider.java
+++ b/extensions/all/misc/directory/documentsprovider/export-internal-data-documents-provider/src/main/java/app/revanced/extension/all/misc/directory/documentsprovider/InternalDataDocumentsProvider.java
@@ -31,7 +31,10 @@ public class InternalDataDocumentsProvider extends DocumentsProvider {
private static final String[] directoryColumns =
{"document_id", "mime_type", "_display_name", "last_modified", "flags",
"_size", "full_path", "lstat_info"};
- private static final int S_IFLNK = 0x8000;
+ @SuppressWarnings("OctalInteger")
+ private static final int S_IFMT = 0170000;
+ @SuppressWarnings("OctalInteger")
+ private static final int S_IFLNK = 0120000;
private String packageName;
private File dataDirectory;
@@ -47,7 +50,7 @@ public class InternalDataDocumentsProvider extends DocumentsProvider {
if (root.isDirectory()) {
try {
// Only delete recursively if the directory is not a symlink
- if ((Os.lstat(root.getPath()).st_mode & S_IFLNK) != S_IFLNK) {
+ if ((Os.lstat(root.getPath()).st_mode & S_IFMT) != S_IFLNK) {
File[] files = root.listFiles();
if (files != null) {
for (File file : files) {
@@ -324,7 +327,7 @@ public class InternalDataDocumentsProvider extends DocumentsProvider {
sb.append(";");
sb.append(lstat.st_gid);
// Append symlink target if it is a symlink
- if ((lstat.st_mode & S_IFLNK) == S_IFLNK) {
+ if ((lstat.st_mode & S_IFMT) == S_IFLNK) {
sb.append(";");
sb.append(Os.readlink(path));
}
diff --git a/extensions/all/misc/disable-play-integrity/build.gradle.kts b/extensions/all/misc/disable-play-integrity/build.gradle.kts
new file mode 100644
index 0000000000..b3a57874e5
--- /dev/null
+++ b/extensions/all/misc/disable-play-integrity/build.gradle.kts
@@ -0,0 +1,13 @@
+android {
+ defaultConfig {
+ minSdk = 21
+ }
+
+ buildFeatures {
+ aidl = true
+ }
+}
+
+dependencies {
+ compileOnly(libs.annotation)
+}
diff --git a/extensions/all/misc/disable-play-integrity/src/main/AndroidManifest.xml b/extensions/all/misc/disable-play-integrity/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..9b65eb06cf
--- /dev/null
+++ b/extensions/all/misc/disable-play-integrity/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+
diff --git a/extensions/all/misc/disable-play-integrity/src/main/aidl/com/google/android/play/core/integrity/protocol/IExpressIntegrityService.aidl b/extensions/all/misc/disable-play-integrity/src/main/aidl/com/google/android/play/core/integrity/protocol/IExpressIntegrityService.aidl
new file mode 100644
index 0000000000..7b8f59f1d1
--- /dev/null
+++ b/extensions/all/misc/disable-play-integrity/src/main/aidl/com/google/android/play/core/integrity/protocol/IExpressIntegrityService.aidl
@@ -0,0 +1,8 @@
+package com.google.android.play.core.integrity.protocol;
+
+import android.os.Bundle;
+import com.google.android.play.core.integrity.protocol.IExpressIntegrityServiceCallback;
+
+interface IExpressIntegrityService {
+ oneway void requestIntegrityToken(in Bundle request, IExpressIntegrityServiceCallback callback) = 2;
+}
diff --git a/extensions/all/misc/disable-play-integrity/src/main/aidl/com/google/android/play/core/integrity/protocol/IExpressIntegrityServiceCallback.aidl b/extensions/all/misc/disable-play-integrity/src/main/aidl/com/google/android/play/core/integrity/protocol/IExpressIntegrityServiceCallback.aidl
new file mode 100644
index 0000000000..624167afb0
--- /dev/null
+++ b/extensions/all/misc/disable-play-integrity/src/main/aidl/com/google/android/play/core/integrity/protocol/IExpressIntegrityServiceCallback.aidl
@@ -0,0 +1,5 @@
+package com.google.android.play.core.integrity.protocol;
+
+interface IExpressIntegrityServiceCallback {
+ oneway void onRequestExpressIntegrityTokenResult(in Bundle result) = 2;
+}
diff --git a/extensions/all/misc/disable-play-integrity/src/main/aidl/com/google/android/play/core/integrity/protocol/IIntegrityService.aidl b/extensions/all/misc/disable-play-integrity/src/main/aidl/com/google/android/play/core/integrity/protocol/IIntegrityService.aidl
new file mode 100644
index 0000000000..bb1bcd5518
--- /dev/null
+++ b/extensions/all/misc/disable-play-integrity/src/main/aidl/com/google/android/play/core/integrity/protocol/IIntegrityService.aidl
@@ -0,0 +1,8 @@
+package com.google.android.play.core.integrity.protocol;
+
+import android.os.Bundle;
+import com.google.android.play.core.integrity.protocol.IIntegrityServiceCallback;
+
+interface IIntegrityService {
+ oneway void requestIntegrityToken(in Bundle request, IIntegrityServiceCallback callback) = 1;
+}
diff --git a/extensions/all/misc/disable-play-integrity/src/main/aidl/com/google/android/play/core/integrity/protocol/IIntegrityServiceCallback.aidl b/extensions/all/misc/disable-play-integrity/src/main/aidl/com/google/android/play/core/integrity/protocol/IIntegrityServiceCallback.aidl
new file mode 100644
index 0000000000..9485ec1694
--- /dev/null
+++ b/extensions/all/misc/disable-play-integrity/src/main/aidl/com/google/android/play/core/integrity/protocol/IIntegrityServiceCallback.aidl
@@ -0,0 +1,7 @@
+package com.google.android.play.core.integrity.protocol;
+
+import android.os.Bundle;
+
+interface IIntegrityServiceCallback {
+ oneway void onResult(in Bundle result) = 1;
+}
diff --git a/extensions/all/misc/disable-play-integrity/src/main/java/android/ext/PackageId.java b/extensions/all/misc/disable-play-integrity/src/main/java/android/ext/PackageId.java
new file mode 100644
index 0000000000..31c2ca6dba
--- /dev/null
+++ b/extensions/all/misc/disable-play-integrity/src/main/java/android/ext/PackageId.java
@@ -0,0 +1,10 @@
+package android.ext;
+/** @hide */
+// Int values that are assigned to packages in this interface can be retrieved at runtime from
+// ApplicationInfo.ext().getPackageId() or from AndroidPackage.ext().getPackageId() (in system_server).
+//
+// PackageIds are assigned to parsed APKs only after they are verified, either by a certificate check
+// or by a check that the APK is stored on an immutable OS partition.
+public interface PackageId {
+ String PLAY_STORE_NAME = "com.android.vending";
+}
diff --git a/extensions/all/misc/disable-play-integrity/src/main/java/android/os/BinderWrapper.java b/extensions/all/misc/disable-play-integrity/src/main/java/android/os/BinderWrapper.java
new file mode 100644
index 0000000000..a01806441a
--- /dev/null
+++ b/extensions/all/misc/disable-play-integrity/src/main/java/android/os/BinderWrapper.java
@@ -0,0 +1,62 @@
+package android.os;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.io.FileDescriptor;
+
+/** @hide */
+public class BinderWrapper implements IBinder {
+ protected final IBinder base;
+
+ public BinderWrapper(IBinder base) {
+ this.base = base;
+ }
+
+ @Override
+ public boolean transact(int code, @NonNull Parcel data, @Nullable Parcel reply, int flags) throws RemoteException {
+ return base.transact(code, data, reply, flags);
+ }
+
+ @Nullable
+ @Override
+ public IInterface queryLocalInterface(@NonNull String descriptor) {
+ return base.queryLocalInterface(descriptor);
+ }
+
+ @Nullable
+ @Override
+ public String getInterfaceDescriptor() throws RemoteException {
+ return base.getInterfaceDescriptor();
+ }
+
+ @Override
+ public boolean pingBinder() {
+ return base.pingBinder();
+ }
+
+ @Override
+ public boolean isBinderAlive() {
+ return base.isBinderAlive();
+ }
+
+ @Override
+ public void dump(@NonNull FileDescriptor fd, @Nullable String[] args) throws RemoteException {
+ base.dump(fd, args);
+ }
+
+ @Override
+ public void dumpAsync(@NonNull FileDescriptor fd, @Nullable String[] args) throws RemoteException {
+ base.dumpAsync(fd, args);
+ }
+
+ @Override
+ public void linkToDeath(@NonNull DeathRecipient recipient, int flags) throws RemoteException {
+ base.linkToDeath(recipient, flags);
+ }
+
+ @Override
+ public boolean unlinkToDeath(@NonNull DeathRecipient recipient, int flags) {
+ return base.unlinkToDeath(recipient, flags);
+ }
+}
diff --git a/extensions/all/misc/disable-play-integrity/src/main/java/app/grapheneos/gmscompat/lib/playintegrity/ClassicPlayIntegrityServiceWrapper.java b/extensions/all/misc/disable-play-integrity/src/main/java/app/grapheneos/gmscompat/lib/playintegrity/ClassicPlayIntegrityServiceWrapper.java
new file mode 100644
index 0000000000..3bd88d2a65
--- /dev/null
+++ b/extensions/all/misc/disable-play-integrity/src/main/java/app/grapheneos/gmscompat/lib/playintegrity/ClassicPlayIntegrityServiceWrapper.java
@@ -0,0 +1,41 @@
+package app.grapheneos.gmscompat.lib.playintegrity;
+
+import android.os.Binder;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.util.Log;
+
+import com.android.internal.os.FakeBackgroundHandler;
+import com.google.android.play.core.integrity.protocol.IIntegrityService;
+import com.google.android.play.core.integrity.protocol.IIntegrityServiceCallback;
+
+class ClassicPlayIntegrityServiceWrapper extends PlayIntegrityServiceWrapper {
+
+ ClassicPlayIntegrityServiceWrapper(IBinder base) {
+ super(base);
+ requestIntegrityTokenTxnCode = 2; // IIntegrityService.Stub.TRANSACTION_requestIntegrityToken
+ }
+
+ static class TokenRequestStub extends IIntegrityService.Stub {
+ public void requestIntegrityToken(Bundle request, IIntegrityServiceCallback callback) {
+ Runnable r = () -> {
+ var result = new Bundle();
+ // https://developer.android.com/google/play/integrity/reference/com/google/android/play/core/integrity/model/IntegrityErrorCode.html#API_NOT_AVAILABLE
+ final int API_NOT_AVAILABLE = -1;
+ result.putInt("error", API_NOT_AVAILABLE);
+ try {
+ callback.onResult(result);
+ } catch (RemoteException e) {
+ Log.e("IIntegrityService.Stub", "", e);
+ }
+ };
+ FakeBackgroundHandler.getHandler().postDelayed(r, getTokenRequestResultDelay());
+ }
+ };
+
+ @Override
+ protected Binder createTokenRequestStub() {
+ return new TokenRequestStub();
+ }
+}
diff --git a/extensions/all/misc/disable-play-integrity/src/main/java/app/grapheneos/gmscompat/lib/playintegrity/PlayIntegrityServiceWrapper.java b/extensions/all/misc/disable-play-integrity/src/main/java/app/grapheneos/gmscompat/lib/playintegrity/PlayIntegrityServiceWrapper.java
new file mode 100644
index 0000000000..0418b4fe73
--- /dev/null
+++ b/extensions/all/misc/disable-play-integrity/src/main/java/app/grapheneos/gmscompat/lib/playintegrity/PlayIntegrityServiceWrapper.java
@@ -0,0 +1,48 @@
+package app.grapheneos.gmscompat.lib.playintegrity;
+
+import android.os.Binder;
+import android.os.BinderWrapper;
+import android.os.IBinder;
+import android.os.Parcel;
+import android.os.RemoteException;
+import android.util.Log;
+
+import androidx.annotation.Nullable;
+
+abstract class PlayIntegrityServiceWrapper extends BinderWrapper {
+ final String TAG;
+ protected int requestIntegrityTokenTxnCode;
+
+ public PlayIntegrityServiceWrapper(IBinder base) {
+ super(base);
+ TAG = getClass().getSimpleName();
+ }
+
+ protected abstract Binder createTokenRequestStub();
+
+ @Override
+ public boolean transact(int code, Parcel data, @Nullable Parcel reply, int flags) throws RemoteException {
+ if (code == requestIntegrityTokenTxnCode) {
+ if (maybeStubOutIntegrityTokenRequest(code, data, reply, flags)) {
+ return true;
+ }
+ }
+ return super.transact(code, data, reply, flags);
+ }
+
+ private boolean maybeStubOutIntegrityTokenRequest(int code, Parcel data, @Nullable Parcel reply, int flags) {
+ Log.d(TAG, "integrity token request detected");
+
+ try {
+ createTokenRequestStub().transact(code, data, reply, flags);
+ } catch (RemoteException e) {
+ // this is a local call
+ throw new IllegalStateException(e);
+ }
+ return true;
+ }
+
+ protected static long getTokenRequestResultDelay() {
+ return 500L;
+ }
+}
diff --git a/extensions/all/misc/disable-play-integrity/src/main/java/app/grapheneos/gmscompat/lib/playintegrity/PlayIntegrityUtils.java b/extensions/all/misc/disable-play-integrity/src/main/java/app/grapheneos/gmscompat/lib/playintegrity/PlayIntegrityUtils.java
new file mode 100644
index 0000000000..6ff4720cce
--- /dev/null
+++ b/extensions/all/misc/disable-play-integrity/src/main/java/app/grapheneos/gmscompat/lib/playintegrity/PlayIntegrityUtils.java
@@ -0,0 +1,35 @@
+package app.grapheneos.gmscompat.lib.playintegrity;
+
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.ext.PackageId;
+import android.os.IBinder;
+import androidx.annotation.Nullable;
+import app.grapheneos.gmscompat.lib.util.ServiceConnectionWrapper;
+import java.util.function.UnaryOperator;
+
+public class PlayIntegrityUtils {
+
+ public static @Nullable ServiceConnection maybeReplaceServiceConnection(Intent service, ServiceConnection orig) {
+ if (PackageId.PLAY_STORE_NAME.equals(service.getPackage())) {
+ UnaryOperator binderOverride = null;
+
+ final String CLASSIC_SERVICE =
+ "com.google.android.play.core.integrityservice.BIND_INTEGRITY_SERVICE";
+ final String STANDARD_SERVICE =
+ "com.google.android.play.core.expressintegrityservice.BIND_EXPRESS_INTEGRITY_SERVICE";
+
+ String action = service.getAction();
+ if (STANDARD_SERVICE.equals(action)) {
+ binderOverride = StandardPlayIntegrityServiceWrapper::new;
+ } else if (CLASSIC_SERVICE.equals(action)) {
+ binderOverride = ClassicPlayIntegrityServiceWrapper::new;
+ }
+
+ if (binderOverride != null) {
+ return new ServiceConnectionWrapper(orig, binderOverride);
+ }
+ }
+ return null;
+ }
+}
diff --git a/extensions/all/misc/disable-play-integrity/src/main/java/app/grapheneos/gmscompat/lib/playintegrity/StandardPlayIntegrityServiceWrapper.java b/extensions/all/misc/disable-play-integrity/src/main/java/app/grapheneos/gmscompat/lib/playintegrity/StandardPlayIntegrityServiceWrapper.java
new file mode 100644
index 0000000000..c1c4937f0c
--- /dev/null
+++ b/extensions/all/misc/disable-play-integrity/src/main/java/app/grapheneos/gmscompat/lib/playintegrity/StandardPlayIntegrityServiceWrapper.java
@@ -0,0 +1,42 @@
+package app.grapheneos.gmscompat.lib.playintegrity;
+
+import android.annotation.SuppressLint;
+import android.os.Binder;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.util.Log;
+import com.android.internal.os.FakeBackgroundHandler;
+import com.google.android.play.core.integrity.protocol.IExpressIntegrityService;
+import com.google.android.play.core.integrity.protocol.IExpressIntegrityServiceCallback;
+
+@SuppressLint("LongLogTag")
+class StandardPlayIntegrityServiceWrapper extends PlayIntegrityServiceWrapper {
+
+ StandardPlayIntegrityServiceWrapper(IBinder base) {
+ super(base);
+ requestIntegrityTokenTxnCode = 3; // IExpressIntegrityService.Stub.TRANSACTION_requestIntegrityToken
+ }
+
+ static class TokenRequestStub extends IExpressIntegrityService.Stub {
+ public void requestIntegrityToken(Bundle request, IExpressIntegrityServiceCallback callback) {
+ Runnable r = () -> {
+ var result = new Bundle();
+ // https://developer.android.com/google/play/integrity/reference/com/google/android/play/core/integrity/model/StandardIntegrityErrorCode.html#API_NOT_AVAILABLE
+ final int API_NOT_AVAILABLE = -1;
+ result.putInt("error", API_NOT_AVAILABLE);
+ try {
+ callback.onRequestExpressIntegrityTokenResult(result);
+ } catch (RemoteException e) {
+ Log.e("IExpressIntegrityService.Stub", "", e);
+ }
+ };
+ FakeBackgroundHandler.getHandler().postDelayed(r, getTokenRequestResultDelay());
+ }
+ };
+
+ @Override
+ protected Binder createTokenRequestStub() {
+ return new TokenRequestStub();
+ }
+}
diff --git a/extensions/all/misc/disable-play-integrity/src/main/java/app/grapheneos/gmscompat/lib/util/ServiceConnectionWrapper.java b/extensions/all/misc/disable-play-integrity/src/main/java/app/grapheneos/gmscompat/lib/util/ServiceConnectionWrapper.java
new file mode 100644
index 0000000000..9edfc39f85
--- /dev/null
+++ b/extensions/all/misc/disable-play-integrity/src/main/java/app/grapheneos/gmscompat/lib/util/ServiceConnectionWrapper.java
@@ -0,0 +1,49 @@
+package app.grapheneos.gmscompat.lib.util;
+
+import android.content.ComponentName;
+import android.content.ServiceConnection;
+import android.os.Build;
+import android.os.IBinder;
+
+import java.util.function.UnaryOperator;
+
+public class ServiceConnectionWrapper implements ServiceConnection {
+ private final ServiceConnection base;
+ private final UnaryOperator binderOverride;
+
+ public ServiceConnectionWrapper(ServiceConnection base, UnaryOperator binderOverride) {
+ this.base = base;
+ this.binderOverride = binderOverride;
+ }
+
+ @Override
+ public void onServiceConnected(ComponentName name, IBinder service) {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+ IBinder override = binderOverride.apply(service);
+ if (override != null) {
+ service = override;
+ }
+ }
+
+ base.onServiceConnected(name, service);
+ }
+
+ @Override
+ public void onServiceDisconnected(ComponentName name) {
+ base.onServiceDisconnected(name);
+ }
+
+ @Override
+ public void onBindingDied(ComponentName name) {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+ base.onBindingDied(name);
+ }
+ }
+
+ @Override
+ public void onNullBinding(ComponentName name) {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+ base.onNullBinding(name);
+ }
+ }
+}
diff --git a/extensions/all/misc/disable-play-integrity/src/main/java/app/revanced/extension/play/DisablePlayIntegrityPatch.java b/extensions/all/misc/disable-play-integrity/src/main/java/app/revanced/extension/play/DisablePlayIntegrityPatch.java
new file mode 100644
index 0000000000..4dd09f693f
--- /dev/null
+++ b/extensions/all/misc/disable-play-integrity/src/main/java/app/revanced/extension/play/DisablePlayIntegrityPatch.java
@@ -0,0 +1,17 @@
+package app.revanced.extension.play;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import app.grapheneos.gmscompat.lib.playintegrity.PlayIntegrityUtils;
+
+public class DisablePlayIntegrityPatch {
+ public static boolean bindService(Context context, Intent service, ServiceConnection conn, int flags) {
+ ServiceConnection override = PlayIntegrityUtils.maybeReplaceServiceConnection(service, conn);
+ if (override != null) {
+ conn = override;
+ }
+
+ return context.bindService(service, conn, flags);
+ }
+}
diff --git a/extensions/all/misc/disable-play-integrity/src/main/java/com/android/internal/os/FakeBackgroundHandler.java b/extensions/all/misc/disable-play-integrity/src/main/java/com/android/internal/os/FakeBackgroundHandler.java
new file mode 100644
index 0000000000..6b4cb92b45
--- /dev/null
+++ b/extensions/all/misc/disable-play-integrity/src/main/java/com/android/internal/os/FakeBackgroundHandler.java
@@ -0,0 +1,11 @@
+package com.android.internal.os;
+
+import android.os.Handler;
+import android.os.Looper;
+
+public class FakeBackgroundHandler {
+
+ public static Handler getHandler() {
+ return new Handler(Looper.getMainLooper());
+ }
+}
diff --git a/extensions/all/misc/screencapture/remove-screen-capture-restriction/build.gradle.kts b/extensions/all/misc/screencapture/remove-screen-capture-restriction/build.gradle.kts
index 18568df5c5..42eb9984c0 100644
--- a/extensions/all/misc/screencapture/remove-screen-capture-restriction/build.gradle.kts
+++ b/extensions/all/misc/screencapture/remove-screen-capture-restriction/build.gradle.kts
@@ -1,14 +1,7 @@
android {
- namespace = "app.revanced.extension"
-
defaultConfig {
minSdk = 21
}
-
- compileOptions {
- sourceCompatibility = JavaVersion.VERSION_11
- targetCompatibility = JavaVersion.VERSION_11
- }
}
dependencies {
diff --git a/extensions/all/misc/screenshot/remove-screenshot-restriction/build.gradle.kts b/extensions/all/misc/screenshot/remove-screenshot-restriction/build.gradle.kts
index 18568df5c5..42eb9984c0 100644
--- a/extensions/all/misc/screenshot/remove-screenshot-restriction/build.gradle.kts
+++ b/extensions/all/misc/screenshot/remove-screenshot-restriction/build.gradle.kts
@@ -1,14 +1,7 @@
android {
- namespace = "app.revanced.extension"
-
defaultConfig {
minSdk = 21
}
-
- compileOptions {
- sourceCompatibility = JavaVersion.VERSION_11
- targetCompatibility = JavaVersion.VERSION_11
- }
}
dependencies {
diff --git a/extensions/baconreader/build.gradle.kts b/extensions/baconreader/build.gradle.kts
index 804e90884c..843fd12cc9 100644
--- a/extensions/baconreader/build.gradle.kts
+++ b/extensions/baconreader/build.gradle.kts
@@ -3,3 +3,9 @@ dependencies {
compileOnly(libs.annotation)
compileOnly(libs.okhttp)
}
+
+android {
+ defaultConfig {
+ minSdk = 22
+ }
+}
diff --git a/extensions/boostforreddit/build.gradle.kts b/extensions/boostforreddit/build.gradle.kts
index 4f79f5a794..d84b488441 100644
--- a/extensions/boostforreddit/build.gradle.kts
+++ b/extensions/boostforreddit/build.gradle.kts
@@ -4,3 +4,9 @@ dependencies {
compileOnly(libs.annotation)
compileOnly(libs.okhttp)
}
+
+android {
+ defaultConfig {
+ minSdk = 21
+ }
+}
diff --git a/extensions/cricbuzz/build.gradle.kts b/extensions/cricbuzz/build.gradle.kts
index 7d4adde29b..b09ca9effe 100644
--- a/extensions/cricbuzz/build.gradle.kts
+++ b/extensions/cricbuzz/build.gradle.kts
@@ -1,4 +1,10 @@
dependencies {
compileOnly(project(":extensions:shared:library"))
compileOnly(project(":extensions:cricbuzz:stub"))
-}
\ No newline at end of file
+}
+
+android {
+ defaultConfig {
+ minSdk = 21
+ }
+}
diff --git a/extensions/instagram/build.gradle.kts b/extensions/instagram/build.gradle.kts
index 8cf6305c11..9b476b1c81 100644
--- a/extensions/instagram/build.gradle.kts
+++ b/extensions/instagram/build.gradle.kts
@@ -1,3 +1,9 @@
dependencies {
compileOnly(project(":extensions:shared:library"))
}
+
+android {
+ defaultConfig {
+ minSdk = 26
+ }
+}
diff --git a/extensions/instagram/src/main/java/app/revanced/extension/instagram/misc/privacy/SanitizeSharingLinksPatch.java b/extensions/instagram/src/main/java/app/revanced/extension/instagram/misc/privacy/SanitizeSharingLinksPatch.java
index b7a017e77f..058ee19f90 100644
--- a/extensions/instagram/src/main/java/app/revanced/extension/instagram/misc/privacy/SanitizeSharingLinksPatch.java
+++ b/extensions/instagram/src/main/java/app/revanced/extension/instagram/misc/privacy/SanitizeSharingLinksPatch.java
@@ -10,6 +10,6 @@ public final class SanitizeSharingLinksPatch {
* Injection point.
*/
public static String sanitizeSharingLink(String url) {
- return sanitizer.sanitizeUrlString(url);
+ return sanitizer.sanitizeURLString(url);
}
}
diff --git a/extensions/instagram/src/main/java/app/revanced/extension/instagram/misc/share/privacy/SanitizeSharingLinksPatch.java b/extensions/instagram/src/main/java/app/revanced/extension/instagram/misc/share/privacy/SanitizeSharingLinksPatch.java
index 9b3aa6347a..0566f68acb 100644
--- a/extensions/instagram/src/main/java/app/revanced/extension/instagram/misc/share/privacy/SanitizeSharingLinksPatch.java
+++ b/extensions/instagram/src/main/java/app/revanced/extension/instagram/misc/share/privacy/SanitizeSharingLinksPatch.java
@@ -10,6 +10,6 @@ public final class SanitizeSharingLinksPatch {
* Injection point.
*/
public static String sanitizeSharingLink(String url) {
- return sanitizer.sanitizeUrlString(url);
+ return sanitizer.sanitizeURLString(url);
}
}
diff --git a/extensions/messenger/build.gradle.kts b/extensions/messenger/build.gradle.kts
index 8cf6305c11..36b080b27b 100644
--- a/extensions/messenger/build.gradle.kts
+++ b/extensions/messenger/build.gradle.kts
@@ -1,3 +1,9 @@
dependencies {
compileOnly(project(":extensions:shared:library"))
}
+
+android {
+ defaultConfig {
+ minSdk = 24
+ }
+}
diff --git a/extensions/music/src/main/java/app/revanced/extension/music/VersionCheckUtils.java b/extensions/music/src/main/java/app/revanced/extension/music/VersionCheckUtils.java
new file mode 100644
index 0000000000..76331a720b
--- /dev/null
+++ b/extensions/music/src/main/java/app/revanced/extension/music/VersionCheckUtils.java
@@ -0,0 +1,12 @@
+package app.revanced.extension.music;
+
+import app.revanced.extension.shared.Utils;
+
+public class VersionCheckUtils {
+ private static boolean isVersionOrGreater(String version) {
+ return Utils.getAppVersionName().compareTo(version) >= 0;
+ }
+
+ public static final boolean IS_8_40_OR_GREATER = isVersionOrGreater("8.40.00");
+}
+
diff --git a/extensions/music/src/main/java/app/revanced/extension/music/patches/NavigationBarPatch.java b/extensions/music/src/main/java/app/revanced/extension/music/patches/NavigationBarPatch.java
index 511e503044..6131401ce2 100644
--- a/extensions/music/src/main/java/app/revanced/extension/music/patches/NavigationBarPatch.java
+++ b/extensions/music/src/main/java/app/revanced/extension/music/patches/NavigationBarPatch.java
@@ -5,14 +5,15 @@ import static app.revanced.extension.shared.Utils.hideViewUnderCondition;
import android.view.View;
import android.widget.TextView;
-import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import java.util.Arrays;
+import java.util.List;
+
import app.revanced.extension.music.settings.Settings;
@SuppressWarnings("unused")
public class NavigationBarPatch {
- @NonNull
private static String lastYTNavigationEnumName = "";
public static void setLastAppNavigationEnum(@Nullable Enum ytNavigationEnumName) {
@@ -25,7 +26,7 @@ public class NavigationBarPatch {
hideViewUnderCondition(Settings.HIDE_NAVIGATION_BAR_LABEL.get(), textview);
}
- public static void hideNavigationButton(@NonNull View view) {
+ public static void hideNavigationButton(View view) {
// Hide entire navigation bar.
if (Settings.HIDE_NAVIGATION_BAR.get() && view.getParent() != null) {
hideViewUnderCondition(true, (View) view.getParent());
@@ -34,7 +35,7 @@ public class NavigationBarPatch {
// Hide navigation buttons based on their type.
for (NavigationButton button : NavigationButton.values()) {
- if (button.ytEnumNames.equals(lastYTNavigationEnumName)) {
+ if (button.ytEnumNames.contains(lastYTNavigationEnumName)) {
hideViewUnderCondition(button.hidden, view);
break;
}
@@ -43,30 +44,41 @@ public class NavigationBarPatch {
private enum NavigationButton {
HOME(
- "TAB_HOME",
+ Arrays.asList(
+ "TAB_HOME"
+ ),
Settings.HIDE_NAVIGATION_BAR_HOME_BUTTON.get()
),
SAMPLES(
- "TAB_SAMPLES",
+ Arrays.asList(
+ "TAB_SAMPLES"
+ ),
Settings.HIDE_NAVIGATION_BAR_SAMPLES_BUTTON.get()
),
EXPLORE(
- "TAB_EXPLORE",
+ Arrays.asList(
+ "TAB_EXPLORE"
+ ),
Settings.HIDE_NAVIGATION_BAR_EXPLORE_BUTTON.get()
),
LIBRARY(
- "LIBRARY_MUSIC",
+ Arrays.asList(
+ "LIBRARY_MUSIC",
+ "TAB_BOOKMARK" // YouTube Music 8.24+
+ ),
Settings.HIDE_NAVIGATION_BAR_LIBRARY_BUTTON.get()
),
UPGRADE(
- "TAB_MUSIC_PREMIUM",
+ Arrays.asList(
+ "TAB_MUSIC_PREMIUM"
+ ),
Settings.HIDE_NAVIGATION_BAR_UPGRADE_BUTTON.get()
);
- private final String ytEnumNames;
+ private final List ytEnumNames;
private final boolean hidden;
- NavigationButton(@NonNull String ytEnumNames, boolean hidden) {
+ NavigationButton(List ytEnumNames, boolean hidden) {
this.ytEnumNames = ytEnumNames;
this.hidden = hidden;
}
diff --git a/extensions/music/src/main/java/app/revanced/extension/music/patches/spoof/SpoofVideoStreamsPatch.java b/extensions/music/src/main/java/app/revanced/extension/music/patches/spoof/SpoofVideoStreamsPatch.java
index ade26a30fb..46c85a8edd 100644
--- a/extensions/music/src/main/java/app/revanced/extension/music/patches/spoof/SpoofVideoStreamsPatch.java
+++ b/extensions/music/src/main/java/app/revanced/extension/music/patches/spoof/SpoofVideoStreamsPatch.java
@@ -1,7 +1,7 @@
package app.revanced.extension.music.patches.spoof;
import static app.revanced.extension.music.settings.Settings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE;
-import static app.revanced.extension.shared.spoof.ClientType.ANDROID_NO_SDK;
+import static app.revanced.extension.shared.spoof.ClientType.ANDROID_REEL;
import static app.revanced.extension.shared.spoof.ClientType.ANDROID_VR_1_43_32;
import static app.revanced.extension.shared.spoof.ClientType.ANDROID_VR_1_61_48;
import static app.revanced.extension.shared.spoof.ClientType.VISIONOS;
@@ -18,8 +18,8 @@ public class SpoofVideoStreamsPatch {
*/
public static void setClientOrderToUse() {
List availableClients = List.of(
+ ANDROID_REEL,
ANDROID_VR_1_43_32,
- ANDROID_NO_SDK,
VISIONOS,
ANDROID_VR_1_61_48
);
diff --git a/extensions/music/src/main/java/app/revanced/extension/music/settings/MusicActivityHook.java b/extensions/music/src/main/java/app/revanced/extension/music/settings/MusicActivityHook.java
index bb19d2497b..c3874f655c 100644
--- a/extensions/music/src/main/java/app/revanced/extension/music/settings/MusicActivityHook.java
+++ b/extensions/music/src/main/java/app/revanced/extension/music/settings/MusicActivityHook.java
@@ -8,9 +8,11 @@ import android.preference.PreferenceFragment;
import android.view.View;
import android.widget.Toolbar;
+import app.revanced.extension.music.VersionCheckUtils;
import app.revanced.extension.music.settings.preference.MusicPreferenceFragment;
import app.revanced.extension.music.settings.search.MusicSearchViewController;
import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.ResourceType;
import app.revanced.extension.shared.Utils;
import app.revanced.extension.shared.settings.BaseActivityHook;
@@ -22,6 +24,24 @@ public class MusicActivityHook extends BaseActivityHook {
@SuppressLint("StaticFieldLeak")
public static MusicSearchViewController searchViewController;
+ /**
+ * How much time has passed since the first launch of the app. Simple check to prevent
+ * forcing bold icons on first launch where the settings menu is partially broken
+ * due to missing icon resources the client has not yet received.
+ *
+ * @see app.revanced.extension.youtube.settings.YouTubeActivityHook#MINIMUM_TIME_AFTER_FIRST_LAUNCH_BEFORE_ALLOWING_BOLD_ICONS
+ */
+ private static final long MINIMUM_TIME_AFTER_FIRST_LAUNCH_BEFORE_ALLOWING_BOLD_ICONS = 30 * 1000; // 30 seconds.
+
+ static {
+ final boolean useBoldIcons = VersionCheckUtils.IS_8_40_OR_GREATER
+ && !Settings.SETTINGS_DISABLE_BOLD_ICONS.get()
+ && (System.currentTimeMillis() - Settings.FIRST_TIME_APP_LAUNCHED.get())
+ > MINIMUM_TIME_AFTER_FIRST_LAUNCH_BEFORE_ALLOWING_BOLD_ICONS;
+
+ Utils.setAppIsUsingBoldIcons(useBoldIcons);
+ }
+
/**
* Injection point.
*/
@@ -46,15 +66,7 @@ public class MusicActivityHook extends BaseActivityHook {
// Override the default YouTube Music theme to increase start padding of list items.
// Custom style located in resources/music/values/style.xml
activity.setTheme(Utils.getResourceIdentifierOrThrow(
- "Theme.ReVanced.YouTubeMusic.Settings", "style"));
- }
-
- /**
- * Returns the resource ID for the YouTube Music settings layout.
- */
- @Override
- protected int getContentViewResourceId() {
- return LAYOUT_REVANCED_SETTINGS_WITH_TOOLBAR;
+ ResourceType.STYLE, "Theme.ReVanced.YouTubeMusic.Settings"));
}
/**
@@ -123,4 +135,14 @@ public class MusicActivityHook extends BaseActivityHook {
public static boolean handleFinish() {
return MusicSearchViewController.handleFinish(searchViewController);
}
+
+ /**
+ * Injection point.
+ *
+ * Decides whether to use bold icons.
+ */
+ @SuppressWarnings("unused")
+ public static boolean useBoldIcons(boolean original) {
+ return Utils.appIsUsingBoldIcons();
+ }
}
diff --git a/extensions/music/src/main/java/app/revanced/extension/music/settings/Settings.java b/extensions/music/src/main/java/app/revanced/extension/music/settings/Settings.java
index bd0c804025..7decd29b8a 100644
--- a/extensions/music/src/main/java/app/revanced/extension/music/settings/Settings.java
+++ b/extensions/music/src/main/java/app/revanced/extension/music/settings/Settings.java
@@ -4,12 +4,12 @@ import static java.lang.Boolean.FALSE;
import static java.lang.Boolean.TRUE;
import static app.revanced.extension.shared.settings.Setting.parent;
-import app.revanced.extension.shared.settings.BaseSettings;
+import app.revanced.extension.shared.settings.YouTubeAndMusicSettings;
import app.revanced.extension.shared.settings.BooleanSetting;
import app.revanced.extension.shared.settings.EnumSetting;
import app.revanced.extension.shared.spoof.ClientType;
-public class Settings extends BaseSettings {
+public class Settings extends YouTubeAndMusicSettings {
// Ads
public static final BooleanSetting HIDE_VIDEO_ADS = new BooleanSetting("revanced_music_hide_video_ads", TRUE, true);
@@ -35,7 +35,7 @@ public class Settings extends BaseSettings {
// Miscellaneous
public static final EnumSetting SPOOF_VIDEO_STREAMS_CLIENT_TYPE = new EnumSetting<>("revanced_spoof_video_streams_client_type",
- ClientType.ANDROID_VR_1_43_32, true, parent(SPOOF_VIDEO_STREAMS));
+ ClientType.ANDROID_REEL, true, parent(SPOOF_VIDEO_STREAMS));
public static final BooleanSetting FORCE_ORIGINAL_AUDIO = new BooleanSetting("revanced_force_original_audio", TRUE, true);
}
diff --git a/extensions/nothingx/build.gradle.kts b/extensions/nothingx/build.gradle.kts
new file mode 100644
index 0000000000..ed2b78c5f6
--- /dev/null
+++ b/extensions/nothingx/build.gradle.kts
@@ -0,0 +1,10 @@
+dependencies {
+ compileOnly(project(":extensions:shared:library"))
+ compileOnly(project(":extensions:nothingx:stub"))
+}
+
+android {
+ defaultConfig {
+ minSdk = 23
+ }
+}
\ No newline at end of file
diff --git a/extensions/nothingx/src/main/AndroidManifest.xml b/extensions/nothingx/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..15e7c2ae67
--- /dev/null
+++ b/extensions/nothingx/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/extensions/nothingx/src/main/java/app/revanced/extension/nothingx/patches/ShowK1TokensPatch.java b/extensions/nothingx/src/main/java/app/revanced/extension/nothingx/patches/ShowK1TokensPatch.java
new file mode 100644
index 0000000000..c301ae2fb3
--- /dev/null
+++ b/extensions/nothingx/src/main/java/app/revanced/extension/nothingx/patches/ShowK1TokensPatch.java
@@ -0,0 +1,590 @@
+package app.revanced.extension.nothingx.patches;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Application;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.os.Build;
+import android.os.Bundle;
+import android.util.Log;
+import android.util.TypedValue;
+import android.view.Gravity;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.ScrollView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Patches to expose the K1 token for Nothing X app to enable pairing with GadgetBridge.
+ */
+@SuppressWarnings("unused")
+public class ShowK1TokensPatch {
+
+ private static final String TAG = "ReVanced";
+ private static final String PACKAGE_NAME = "com.nothing.smartcenter";
+ private static final String EMPTY_MD5 = "d41d8cd98f00b204e9800998ecf8427e";
+ private static final String PREFS_NAME = "revanced_nothingx_prefs";
+ private static final String KEY_DONT_SHOW_DIALOG = "dont_show_k1_dialog";
+
+ // Colors
+ private static final int COLOR_BG = 0xFF1E1E1E;
+ private static final int COLOR_CARD = 0xFF2D2D2D;
+ private static final int COLOR_TEXT_PRIMARY = 0xFFFFFFFF;
+ private static final int COLOR_TEXT_SECONDARY = 0xFFB0B0B0;
+ private static final int COLOR_ACCENT = 0xFFFF9500;
+ private static final int COLOR_TOKEN_BG = 0xFF3A3A3A;
+ private static final int COLOR_BUTTON_POSITIVE = 0xFFFF9500;
+ private static final int COLOR_BUTTON_NEGATIVE = 0xFFFF6B6B;
+
+ // Match standalone K1: k1:, K1:, k1>, etc.
+ private static final Pattern K1_STANDALONE_PATTERN = Pattern.compile("(?i)(?:k1\\s*[:>]\\s*)([0-9a-f]{32})");
+ // Match combined r3+k1: format (64 chars = r3(32) + k1(32))
+ private static final Pattern K1_COMBINED_PATTERN = Pattern.compile("(?i)r3\\+k1\\s*:\\s*([0-9a-f]{64})");
+
+ private static volatile boolean k1Logged = false;
+ private static volatile boolean lifecycleCallbacksRegistered = false;
+ private static Context appContext;
+
+ /**
+ * Get K1 tokens from database and log files.
+ * Call this after the app initializes.
+ *
+ * @param context Application context
+ */
+ public static void showK1Tokens(Context context) {
+ if (k1Logged) {
+ return;
+ }
+
+ appContext = context.getApplicationContext();
+
+ Set allTokens = new LinkedHashSet<>();
+
+ // First try to get from database.
+ String dbToken = getK1TokensFromDatabase();
+ if (dbToken != null) {
+ allTokens.add(dbToken);
+ }
+
+ // Then get from log files.
+ Set logTokens = getK1TokensFromLogFiles();
+ allTokens.addAll(logTokens);
+
+ if (allTokens.isEmpty()) {
+ return;
+ }
+
+ // Log all found tokens.
+ int index = 1;
+ for (String token : allTokens) {
+ Log.i(TAG, "#" + index++ + ": " + token.toUpperCase());
+ }
+
+ // Register lifecycle callbacks to show dialog when an Activity is ready.
+ registerLifecycleCallbacks(allTokens);
+
+ k1Logged = true;
+ }
+
+ /**
+ * Register ActivityLifecycleCallbacks to show dialog when first Activity resumes.
+ *
+ * @param tokens Set of K1 tokens to display
+ */
+ private static void registerLifecycleCallbacks(Set tokens) {
+ if (lifecycleCallbacksRegistered || !(appContext instanceof Application)) {
+ return;
+ }
+
+ Application application = (Application) appContext;
+ application.registerActivityLifecycleCallbacks(new Application.ActivityLifecycleCallbacks() {
+ @Override
+ public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
+ }
+
+ @Override
+ public void onActivityStarted(Activity activity) {
+ }
+
+ @Override
+ public void onActivityResumed(Activity activity) {
+ // Check if user chose not to show dialog.
+ SharedPreferences prefs = activity.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+ if (prefs.getBoolean(KEY_DONT_SHOW_DIALOG, false)) {
+ application.unregisterActivityLifecycleCallbacks(this);
+ lifecycleCallbacksRegistered = false;
+ return;
+ }
+
+ // Show dialog on first Activity resume.
+ if (tokens != null && !tokens.isEmpty()) {
+ activity.runOnUiThread(() -> showK1TokensDialog(activity, tokens));
+ // Unregister after showing
+ application.unregisterActivityLifecycleCallbacks(this);
+ lifecycleCallbacksRegistered = false;
+ }
+ }
+
+ @Override
+ public void onActivityPaused(Activity activity) {
+ }
+
+ @Override
+ public void onActivityStopped(Activity activity) {
+ }
+
+ @Override
+ public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
+ }
+
+ @Override
+ public void onActivityDestroyed(Activity activity) {
+ }
+ });
+
+ lifecycleCallbacksRegistered = true;
+ }
+
+ /**
+ * Show dialog with K1 tokens.
+ *
+ * @param activity Activity context
+ * @param tokens Set of K1 tokens
+ */
+ private static void showK1TokensDialog(Activity activity, Set tokens) {
+ try {
+ // Create main container.
+ LinearLayout mainLayout = new LinearLayout(activity);
+ mainLayout.setOrientation(LinearLayout.VERTICAL);
+ mainLayout.setBackgroundColor(COLOR_BG);
+ mainLayout.setPadding(dpToPx(activity, 24), dpToPx(activity, 16),
+ dpToPx(activity, 24), dpToPx(activity, 16));
+
+ // Title.
+ TextView titleView = new TextView(activity);
+ titleView.setText("K1 Token(s) Found");
+ titleView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20);
+ titleView.setTypeface(Typeface.DEFAULT_BOLD);
+ titleView.setTextColor(COLOR_TEXT_PRIMARY);
+ titleView.setGravity(Gravity.CENTER);
+ mainLayout.addView(titleView, new LinearLayout.LayoutParams(
+ LinearLayout.LayoutParams.MATCH_PARENT,
+ LinearLayout.LayoutParams.WRAP_CONTENT
+ ));
+
+ // Subtitle.
+ TextView subtitleView = new TextView(activity);
+ subtitleView.setText(tokens.size() == 1 ? "1 token found • Tap to copy" : tokens.size() + " tokens found • Tap to copy");
+ subtitleView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14);
+ subtitleView.setTextColor(COLOR_TEXT_SECONDARY);
+ subtitleView.setGravity(Gravity.CENTER);
+ LinearLayout.LayoutParams subtitleParams = new LinearLayout.LayoutParams(
+ LinearLayout.LayoutParams.MATCH_PARENT,
+ LinearLayout.LayoutParams.WRAP_CONTENT
+ );
+ subtitleParams.topMargin = dpToPx(activity, 4);
+ subtitleParams.bottomMargin = dpToPx(activity, 16);
+ mainLayout.addView(subtitleView, subtitleParams);
+
+ // Scrollable content.
+ ScrollView scrollView = new ScrollView(activity);
+ scrollView.setVerticalScrollBarEnabled(false);
+ LinearLayout.LayoutParams scrollParams = new LinearLayout.LayoutParams(
+ LinearLayout.LayoutParams.MATCH_PARENT,
+ 0,
+ 1.0f
+ );
+ scrollParams.topMargin = dpToPx(activity, 8);
+ scrollParams.bottomMargin = dpToPx(activity, 16);
+ mainLayout.addView(scrollView, scrollParams);
+
+ LinearLayout tokensContainer = new LinearLayout(activity);
+ tokensContainer.setOrientation(LinearLayout.VERTICAL);
+ scrollView.addView(tokensContainer);
+
+ // Add each token as a card.
+ boolean singleToken = tokens.size() == 1;
+ int index = 1;
+ for (String token : tokens) {
+ LinearLayout tokenCard = createTokenCard(activity, token, index++, singleToken);
+ LinearLayout.LayoutParams cardParams = new LinearLayout.LayoutParams(
+ LinearLayout.LayoutParams.MATCH_PARENT,
+ LinearLayout.LayoutParams.WRAP_CONTENT
+ );
+ cardParams.bottomMargin = dpToPx(activity, 12);
+ tokensContainer.addView(tokenCard, cardParams);
+ }
+
+ // Info text.
+ TextView infoView = new TextView(activity);
+ infoView.setText(tokens.size() == 1 ? "Tap the token to copy it" : "Tap any token to copy it");
+ infoView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 12);
+ infoView.setTextColor(COLOR_TEXT_SECONDARY);
+ infoView.setGravity(Gravity.CENTER);
+ infoView.setAlpha(0.7f);
+ LinearLayout.LayoutParams infoParams = new LinearLayout.LayoutParams(
+ LinearLayout.LayoutParams.MATCH_PARENT,
+ LinearLayout.LayoutParams.WRAP_CONTENT
+ );
+ infoParams.topMargin = dpToPx(activity, 8);
+ mainLayout.addView(infoView, infoParams);
+
+ // Button row.
+ LinearLayout buttonRow = new LinearLayout(activity);
+ buttonRow.setOrientation(LinearLayout.HORIZONTAL);
+ buttonRow.setGravity(Gravity.END);
+ LinearLayout.LayoutParams buttonRowParams = new LinearLayout.LayoutParams(
+ LinearLayout.LayoutParams.MATCH_PARENT,
+ LinearLayout.LayoutParams.WRAP_CONTENT
+ );
+ buttonRowParams.topMargin = dpToPx(activity, 16);
+ mainLayout.addView(buttonRow, buttonRowParams);
+
+ // "Don't show again" button.
+ Button dontShowButton = new Button(activity);
+ dontShowButton.setText("Don't show again");
+ dontShowButton.setTextColor(Color.WHITE);
+ dontShowButton.setBackgroundColor(Color.TRANSPARENT);
+ dontShowButton.setAllCaps(false);
+ dontShowButton.setTypeface(Typeface.DEFAULT);
+ dontShowButton.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14);
+ dontShowButton.setPadding(dpToPx(activity, 16), dpToPx(activity, 8),
+ dpToPx(activity, 16), dpToPx(activity, 8));
+ LinearLayout.LayoutParams dontShowParams = new LinearLayout.LayoutParams(
+ LinearLayout.LayoutParams.WRAP_CONTENT,
+ LinearLayout.LayoutParams.WRAP_CONTENT
+ );
+ dontShowParams.rightMargin = dpToPx(activity, 8);
+ buttonRow.addView(dontShowButton, dontShowParams);
+
+ // "OK" button.
+ Button okButton = new Button(activity);
+ okButton.setText("OK");
+ okButton.setTextColor(Color.BLACK);
+ okButton.setBackgroundColor(COLOR_BUTTON_POSITIVE);
+ okButton.setAllCaps(false);
+ okButton.setTypeface(Typeface.DEFAULT_BOLD);
+ okButton.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14);
+ okButton.setPadding(dpToPx(activity, 24), dpToPx(activity, 12),
+ dpToPx(activity, 24), dpToPx(activity, 12));
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+ okButton.setElevation(dpToPx(activity, 4));
+ }
+ buttonRow.addView(okButton, new LinearLayout.LayoutParams(
+ LinearLayout.LayoutParams.WRAP_CONTENT,
+ LinearLayout.LayoutParams.WRAP_CONTENT
+ ));
+
+ // Build dialog.
+ AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+ builder.setView(mainLayout);
+
+ final AlertDialog dialog = builder.create();
+
+ // Style the dialog with dark background.
+ if (dialog.getWindow() != null) {
+ dialog.getWindow().setBackgroundDrawableResource(android.R.color.transparent);
+ }
+
+ dialog.show();
+
+ // Set button click listeners after dialog is created.
+ dontShowButton.setOnClickListener(v -> {
+ SharedPreferences prefs = activity.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+ prefs.edit().putBoolean(KEY_DONT_SHOW_DIALOG, true).apply();
+ Toast.makeText(activity, "Dialog disabled. Clear app data to re-enable.",
+ Toast.LENGTH_SHORT).show();
+ dialog.dismiss();
+ });
+
+ okButton.setOnClickListener(v -> {
+ dialog.dismiss();
+ });
+
+ } catch (Exception e) {
+ Log.e(TAG, "Failed to show K1 dialog", e);
+ }
+ }
+
+ /**
+ * Create a card view for a single token.
+ */
+ private static LinearLayout createTokenCard(Activity activity, String token, int index, boolean singleToken) {
+ LinearLayout card = new LinearLayout(activity);
+ card.setOrientation(LinearLayout.VERTICAL);
+ card.setBackgroundColor(COLOR_TOKEN_BG);
+ card.setPadding(dpToPx(activity, 16), dpToPx(activity, 12),
+ dpToPx(activity, 16), dpToPx(activity, 12));
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+ card.setElevation(dpToPx(activity, 2));
+ }
+ card.setClickable(true);
+ card.setFocusable(true);
+
+ // Token label (only show if multiple tokens).
+ if (!singleToken) {
+ TextView labelView = new TextView(activity);
+ labelView.setText("Token #" + index);
+ labelView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 12);
+ labelView.setTextColor(COLOR_ACCENT);
+ labelView.setTypeface(Typeface.DEFAULT_BOLD);
+ card.addView(labelView);
+ }
+
+ // Token value.
+ TextView tokenView = new TextView(activity);
+ tokenView.setText(token.toUpperCase());
+ tokenView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16);
+ tokenView.setTextColor(COLOR_TEXT_PRIMARY);
+ tokenView.setTypeface(Typeface.MONOSPACE);
+ tokenView.setLetterSpacing(0.05f);
+ LinearLayout.LayoutParams tokenParams = new LinearLayout.LayoutParams(
+ LinearLayout.LayoutParams.MATCH_PARENT,
+ LinearLayout.LayoutParams.WRAP_CONTENT
+ );
+ if (!singleToken) {
+ tokenParams.topMargin = dpToPx(activity, 8);
+ }
+ card.addView(tokenView, tokenParams);
+
+ // Click to copy.
+ card.setOnClickListener(v -> {
+ ClipboardManager clipboard = (ClipboardManager) activity.getSystemService(Context.CLIPBOARD_SERVICE);
+ if (clipboard != null) {
+ clipboard.setText(token.toUpperCase());
+ Toast.makeText(activity, "Token copied!", Toast.LENGTH_SHORT).show();
+ }
+ });
+
+ return card;
+ }
+
+ /**
+ * Convert dp to pixels.
+ */
+ private static int dpToPx(Context context, float dp) {
+ return (int) TypedValue.applyDimension(
+ TypedValue.COMPLEX_UNIT_DIP,
+ dp,
+ context.getResources().getDisplayMetrics()
+ );
+ }
+
+ /**
+ * Get K1 tokens from log files.
+ * Prioritizes pairing K1 tokens over reconnect tokens.
+ */
+ private static Set getK1TokensFromLogFiles() {
+ Set pairingTokens = new LinkedHashSet<>();
+ Set reconnectTokens = new LinkedHashSet<>();
+ try {
+ File logDir = new File("/data/data/" + PACKAGE_NAME + "/files/log");
+ if (!logDir.exists() || !logDir.isDirectory()) {
+ return pairingTokens;
+ }
+
+ File[] logFiles = logDir.listFiles((dir, name) ->
+ name.endsWith(".log") || name.endsWith(".log.") || name.matches(".*\\.log\\.\\d+"));
+
+ if (logFiles == null || logFiles.length == 0) {
+ return pairingTokens;
+ }
+
+ for (File logFile : logFiles) {
+ try (BufferedReader reader = new BufferedReader(new FileReader(logFile))) {
+ String line;
+ while ((line = reader.readLine()) != null) {
+ // Determine if this is a pairing or reconnect context.
+ boolean isPairingContext = line.toLowerCase().contains("watchbind");
+ boolean isReconnectContext = line.toLowerCase().contains("watchreconnect");
+
+ String k1Token = null;
+
+ // First check for combined r3+k1 format (priority).
+ Matcher combinedMatcher = K1_COMBINED_PATTERN.matcher(line);
+ if (combinedMatcher.find()) {
+ String combined = combinedMatcher.group(1);
+ if (combined.length() == 64) {
+ // Second half is the actual K1
+ k1Token = combined.substring(32).toLowerCase();
+ }
+ }
+
+ // Then check for standalone K1 format (only if not found in combined).
+ if (k1Token == null) {
+ Matcher standaloneMatcher = K1_STANDALONE_PATTERN.matcher(line);
+ if (standaloneMatcher.find()) {
+ String token = standaloneMatcher.group(1);
+ if (token != null && token.length() == 32) {
+ k1Token = token.toLowerCase();
+ }
+ }
+ }
+
+ // Add to appropriate set.
+ if (k1Token != null) {
+ if (isPairingContext && !isReconnectContext) {
+ pairingTokens.add(k1Token);
+ } else {
+ reconnectTokens.add(k1Token);
+ }
+ }
+ }
+ } catch (Exception e) {
+ // Skip unreadable files.
+ }
+ }
+ } catch (Exception ex) {
+ // Fail silently.
+ }
+
+ // Return pairing tokens first, add reconnect tokens if no pairing tokens found.
+ if (!pairingTokens.isEmpty()) {
+ Log.i(TAG, "Found " + pairingTokens.size() + " pairing K1 token(s)");
+ return pairingTokens;
+ }
+
+ if (!reconnectTokens.isEmpty()) {
+ Log.i(TAG, "Found " + reconnectTokens.size() + " reconnect K1 token(s) (may not work for initial pairing)");
+ }
+ return reconnectTokens;
+ }
+
+ /**
+ * Try to get K1 tokens from the database.
+ */
+ private static String getK1TokensFromDatabase() {
+ try {
+ File dbDir = new File("/data/data/" + PACKAGE_NAME + "/databases");
+ if (!dbDir.exists() || !dbDir.isDirectory()) {
+ return null;
+ }
+
+ File[] dbFiles = dbDir.listFiles((dir, name) ->
+ name.endsWith(".db") && !name.startsWith("google_app_measurement") && !name.contains("firebase"));
+
+ if (dbFiles == null || dbFiles.length == 0) {
+ return null;
+ }
+
+ for (File dbFile : dbFiles) {
+ String token = getK1TokensFromDatabase(dbFile);
+ if (token != null) {
+ return token;
+ }
+ }
+
+ return null;
+ } catch (Exception ex) {
+ return null;
+ }
+ }
+
+ /**
+ * Extract K1 tokens from a database file.
+ */
+ private static String getK1TokensFromDatabase(File dbFile) {
+ SQLiteDatabase db = null;
+ try {
+ db = SQLiteDatabase.openDatabase(dbFile.getPath(), null, SQLiteDatabase.OPEN_READONLY);
+
+ // Get all tables.
+ Cursor cursor = db.rawQuery(
+ "SELECT name FROM sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%'",
+ null
+ );
+
+ List tables = new ArrayList<>();
+ while (cursor.moveToNext()) {
+ tables.add(cursor.getString(0));
+ }
+ cursor.close();
+
+ // Scan all columns for 32-char hex strings.
+ for (String table : tables) {
+ Cursor schemaCursor = null;
+ try {
+ schemaCursor = db.rawQuery("PRAGMA table_info(" + table + ")", null);
+ List columns = new ArrayList<>();
+ while (schemaCursor.moveToNext()) {
+ columns.add(schemaCursor.getString(1));
+ }
+ schemaCursor.close();
+
+ for (String column : columns) {
+ Cursor dataCursor = null;
+ try {
+ dataCursor = db.query(table, new String[]{column}, null, null, null, null, null);
+ while (dataCursor.moveToNext()) {
+ String value = dataCursor.getString(0);
+ if (value != null && value.length() == 32 && value.matches("[0-9a-fA-F]{32}")) {
+ // Skip obviously fake tokens (MD5 of empty string).
+ if (!value.equalsIgnoreCase(EMPTY_MD5)) {
+ dataCursor.close();
+ db.close();
+ return value.toLowerCase();
+ }
+ }
+ }
+ } catch (Exception e) {
+ // Skip non-string columns.
+ } finally {
+ if (dataCursor != null) {
+ dataCursor.close();
+ }
+ }
+ }
+ } catch (Exception e) {
+ // Continue to next table.
+ } finally {
+ if (schemaCursor != null && !schemaCursor.isClosed()) {
+ schemaCursor.close();
+ }
+ }
+ }
+
+ return null;
+ } catch (Exception ex) {
+ return null;
+ } finally {
+ if (db != null && db.isOpen()) {
+ db.close();
+ }
+ }
+ }
+
+ /**
+ * Reset the logged flag (useful for testing or re-pairing).
+ */
+ public static void resetK1Logged() {
+ k1Logged = false;
+ lifecycleCallbacksRegistered = false;
+ }
+
+ /**
+ * Reset the "don't show again" preference.
+ */
+ public static void resetDontShowPreference() {
+ if (appContext != null) {
+ SharedPreferences prefs = appContext.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+ prefs.edit().putBoolean(KEY_DONT_SHOW_DIALOG, false).apply();
+ }
+ }
+}
diff --git a/extensions/nothingx/stub/build.gradle.kts b/extensions/nothingx/stub/build.gradle.kts
new file mode 100644
index 0000000000..fcadc678c4
--- /dev/null
+++ b/extensions/nothingx/stub/build.gradle.kts
@@ -0,0 +1,17 @@
+plugins {
+ alias(libs.plugins.android.library)
+}
+
+android {
+ namespace = "app.revanced.extension"
+ compileSdk = 34
+
+ defaultConfig {
+ minSdk = 26
+ }
+
+ compileOptions {
+ sourceCompatibility = JavaVersion.VERSION_11
+ targetCompatibility = JavaVersion.VERSION_11
+ }
+}
\ No newline at end of file
diff --git a/extensions/nothingx/stub/src/main/AndroidManifest.xml b/extensions/nothingx/stub/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..15e7c2ae67
--- /dev/null
+++ b/extensions/nothingx/stub/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/extensions/nunl/build.gradle.kts b/extensions/nunl/build.gradle.kts
index 6020de901a..ab48531bba 100644
--- a/extensions/nunl/build.gradle.kts
+++ b/extensions/nunl/build.gradle.kts
@@ -2,3 +2,9 @@ dependencies {
compileOnly(project(":extensions:shared:library"))
compileOnly(project(":extensions:nunl:stub"))
}
+
+android {
+ defaultConfig {
+ minSdk = 26
+ }
+}
diff --git a/extensions/primevideo/build.gradle.kts b/extensions/primevideo/build.gradle.kts
index 9a81cc3e89..17a3c31a21 100644
--- a/extensions/primevideo/build.gradle.kts
+++ b/extensions/primevideo/build.gradle.kts
@@ -2,3 +2,9 @@ dependencies {
compileOnly(project(":extensions:shared:library"))
compileOnly(project(":extensions:primevideo:stub"))
}
+
+android {
+ defaultConfig {
+ minSdk = 21
+ }
+}
diff --git a/extensions/reddit/build.gradle.kts b/extensions/reddit/build.gradle.kts
index 8693f97f53..75c8d7a179 100644
--- a/extensions/reddit/build.gradle.kts
+++ b/extensions/reddit/build.gradle.kts
@@ -1,3 +1,9 @@
dependencies {
compileOnly(project(":extensions:reddit:stub"))
}
+
+android {
+ defaultConfig {
+ minSdk = 28
+ }
+}
diff --git a/extensions/samsung/radio/build.gradle.kts b/extensions/samsung/radio/build.gradle.kts
index 0eadeef265..15d386efb3 100644
--- a/extensions/samsung/radio/build.gradle.kts
+++ b/extensions/samsung/radio/build.gradle.kts
@@ -2,3 +2,9 @@ dependencies {
compileOnly(project(":extensions:shared:library"))
compileOnly(project(":extensions:samsung:radio:stub"))
}
+
+android {
+ defaultConfig {
+ minSdk = 26
+ }
+}
diff --git a/extensions/shared/build.gradle.kts b/extensions/shared/build.gradle.kts
index 8f037894ca..3eb6ff48c7 100644
--- a/extensions/shared/build.gradle.kts
+++ b/extensions/shared/build.gradle.kts
@@ -2,3 +2,9 @@ dependencies {
implementation(project(":extensions:shared:library"))
compileOnly(libs.okhttp)
}
+
+android {
+ defaultConfig {
+ minSdk = 23
+ }
+}
diff --git a/extensions/shared/library/build.gradle.kts b/extensions/shared/library/build.gradle.kts
index 100de7ae14..8215e513ad 100644
--- a/extensions/shared/library/build.gradle.kts
+++ b/extensions/shared/library/build.gradle.kts
@@ -1,5 +1,5 @@
plugins {
- alias(libs.plugins.android.library)
+ alias(libs.plugins.android.library)
}
android {
@@ -19,4 +19,6 @@ android {
dependencies {
compileOnly(libs.annotation)
compileOnly(libs.okhttp)
+ compileOnly(libs.protobuf.javalite)
+ implementation(project(":extensions:shared:protobuf", configuration = "shadowRuntimeElements"))
}
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/GmsCoreSupport.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/GmsCoreSupport.java
index 3b544371bd..fb7e68963a 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/GmsCoreSupport.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/GmsCoreSupport.java
@@ -1,8 +1,5 @@
package app.revanced.extension.shared;
-import static app.revanced.extension.shared.StringRef.str;
-import static app.revanced.extension.shared.requests.Route.Method.GET;
-
import android.annotation.SuppressLint;
import android.app.Activity;
import android.app.Dialog;
@@ -20,43 +17,53 @@ import android.widget.LinearLayout;
import androidx.annotation.Nullable;
+import app.revanced.extension.shared.requests.Requester;
+import app.revanced.extension.shared.requests.Route;
+import app.revanced.extension.shared.settings.BaseSettings;
+import app.revanced.extension.shared.ui.CustomDialog;
+
+import org.json.JSONObject;
+
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Locale;
-import app.revanced.extension.shared.requests.Requester;
-import app.revanced.extension.shared.requests.Route;
-import app.revanced.extension.shared.ui.CustomDialog;
+import static app.revanced.extension.shared.StringRef.str;
+import static app.revanced.extension.shared.requests.Route.Method.GET;
@SuppressWarnings("unused")
public class GmsCoreSupport {
- private static final String GMS_CORE_PACKAGE_NAME
- = getGmsCoreVendorGroupId() + ".android.gms";
- private static final Uri GMS_CORE_PROVIDER
- = Uri.parse("content://" + getGmsCoreVendorGroupId() + ".android.gsf.gservices/prefix");
- private static final String DONT_KILL_MY_APP_URL
- = "https://dontkillmyapp.com/";
- private static final Route DONT_KILL_MY_APP_MANUFACTURER_API
- = new Route(GET, "/api/v2/{manufacturer}.json");
- private static final String DONT_KILL_MY_APP_NAME_PARAMETER
- = "?app=MicroG";
- private static final String BUILD_MANUFACTURER
- = Build.MANUFACTURER.toLowerCase(Locale.ROOT).replace(" ", "-");
+ private static GmsCore gmsCore = GmsCore.UNKNOWN;
- /**
- * If a manufacturer specific page exists on DontKillMyApp.
- */
- @Nullable
- private static volatile Boolean DONT_KILL_MY_APP_MANUFACTURER_SUPPORTED;
-
- private static String getOriginalPackageName() {
- return null; // Modified during patching.
+ static {
+ for (GmsCore core : GmsCore.values()) {
+ if (core.getGroupId().equals(getGmsCoreVendorGroupId())) {
+ GmsCoreSupport.gmsCore = core;
+ break;
+ }
+ }
}
+ /**
+ * Injection point.
+ */
+ public static void checkGmsCore(Activity context) {
+ gmsCore.check(context);
+ }
+
+ private static String getOriginalPackageName() {
+ return null; // Modified during patching.
+ }
+
+ private static String getGmsCoreVendorGroupId() {
+ return "app.revanced"; // Modified during patching.
+ }
+
+
/**
* @return If the current package name is the same as the original unpatched app.
- * If `GmsCore support` was not included during patching, this returns true;
+ * If `GmsCore support` was not included during patching, this returns true;
*/
public static boolean isPackageNameOriginal() {
String originalPackageName = getOriginalPackageName();
@@ -64,203 +71,342 @@ public class GmsCoreSupport {
|| originalPackageName.equals(Utils.getContext().getPackageName());
}
- private static void open(String queryOrLink) {
- Logger.printInfo(() -> "Opening link: " + queryOrLink);
-
- Intent intent;
- try {
- // Check if queryOrLink is a valid URL.
- new URL(queryOrLink);
-
- intent = new Intent(Intent.ACTION_VIEW, Uri.parse(queryOrLink));
- } catch (MalformedURLException e) {
- intent = new Intent(Intent.ACTION_WEB_SEARCH);
- intent.putExtra(SearchManager.QUERY, queryOrLink);
- }
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- Utils.getContext().startActivity(intent);
-
- // Gracefully exit, otherwise the broken app will continue to run.
- System.exit(0);
- }
-
- private static void showBatteryOptimizationDialog(Activity context,
- String dialogMessageRef,
- String positiveButtonTextRef,
- DialogInterface.OnClickListener onPositiveClickListener) {
- // Use a delay to allow the activity to finish initializing.
- // Otherwise, if device is in dark mode the dialog is shown with wrong color scheme.
- Utils.runOnMainThreadDelayed(() -> {
- // Create the custom dialog.
- Pair dialogPair = CustomDialog.create(
- context,
- str("gms_core_dialog_title"), // Title.
- str(dialogMessageRef), // Message.
- null, // No EditText.
- str(positiveButtonTextRef), // OK button text.
- () -> onPositiveClickListener.onClick(null, 0), // Convert DialogInterface.OnClickListener to Runnable.
- null, // No Cancel button action.
- null, // No Neutral button text.
- null, // No Neutral button action.
- true // Dismiss dialog when onNeutralClick.
- );
-
- Dialog dialog = dialogPair.first;
-
- // Do not set cancelable to false, to allow using back button to skip the action,
- // just in case the battery change can never be satisfied.
- dialog.setCancelable(true);
-
- // Show the dialog
- Utils.showDialog(context, dialog);
- }, 100);
- }
-
- /**
- * Injection point.
- */
- public static void checkGmsCore(Activity context) {
- try {
- // Verify the user has not included GmsCore for a root installation.
- // GmsCore Support changes the package name, but with a mounted installation
- // all manifest changes are ignored and the original package name is used.
- if (isPackageNameOriginal()) {
- Logger.printInfo(() -> "App is mounted with root, but GmsCore patch was included");
- // Cannot use localize text here, since the app will load resources
- // from the unpatched app and all patch strings are missing.
- Utils.showToastLong("The 'GmsCore support' patch breaks mount installations");
-
- // Do not exit. If the app exits before launch completes (and without
- // opening another activity), then on some devices such as Pixel phone Android 10
- // no toast will be shown and the app will continually relaunch
- // with the appearance of a hung app.
- }
-
- // Verify GmsCore is installed.
+ private enum GmsCore {
+ REVANCED("app.revanced", "https://github.com/revanced/gmscore/releases/latest", () -> {
try {
- PackageManager manager = context.getPackageManager();
- manager.getPackageInfo(GMS_CORE_PACKAGE_NAME, PackageManager.GET_ACTIVITIES);
- } catch (PackageManager.NameNotFoundException exception) {
- Logger.printInfo(() -> "GmsCore was not found");
- // Cannot show a dialog and must show a toast,
- // because on some installations the app crashes before a dialog can be displayed.
- Utils.showToastLong(str("gms_core_toast_not_installed_message"));
- open(getGmsCoreDownload());
- return;
- }
-
- // Check if GmsCore is whitelisted from battery optimizations.
- if (isAndroidAutomotive(context)) {
- // Ignore Android Automotive devices (Google built-in),
- // as there is no way to disable battery optimizations.
- Logger.printDebug(() -> "Device is Android Automotive");
- } else if (batteryOptimizationsEnabled(context)) {
- Logger.printInfo(() -> "GmsCore is not whitelisted from battery optimizations");
-
- showBatteryOptimizationDialog(context,
- "gms_core_dialog_not_whitelisted_using_battery_optimizations_message",
- "gms_core_dialog_continue_text",
- (dialog, id) -> openGmsCoreDisableBatteryOptimizationsIntent(context));
- return;
- }
-
- // Check if GmsCore is currently running in the background.
- var client = context.getContentResolver().acquireContentProviderClient(GMS_CORE_PROVIDER);
- //noinspection TryFinallyCanBeTryWithResources
- try {
- if (client == null) {
- Logger.printInfo(() -> "GmsCore is not running in the background");
- checkIfDontKillMyAppSupportsManufacturer();
-
- showBatteryOptimizationDialog(context,
- "gms_core_dialog_not_whitelisted_not_allowed_in_background_message",
- "gms_core_dialog_open_website_text",
- (dialog, id) -> openDontKillMyApp());
- }
- } finally {
- if (client != null) client.close();
- }
- } catch (Exception ex) {
- Logger.printException(() -> "checkGmsCore failure", ex);
- }
- }
-
- @SuppressLint("BatteryLife") // Permission is part of GmsCore
- private static void openGmsCoreDisableBatteryOptimizationsIntent(Activity activity) {
- Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
- intent.setData(Uri.fromParts("package", GMS_CORE_PACKAGE_NAME, null));
- activity.startActivityForResult(intent, 0);
- }
-
- private static void checkIfDontKillMyAppSupportsManufacturer() {
- Utils.runOnBackgroundThread(() -> {
- try {
- final long start = System.currentTimeMillis();
HttpURLConnection connection = Requester.getConnectionFromRoute(
- DONT_KILL_MY_APP_URL, DONT_KILL_MY_APP_MANUFACTURER_API, BUILD_MANUFACTURER);
+ "https://api.github.com",
+ new Route(GET, "/repos/revanced/gmscore/releases/latest")
+ );
connection.setConnectTimeout(5000);
connection.setReadTimeout(5000);
- final boolean supported = connection.getResponseCode() == 200;
- Logger.printInfo(() -> "Manufacturer is " + (supported ? "" : "NOT ")
- + "listed on DontKillMyApp: " + BUILD_MANUFACTURER
- + " fetch took: " + (System.currentTimeMillis() - start) + "ms");
- DONT_KILL_MY_APP_MANUFACTURER_SUPPORTED = supported;
+ int responseCode = connection.getResponseCode();
+ if (responseCode != 200) {
+ Logger.printDebug(() -> "GitHub API returned status code: " + responseCode);
+ return null;
+ }
+
+ // Parse the response
+ JSONObject releaseData = Requester.parseJSONObject(connection);
+ String tagName = releaseData.optString("tag_name", "");
+ connection.disconnect();
+
+ if (tagName.isEmpty()) {
+ Logger.printDebug(() -> "No tag_name found in GitHub release data");
+ return null;
+ }
+
+ if (tagName.startsWith("v")) tagName = tagName.substring(1);
+
+ return tagName;
} catch (Exception ex) {
- Logger.printInfo(() -> "Could not check if manufacturer is listed on DontKillMyApp: "
- + BUILD_MANUFACTURER, ex);
- DONT_KILL_MY_APP_MANUFACTURER_SUPPORTED = null;
+ Logger.printInfo(() -> "Failed to fetch latest GmsCore version from GitHub", ex);
+ return null;
}
- });
- }
+ }),
+ UNKNOWN(getGmsCoreVendorGroupId(), getGmsCoreVendorGroupId() + "android.gms", () -> null);
- private static void openDontKillMyApp() {
- final Boolean manufacturerSupported = DONT_KILL_MY_APP_MANUFACTURER_SUPPORTED;
+ private static final String DONT_KILL_MY_APP_URL
+ = "https://dontkillmyapp.com/";
+ private static final Route DONT_KILL_MY_APP_MANUFACTURER_API
+ = new Route(GET, "/api/v2/{manufacturer}.json");
+ private static final String DONT_KILL_MY_APP_NAME_PARAMETER
+ = "?app=MicroG";
+ private static final String BUILD_MANUFACTURER
+ = Build.MANUFACTURER.toLowerCase(Locale.ROOT).replace(" ", "-");
- String manufacturerPageToOpen;
- if (manufacturerSupported == null) {
- // Fetch has not completed yet. Only happens on extremely slow internet connections
- // and the user spends less than 1 second reading what's on screen.
- // Instead of waiting for the fetch (which may timeout),
- // open the website without a vendor.
- manufacturerPageToOpen = "";
- } else if (manufacturerSupported) {
- manufacturerPageToOpen = BUILD_MANUFACTURER;
- } else {
- // No manufacturer specific page exists. Open the general page.
- manufacturerPageToOpen = "general";
+ /**
+ * If a manufacturer specific page exists on DontKillMyApp.
+ */
+ @Nullable
+ private volatile Boolean dontKillMyAppManufacturerSupported;
+
+ private final String groupId;
+ private final String packageName;
+ private final String downloadQuery;
+ private final GetLatestVersion getLatestVersion;
+ private final Uri gmsCoreProvider;
+
+ GmsCore(String groupId, String downloadQuery, GetLatestVersion getLatestVersion) {
+ this.groupId = groupId;
+ this.packageName = groupId + ".android.gms";
+ this.gmsCoreProvider = Uri.parse("content://" + groupId + ".android.gsf.gservices/prefix");
+
+ this.downloadQuery = downloadQuery;
+ this.getLatestVersion = getLatestVersion;
}
- open(DONT_KILL_MY_APP_URL + manufacturerPageToOpen + DONT_KILL_MY_APP_NAME_PARAMETER);
- }
-
- /**
- * @return If GmsCore is not whitelisted from battery optimizations.
- */
- private static boolean batteryOptimizationsEnabled(Context context) {
- //noinspection ObsoleteSdkInt
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
- // Android 5.0 does not have battery optimization settings.
- return false;
+ String getGroupId() {
+ return groupId;
+ }
+
+ void check(Activity context) {
+ checkInstallation(context);
+ checkUpdates(context);
+ }
+
+ private void checkInstallation(Activity context) {
+ try {
+ // Verify the user has not included GmsCore for a root installation.
+ // GmsCore Support changes the package name, but with a mounted installation
+ // all manifest changes are ignored and the original package name is used.
+ if (isPackageNameOriginal()) {
+ Logger.printInfo(() -> "App is mounted with root, but GmsCore patch was included");
+ // Cannot use localize text here, since the app will load resources
+ // from the unpatched app and all patch strings are missing.
+ Utils.showToastLong("The 'GmsCore support' patch breaks mount installations");
+
+ // Do not exit. If the app exits before launch completes (and without
+ // opening another activity), then on some devices such as Pixel phone Android 10
+ // no toast will be shown and the app will continually relaunch
+ // with the appearance of a hung app.
+ }
+
+ // Verify GmsCore is installed.
+ try {
+ PackageManager manager = context.getPackageManager();
+ manager.getPackageInfo(packageName, PackageManager.GET_ACTIVITIES);
+ } catch (PackageManager.NameNotFoundException exception) {
+ Logger.printInfo(() -> "GmsCore was not found");
+ // Cannot show a dialog and must show a toast,
+ // because on some installations the app crashes before a dialog can be displayed.
+ Utils.showToastLong(str("revanced_gms_core_toast_not_installed_message"));
+
+ open(downloadQuery);
+ return;
+ }
+
+ // Check if GmsCore is whitelisted from battery optimizations.
+ if (isAndroidAutomotive(context)) {
+ // Ignore Android Automotive devices (Google built-in),
+ // as there is no way to disable battery optimizations.
+ Logger.printDebug(() -> "Device is Android Automotive");
+ } else if (batteryOptimizationsEnabled(context)) {
+ Logger.printInfo(() -> "GmsCore is not whitelisted from battery optimizations");
+
+ showBatteryOptimizationDialog(context,
+ "revanced_gms_core_dialog_not_whitelisted_using_battery_optimizations_message",
+ "revanced_gms_core_dialog_continue_text",
+ (dialog, id) -> openGmsCoreDisableBatteryOptimizationsIntent(context));
+ return;
+ }
+
+ // Check if GmsCore is currently running in the background.
+ var client = context.getContentResolver().acquireContentProviderClient(gmsCoreProvider);
+ //noinspection TryFinallyCanBeTryWithResources
+ try {
+ if (client == null) {
+ Logger.printInfo(() -> "GmsCore is not running in the background");
+ checkIfDontKillMyAppSupportsManufacturer();
+
+ showBatteryOptimizationDialog(context,
+ "revanced_gms_core_dialog_not_whitelisted_not_allowed_in_background_message",
+ "gmsrevanced_gms_core_log_open_website_text",
+ (dialog, id) -> openDontKillMyApp());
+ }
+ } finally {
+ if (client != null) client.close();
+ }
+ } catch (Exception ex) {
+ Logger.printException(() -> "checkGmsCore failure", ex);
+ }
+ }
+
+ private void checkUpdates(Activity context) {
+ if (!BaseSettings.GMS_CORE_CHECK_UPDATES.get()) {
+ Logger.printDebug(() -> "GmsCore update check is disabled in settings");
+ return;
+ }
+
+ Utils.runOnBackgroundThread(() -> {
+ try {
+ PackageManager manager = context.getPackageManager();
+ var installedVersion = manager.getPackageInfo(packageName, 0).versionName;
+
+ // GmsCore adds suffixes for flavor builds. Remove the suffix for version comparison.
+ int suffixIndex = installedVersion.indexOf('-');
+ if (suffixIndex != -1)
+ installedVersion = installedVersion.substring(0, suffixIndex);
+ String finalInstalledVersion = installedVersion;
+
+ Logger.printDebug(() -> "Installed GmsCore version: " + finalInstalledVersion);
+
+ var latestVersion = getLatestVersion.get();
+
+ if (latestVersion == null || latestVersion.isEmpty()) {
+ Logger.printDebug(() -> "Could not get latest GmsCore version");
+ Utils.showToastLong(str("revanced_gms_core_toast_update_check_failed_message"));
+ return;
+ }
+
+ Logger.printDebug(() -> "Latest GmsCore version on GitHub: " + latestVersion);
+
+ // Compare versions
+ if (!installedVersion.equals(latestVersion)) {
+ Logger.printInfo(() -> "GmsCore update available. Installed: " + finalInstalledVersion
+ + ", Latest: " + latestVersion);
+
+ showUpdateDialog(context, installedVersion, latestVersion);
+ } else {
+ Logger.printDebug(() -> "GmsCore is up to date");
+ }
+ } catch (Exception ex) {
+ Logger.printInfo(() -> "Could not check GmsCore updates", ex);
+ Utils.showToastLong(str("revanced_gms_core_toast_update_check_failed_message"));
+ }
+ });
+ }
+
+ private void open(String queryOrLink) {
+ Logger.printInfo(() -> "Opening link: " + queryOrLink);
+
+ Intent intent;
+ try {
+ // Check if queryOrLink is a valid URL.
+ new URL(queryOrLink);
+
+ intent = new Intent(Intent.ACTION_VIEW, Uri.parse(queryOrLink));
+ } catch (MalformedURLException e) {
+ intent = new Intent(Intent.ACTION_WEB_SEARCH);
+ intent.putExtra(SearchManager.QUERY, queryOrLink);
+ }
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ Utils.getContext().startActivity(intent);
+
+ // Gracefully exit, otherwise the broken app will continue to run.
+ System.exit(0);
+ }
+
+ private void showUpdateDialog(Activity context, String installedVersion, String latestVersion) {
+ // Use a delay to allow the activity to finish initializing.
+ // Otherwise, if device is in dark mode the dialog is shown with wrong color scheme.
+ Utils.runOnMainThreadDelayed(() -> {
+ try {
+ Pair dialogPair = CustomDialog.create(
+ context,
+ str("revanced_gms_core_dialog_title"),
+ String.format(str("revanced_gms_core_update_available_message"), latestVersion, installedVersion),
+ null,
+ str("revanced_gms_core_dialog_open_website_text"),
+ () -> open(downloadQuery),
+ () -> {
+ },
+ str("revanced_gms_core_dialog_cancel_text"),
+ null,
+ true
+ );
+
+ Dialog dialog = dialogPair.first;
+ dialog.setCancelable(true);
+ Utils.showDialog(context, dialog);
+ } catch (Exception ex) {
+ Logger.printException(() -> "Failed to show GmsCore update dialog", ex);
+ }
+ }, 100);
+ }
+
+ private static void showBatteryOptimizationDialog(Activity context,
+ String dialogMessageRef,
+ String positiveButtonTextRef,
+ DialogInterface.OnClickListener onPositiveClickListener) {
+ // Use a delay to allow the activity to finish initializing.
+ // Otherwise, if device is in dark mode the dialog is shown with wrong color scheme.
+ Utils.runOnMainThreadDelayed(() -> {
+ // Create the custom dialog.
+ Pair dialogPair = CustomDialog.create(
+ context,
+ str("revanced_gms_core_dialog_title"), // Title.
+ str(dialogMessageRef), // Message.
+ null, // No EditText.
+ str(positiveButtonTextRef), // OK button text.
+ () -> onPositiveClickListener.onClick(null, 0), // Convert DialogInterface.OnClickListener to Runnable.
+ null, // No Cancel button action.
+ null, // No Neutral button text.
+ null, // No Neutral button action.
+ true // Dismiss dialog when onNeutralClick.
+ );
+
+ Dialog dialog = dialogPair.first;
+
+ // Do not set cancelable to false to allow using back button to skip the action,
+ // just in case the battery change can never be satisfied.
+ dialog.setCancelable(true);
+
+ // Show the dialog
+ Utils.showDialog(context, dialog);
+ }, 100);
+ }
+
+ @SuppressLint("BatteryLife") // Permission is part of GmsCore
+ private void openGmsCoreDisableBatteryOptimizationsIntent(Activity activity) {
+ Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
+ intent.setData(Uri.fromParts("package", packageName, null));
+ activity.startActivityForResult(intent, 0);
+ }
+
+ private void checkIfDontKillMyAppSupportsManufacturer() {
+ Utils.runOnBackgroundThread(() -> {
+ try {
+ final long start = System.currentTimeMillis();
+ HttpURLConnection connection = Requester.getConnectionFromRoute(
+ DONT_KILL_MY_APP_URL, DONT_KILL_MY_APP_MANUFACTURER_API, BUILD_MANUFACTURER);
+ connection.setConnectTimeout(5000);
+ connection.setReadTimeout(5000);
+
+ final boolean supported = connection.getResponseCode() == 200;
+ Logger.printInfo(() -> "Manufacturer is " + (supported ? "" : "NOT ")
+ + "listed on DontKillMyApp: " + BUILD_MANUFACTURER
+ + " fetch took: " + (System.currentTimeMillis() - start) + "ms");
+ dontKillMyAppManufacturerSupported = supported;
+ } catch (Exception ex) {
+ Logger.printInfo(() -> "Could not check if manufacturer is listed on DontKillMyApp: "
+ + BUILD_MANUFACTURER, ex);
+ dontKillMyAppManufacturerSupported = null;
+ }
+ });
+ }
+
+ private void openDontKillMyApp() {
+ final Boolean manufacturerSupported = dontKillMyAppManufacturerSupported;
+
+ String manufacturerPageToOpen;
+ if (manufacturerSupported == null) {
+ // Fetch has not completed yet. Only happens on extremely slow internet connections
+ // and the user spends less than 1 second reading what's on screen.
+ // Instead of waiting for the fetch (which may timeout),
+ // open the website without a vendor.
+ manufacturerPageToOpen = "";
+ } else if (manufacturerSupported) {
+ manufacturerPageToOpen = BUILD_MANUFACTURER;
+ } else {
+ // No manufacturer specific page exists. Open the general page.
+ manufacturerPageToOpen = "general";
+ }
+
+ open(DONT_KILL_MY_APP_URL + manufacturerPageToOpen + DONT_KILL_MY_APP_NAME_PARAMETER);
+ }
+
+ /**
+ * @return If GmsCore is not whitelisted from battery optimizations.
+ */
+ private boolean batteryOptimizationsEnabled(Context context) {
+ //noinspection ObsoleteSdkInt
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+ // Android 5.0 does not have battery optimization settings.
+ return false;
+ }
+ var powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
+ return !powerManager.isIgnoringBatteryOptimizations(packageName);
+ }
+
+ private boolean isAndroidAutomotive(Context context) {
+ return context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE);
}
- var powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
- return !powerManager.isIgnoringBatteryOptimizations(GMS_CORE_PACKAGE_NAME);
}
- private static boolean isAndroidAutomotive(Context context) {
- return context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE);
- }
-
- private static String getGmsCoreDownload() {
- final var vendorGroupId = getGmsCoreVendorGroupId();
- //noinspection SwitchStatementWithTooFewBranches
- return switch (vendorGroupId) {
- case "app.revanced" -> "https://github.com/revanced/gmscore/releases/latest";
- default -> vendorGroupId + ".android.gms";
- };
- }
-
- private static String getGmsCoreVendorGroupId() {
- return "app.revanced"; // Modified during patching.
+ @FunctionalInterface
+ private interface GetLatestVersion {
+ String get();
}
}
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/Logger.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/Logger.java
index 47f6da3e3f..610cd3414f 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/Logger.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/Logger.java
@@ -16,8 +16,8 @@ import app.revanced.extension.shared.settings.BaseSettings;
import app.revanced.extension.shared.settings.preference.LogBufferManager;
/**
- * ReVanced specific logger. Logging is done to standard device log (accessible thru ADB),
- * and additionally accessible thru {@link LogBufferManager}.
+ * ReVanced specific logger. Logging is done to standard device log (accessible through ADB),
+ * and additionally accessible through {@link LogBufferManager}.
*
* All methods are thread safe, and are safe to call even
* if {@link Utils#getContext()} is not available.
@@ -202,7 +202,7 @@ public class Logger {
/**
* Logs exceptions under the outer class name of the code calling this method.
*
- * If the calling code is showing it's own error toast,
+ * If the calling code is showing its own error toast,
* instead use {@link #printInfo(LogMessage, Exception)}
*
* @param message log message
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/ResourceType.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/ResourceType.java
new file mode 100644
index 0000000000..48032017a4
--- /dev/null
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/ResourceType.java
@@ -0,0 +1,57 @@
+package app.revanced.extension.shared;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum ResourceType {
+ ANIM("anim"),
+ ANIMATOR("animator"),
+ ARRAY("array"),
+ ATTR("attr"),
+ BOOL("bool"),
+ COLOR("color"),
+ DIMEN("dimen"),
+ DRAWABLE("drawable"),
+ FONT("font"),
+ FRACTION("fraction"),
+ ID("id"),
+ INTEGER("integer"),
+ INTERPOLATOR("interpolator"),
+ LAYOUT("layout"),
+ MENU("menu"),
+ MIPMAP("mipmap"),
+ NAVIGATION("navigation"),
+ PLURALS("plurals"),
+ RAW("raw"),
+ STRING("string"),
+ STYLE("style"),
+ STYLEABLE("styleable"),
+ TRANSITION("transition"),
+ VALUES("values"),
+ XML("xml");
+
+ private static final Map VALUE_MAP;
+
+ static {
+ ResourceType[] values = values();
+ VALUE_MAP = new HashMap<>(2 * values.length);
+
+ for (ResourceType type : values) {
+ VALUE_MAP.put(type.value, type);
+ }
+ }
+
+ public final String value;
+
+ public static ResourceType fromValue(String value) {
+ ResourceType type = VALUE_MAP.get(value);
+ if (type == null) {
+ throw new IllegalArgumentException("Unknown resource type: " + value);
+ }
+ return type;
+ }
+
+ ResourceType(String value) {
+ this.value = value;
+ }
+}
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/StringRef.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/StringRef.java
index 4390137de7..c1c2c90d14 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/StringRef.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/StringRef.java
@@ -70,7 +70,7 @@ public class StringRef {
}
/**
- * Creates a StringRef object that'll not change it's value
+ * Creates a StringRef object that'll not change its value
*
* @param value value which toString() method returns when invoked on returned object
* @return Unique StringRef instance, its value will never change
@@ -102,7 +102,7 @@ public class StringRef {
public String toString() {
if (!resolved) {
if (resources == null || packageName == null) {
- Context context = Utils.getContext();
+ var context = Utils.getContext();
resources = context.getResources();
packageName = context.getPackageName();
}
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/TrieSearch.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/TrieSearch.java
index 7628a51d9b..97fa4605d8 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/TrieSearch.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/TrieSearch.java
@@ -106,14 +106,18 @@ public abstract class TrieSearch {
* Elements not contained can collide with elements the array does contain,
* so must compare the nodes character value.
*
- * Alternatively this array could be a sorted and densely packed array,
- * and lookup is done using binary search.
- * That would save a small amount of memory because there's no null children entries,
- * but would give a worst case search of O(nlog(m)) where n is the number of
- * characters in the searched text and m is the maximum size of the sorted character arrays.
- * Using a hash table array always gives O(n) search time.
- * The memory usage here is very small (all Litho filters use ~10KB of memory),
- * so the more performant hash implementation is chosen.
+ /*
+ * Alternatively, this could be implemented as a sorted, densely packed array
+ * with lookups performed via binary search.
+ * This approach would save a small amount of memory by eliminating null
+ * child entries. However, it would result in a worst-case lookup time of
+ * O(n log m), where:
+ * - n is the number of characters in the input text, and
+ * - m is the maximum size of the sorted character arrays.
+ * In contrast, using a hash-based array guarantees O(n) lookup time.
+ * Given that the total memory usage is already very small (all Litho filters
+ * together use approximately 10KB), the hash-based implementation is preferred
+ * for its superior performance.
*/
@Nullable
private TrieNode[] children;
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/Utils.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/Utils.java
index 5d6bb492d5..cf65db8a4c 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/Utils.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/Utils.java
@@ -43,8 +43,10 @@ import java.text.Collator;
import java.text.Normalizer;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
+import java.util.Map;
import java.util.Objects;
import java.util.concurrent.Callable;
import java.util.concurrent.Future;
@@ -59,7 +61,6 @@ import app.revanced.extension.shared.settings.BooleanSetting;
import app.revanced.extension.shared.settings.preference.ReVancedAboutPreference;
import app.revanced.extension.shared.ui.Dim;
-@SuppressWarnings("NewApi")
public class Utils {
@SuppressLint("StaticFieldLeak")
@@ -76,6 +77,8 @@ public class Utils {
@Nullable
private static Boolean isDarkModeEnabled;
+ private static boolean appIsUsingBoldIcons;
+
// Cached Collator instance with its locale.
@Nullable
private static Locale cachedCollatorLocale;
@@ -131,6 +134,7 @@ public class Utils {
return versionName;
}
+ @SuppressWarnings("unused")
public static String getApplicationName() {
if (applicationLabel == null) {
try {
@@ -148,12 +152,12 @@ public class Utils {
/**
* Hide a view by setting its layout height and width to 1dp.
*
- * @param condition The setting to check for hiding the view.
+ * @param setting The setting to check for hiding the view.
* @param view The view to hide.
*/
- public static void hideViewBy0dpUnderCondition(BooleanSetting condition, View view) {
- if (hideViewBy0dpUnderCondition(condition.get(), view)) {
- Logger.printDebug(() -> "View hidden by setting: " + condition);
+ public static void hideViewBy0dpUnderCondition(BooleanSetting setting, View view) {
+ if (hideViewBy0dpUnderCondition(setting.get(), view)) {
+ Logger.printDebug(() -> "View hidden by setting: " + setting);
}
}
@@ -165,7 +169,7 @@ public class Utils {
*/
public static boolean hideViewBy0dpUnderCondition(boolean condition, View view) {
if (condition) {
- hideViewByLayoutParams(view);
+ hideViewBy0dp(view);
return true;
}
@@ -173,19 +177,33 @@ public class Utils {
}
/**
- * Hide a view by setting its visibility to GONE.
+ * Hide a view by setting its layout params to 0x0
+ * @param view The view to hide.
+ */
+ public static void hideViewBy0dp(View view) {
+ ViewGroup.LayoutParams params = view.getLayoutParams();
+ if (params == null)
+ params = new ViewGroup.LayoutParams(0, 0);
+
+ params.width = 0;
+ params.height = 0;
+ view.setLayoutParams(params);
+ }
+
+ /**
+ * Hide a view by setting its visibility as GONE.
*
- * @param condition The setting to check for hiding the view.
+ * @param setting The setting to check for hiding the view.
* @param view The view to hide.
*/
- public static void hideViewUnderCondition(BooleanSetting condition, View view) {
- if (hideViewUnderCondition(condition.get(), view)) {
- Logger.printDebug(() -> "View hidden by setting: " + condition);
+ public static void hideViewUnderCondition(BooleanSetting setting, View view) {
+ if (hideViewUnderCondition(setting.get(), view)) {
+ Logger.printDebug(() -> "View hidden by setting: " + setting);
}
}
/**
- * Hide a view by setting its visibility to GONE.
+ * Hide a view by setting its visibility as GONE.
*
* @param condition The setting to check for hiding the view.
* @param view The view to hide.
@@ -199,14 +217,14 @@ public class Utils {
return false;
}
- public static void hideViewByRemovingFromParentUnderCondition(BooleanSetting condition, View view) {
- if (hideViewByRemovingFromParentUnderCondition(condition.get(), view)) {
- Logger.printDebug(() -> "View hidden by setting: " + condition);
+ public static void hideViewByRemovingFromParentUnderCondition(BooleanSetting setting, View view) {
+ if (hideViewByRemovingFromParentUnderCondition(setting.get(), view)) {
+ Logger.printDebug(() -> "View hidden by setting: " + setting);
}
}
- public static boolean hideViewByRemovingFromParentUnderCondition(boolean setting, View view) {
- if (setting) {
+ public static boolean hideViewByRemovingFromParentUnderCondition(boolean condition, View view) {
+ if (condition) {
ViewParent parent = view.getParent();
if (parent instanceof ViewGroup parentGroup) {
parentGroup.removeView(view);
@@ -255,7 +273,7 @@ public class Utils {
// Could do a thread sleep, but that will trigger an exception if the thread is interrupted.
meaninglessValue += Long.numberOfLeadingZeros((long) Math.exp(Math.random()));
}
- // Return the value, otherwise the compiler or VM might optimize and remove the meaningless time wasting work,
+ // Return the value, otherwise the compiler or VM might optimize and remove the meaningless time-wasting work,
// leaving an empty loop that hammers on the System.currentTimeMillis native call.
return meaninglessValue;
}
@@ -265,10 +283,12 @@ public class Utils {
}
public static int indexOfFirstFound(String value, String... targets) {
- for (String string : targets) {
- if (!string.isEmpty()) {
- final int indexOf = value.indexOf(string);
- if (indexOf >= 0) return indexOf;
+ if (isNotEmpty(value)) {
+ for (String string : targets) {
+ if (!string.isEmpty()) {
+ final int indexOf = value.indexOf(string);
+ if (indexOf >= 0) return indexOf;
+ }
}
}
return -1;
@@ -278,12 +298,13 @@ public class Utils {
* @return zero, if the resource is not found.
*/
@SuppressLint("DiscouragedApi")
- public static int getResourceIdentifier(Context context, String resourceIdentifierName, @Nullable String type) {
- return context.getResources().getIdentifier(resourceIdentifierName, type, context.getPackageName());
+ public static int getResourceIdentifier(Context context, @Nullable ResourceType type, String resourceIdentifierName) {
+ return context.getResources().getIdentifier(resourceIdentifierName,
+ type == null ? null : type.value, context.getPackageName());
}
- public static int getResourceIdentifierOrThrow(Context context, String resourceIdentifierName, @Nullable String type) {
- final int resourceId = getResourceIdentifier(context, resourceIdentifierName, type);
+ public static int getResourceIdentifierOrThrow(Context context, @Nullable ResourceType type, String resourceIdentifierName) {
+ final int resourceId = getResourceIdentifier(context, type, resourceIdentifierName);
if (resourceId == 0) {
throw new Resources.NotFoundException("No resource id exists with name: " + resourceIdentifierName
+ " type: " + type);
@@ -293,48 +314,48 @@ public class Utils {
/**
* @return zero, if the resource is not found.
- * @see #getResourceIdentifierOrThrow(String, String)
+ * @see #getResourceIdentifierOrThrow(ResourceType, String)
*/
- public static int getResourceIdentifier(String resourceIdentifierName, @Nullable String type) {
- return getResourceIdentifier(getContext(), resourceIdentifierName, type);
+ public static int getResourceIdentifier(@Nullable ResourceType type, String resourceIdentifierName) {
+ return getResourceIdentifier(getContext(), type, resourceIdentifierName);
}
/**
- * @return The resource identifier, or throws an exception if not found.
+ * @return zero, if the resource is not found.
+ * @see #getResourceIdentifier(ResourceType, String)
*/
- public static int getResourceIdentifierOrThrow(String resourceIdentifierName, @Nullable String type) {
- final int resourceId = getResourceIdentifier(getContext(), resourceIdentifierName, type);
- if (resourceId == 0) {
- throw new Resources.NotFoundException("No resource id exists with name: " + resourceIdentifierName
- + " type: " + type);
- }
- return resourceId;
+ public static int getResourceIdentifierOrThrow(@Nullable ResourceType type, String resourceIdentifierName) {
+ return getResourceIdentifierOrThrow(getContext(), type, resourceIdentifierName);
+ }
+
+ public static String getResourceString(int id) throws Resources.NotFoundException {
+ return getContext().getResources().getString(id);
}
public static int getResourceInteger(String resourceIdentifierName) throws Resources.NotFoundException {
- return getContext().getResources().getInteger(getResourceIdentifierOrThrow(resourceIdentifierName, "integer"));
+ return getContext().getResources().getInteger(getResourceIdentifierOrThrow(ResourceType.INTEGER, resourceIdentifierName));
}
public static Animation getResourceAnimation(String resourceIdentifierName) throws Resources.NotFoundException {
- return AnimationUtils.loadAnimation(getContext(), getResourceIdentifierOrThrow(resourceIdentifierName, "anim"));
+ return AnimationUtils.loadAnimation(getContext(), getResourceIdentifierOrThrow(ResourceType.ANIM, resourceIdentifierName));
}
@ColorInt
public static int getResourceColor(String resourceIdentifierName) throws Resources.NotFoundException {
//noinspection deprecation
- return getContext().getResources().getColor(getResourceIdentifierOrThrow(resourceIdentifierName, "color"));
+ return getContext().getResources().getColor(getResourceIdentifierOrThrow(ResourceType.COLOR, resourceIdentifierName));
}
public static int getResourceDimensionPixelSize(String resourceIdentifierName) throws Resources.NotFoundException {
- return getContext().getResources().getDimensionPixelSize(getResourceIdentifierOrThrow(resourceIdentifierName, "dimen"));
+ return getContext().getResources().getDimensionPixelSize(getResourceIdentifierOrThrow(ResourceType.DIMEN, resourceIdentifierName));
}
public static float getResourceDimension(String resourceIdentifierName) throws Resources.NotFoundException {
- return getContext().getResources().getDimension(getResourceIdentifierOrThrow(resourceIdentifierName, "dimen"));
+ return getContext().getResources().getDimension(getResourceIdentifierOrThrow(ResourceType.DIMEN, resourceIdentifierName));
}
public static String[] getResourceStringArray(String resourceIdentifierName) throws Resources.NotFoundException {
- return getContext().getResources().getStringArray(getResourceIdentifierOrThrow(resourceIdentifierName, "array"));
+ return getContext().getResources().getStringArray(getResourceIdentifierOrThrow(ResourceType.ARRAY, resourceIdentifierName));
}
public interface MatchFilter {
@@ -345,7 +366,7 @@ public class Utils {
* Includes sub children.
*/
public static R getChildViewByResourceName(View view, String str) {
- var child = view.findViewById(Utils.getResourceIdentifierOrThrow(str, "id"));
+ var child = view.findViewById(Utils.getResourceIdentifierOrThrow(ResourceType.ID, str));
//noinspection unchecked
return (R) child;
}
@@ -439,6 +460,11 @@ public class Utils {
clipboard.setPrimaryClip(clip);
}
+ public static boolean isNotEmpty(@Nullable String str) {
+ return str != null && !str.isEmpty();
+ }
+
+ @SuppressWarnings("unused")
public static boolean isTablet() {
return context.getResources().getConfiguration().smallestScreenWidthDp >= 600;
}
@@ -447,7 +473,7 @@ public class Utils {
private static Boolean isRightToLeftTextLayout;
/**
- * @return If the device language uses right to left text layout (Hebrew, Arabic, etc).
+ * @return If the device language uses right to left text layout (Hebrew, Arabic, etc.).
* If this should match any ReVanced language override then instead use
* {@link #isRightToLeftLocale(Locale)} with {@link BaseSettings#REVANCED_LANGUAGE}.
* This is the default locale of the device, which may differ if
@@ -461,7 +487,7 @@ public class Utils {
}
/**
- * @return If the locale uses right to left text layout (Hebrew, Arabic, etc).
+ * @return If the locale uses right to left text layout (Hebrew, Arabic, etc.).
*/
public static boolean isRightToLeftLocale(Locale locale) {
String displayLanguage = locale.getDisplayLanguage();
@@ -478,6 +504,7 @@ public class Utils {
return getTextDirectionString(isRightToLeftLocale());
}
+ @SuppressWarnings("unused")
public static String getTextDirectionString(Locale locale) {
return getTextDirectionString(isRightToLeftLocale(locale));
}
@@ -490,7 +517,7 @@ public class Utils {
/**
* @return if the text contains at least 1 number character,
- * including any unicode numbers such as Arabic.
+ * including any Unicode numbers such as Arabic.
*/
@SuppressWarnings("BooleanMethodIsAlwaysInverted")
public static boolean containsNumber(CharSequence text) {
@@ -802,6 +829,21 @@ public class Utils {
window.setBackgroundDrawable(null); // Remove default dialog background
}
+ /**
+ * @return If the unpatched app is currently using bold icons.
+ */
+ public static boolean appIsUsingBoldIcons() {
+ return appIsUsingBoldIcons;
+ }
+
+ /**
+ * Controls if ReVanced bold icons are shown in various places.
+ * @param boldIcons If the app is currently using bold icons.
+ */
+ public static void setAppIsUsingBoldIcons(boolean boldIcons) {
+ appIsUsingBoldIcons = boldIcons;
+ }
+
/**
* Sets the theme light color used by the app.
*/
@@ -1107,7 +1149,7 @@ public class Utils {
}
/**
- * Uses {@link #adjustColorBrightness(int, float)} depending if light or dark mode is active.
+ * Uses {@link #adjustColorBrightness(int, float)} depending on if light or dark mode is active.
*/
@ColorInt
public static int adjustColorBrightness(@ColorInt int baseColor, float lightThemeFactor, float darkThemeFactor) {
@@ -1163,4 +1205,18 @@ public class Utils {
public static float clamp(float value, float lower, float upper) {
return Math.max(lower, Math.min(value, upper));
}
+
+ /**
+ * @param maxSize The maximum number of elements to keep in the map.
+ * @return A {@link LinkedHashMap} that automatically evicts the oldest entry
+ * when the size exceeds {@code maxSize}.
+ */
+ public static Map createSizeRestrictedMap(int maxSize) {
+ return new LinkedHashMap<>(2 * maxSize) {
+ @Override
+ protected boolean removeEldestEntry(Entry eldest) {
+ return size() > maxSize;
+ }
+ };
+ }
}
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/checks/Check.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/checks/Check.java
index ccb7c9262e..bde66a043c 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/checks/Check.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/checks/Check.java
@@ -4,12 +4,12 @@ import static android.text.Html.FROM_HTML_MODE_COMPACT;
import static app.revanced.extension.shared.StringRef.str;
import static app.revanced.extension.shared.Utils.DialogFragmentOnStartAction;
-import android.annotation.SuppressLint;
import android.app.Activity;
import android.app.Dialog;
import android.content.Intent;
import android.graphics.PorterDuff;
import android.net.Uri;
+import android.os.Build;
import android.text.Html;
import android.util.Pair;
import android.view.Gravity;
@@ -19,14 +19,17 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
import java.util.Collection;
import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.ResourceType;
import app.revanced.extension.shared.Utils;
import app.revanced.extension.shared.settings.BaseSettings;
import app.revanced.extension.shared.ui.CustomDialog;
+@RequiresApi(api = Build.VERSION_CODES.N)
abstract class Check {
private static final int NUMBER_OF_TIMES_TO_IGNORE_WARNING_BEFORE_DISABLING = 2;
@@ -75,7 +78,6 @@ abstract class Check {
BaseSettings.CHECK_ENVIRONMENT_WARNINGS_ISSUED.save(Integer.MAX_VALUE);
}
- @SuppressLint("NewApi")
static void issueWarning(Activity activity, Collection failedChecks) {
final var reasons = new StringBuilder();
@@ -128,7 +130,7 @@ abstract class Check {
// Add icon to the dialog.
ImageView iconView = new ImageView(activity);
iconView.setImageResource(Utils.getResourceIdentifierOrThrow(
- "revanced_ic_dialog_alert", "drawable"));
+ ResourceType.DRAWABLE, "revanced_ic_dialog_alert"));
iconView.setColorFilter(Utils.getAppForegroundColor(), PorterDuff.Mode.SRC_IN);
iconView.setPadding(0, 0, 0, 0);
LinearLayout.LayoutParams iconParams = new LinearLayout.LayoutParams(
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/checks/CheckEnvironmentPatch.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/checks/CheckEnvironmentPatch.java
index d63f8b7e3f..e54ab27f74 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/checks/CheckEnvironmentPatch.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/checks/CheckEnvironmentPatch.java
@@ -7,8 +7,12 @@ import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.os.Build;
import android.util.Base64;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+
+
import app.revanced.extension.shared.Logger;
import app.revanced.extension.shared.Utils;
@@ -27,6 +31,7 @@ import static app.revanced.extension.shared.checks.PatchInfo.Build.*;
*
* Various indicators help to detect if the app was patched by the user.
*/
+@RequiresApi(api = Build.VERSION_CODES.N)
@SuppressWarnings("unused")
public final class CheckEnvironmentPatch {
private static final boolean DEBUG_ALWAYS_SHOW_CHECK_FAILED_DIALOG = debugAlwaysShowWarning();
@@ -39,6 +44,7 @@ public final class CheckEnvironmentPatch {
ADB((String) null),
ROOT_MOUNT_ON_APP_STORE("com.android.vending"),
MANAGER("app.revanced.manager.flutter",
+ "app.revanced.manager.flutter.debug",
"app.revanced.manager",
"app.revanced.manager.debug");
@@ -118,7 +124,7 @@ public final class CheckEnvironmentPatch {
* If the build properties are different, the app was likely downloaded pre-patched or patched on another device.
*/
private static class CheckWasPatchedOnSameDevice extends Check {
- @SuppressLint({"NewApi", "HardwareIds"})
+ @SuppressLint("HardwareIds")
@Override
protected Boolean check() {
if (PATCH_BOARD.isEmpty()) {
@@ -192,7 +198,7 @@ public final class CheckEnvironmentPatch {
PackageManager packageManager = context.getPackageManager();
PackageInfo packageInfo = packageManager.getPackageInfo(context.getPackageName(), 0);
- // Duration since initial install or last update, which ever is sooner.
+ // Duration since initial install or last update, whichever is sooner.
durationBetweenPatchingAndInstallation = packageInfo.lastUpdateTime - PatchInfo.PATCH_TIME;
Logger.printInfo(() -> "App was installed/updated: "
+ (durationBetweenPatchingAndInstallation / (60 * 1000) + " minutes after patching"));
@@ -288,8 +294,8 @@ public final class CheckEnvironmentPatch {
CheckIsNearPatchTime nearPatchTime = new CheckIsNearPatchTime();
Boolean timeCheckPassed = nearPatchTime.check();
if (timeCheckPassed && !DEBUG_ALWAYS_SHOW_CHECK_FAILED_DIALOG) {
- // Allow installing recently patched apks,
- // even if the install source is not Manager or ADB.
+ // Allow installing recently patched APKs,
+ // even if the installation source is not Manager or ADB.
Check.disableForever();
return;
} else {
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/fixes/redgifs/BaseFixRedgifsApiPatch.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/fixes/redgifs/BaseFixRedgifsApiPatch.java
index b6fa2caa0c..00ee6def3b 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/fixes/redgifs/BaseFixRedgifsApiPatch.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/fixes/redgifs/BaseFixRedgifsApiPatch.java
@@ -15,7 +15,6 @@ import okhttp3.Request;
import okhttp3.Response;
import okhttp3.ResponseBody;
-
public abstract class BaseFixRedgifsApiPatch implements Interceptor {
protected static BaseFixRedgifsApiPatch INSTANCE;
public abstract String getDefaultUserAgent();
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/CustomBrandingPatch.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/CustomBrandingPatch.java
index 9908c0be75..d13513e2df 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/CustomBrandingPatch.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/CustomBrandingPatch.java
@@ -7,12 +7,15 @@ import android.content.pm.PackageManager;
import android.graphics.Color;
import android.view.View;
+import androidx.annotation.Nullable;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import app.revanced.extension.shared.GmsCoreSupport;
import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.ResourceType;
import app.revanced.extension.shared.Utils;
import app.revanced.extension.shared.settings.BaseSettings;
@@ -52,24 +55,35 @@ public class CustomBrandingPatch {
}
}
- private static final int notificationSmallIcon;
+ @Nullable
+ private static Integer notificationSmallIcon;
- static {
- BrandingTheme branding = BaseSettings.CUSTOM_BRANDING_ICON.get();
- if (branding == BrandingTheme.ORIGINAL) {
- notificationSmallIcon = 0;
- } else {
- // Original icon is quantum_ic_video_youtube_white_24
- String iconName = "revanced_notification_icon";
- if (branding == BrandingTheme.CUSTOM) {
- iconName += "_custom";
+ private static int getNotificationSmallIcon() {
+ // Cannot use static initialization block otherwise cyclic references exist
+ // between Settings initialization and this class.
+ if (notificationSmallIcon == null) {
+ if (GmsCoreSupport.isPackageNameOriginal()) {
+ Logger.printDebug(() -> "App is root mounted. Not overriding small notification icon");
+ return notificationSmallIcon = 0;
}
- notificationSmallIcon = Utils.getResourceIdentifier(iconName, "drawable");
- if (notificationSmallIcon == 0) {
- Logger.printException(() -> "Could not load notification small icon");
+ BrandingTheme branding = BaseSettings.CUSTOM_BRANDING_ICON.get();
+ if (branding == BrandingTheme.ORIGINAL) {
+ notificationSmallIcon = 0;
+ } else {
+ // Original icon is quantum_ic_video_youtube_white_24
+ String iconName = "revanced_notification_icon";
+ if (branding == BrandingTheme.CUSTOM) {
+ iconName += "_custom";
+ }
+
+ notificationSmallIcon = Utils.getResourceIdentifier(ResourceType.DRAWABLE, iconName);
+ if (notificationSmallIcon == 0) {
+ Logger.printException(() -> "Could not load notification small icon");
+ }
}
}
+ return notificationSmallIcon;
}
/**
@@ -88,8 +102,9 @@ public class CustomBrandingPatch {
*/
public static void setNotificationIcon(Notification.Builder builder) {
try {
- if (notificationSmallIcon != 0) {
- builder.setSmallIcon(notificationSmallIcon)
+ final int smallIcon = getNotificationSmallIcon();
+ if (smallIcon != 0) {
+ builder.setSmallIcon(smallIcon)
.setColor(Color.TRANSPARENT); // Remove YT red tint.
}
} catch (Exception ex) {
@@ -99,12 +114,45 @@ public class CustomBrandingPatch {
/**
* Injection point.
- *
+ *
* The total number of app name aliases, including dummy aliases.
*/
private static int numberOfPresetAppNames() {
- // Modified during patching.
- throw new IllegalStateException();
+ // Modified during patching, but requires a default if custom branding is excluded.
+ return 1;
+ }
+
+
+ /**
+ * Injection point.
+ *
+ * If a custom icon was provided during patching.
+ */
+ private static boolean userProvidedCustomIcon() {
+ // Modified during patching, but requires a default if custom branding is excluded.
+ return false;
+ }
+
+ /**
+ * Injection point.
+ *
+ * If a custom name was provided during patching.
+ */
+ private static boolean userProvidedCustomName() {
+ // Modified during patching, but requires a default if custom branding is excluded..
+ return false;
+ }
+
+ public static int getDefaultAppNameIndex() {
+ return userProvidedCustomName()
+ ? numberOfPresetAppNames()
+ : 2;
+ }
+
+ public static BrandingTheme getDefaultIconStyle() {
+ return userProvidedCustomIcon()
+ ? BrandingTheme.CUSTOM
+ : BrandingTheme.ROUNDED;
}
/**
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/EnableDebuggingPatch.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/EnableDebuggingPatch.java
index e0551ed045..b63f2c6049 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/EnableDebuggingPatch.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/EnableDebuggingPatch.java
@@ -41,12 +41,13 @@ public final class EnableDebuggingPatch {
/**
* Injection point.
*/
- public static boolean isBooleanFeatureFlagEnabled(boolean value, Long flag) {
+ public static boolean isBooleanFeatureFlagEnabled(boolean value, long flag) {
if (LOG_FEATURE_FLAGS && value) {
- if (DISABLED_FEATURE_FLAGS.contains(flag)) {
+ Long flagObj = flag;
+ if (DISABLED_FEATURE_FLAGS.contains(flagObj)) {
return false;
}
- if (featureFlags.putIfAbsent(flag, TRUE) == null) {
+ if (featureFlags.putIfAbsent(flagObj, TRUE) == null) {
Logger.printDebug(() -> "boolean feature is enabled: " + flag);
}
}
@@ -59,6 +60,8 @@ public final class EnableDebuggingPatch {
*/
public static double isDoubleFeatureFlagEnabled(double value, long flag, double defaultValue) {
if (LOG_FEATURE_FLAGS && defaultValue != value) {
+ if (DISABLED_FEATURE_FLAGS.contains(flag)) return defaultValue;
+
if (featureFlags.putIfAbsent(flag, true) == null) {
// Align the log outputs to make post processing easier.
Logger.printDebug(() -> " double feature is enabled: " + flag
@@ -74,6 +77,8 @@ public final class EnableDebuggingPatch {
*/
public static long isLongFeatureFlagEnabled(long value, long flag, long defaultValue) {
if (LOG_FEATURE_FLAGS && defaultValue != value) {
+ if (DISABLED_FEATURE_FLAGS.contains(flag)) return defaultValue;
+
if (featureFlags.putIfAbsent(flag, true) == null) {
Logger.printDebug(() -> " long feature is enabled: " + flag
+ " value: " + value + (defaultValue == 0 ? "" : " default: " + defaultValue));
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/SanitizeSharingLinksPatch.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/SanitizeSharingLinksPatch.java
index d028997276..b0bcbc6f04 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/SanitizeSharingLinksPatch.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/SanitizeSharingLinksPatch.java
@@ -18,8 +18,8 @@ public final class SanitizeSharingLinksPatch {
* Injection point.
*/
public static String sanitize(String url) {
- if (BaseSettings.SANITIZE_SHARED_LINKS.get()) {
- url = sanitizer.sanitizeUrlString(url);
+ if (BaseSettings.SANITIZE_SHARING_LINKS.get()) {
+ url = sanitizer.sanitizeURLString(url);
}
if (BaseSettings.REPLACE_MUSIC_LINKS_WITH_YOUTUBE.get()) {
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/CustomFilter.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/litho/CustomFilter.java
similarity index 56%
rename from extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/CustomFilter.java
rename to extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/litho/CustomFilter.java
index 1fed2e9673..beb623a799 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/CustomFilter.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/litho/CustomFilter.java
@@ -1,4 +1,4 @@
-package app.revanced.extension.youtube.patches.components;
+package app.revanced.extension.shared.patches.litho;
import static app.revanced.extension.shared.StringRef.str;
@@ -13,17 +13,19 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.StringTrieSearch;
import app.revanced.extension.shared.Utils;
import app.revanced.extension.shared.ByteTrieSearch;
-import app.revanced.extension.youtube.settings.Settings;
+import app.revanced.extension.shared.patches.litho.FilterGroup.StringFilterGroup;
+import app.revanced.extension.shared.settings.YouTubeAndMusicSettings;
/**
* Allows custom filtering using a path and optionally a proto buffer string.
*/
@SuppressWarnings("unused")
-final class CustomFilter extends Filter {
+public final class CustomFilter extends Filter {
- private static void showInvalidSyntaxToast(@NonNull String expression) {
+ private static void showInvalidSyntaxToast(String expression) {
Utils.showToastLong(str("revanced_custom_filter_toast_invalid_syntax", expression));
}
@@ -35,7 +37,12 @@ final class CustomFilter extends Filter {
public static final String SYNTAX_STARTS_WITH = "^";
/**
- * Optional character that separates the path from a proto buffer string pattern.
+ * Optional character that separates the path from an accessibility string pattern.
+ */
+ public static final String SYNTAX_ACCESSIBILITY_SYMBOL = "#";
+
+ /**
+ * Optional character that separates the path/accessibility from a proto buffer string pattern.
*/
public static final String SYNTAX_BUFFER_SYMBOL = "$";
@@ -45,20 +52,26 @@ final class CustomFilter extends Filter {
@NonNull
@SuppressWarnings("ConstantConditions")
static Collection parseCustomFilterGroups() {
- String rawCustomFilterText = Settings.CUSTOM_FILTER_STRINGS.get();
+ String rawCustomFilterText = YouTubeAndMusicSettings.CUSTOM_FILTER_STRINGS.get();
if (rawCustomFilterText.isBlank()) {
return Collections.emptyList();
}
- // Map key is the path including optional special characters (^ and/or $)
+ // Map key is the full path including optional special characters (^, #, $),
+ // and any accessibility pattern, but does not contain any buffer patterns.
Map result = new HashMap<>();
+
Pattern pattern = Pattern.compile(
- "(" // map key group
- + "(\\Q" + SYNTAX_STARTS_WITH + "\\E?)" // optional starts with
- + "([^\\Q" + SYNTAX_BUFFER_SYMBOL + "\\E]*)" // path
- + "(\\Q" + SYNTAX_BUFFER_SYMBOL + "\\E?)" // optional buffer symbol
- + ")" // end map key group
- + "(.*)"); // optional buffer string
+ "(" // Map key group.
+ // Optional starts with.
+ + "(\\Q" + SYNTAX_STARTS_WITH + "\\E?)"
+ // Path string.
+ + "([^\\Q" + SYNTAX_ACCESSIBILITY_SYMBOL + SYNTAX_BUFFER_SYMBOL + "\\E]*)"
+ // Optional accessibility string.
+ + "(?:\\Q" + SYNTAX_ACCESSIBILITY_SYMBOL + "\\E([^\\Q" + SYNTAX_BUFFER_SYMBOL + "\\E]*))?"
+ // Optional buffer string.
+ + "(?:\\Q" + SYNTAX_BUFFER_SYMBOL + "\\E(.*))?"
+ + ")"); // end map key group
for (String expression : rawCustomFilterText.split("\n")) {
if (expression.isBlank()) continue;
@@ -72,10 +85,12 @@ final class CustomFilter extends Filter {
final String mapKey = matcher.group(1);
final boolean pathStartsWith = !matcher.group(2).isEmpty();
final String path = matcher.group(3);
- final boolean hasBufferSymbol = !matcher.group(4).isEmpty();
- final String bufferString = matcher.group(5);
+ final String accessibility = matcher.group(4); // null if not present
+ final String buffer = matcher.group(5); // null if not present
- if (path.isBlank() || (hasBufferSymbol && bufferString.isBlank())) {
+ if (path.isBlank()
+ || (accessibility != null && accessibility.isEmpty())
+ || (buffer != null && buffer.isEmpty())) {
showInvalidSyntaxToast(expression);
continue;
}
@@ -88,8 +103,13 @@ final class CustomFilter extends Filter {
group = new CustomFilterGroup(pathStartsWith, path);
result.put(mapKey, group);
}
- if (hasBufferSymbol) {
- group.addBufferString(bufferString);
+
+ if (accessibility != null) {
+ group.addAccessibilityString(accessibility);
+ }
+
+ if (buffer != null) {
+ group.addBufferString(buffer);
}
}
@@ -97,14 +117,22 @@ final class CustomFilter extends Filter {
}
final boolean startsWith;
+ StringTrieSearch accessibilitySearch;
ByteTrieSearch bufferSearch;
- CustomFilterGroup(boolean startsWith, @NonNull String path) {
- super(Settings.CUSTOM_FILTER, path);
+ CustomFilterGroup(boolean startsWith, String path) {
+ super(YouTubeAndMusicSettings.CUSTOM_FILTER, path);
this.startsWith = startsWith;
}
- void addBufferString(@NonNull String bufferString) {
+ void addAccessibilityString(String accessibilityString) {
+ if (accessibilitySearch == null) {
+ accessibilitySearch = new StringTrieSearch();
+ }
+ accessibilitySearch.addPattern(accessibilityString);
+ }
+
+ void addBufferString(String bufferString) {
if (bufferSearch == null) {
bufferSearch = new ByteTrieSearch();
}
@@ -116,6 +144,11 @@ final class CustomFilter extends Filter {
public String toString() {
StringBuilder builder = new StringBuilder();
builder.append("CustomFilterGroup{");
+ if (accessibilitySearch != null) {
+ builder.append(", accessibility=");
+ builder.append(accessibilitySearch.getPatterns());
+ }
+
builder.append("path=");
if (startsWith) builder.append(SYNTAX_STARTS_WITH);
builder.append(filters[0]);
@@ -145,18 +178,26 @@ final class CustomFilter extends Filter {
}
@Override
- boolean isFiltered(String identifier, String path, byte[] buffer,
- StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
+ public boolean isFiltered(String identifier, String accessibility, String path, byte[] buffer,
+ StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
// All callbacks are custom filter groups.
CustomFilterGroup custom = (CustomFilterGroup) matchedGroup;
+
+ // Check path start requirement.
if (custom.startsWith && contentIndex != 0) {
return false;
}
- if (custom.bufferSearch == null) {
- return true; // No buffer filter, only path filtering.
+ // Check accessibility string if specified.
+ if (custom.accessibilitySearch != null && !custom.accessibilitySearch.matches(accessibility)) {
+ return false;
}
- return custom.bufferSearch.matches(buffer);
+ // Check buffer if specified.
+ if (custom.bufferSearch != null && !custom.bufferSearch.matches(buffer)) {
+ return false;
+ }
+
+ return true; // All custom filter conditions passed.
}
-}
\ No newline at end of file
+}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/Filter.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/litho/Filter.java
similarity index 60%
rename from extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/Filter.java
rename to extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/litho/Filter.java
index 003949ce23..b34ca9bdd7 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/Filter.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/litho/Filter.java
@@ -1,4 +1,7 @@
-package app.revanced.extension.youtube.patches.components;
+package app.revanced.extension.shared.patches.litho;
+
+import app.revanced.extension.shared.patches.litho.FilterGroup.ByteArrayFilterGroup;
+import app.revanced.extension.shared.patches.litho.FilterGroup.StringFilterGroup;
import java.util.ArrayList;
import java.util.Arrays;
@@ -10,19 +13,20 @@ import java.util.List;
* Callbacks to filter content are added using {@link #addIdentifierCallbacks(StringFilterGroup...)}
* and {@link #addPathCallbacks(StringFilterGroup...)}.
*
- * To filter {@link FilterContentType#PROTOBUFFER}, first add a callback to
+ * To filter {@link FilterContentType#PROTOBUFFER} or {@link FilterContentType#ACCESSIBILITY}, first add a callback to
* either an identifier or a path.
- * Then inside {@link #isFiltered(String, String, byte[], StringFilterGroup, FilterContentType, int)}
+ * Then inside {@link #isFiltered(String, String, String, byte[], StringFilterGroup, FilterContentType, int)}
* search for the buffer content using either a {@link ByteArrayFilterGroup} (if searching for 1 pattern)
- * or a {@link ByteArrayFilterGroupList} (if searching for more than 1 pattern).
+ * or a {@link FilterGroupList.ByteArrayFilterGroupList} (if searching for more than 1 pattern).
*
* All callbacks must be registered before the constructor completes.
*/
-abstract class Filter {
+public abstract class Filter {
public enum FilterContentType {
IDENTIFIER,
PATH,
+ ACCESSIBILITY,
PROTOBUFFER
}
@@ -30,15 +34,15 @@ abstract class Filter {
* Identifier callbacks. Do not add to this instance,
* and instead use {@link #addIdentifierCallbacks(StringFilterGroup...)}.
*/
- protected final List identifierCallbacks = new ArrayList<>();
+ public final List identifierCallbacks = new ArrayList<>();
/**
* Path callbacks. Do not add to this instance,
* and instead use {@link #addPathCallbacks(StringFilterGroup...)}.
*/
- protected final List pathCallbacks = new ArrayList<>();
+ public final List pathCallbacks = new ArrayList<>();
/**
- * Adds callbacks to {@link #isFiltered(String, String, byte[], StringFilterGroup, FilterContentType, int)}
+ * Adds callbacks to {@link #isFiltered(String, String, String, byte[], StringFilterGroup, FilterContentType, int)}
* if any of the groups are found.
*/
protected final void addIdentifierCallbacks(StringFilterGroup... groups) {
@@ -46,7 +50,7 @@ abstract class Filter {
}
/**
- * Adds callbacks to {@link #isFiltered(String, String, byte[], StringFilterGroup, FilterContentType, int)}
+ * Adds callbacks to {@link #isFiltered(String, String, String, byte[], StringFilterGroup, FilterContentType, int)}
* if any of the groups are found.
*/
protected final void addPathCallbacks(StringFilterGroup... groups) {
@@ -60,12 +64,15 @@ abstract class Filter {
*
* Method is called off the main thread.
*
+ * @param identifier Litho identifier.
+ * @param accessibility Accessibility string, or an empty string if not present for the component.
+ * @param buffer Protocol buffer.
* @param matchedGroup The actual filter that matched.
* @param contentType The type of content matched.
* @param contentIndex Matched index of the identifier or path.
* @return True if the litho component should be filtered out.
*/
- boolean isFiltered(String identifier, String path, byte[] buffer,
+ public boolean isFiltered(String identifier, String accessibility, String path, byte[] buffer,
StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
return true;
}
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/litho/FilterGroup.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/litho/FilterGroup.java
new file mode 100644
index 0000000000..212787f305
--- /dev/null
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/litho/FilterGroup.java
@@ -0,0 +1,213 @@
+package app.revanced.extension.shared.patches.litho;
+
+import androidx.annotation.NonNull;
+import app.revanced.extension.shared.ByteTrieSearch;
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.settings.BooleanSetting;
+
+public abstract class FilterGroup {
+ public final static class FilterGroupResult {
+ private BooleanSetting setting;
+ private int matchedIndex;
+ private int matchedLength;
+ // In the future it might be useful to include which pattern matched,
+ // but for now that is not needed.
+
+ FilterGroupResult() {
+ this(null, -1, 0);
+ }
+
+ FilterGroupResult(BooleanSetting setting, int matchedIndex, int matchedLength) {
+ setValues(setting, matchedIndex, matchedLength);
+ }
+
+ public void setValues(BooleanSetting setting, int matchedIndex, int matchedLength) {
+ this.setting = setting;
+ this.matchedIndex = matchedIndex;
+ this.matchedLength = matchedLength;
+ }
+
+ /**
+ * A null value if the group has no setting,
+ * or if no match is returned from {@link FilterGroupList#check(Object)}.
+ */
+ public BooleanSetting getSetting() {
+ return setting;
+ }
+
+ public boolean isFiltered() {
+ return matchedIndex >= 0;
+ }
+
+ /**
+ * Matched index of first pattern that matched, or -1 if nothing matched.
+ */
+ public int getMatchedIndex() {
+ return matchedIndex;
+ }
+
+ /**
+ * Length of the matched filter pattern.
+ */
+ public int getMatchedLength() {
+ return matchedLength;
+ }
+ }
+
+ protected final BooleanSetting setting;
+ public final T[] filters;
+
+ /**
+ * Initialize a new filter group.
+ *
+ * @param setting The associated setting.
+ * @param filters The filters.
+ */
+ @SafeVarargs
+ public FilterGroup(final BooleanSetting setting, final T... filters) {
+ this.setting = setting;
+ this.filters = filters;
+ if (filters.length == 0) {
+ throw new IllegalArgumentException("Must use one or more filter patterns (zero specified)");
+ }
+ }
+
+ public boolean isEnabled() {
+ return setting == null || setting.get();
+ }
+
+ /**
+ * @return If {@link FilterGroupList} should include this group when searching.
+ * By default, all filters are included except non enabled settings that require reboot.
+ */
+ @SuppressWarnings("BooleanMethodIsAlwaysInverted")
+ public boolean includeInSearch() {
+ return isEnabled() || !setting.rebootApp;
+ }
+
+ @NonNull
+ @Override
+ public String toString() {
+ return getClass().getSimpleName() + ": " + (setting == null ? "(null setting)" : setting);
+ }
+
+ public abstract FilterGroupResult check(final T stack);
+
+
+ public static class StringFilterGroup extends FilterGroup {
+
+ public StringFilterGroup(final BooleanSetting setting, final String... filters) {
+ super(setting, filters);
+ }
+
+ @Override
+ public FilterGroupResult check(final String string) {
+ int matchedIndex = -1;
+ int matchedLength = 0;
+ if (isEnabled()) {
+ for (String pattern : filters) {
+ if (!string.isEmpty()) {
+ final int indexOf = string.indexOf(pattern);
+ if (indexOf >= 0) {
+ matchedIndex = indexOf;
+ matchedLength = pattern.length();
+ break;
+ }
+ }
+ }
+ }
+ return new FilterGroupResult(setting, matchedIndex, matchedLength);
+ }
+ }
+
+ /**
+ * If you have more than 1 filter patterns, then all instances of
+ * this class should be filtered using {@link FilterGroupList.ByteArrayFilterGroupList#check(byte[])},
+ * which uses a prefix tree to give better performance.
+ */
+ public static class ByteArrayFilterGroup extends FilterGroup {
+
+ private volatile int[][] failurePatterns;
+
+ // Modified implementation from https://stackoverflow.com/a/1507813
+ private static int indexOf(final byte[] data, final byte[] pattern, final int[] failure) {
+ // Finds the first occurrence of the pattern in the byte array using
+ // KMP matching algorithm.
+ int patternLength = pattern.length;
+ for (int i = 0, j = 0, dataLength = data.length; i < dataLength; i++) {
+ while (j > 0 && pattern[j] != data[i]) {
+ j = failure[j - 1];
+ }
+ if (pattern[j] == data[i]) {
+ j++;
+ }
+ if (j == patternLength) {
+ return i - patternLength + 1;
+ }
+ }
+ return -1;
+ }
+
+ private static int[] createFailurePattern(byte[] pattern) {
+ // Computes the failure function using a bootstrapping process,
+ // where the pattern is matched against itself.
+ final int patternLength = pattern.length;
+ final int[] failure = new int[patternLength];
+
+ for (int i = 1, j = 0; i < patternLength; i++) {
+ while (j > 0 && pattern[j] != pattern[i]) {
+ j = failure[j - 1];
+ }
+ if (pattern[j] == pattern[i]) {
+ j++;
+ }
+ failure[i] = j;
+ }
+ return failure;
+ }
+
+ public ByteArrayFilterGroup(BooleanSetting setting, byte[]... filters) {
+ super(setting, filters);
+ }
+
+ /**
+ * Converts the Strings into byte arrays. Used to search for text in binary data.
+ */
+ public ByteArrayFilterGroup(BooleanSetting setting, String... filters) {
+ super(setting, ByteTrieSearch.convertStringsToBytes(filters));
+ }
+
+ private synchronized void buildFailurePatterns() {
+ if (failurePatterns != null) return; // Thread race and another thread already initialized the search.
+ Logger.printDebug(() -> "Building failure array for: " + this);
+ int[][] failurePatterns = new int[filters.length][];
+ int i = 0;
+ for (byte[] pattern : filters) {
+ failurePatterns[i++] = createFailurePattern(pattern);
+ }
+ this.failurePatterns = failurePatterns; // Must set after initialization finishes.
+ }
+
+ @Override
+ public FilterGroupResult check(final byte[] bytes) {
+ int matchedLength = 0;
+ int matchedIndex = -1;
+ if (isEnabled()) {
+ int[][] failures = failurePatterns;
+ if (failures == null) {
+ buildFailurePatterns(); // Lazy load.
+ failures = failurePatterns;
+ }
+ for (int i = 0, length = filters.length; i < length; i++) {
+ byte[] filter = filters[i];
+ matchedIndex = indexOf(bytes, filter, failures[i]);
+ if (matchedIndex >= 0) {
+ matchedLength = filter.length;
+ break;
+ }
+ }
+ }
+ return new FilterGroupResult(setting, matchedIndex, matchedLength);
+ }
+ }
+}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/FilterGroupList.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/litho/FilterGroupList.java
similarity index 54%
rename from extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/FilterGroupList.java
rename to extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/litho/FilterGroupList.java
index f839436c0b..da22ca9ff7 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/FilterGroupList.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/litho/FilterGroupList.java
@@ -1,21 +1,24 @@
-package app.revanced.extension.youtube.patches.components;
+package app.revanced.extension.shared.patches.litho;
import androidx.annotation.NonNull;
-
-import java.util.*;
-import java.util.function.Consumer;
-
import app.revanced.extension.shared.ByteTrieSearch;
import app.revanced.extension.shared.StringTrieSearch;
import app.revanced.extension.shared.TrieSearch;
+import app.revanced.extension.shared.patches.litho.FilterGroup.ByteArrayFilterGroup;
+import app.revanced.extension.shared.patches.litho.FilterGroup.StringFilterGroup;
-abstract class FilterGroupList> implements Iterable {
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+public abstract class FilterGroupList> implements Iterable {
private final List filterGroups = new ArrayList<>();
private final TrieSearch search = createSearchGraph();
@SafeVarargs
- protected final void addAll(final T... groups) {
+ public final void addAll(final T... groups) {
filterGroups.addAll(Arrays.asList(groups));
for (T group : groups) {
@@ -41,18 +44,7 @@ abstract class FilterGroupList> implements Iterable<
return filterGroups.iterator();
}
- @Override
- public void forEach(@NonNull Consumer action) {
- filterGroups.forEach(action);
- }
-
- @NonNull
- @Override
- public Spliterator spliterator() {
- return filterGroups.spliterator();
- }
-
- protected FilterGroup.FilterGroupResult check(V stack) {
+ public FilterGroup.FilterGroupResult check(V stack) {
FilterGroup.FilterGroupResult result = new FilterGroup.FilterGroupResult();
search.matches(stack, result);
return result;
@@ -60,21 +52,21 @@ abstract class FilterGroupList> implements Iterable<
}
protected abstract TrieSearch createSearchGraph();
-}
-final class StringFilterGroupList extends FilterGroupList {
- protected StringTrieSearch createSearchGraph() {
- return new StringTrieSearch();
+ public static final class StringFilterGroupList extends FilterGroupList {
+ protected StringTrieSearch createSearchGraph() {
+ return new StringTrieSearch();
+ }
}
-}
-/**
- * If searching for a single byte pattern, then it is slightly better to use
- * {@link ByteArrayFilterGroup#check(byte[])} as it uses KMP which is faster
- * than a prefix tree to search for only 1 pattern.
- */
-final class ByteArrayFilterGroupList extends FilterGroupList {
- protected ByteTrieSearch createSearchGraph() {
- return new ByteTrieSearch();
+ /**
+ * If searching for a single byte pattern, then it is slightly better to use
+ * {@link ByteArrayFilterGroup#check(byte[])} as it uses KMP which is faster
+ * than a prefix tree to search for only 1 pattern.
+ */
+ public static final class ByteArrayFilterGroupList extends FilterGroupList {
+ protected ByteTrieSearch createSearchGraph() {
+ return new ByteTrieSearch();
+ }
}
}
\ No newline at end of file
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/litho/LithoFilterPatch.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/litho/LithoFilterPatch.java
new file mode 100644
index 0000000000..e1b329ee54
--- /dev/null
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/litho/LithoFilterPatch.java
@@ -0,0 +1,439 @@
+package app.revanced.extension.shared.patches.litho;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.patches.litho.FilterGroup.StringFilterGroup;
+import app.revanced.extension.shared.settings.BaseSettings;
+import app.revanced.extension.shared.StringTrieSearch;
+import app.revanced.extension.shared.settings.YouTubeAndMusicSettings;
+
+@SuppressWarnings("unused")
+public final class LithoFilterPatch {
+ /**
+ * Simple wrapper to pass the litho parameters through the prefix search.
+ */
+ private static final class LithoFilterParameters {
+ final String identifier;
+ final String path;
+ final String accessibility;
+ final byte[] buffer;
+
+ LithoFilterParameters(String lithoIdentifier, String lithoPath,
+ String accessibility, byte[] buffer) {
+ this.identifier = lithoIdentifier;
+ this.path = lithoPath;
+ this.accessibility = accessibility;
+ this.buffer = buffer;
+ }
+
+ @NonNull
+ @Override
+ public String toString() {
+ // Estimate the percentage of the buffer that are Strings.
+ StringBuilder builder = new StringBuilder(Math.max(100, buffer.length / 2));
+ builder.append("ID: ");
+ builder.append(identifier);
+ if (!accessibility.isEmpty()) {
+ // AccessibilityId and AccessibilityText are pieces of BufferStrings.
+ builder.append(" Accessibility: ");
+ builder.append(accessibility);
+ }
+ builder.append(" Path: ");
+ builder.append(path);
+ if (YouTubeAndMusicSettings.DEBUG_PROTOCOLBUFFER.get()) {
+ builder.append(" BufferStrings: ");
+ findAsciiStrings(builder, buffer);
+ }
+
+ return builder.toString();
+ }
+
+ /**
+ * Search through a byte array for all ASCII strings.
+ */
+ static void findAsciiStrings(StringBuilder builder, byte[] buffer) {
+ // Valid ASCII values (ignore control characters).
+ final int minimumAscii = 32; // 32 = space character
+ final int maximumAscii = 126; // 127 = delete character
+ final int minimumAsciiStringLength = 4; // Minimum length of an ASCII string to include.
+ String delimitingCharacter = "❙"; // Non ascii character, to allow easier log filtering.
+
+ final int length = buffer.length;
+ int start = 0;
+ int end = 0;
+ while (end < length) {
+ int value = buffer[end];
+ if (value < minimumAscii || value > maximumAscii || end == length - 1) {
+ if (end - start >= minimumAsciiStringLength) {
+ for (int i = start; i < end; i++) {
+ builder.append((char) buffer[i]);
+ }
+ builder.append(delimitingCharacter);
+ }
+ start = end + 1;
+ }
+ end++;
+ }
+ }
+ }
+
+ /**
+ * Placeholder for actual filters.
+ */
+ private static final class DummyFilter extends Filter {
+ }
+
+ private static final Filter[] filters = new Filter[]{
+ new DummyFilter() // Replaced during patching, do not touch.
+ };
+
+ /**
+ * Litho layout fixed thread pool size override.
+ *
+ * Unpatched YouTube uses a layout fixed thread pool between 1 and 3 threads:
+ *
+ * 1 thread - > Device has less than 6 cores
+ * 2 threads -> Device has over 6 cores and less than 6GB of memory
+ * 3 threads -> Device has over 6 cores and more than 6GB of memory
+ *
+ *
+ * Using more than 1 thread causes layout issues such as the You tab watch/playlist shelf
+ * that is sometimes incorrectly hidden (ReVanced is not hiding it), and seems to
+ * fix a race issue if using the active navigation tab status with litho filtering.
+ */
+ private static final int LITHO_LAYOUT_THREAD_POOL_SIZE = 1;
+
+ /**
+ * For YouTube 20.22+, this is set to true by a patch,
+ * because it cannot use the thread buffer due to the buffer frequently not being correct,
+ * especially for components that are recreated such as dragging off-screen then back on screen.
+ * Instead, parse the identifier found near the start of the buffer and use that to
+ * identify the correct buffer to use when filtering.
+ *
+ * This is set during patching, do not change manually.
+ */
+ private static final boolean EXTRACT_IDENTIFIER_FROM_BUFFER = false;
+
+ /**
+ * Turns on additional logging, used for development purposes only.
+ */
+ public static final boolean DEBUG_EXTRACT_IDENTIFIER_FROM_BUFFER = false;
+
+ /**
+ * String suffix for components.
+ * Can be any of: ".eml", ".eml-fe", ".e-b", ".eml-js", "e-js-b"
+ */
+ private static final byte[] LITHO_COMPONENT_EXTENSION_BYTES = ".e".getBytes(StandardCharsets.US_ASCII);
+
+ /**
+ * Used as placeholder for litho id/path filters that do not use a buffer
+ */
+ private static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
+
+ /**
+ * Because litho filtering is multithreaded and the buffer is passed in from a different injection point,
+ * the buffer is saved to a ThreadLocal so each calling thread does not interfere with other threads.
+ * Used for 20.21 and lower.
+ */
+ private static final ThreadLocal bufferThreadLocal = new ThreadLocal<>();
+
+ /**
+ * Identifier to protocol buffer mapping. Only used for 20.22+.
+ * Thread local is needed because filtering is multithreaded and each thread can load
+ * a different component with the same identifier.
+ */
+ private static final ThreadLocal> identifierToBufferThread = new ThreadLocal<>();
+
+ /**
+ * Global shared buffer. Used only if the buffer is not found in the ThreadLocal.
+ */
+ private static final Map identifierToBufferGlobal
+ = Collections.synchronizedMap(createIdentifierToBufferMap());
+
+ private static final StringTrieSearch pathSearchTree = new StringTrieSearch();
+ private static final StringTrieSearch identifierSearchTree = new StringTrieSearch();
+
+ static {
+
+ for (Filter filter : filters) {
+ filterUsingCallbacks(identifierSearchTree, filter,
+ filter.identifierCallbacks, Filter.FilterContentType.IDENTIFIER);
+ filterUsingCallbacks(pathSearchTree, filter,
+ filter.pathCallbacks, Filter.FilterContentType.PATH);
+ }
+
+ Logger.printDebug(() -> "Using: "
+ + identifierSearchTree.numberOfPatterns() + " identifier filters"
+ + " (" + identifierSearchTree.getEstimatedMemorySize() + " KB), "
+ + pathSearchTree.numberOfPatterns() + " path filters"
+ + " (" + pathSearchTree.getEstimatedMemorySize() + " KB)");
+ }
+
+ private static void filterUsingCallbacks(StringTrieSearch pathSearchTree,
+ Filter filter, List groups,
+ Filter.FilterContentType type) {
+ String filterSimpleName = filter.getClass().getSimpleName();
+
+ for (StringFilterGroup group : groups) {
+ if (!group.includeInSearch()) {
+ continue;
+ }
+
+ for (String pattern : group.filters) {
+ pathSearchTree.addPattern(pattern, (textSearched, matchedStartIndex,
+ matchedLength, callbackParameter) -> {
+ if (!group.isEnabled()) return false;
+
+ LithoFilterParameters parameters = (LithoFilterParameters) callbackParameter;
+ final boolean isFiltered = filter.isFiltered(parameters.identifier,
+ parameters.accessibility, parameters.path, parameters.buffer,
+ group, type, matchedStartIndex);
+
+ if (isFiltered && BaseSettings.DEBUG.get()) {
+ Logger.printDebug(() -> type == Filter.FilterContentType.IDENTIFIER
+ ? filterSimpleName + " filtered identifier: " + parameters.identifier
+ : filterSimpleName + " filtered path: " + parameters.path);
+ }
+
+ return isFiltered;
+ }
+ );
+ }
+ }
+ }
+
+ private static Map createIdentifierToBufferMap() {
+ // It's unclear how many items should be cached. This is a guess.
+ return Utils.createSizeRestrictedMap(100);
+ }
+
+ /**
+ * Helper function that differs from {@link Character#isDigit(char)}
+ * as this only matches ascii and not Unicode numbers.
+ */
+ private static boolean isAsciiNumber(byte character) {
+ return '0' <= character && character <= '9';
+ }
+
+ private static boolean isAsciiLowerCaseLetter(byte character) {
+ return 'a' <= character && character <= 'z';
+ }
+
+ /**
+ * Injection point. Called off the main thread.
+ * Targets 20.22+
+ */
+ public static void setProtoBuffer(byte[] buffer) {
+ if (DEBUG_EXTRACT_IDENTIFIER_FROM_BUFFER) {
+ StringBuilder builder = new StringBuilder();
+ LithoFilterParameters.findAsciiStrings(builder, buffer);
+ Logger.printDebug(() -> "New buffer: " + builder);
+ }
+
+ // The identifier always seems to start very close to the buffer start.
+ // Highest identifier start index ever observed is 50, with most around 30 to 40.
+ // The buffer can be very large with up to 200kb has been observed,
+ // so the search is restricted to only the start.
+ final int maxBufferStartIndex = 500; // 10x expected upper bound.
+
+ // Could use Boyer-Moore-Horspool since the string is ASCII and has a limited number of
+ // unique characters, but it seems to be slower since the extra overhead of checking the
+ // bad character array negates any performance gain of skipping a few extra subsearches.
+ int emlIndex = -1;
+ final int emlStringLength = LITHO_COMPONENT_EXTENSION_BYTES.length;
+ final int lastBufferIndexToCheckFrom = Math.min(maxBufferStartIndex, buffer.length - emlStringLength);
+ for (int i = 0; i < lastBufferIndexToCheckFrom; i++) {
+ boolean match = true;
+ for (int j = 0; j < emlStringLength; j++) {
+ if (buffer[i + j] != LITHO_COMPONENT_EXTENSION_BYTES[j]) {
+ match = false;
+ break;
+ }
+ }
+ if (match) {
+ emlIndex = i;
+ break;
+ }
+ }
+
+ if (emlIndex < 0) {
+ // Buffer is not used for creating a new litho component.
+ if (DEBUG_EXTRACT_IDENTIFIER_FROM_BUFFER) {
+ Logger.printDebug(() -> "Could not find eml index");
+ }
+ return;
+ }
+
+ int startIndex = emlIndex - 1;
+ while (startIndex > 0) {
+ final byte character = buffer[startIndex];
+ int startIndexFinal = startIndex;
+ if (isAsciiLowerCaseLetter(character) || isAsciiNumber(character) || character == '_') {
+ // Valid character for the first path element.
+ startIndex--;
+ } else {
+ startIndex++;
+ break;
+ }
+ }
+
+ // Strip away any numbers on the start of the identifier, which can
+ // be from random data in the buffer before the identifier starts.
+ while (true) {
+ final byte character = buffer[startIndex];
+ if (isAsciiNumber(character)) {
+ startIndex++;
+ } else {
+ break;
+ }
+ }
+
+ // Find the pipe character after the identifier.
+ int endIndex = -1;
+ for (int i = emlIndex, length = buffer.length; i < length; i++) {
+ if (buffer[i] == '|') {
+ endIndex = i;
+ break;
+ }
+ }
+ if (endIndex < 0) {
+ if (BaseSettings.DEBUG.get()) {
+ Logger.printException(() -> "Debug: Could not find buffer identifier");
+ }
+ return;
+ }
+
+ String identifier = new String(buffer, startIndex, endIndex - startIndex, StandardCharsets.US_ASCII);
+ if (DEBUG_EXTRACT_IDENTIFIER_FROM_BUFFER) {
+ Logger.printDebug(() -> "Found buffer for identifier: " + identifier);
+ }
+ identifierToBufferGlobal.put(identifier, buffer);
+
+ Map map = identifierToBufferThread.get();
+ if (map == null) {
+ map = createIdentifierToBufferMap();
+ identifierToBufferThread.set(map);
+ }
+ map.put(identifier, buffer);
+ }
+
+ /**
+ * Injection point. Called off the main thread.
+ * Targets 20.21 and lower.
+ */
+ public static void setProtoBuffer(@Nullable ByteBuffer buffer) {
+ if (buffer == null || !buffer.hasArray()) {
+ // It appears the buffer can be cleared out just before the call to #filter()
+ // Ignore this null value and retain the last buffer that was set.
+ Logger.printDebug(() -> "Ignoring null or empty buffer: " + buffer);
+ } else {
+ // Set the buffer to a thread local. The buffer will remain in memory, even after the call to #filter completes.
+ // This is intentional, as it appears the buffer can be set once and then filtered multiple times.
+ // The buffer will be cleared from memory after a new buffer is set by the same thread,
+ // or when the calling thread eventually dies.
+ bufferThreadLocal.set(buffer.array());
+ }
+ }
+
+ /**
+ * Injection point.
+ */
+ public static boolean isFiltered(String identifier, @Nullable String accessibilityId,
+ @Nullable String accessibilityText, StringBuilder pathBuilder) {
+ try {
+ if (identifier.isEmpty() || pathBuilder.length() == 0) {
+ return false;
+ }
+
+ byte[] buffer = null;
+ if (EXTRACT_IDENTIFIER_FROM_BUFFER) {
+ final int pipeIndex = identifier.indexOf('|');
+ if (pipeIndex >= 0) {
+ // If the identifier contains no pipe, then it's not an ".eml" identifier
+ // and the buffer is not uniquely identified. Typically, this only happens
+ // for subcomponents where buffer filtering is not used.
+ String identifierKey = identifier.substring(0, pipeIndex);
+
+ var map = identifierToBufferThread.get();
+ if (map != null) {
+ buffer = map.get(identifierKey);
+ }
+
+ if (buffer == null) {
+ // Buffer for thread local not found. Use the last buffer found from any thread.
+ buffer = identifierToBufferGlobal.get(identifierKey);
+
+ if (DEBUG_EXTRACT_IDENTIFIER_FROM_BUFFER && buffer == null) {
+ // No buffer is found for some components, such as
+ // shorts_lockup_cell.eml on channel profiles.
+ // For now, just ignore this and filter without a buffer.
+ if (BaseSettings.DEBUG.get()) {
+ Logger.printException(() -> "Debug: Could not find buffer for identifier: " + identifier);
+ }
+ }
+ }
+ }
+ } else {
+ buffer = bufferThreadLocal.get();
+ }
+
+ // Potentially the buffer may have been null or never set up until now.
+ // Use an empty buffer so the litho id/path filters that do not use a buffer still work.
+ if (buffer == null) {
+ buffer = EMPTY_BYTE_ARRAY;
+ }
+
+ String path = pathBuilder.toString();
+
+ String accessibility = "";
+ if (accessibilityId != null && !accessibilityId.isBlank()) {
+ accessibility = accessibilityId;
+ }
+ if (accessibilityText != null && !accessibilityText.isBlank()) {
+ accessibility = accessibilityId + '|' + accessibilityText;
+ }
+ LithoFilterParameters parameter = new LithoFilterParameters(identifier, path, accessibility, buffer);
+ Logger.printDebug(() -> "Searching " + parameter);
+
+ return identifierSearchTree.matches(identifier, parameter)
+ || pathSearchTree.matches(path, parameter);
+ } catch (Exception ex) {
+ Logger.printException(() -> "isFiltered failure", ex);
+ }
+
+ return false;
+ }
+
+ /**
+ * Injection point.
+ */
+ public static int getExecutorCorePoolSize(int originalCorePoolSize) {
+ if (originalCorePoolSize != LITHO_LAYOUT_THREAD_POOL_SIZE) {
+ Logger.printDebug(() -> "Overriding core thread pool size from: " + originalCorePoolSize
+ + " to: " + LITHO_LAYOUT_THREAD_POOL_SIZE);
+ }
+
+ return LITHO_LAYOUT_THREAD_POOL_SIZE;
+ }
+
+ /**
+ * Injection point.
+ */
+ public static int getExecutorMaxThreads(int originalMaxThreads) {
+ if (originalMaxThreads != LITHO_LAYOUT_THREAD_POOL_SIZE) {
+ Logger.printDebug(() -> "Overriding max thread pool size from: " + originalMaxThreads
+ + " to: " + LITHO_LAYOUT_THREAD_POOL_SIZE);
+ }
+
+ return LITHO_LAYOUT_THREAD_POOL_SIZE;
+ }
+}
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/privacy/LinkSanitizer.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/privacy/LinkSanitizer.java
index 941279f29b..421761f7da 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/privacy/LinkSanitizer.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/privacy/LinkSanitizer.java
@@ -24,23 +24,23 @@ public class LinkSanitizer {
: List.of(parametersToRemove);
}
- public String sanitizeUrlString(String url) {
+ public String sanitizeURLString(String url) {
try {
- return sanitizeUri(Uri.parse(url)).toString();
+ return sanitizeURI(Uri.parse(url)).toString();
} catch (Exception ex) {
- Logger.printException(() -> "sanitizeUrlString failure: " + url, ex);
+ Logger.printException(() -> "sanitizeURLString failure: " + url, ex);
return url;
}
}
- public Uri sanitizeUri(Uri uri) {
+ public Uri sanitizeURI(Uri uri) {
try {
String scheme = uri.getScheme();
if (scheme == null || !(scheme.equals("http") || scheme.equals("https"))) {
// Opening YouTube share sheet 'other' option passes the video title as a URI.
// Checking !uri.isHierarchical() works for all cases, except if the
// video title starts with / and then it's hierarchical but still an invalid URI.
- Logger.printDebug(() -> "Ignoring uri: " + uri);
+ Logger.printDebug(() -> "Ignoring URI: " + uri);
return uri;
}
@@ -56,12 +56,12 @@ public class LinkSanitizer {
}
}
- Uri sanitizedUrl = builder.build();
- Logger.printInfo(() -> "Sanitized url: " + uri + " to: " + sanitizedUrl);
+ Uri sanitizedURL = builder.build();
+ Logger.printInfo(() -> "Sanitized URL: " + uri + " to: " + sanitizedURL);
- return sanitizedUrl;
+ return sanitizedURL;
} catch (Exception ex) {
- Logger.printException(() -> "sanitizeUri failure: " + uri, ex);
+ Logger.printException(() -> "sanitizeURI failure: " + uri, ex);
return uri;
}
}
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/requests/Requester.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/requests/Requester.java
index c25e71d78c..2e5c457f7b 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/requests/Requester.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/requests/Requester.java
@@ -23,8 +23,8 @@ public class Requester {
public static HttpURLConnection getConnectionFromCompiledRoute(String apiUrl, Route.CompiledRoute route) throws IOException {
String url = apiUrl + route.getCompiledRoute();
HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
- // Request data is in the URL parameters and no body is sent.
- // The calling code must set a length if using a request body.
+ // This request sends data via URL query parameters. No request body is included.
+ // If a request body is added, the caller must set the appropriate Content-Length header.
connection.setFixedLengthStreamingMode(0);
connection.setRequestMethod(route.getMethod().name());
String agentString = System.getProperty("http.agent")
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseActivityHook.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseActivityHook.java
index fb068d8ede..1a2bfe9a2b 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseActivityHook.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseActivityHook.java
@@ -6,13 +6,17 @@ import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Context;
import android.graphics.drawable.Drawable;
+import android.os.Build;
import android.preference.PreferenceFragment;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import android.widget.Toolbar;
+import androidx.annotation.RequiresApi;
+
import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.ResourceType;
import app.revanced.extension.shared.Utils;
import app.revanced.extension.shared.settings.preference.ToolbarPreferenceFragment;
import app.revanced.extension.shared.ui.Dim;
@@ -21,17 +25,18 @@ import app.revanced.extension.shared.ui.Dim;
* Base class for hooking activities to inject a custom PreferenceFragment with a toolbar.
* Provides common logic for initializing the activity and setting up the toolbar.
*/
-@SuppressWarnings({"deprecation", "NewApi"})
+@SuppressWarnings("deprecation")
+@RequiresApi(api = Build.VERSION_CODES.O)
public abstract class BaseActivityHook extends Activity {
private static final int ID_REVANCED_SETTINGS_FRAGMENTS =
- getResourceIdentifierOrThrow("revanced_settings_fragments", "id");
+ getResourceIdentifierOrThrow(ResourceType.ID, "revanced_settings_fragments");
private static final int ID_REVANCED_TOOLBAR_PARENT =
- getResourceIdentifierOrThrow("revanced_toolbar_parent", "id");
+ getResourceIdentifierOrThrow(ResourceType.ID, "revanced_toolbar_parent");
public static final int LAYOUT_REVANCED_SETTINGS_WITH_TOOLBAR =
- getResourceIdentifierOrThrow("revanced_settings_with_toolbar", "layout");
+ getResourceIdentifierOrThrow(ResourceType.LAYOUT, "revanced_settings_with_toolbar");
private static final int STRING_REVANCED_SETTINGS_TITLE =
- getResourceIdentifierOrThrow("revanced_settings_title", "string");
+ getResourceIdentifierOrThrow(ResourceType.STRING, "revanced_settings_title");
/**
* Layout parameters for the toolbar, extracted from the dummy toolbar.
@@ -95,15 +100,15 @@ public abstract class BaseActivityHook extends Activity {
protected void createToolbar(Activity activity, PreferenceFragment fragment) {
// Replace dummy placeholder toolbar.
// This is required to fix submenu title alignment issue with Android ASOP 15+
- ViewGroup toolBarParent = activity.findViewById(ID_REVANCED_TOOLBAR_PARENT);
- ViewGroup dummyToolbar = Utils.getChildViewByResourceName(toolBarParent, "revanced_toolbar");
+ ViewGroup toolbarParent = activity.findViewById(ID_REVANCED_TOOLBAR_PARENT);
+ ViewGroup dummyToolbar = Utils.getChildViewByResourceName(toolbarParent, "revanced_toolbar");
toolbarLayoutParams = dummyToolbar.getLayoutParams();
- toolBarParent.removeView(dummyToolbar);
+ toolbarParent.removeView(dummyToolbar);
// Sets appropriate system navigation bar color for the activity.
ToolbarPreferenceFragment.setNavigationBarColor(activity.getWindow());
- Toolbar toolbar = new Toolbar(toolBarParent.getContext());
+ Toolbar toolbar = new Toolbar(toolbarParent.getContext());
toolbar.setBackgroundColor(getToolbarBackgroundColor());
toolbar.setNavigationIcon(getNavigationIcon());
toolbar.setNavigationOnClickListener(getNavigationClickListener(activity));
@@ -120,7 +125,14 @@ public abstract class BaseActivityHook extends Activity {
onPostToolbarSetup(activity, toolbar, fragment);
- toolBarParent.addView(toolbar, 0);
+ toolbarParent.addView(toolbar, 0);
+ }
+
+ /**
+ * Returns the resource ID for the content view layout.
+ */
+ protected int getContentViewResourceId() {
+ return LAYOUT_REVANCED_SETTINGS_WITH_TOOLBAR;
}
/**
@@ -128,11 +140,6 @@ public abstract class BaseActivityHook extends Activity {
*/
protected abstract void customizeActivityTheme(Activity activity);
- /**
- * Returns the resource ID for the content view layout.
- */
- protected abstract int getContentViewResourceId();
-
/**
* Returns the background color for the toolbar.
*/
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java
index e9dc280a8d..5fc4418366 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java
@@ -5,6 +5,9 @@ import static java.lang.Boolean.TRUE;
import static app.revanced.extension.shared.patches.CustomBrandingPatch.BrandingTheme;
import static app.revanced.extension.shared.settings.Setting.parent;
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.patches.CustomBrandingPatch;
+
/**
* Settings shared across multiple apps.
*
@@ -24,24 +27,44 @@ public class BaseSettings {
* Use the icons declared in the preferences created during patching. If no icons or styles are declared then this setting does nothing.
*/
public static final BooleanSetting SHOW_MENU_ICONS = new BooleanSetting("revanced_show_menu_icons", TRUE, true);
+ /**
+ * Do not use this setting directly. Instead use {@link app.revanced.extension.shared.Utils#appIsUsingBoldIcons()}
+ */
+ public static final BooleanSetting SETTINGS_DISABLE_BOLD_ICONS = new BooleanSetting("revanced_settings_disable_bold_icons", FALSE, true);
public static final BooleanSetting SETTINGS_SEARCH_HISTORY = new BooleanSetting("revanced_settings_search_history", TRUE, true);
public static final StringSetting SETTINGS_SEARCH_ENTRIES = new StringSetting("revanced_settings_search_entries", "");
+ /**
+ * The first time the app was launched with no previous app data (either a clean install, or after wiping app data).
+ */
+ public static final LongSetting FIRST_TIME_APP_LAUNCHED = new LongSetting("revanced_last_time_app_was_launched", -1L, false, false);
+
+ public static final BooleanSetting GMS_CORE_CHECK_UPDATES = new BooleanSetting("revanced_gms_core_check_updates", true, true);
+
//
// Settings shared by YouTube and YouTube Music.
//
public static final BooleanSetting SPOOF_VIDEO_STREAMS = new BooleanSetting("revanced_spoof_video_streams", TRUE, true, "revanced_spoof_video_streams_user_dialog_message");
- public static final BooleanSetting SPOOF_STREAMING_DATA_STATS_FOR_NERDS = new BooleanSetting("revanced_spoof_streaming_data_stats_for_nerds", TRUE, parent(SPOOF_VIDEO_STREAMS));
+ public static final BooleanSetting SPOOF_STREAMING_DATA_STATS_FOR_NERDS = new BooleanSetting("revanced_spoof_video_streams_stats_for_nerds", TRUE, parent(SPOOF_VIDEO_STREAMS));
- public static final BooleanSetting SANITIZE_SHARED_LINKS = new BooleanSetting("revanced_sanitize_sharing_links", TRUE);
+ public static final BooleanSetting SANITIZE_SHARING_LINKS = new BooleanSetting("revanced_sanitize_sharing_links", TRUE);
public static final BooleanSetting REPLACE_MUSIC_LINKS_WITH_YOUTUBE = new BooleanSetting("revanced_replace_music_with_youtube", FALSE);
public static final BooleanSetting CHECK_WATCH_HISTORY_DOMAIN_NAME = new BooleanSetting("revanced_check_watch_history_domain_name", TRUE, false, false);
- public static final EnumSetting CUSTOM_BRANDING_ICON = new EnumSetting<>("revanced_custom_branding_icon", BrandingTheme.ORIGINAL, true);
- public static final IntegerSetting CUSTOM_BRANDING_NAME = new IntegerSetting("revanced_custom_branding_name", 1, true);
+ public static final EnumSetting CUSTOM_BRANDING_ICON = new EnumSetting<>("revanced_custom_branding_icon", CustomBrandingPatch.getDefaultIconStyle(), true);
+ public static final IntegerSetting CUSTOM_BRANDING_NAME = new IntegerSetting("revanced_custom_branding_name", CustomBrandingPatch.getDefaultAppNameIndex(), true);
public static final StringSetting DISABLED_FEATURE_FLAGS = new StringSetting("revanced_disabled_feature_flags", "", true, parent(DEBUG));
+
+ static {
+ final long now = System.currentTimeMillis();
+
+ if (FIRST_TIME_APP_LAUNCHED.get() < 0) {
+ Logger.printInfo(() -> "First launch of installation with no prior app data");
+ FIRST_TIME_APP_LAUNCHED.save(now);
+ }
+ }
}
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BooleanSetting.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BooleanSetting.java
index 58745a16cb..c67ebabf96 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BooleanSetting.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BooleanSetting.java
@@ -43,7 +43,7 @@ public class BooleanSetting extends Setting {
* This method is only to be used by the Settings preference code.
*
* This intentionally is a static method to deter
- * accidental usage when {@link #save(Boolean)} was intnded.
+ * accidental usage when {@link #save(Boolean)} was intended.
*/
public static void privateSetValue(@NonNull BooleanSetting setting, @NonNull Boolean newValue) {
setting.value = Objects.requireNonNull(newValue);
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/EnumSetting.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/EnumSetting.java
index 88de4029ef..2c2cb6a3a8 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/EnumSetting.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/EnumSetting.java
@@ -72,7 +72,7 @@ public class EnumSetting> extends Setting {
}
/**
- * @param enumName Enum name. Casing does not matter.
+ * @param enumName Enum name. Casing does not matter.
* @return Enum of this type with the same declared name.
* @throws IllegalArgumentException if the name is not a valid enum of this type.
*/
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/Setting.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/Setting.java
index 32d24e3e1f..53a980e3c2 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/Setting.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/Setting.java
@@ -274,60 +274,6 @@ public abstract class Setting {
load();
}
- /**
- * Migrate a setting value if the path is renamed but otherwise the old and new settings are identical.
- */
- public static void migrateOldSettingToNew(Setting oldSetting, Setting newSetting) {
- if (oldSetting == newSetting) throw new IllegalArgumentException();
-
- if (!oldSetting.isSetToDefault()) {
- Logger.printInfo(() -> "Migrating old setting value: " + oldSetting + " into replacement setting: " + newSetting);
- newSetting.save(oldSetting.value);
- oldSetting.resetToDefault();
- }
- }
-
- /**
- * Migrate an old Setting value previously stored in a different SharedPreference.
- *
- * This method will be deleted in the future.
- */
- @SuppressWarnings({"rawtypes", "NewApi"})
- public static void migrateFromOldPreferences(SharedPrefCategory oldPrefs, Setting setting, String settingKey) {
- if (!oldPrefs.preferences.contains(settingKey)) {
- return; // Nothing to do.
- }
-
- Object newValue = setting.get();
- final Object migratedValue;
- if (setting instanceof BooleanSetting) {
- migratedValue = oldPrefs.getBoolean(settingKey, (Boolean) newValue);
- } else if (setting instanceof IntegerSetting) {
- migratedValue = oldPrefs.getIntegerString(settingKey, (Integer) newValue);
- } else if (setting instanceof LongSetting) {
- migratedValue = oldPrefs.getLongString(settingKey, (Long) newValue);
- } else if (setting instanceof FloatSetting) {
- migratedValue = oldPrefs.getFloatString(settingKey, (Float) newValue);
- } else if (setting instanceof StringSetting) {
- migratedValue = oldPrefs.getString(settingKey, (String) newValue);
- } else {
- Logger.printException(() -> "Unknown setting: " + setting);
- // Remove otherwise it'll show a toast on every launch.
- oldPrefs.preferences.edit().remove(settingKey).apply();
- return;
- }
-
- oldPrefs.preferences.edit().remove(settingKey).apply(); // Remove the old setting.
- if (migratedValue.equals(newValue)) {
- Logger.printDebug(() -> "Value does not need migrating: " + settingKey);
- return; // Old value is already equal to the new setting value.
- }
-
- Logger.printDebug(() -> "Migrating old preference value into current preference: " + settingKey);
- //noinspection unchecked
- setting.save(migratedValue);
- }
-
/**
* Sets, but does _not_ persistently save the value.
* This method is only to be used by the Settings preference code.
@@ -419,7 +365,7 @@ public abstract class Setting {
}
/**
- * @return if the currently set value is the same as {@link #defaultValue}
+ * @return if the currently set value is the same as {@link #defaultValue}.
*/
public boolean isSetToDefault() {
return value.equals(defaultValue);
@@ -450,7 +396,7 @@ public abstract class Setting {
/**
* @param importExportKey The JSON key. The JSONObject parameter will contain data for this key.
- * @return the value stored using the import/export key. Do not set any values in this method.
+ * @return the value stored using the import/export key. Do not set any values in this method.
*/
protected abstract T readFromJSON(JSONObject json, String importExportKey) throws JSONException;
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/YouTubeAndMusicSettings.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/YouTubeAndMusicSettings.java
new file mode 100644
index 0000000000..221ce00456
--- /dev/null
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/YouTubeAndMusicSettings.java
@@ -0,0 +1,14 @@
+package app.revanced.extension.shared.settings;
+
+import static app.revanced.extension.shared.settings.Setting.parent;
+import static java.lang.Boolean.FALSE;
+
+public class YouTubeAndMusicSettings extends BaseSettings {
+ // 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));
+
+ // Miscellaneous
+ public static final BooleanSetting DEBUG_PROTOCOLBUFFER = new BooleanSetting("revanced_debug_protocolbuffer", FALSE, false,
+ "revanced_debug_protocolbuffer_user_dialog_message", parent(BaseSettings.DEBUG));
+}
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/AbstractPreferenceFragment.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/AbstractPreferenceFragment.java
index 6e0e8957b9..a515471a00 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/AbstractPreferenceFragment.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/AbstractPreferenceFragment.java
@@ -23,6 +23,7 @@ import androidx.annotation.Nullable;
import java.util.Objects;
import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.ResourceType;
import app.revanced.extension.shared.Utils;
import app.revanced.extension.shared.settings.BaseSettings;
import app.revanced.extension.shared.settings.BooleanSetting;
@@ -103,10 +104,16 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
* so all app specific {@link Setting} instances are loaded before this method returns.
*/
protected void initialize() {
- String preferenceResourceName = BaseSettings.SHOW_MENU_ICONS.get()
- ? "revanced_prefs_icons"
- : "revanced_prefs";
- final var identifier = Utils.getResourceIdentifier(preferenceResourceName, "xml");
+ String preferenceResourceName;
+ if (BaseSettings.SHOW_MENU_ICONS.get()) {
+ preferenceResourceName = Utils.appIsUsingBoldIcons()
+ ? "revanced_prefs_icons_bold"
+ : "revanced_prefs_icons";
+ } else {
+ preferenceResourceName = "revanced_prefs";
+ }
+
+ final var identifier = Utils.getResourceIdentifier(ResourceType.XML, preferenceResourceName);
if (identifier == 0) return;
addPreferencesFromResource(identifier);
@@ -201,7 +208,7 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
private void updatePreferenceScreen(@NonNull PreferenceGroup group,
boolean syncSettingValue,
boolean applySettingToPreference) {
- // Alternatively this could iterate thru all Settings and check for any matching Preferences,
+ // Alternatively this could iterate through all Settings and check for any matching Preferences,
// but there are many more Settings than UI preferences so it's more efficient to only check
// the Preferences.
for (int i = 0, prefCount = group.getPreferenceCount(); i < prefCount; i++) {
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ColorPickerPreference.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ColorPickerPreference.java
index e3d6abee25..c9fc7b6da9 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ColorPickerPreference.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ColorPickerPreference.java
@@ -31,6 +31,7 @@ import java.util.Locale;
import java.util.regex.Pattern;
import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.ResourceType;
import app.revanced.extension.shared.Utils;
import app.revanced.extension.shared.settings.Setting;
import app.revanced.extension.shared.settings.StringSetting;
@@ -81,13 +82,13 @@ public class ColorPickerPreference extends EditTextPreference {
private boolean opacitySliderEnabled = false;
public static final int ID_REVANCED_COLOR_PICKER_VIEW =
- getResourceIdentifierOrThrow("revanced_color_picker_view", "id");
+ getResourceIdentifierOrThrow(ResourceType.ID, "revanced_color_picker_view");
public static final int ID_PREFERENCE_COLOR_DOT =
- getResourceIdentifierOrThrow("preference_color_dot", "id");
+ getResourceIdentifierOrThrow(ResourceType.ID, "preference_color_dot");
public static final int LAYOUT_REVANCED_COLOR_DOT_WIDGET =
- getResourceIdentifierOrThrow("revanced_color_dot_widget", "layout");
+ getResourceIdentifierOrThrow(ResourceType.LAYOUT, "revanced_color_dot_widget");
public static final int LAYOUT_REVANCED_COLOR_PICKER =
- getResourceIdentifierOrThrow("revanced_color_picker", "layout");
+ getResourceIdentifierOrThrow(ResourceType.LAYOUT, "revanced_color_picker");
/**
* Removes non valid hex characters, converts to all uppercase,
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/CustomDialogListPreference.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/CustomDialogListPreference.java
index ff728838b7..48c50c1f33 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/CustomDialogListPreference.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/CustomDialogListPreference.java
@@ -20,6 +20,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import app.revanced.extension.shared.ResourceType;
import app.revanced.extension.shared.Utils;
import app.revanced.extension.shared.ui.CustomDialog;
@@ -30,14 +31,18 @@ import app.revanced.extension.shared.ui.CustomDialog;
@SuppressWarnings({"unused", "deprecation"})
public class CustomDialogListPreference extends ListPreference {
- public static final int ID_REVANCED_CHECK_ICON =
- getResourceIdentifierOrThrow("revanced_check_icon", "id");
- public static final int ID_REVANCED_CHECK_ICON_PLACEHOLDER =
- getResourceIdentifierOrThrow("revanced_check_icon_placeholder", "id");
- public static final int ID_REVANCED_ITEM_TEXT =
- getResourceIdentifierOrThrow("revanced_item_text", "id");
- public static final int LAYOUT_REVANCED_CUSTOM_LIST_ITEM_CHECKED =
- getResourceIdentifierOrThrow("revanced_custom_list_item_checked", "layout");
+ public static final int ID_REVANCED_CHECK_ICON = getResourceIdentifierOrThrow(
+ ResourceType.ID, "revanced_check_icon");
+ public static final int ID_REVANCED_CHECK_ICON_PLACEHOLDER = getResourceIdentifierOrThrow(
+ ResourceType.ID, "revanced_check_icon_placeholder");
+ public static final int ID_REVANCED_ITEM_TEXT = getResourceIdentifierOrThrow(
+ ResourceType.ID, "revanced_item_text");
+ public static final int LAYOUT_REVANCED_CUSTOM_LIST_ITEM_CHECKED = getResourceIdentifierOrThrow(
+ ResourceType.LAYOUT, "revanced_custom_list_item_checked");
+ public static final int DRAWABLE_CHECKMARK = getResourceIdentifierOrThrow(
+ ResourceType.DRAWABLE, "revanced_settings_custom_checkmark");
+ public static final int DRAWABLE_CHECKMARK_BOLD = getResourceIdentifierOrThrow(
+ ResourceType.DRAWABLE, "revanced_settings_custom_checkmark_bold");
private String staticSummary = null;
private CharSequence[] highlightedEntriesForDialog = null;
@@ -125,9 +130,13 @@ public class CustomDialogListPreference extends ListPreference {
LayoutInflater inflater = LayoutInflater.from(getContext());
view = inflater.inflate(layoutResourceId, parent, false);
holder = new SubViewDataContainer();
- holder.checkIcon = view.findViewById(ID_REVANCED_CHECK_ICON);
holder.placeholder = view.findViewById(ID_REVANCED_CHECK_ICON_PLACEHOLDER);
holder.itemText = view.findViewById(ID_REVANCED_ITEM_TEXT);
+ holder.checkIcon = view.findViewById(ID_REVANCED_CHECK_ICON);
+ holder.checkIcon.setImageResource(Utils.appIsUsingBoldIcons()
+ ? DRAWABLE_CHECKMARK_BOLD
+ : DRAWABLE_CHECKMARK
+ );
view.setTag(holder);
} else {
holder = (SubViewDataContainer) view.getTag();
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/FeatureFlagsManagerPreference.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/FeatureFlagsManagerPreference.java
index 1ada6584ac..4e6d2e5cdd 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/FeatureFlagsManagerPreference.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/FeatureFlagsManagerPreference.java
@@ -38,6 +38,7 @@ import java.util.Set;
import java.util.TreeSet;
import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.ResourceType;
import app.revanced.extension.shared.Utils;
import app.revanced.extension.shared.patches.EnableDebuggingPatch;
import app.revanced.extension.shared.settings.BaseSettings;
@@ -52,25 +53,26 @@ import app.revanced.extension.shared.ui.Dim;
public class FeatureFlagsManagerPreference extends Preference {
private static final int DRAWABLE_REVANCED_SETTINGS_SELECT_ALL =
- getResourceIdentifierOrThrow("revanced_settings_select_all", "drawable");
+ getResourceIdentifierOrThrow(ResourceType.DRAWABLE, "revanced_settings_select_all");
private static final int DRAWABLE_REVANCED_SETTINGS_DESELECT_ALL =
- getResourceIdentifierOrThrow("revanced_settings_deselect_all", "drawable");
+ getResourceIdentifierOrThrow(ResourceType.DRAWABLE, "revanced_settings_deselect_all");
private static final int DRAWABLE_REVANCED_SETTINGS_COPY_ALL =
- getResourceIdentifierOrThrow("revanced_settings_copy_all", "drawable");
+ getResourceIdentifierOrThrow(ResourceType.DRAWABLE, "revanced_settings_copy_all");
private static final int DRAWABLE_REVANCED_SETTINGS_ARROW_RIGHT_ONE =
- getResourceIdentifierOrThrow("revanced_settings_arrow_right_one", "drawable");
+ getResourceIdentifierOrThrow(ResourceType.DRAWABLE, "revanced_settings_arrow_right_one");
private static final int DRAWABLE_REVANCED_SETTINGS_ARROW_RIGHT_DOUBLE =
- getResourceIdentifierOrThrow("revanced_settings_arrow_right_double", "drawable");
+ getResourceIdentifierOrThrow(ResourceType.DRAWABLE, "revanced_settings_arrow_right_double");
private static final int DRAWABLE_REVANCED_SETTINGS_ARROW_LEFT_ONE =
- getResourceIdentifierOrThrow("revanced_settings_arrow_left_one", "drawable");
+ getResourceIdentifierOrThrow(ResourceType.DRAWABLE, "revanced_settings_arrow_left_one");
private static final int DRAWABLE_REVANCED_SETTINGS_ARROW_LEFT_DOUBLE =
- getResourceIdentifierOrThrow("revanced_settings_arrow_left_double", "drawable");
+ getResourceIdentifierOrThrow(ResourceType.DRAWABLE, "revanced_settings_arrow_left_double");
/**
* Flags to hide from the UI.
*/
private static final Set FLAGS_TO_IGNORE = Set.of(
- 45386834L // 'You' tab settings icon.
+ 45386834L, // 'You' tab settings icon.
+ 45532100L // Cairo flag. Turning this off with all other flags causes the settings menu to be a mix of old/new.
);
/**
@@ -129,9 +131,10 @@ public class FeatureFlagsManagerPreference extends Preference {
disabledFlags.removeAll(FLAGS_TO_IGNORE);
if (allKnownFlags.isEmpty() && disabledFlags.isEmpty()) {
- // String does not need to be localized because it's basically impossible
- // to reach the settings menu without encountering at least 1 flag.
- Utils.showToastShort("No feature flags logged yet");
+ // It's impossible to reach the settings menu without reaching at least one flag.
+ // So if theres no flags, then that means the user has just enabled debugging
+ // but has not restarted the app yet.
+ Utils.showToastShort(str("revanced_debug_feature_flags_manager_toast_no_flags"));
return;
}
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/SharedPrefCategory.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/SharedPrefCategory.java
index 4e9c1f2e0b..ed5db6b235 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/SharedPrefCategory.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/SharedPrefCategory.java
@@ -36,18 +36,18 @@ public class SharedPrefCategory {
}
private void saveObjectAsString(@NonNull String key, @Nullable Object value) {
- preferences.edit().putString(key, (value == null ? null : value.toString())).apply();
+ preferences.edit().putString(key, (value == null ? null : value.toString())).commit();
}
/**
* Removes any preference data type that has the specified key.
*/
public void removeKey(@NonNull String key) {
- preferences.edit().remove(Objects.requireNonNull(key)).apply();
+ preferences.edit().remove(Objects.requireNonNull(key)).commit();
}
public void saveBoolean(@NonNull String key, boolean value) {
- preferences.edit().putBoolean(key, value).apply();
+ preferences.edit().putBoolean(key, value).commit();
}
/**
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ToolbarPreferenceFragment.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ToolbarPreferenceFragment.java
index 5c595a97ae..8b1d8b882d 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ToolbarPreferenceFragment.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ToolbarPreferenceFragment.java
@@ -15,13 +15,16 @@ import android.widget.TextView;
import android.widget.Toolbar;
import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.ResourceType;
import app.revanced.extension.shared.Utils;
import app.revanced.extension.shared.settings.BaseActivityHook;
import app.revanced.extension.shared.ui.Dim;
-@SuppressWarnings({"deprecation", "NewApi"})
+@SuppressWarnings("deprecation")
+@RequiresApi(api = Build.VERSION_CODES.O)
public class ToolbarPreferenceFragment extends AbstractPreferenceFragment {
/**
@@ -133,8 +136,10 @@ public class ToolbarPreferenceFragment extends AbstractPreferenceFragment {
*/
@SuppressLint("UseCompatLoadingForDrawables")
public static Drawable getBackButtonDrawable() {
- final int backButtonResource = Utils.getResourceIdentifierOrThrow(
- "revanced_settings_toolbar_arrow_left", "drawable");
+ final int backButtonResource = Utils.getResourceIdentifierOrThrow(ResourceType.DRAWABLE,
+ Utils.appIsUsingBoldIcons()
+ ? "revanced_settings_toolbar_arrow_left_bold"
+ : "revanced_settings_toolbar_arrow_left");
Drawable drawable = Utils.getContext().getResources().getDrawable(backButtonResource);
customizeBackButtonDrawable(drawable);
return drawable;
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/UrlLinkPreference.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/URLLinkPreference.java
similarity index 65%
rename from extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/UrlLinkPreference.java
rename to extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/URLLinkPreference.java
index 8b9a76f039..59f3077ceb 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/UrlLinkPreference.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/URLLinkPreference.java
@@ -9,36 +9,36 @@ import android.util.AttributeSet;
import app.revanced.extension.shared.Logger;
/**
- * Simple preference that opens a url when clicked.
+ * Simple preference that opens a URL when clicked.
*/
@SuppressWarnings("deprecation")
-public class UrlLinkPreference extends Preference {
+public class URLLinkPreference extends Preference {
- protected String externalUrl;
+ protected String externalURL;
{
setOnPreferenceClickListener(pref -> {
- if (externalUrl == null) {
+ if (externalURL == null) {
Logger.printException(() -> "URL not set " + getClass().getSimpleName());
return false;
}
Intent i = new Intent(Intent.ACTION_VIEW);
- i.setData(Uri.parse(externalUrl));
+ i.setData(Uri.parse(externalURL));
pref.getContext().startActivity(i);
return true;
});
}
- public UrlLinkPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+ public URLLinkPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
}
- public UrlLinkPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+ public URLLinkPreference(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
}
- public UrlLinkPreference(Context context, AttributeSet attrs) {
+ public URLLinkPreference(Context context, AttributeSet attrs) {
super(context, attrs);
}
- public UrlLinkPreference(Context context) {
+ public URLLinkPreference(Context context) {
super(context);
}
}
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/BaseSearchResultItem.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/BaseSearchResultItem.java
index ab1e2ee6c1..95731418d2 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/BaseSearchResultItem.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/BaseSearchResultItem.java
@@ -16,10 +16,11 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import app.revanced.extension.shared.ResourceType;
import app.revanced.extension.shared.Utils;
import app.revanced.extension.shared.settings.preference.ColorPickerPreference;
import app.revanced.extension.shared.settings.preference.CustomDialogListPreference;
-import app.revanced.extension.shared.settings.preference.UrlLinkPreference;
+import app.revanced.extension.shared.settings.preference.URLLinkPreference;
/**
* Abstract base class for search result items, defining common fields and behavior.
@@ -38,18 +39,18 @@ public abstract class BaseSearchResultItem {
// Get the corresponding layout resource ID.
public int getLayoutResourceId() {
return switch (this) {
- case REGULAR, URL_LINK -> getResourceIdentifier("revanced_preference_search_result_regular");
- case SWITCH -> getResourceIdentifier("revanced_preference_search_result_switch");
- case LIST -> getResourceIdentifier("revanced_preference_search_result_list");
- case COLOR_PICKER -> getResourceIdentifier("revanced_preference_search_result_color");
- case GROUP_HEADER -> getResourceIdentifier("revanced_preference_search_result_group_header");
- case NO_RESULTS -> getResourceIdentifier("revanced_preference_search_no_result");
+ case REGULAR, URL_LINK -> getResourceIdentifier("revanced_preference_search_result_regular");
+ case SWITCH -> getResourceIdentifier("revanced_preference_search_result_switch");
+ case LIST -> getResourceIdentifier("revanced_preference_search_result_list");
+ case COLOR_PICKER -> getResourceIdentifier("revanced_preference_search_result_color");
+ case GROUP_HEADER -> getResourceIdentifier("revanced_preference_search_result_group_header");
+ case NO_RESULTS -> getResourceIdentifier("revanced_preference_search_no_result");
};
}
private static int getResourceIdentifier(String name) {
// Placeholder for actual resource identifier retrieval.
- return Utils.getResourceIdentifierOrThrow(name, "layout");
+ return Utils.getResourceIdentifierOrThrow(ResourceType.LAYOUT, name);
}
}
@@ -166,7 +167,7 @@ public abstract class BaseSearchResultItem {
if (pref instanceof SwitchPreference) return ViewType.SWITCH;
if (pref instanceof ListPreference) return ViewType.LIST;
if (pref instanceof ColorPickerPreference) return ViewType.COLOR_PICKER;
- if (pref instanceof UrlLinkPreference) return ViewType.URL_LINK;
+ if (pref instanceof URLLinkPreference) return ViewType.URL_LINK;
if ("no_results_placeholder".equals(pref.getKey())) return ViewType.NO_RESULTS;
return ViewType.REGULAR;
}
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/BaseSearchResultsAdapter.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/BaseSearchResultsAdapter.java
index cb5e792e83..04d69c6b6b 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/BaseSearchResultsAdapter.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/BaseSearchResultsAdapter.java
@@ -1,7 +1,6 @@
package app.revanced.extension.shared.settings.search;
import static app.revanced.extension.shared.Utils.getResourceIdentifierOrThrow;
-import static app.revanced.extension.shared.settings.search.BaseSearchViewController.DRAWABLE_REVANCED_SETTINGS_SEARCH_ICON;
import android.animation.AnimatorSet;
import android.animation.ArgbEvaluator;
@@ -33,10 +32,11 @@ import java.lang.reflect.Method;
import java.util.List;
import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.ResourceType;
import app.revanced.extension.shared.Utils;
import app.revanced.extension.shared.settings.preference.ColorPickerPreference;
import app.revanced.extension.shared.settings.preference.CustomDialogListPreference;
-import app.revanced.extension.shared.settings.preference.UrlLinkPreference;
+import app.revanced.extension.shared.settings.preference.URLLinkPreference;
import app.revanced.extension.shared.ui.ColorDot;
/**
@@ -54,15 +54,15 @@ public abstract class BaseSearchResultsAdapter extends ArrayAdapter searchHistory;
private final Activity activity;
@@ -97,7 +109,8 @@ public class SearchHistoryManager {
// Inflate search history layout.
LayoutInflater inflater = LayoutInflater.from(activity);
- View historyView = inflater.inflate(LAYOUT_REVANCED_PREFERENCE_SEARCH_HISTORY_SCREEN, searchHistoryContainer, false);
+ View historyView = inflater.inflate(LAYOUT_REVANCED_PREFERENCE_SEARCH_HISTORY_SCREEN,
+ searchHistoryContainer, false);
searchHistoryContainer.addView(historyView, new FrameLayout.LayoutParams(
FrameLayout.LayoutParams.MATCH_PARENT,
FrameLayout.LayoutParams.MATCH_PARENT));
@@ -320,17 +333,29 @@ public class SearchHistoryManager {
public void notifyDataSetChanged() {
container.removeAllViews();
for (String query : history) {
- View view = inflater.inflate(LAYOUT_REVANCED_PREFERENCE_SEARCH_HISTORY_ITEM, container, false);
-
- TextView historyText = view.findViewById(ID_HISTORY_TEXT);
- ImageView deleteIcon = view.findViewById(ID_DELETE_ICON);
-
- historyText.setText(query);
-
+ View view = inflater.inflate(LAYOUT_REVANCED_PREFERENCE_SEARCH_HISTORY_ITEM,
+ container, false);
// Set click listener for main item (select query).
view.setOnClickListener(v -> onSelectHistoryItemListener.onSelectHistoryItem(query));
+ // Set history icon.
+ ImageView historyIcon = view.findViewById(ID_HISTORY_ICON);
+ historyIcon.setImageResource(Utils.appIsUsingBoldIcons()
+ ? ID_SEARCH_ARROW_TIME_ICON_BOLD
+ : ID_SEARCH_ARROW_TIME_ICON
+ );
+
+ TextView historyText = view.findViewById(ID_HISTORY_TEXT);
+ historyText.setText(query);
+
// Set click listener for delete icon.
+ ImageView deleteIcon = view.findViewById(ID_DELETE_ICON);
+
+ deleteIcon.setImageResource(Utils.appIsUsingBoldIcons()
+ ? ID_SEARCH_REMOVE_ICON_BOLD
+ : ID_SEARCH_REMOVE_ICON
+ );
+
deleteIcon.setOnClickListener(v -> createAndShowDialog(
query,
str("revanced_settings_search_remove_message"),
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/ClientType.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/ClientType.java
index 39076b562d..9abd430719 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/ClientType.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/ClientType.java
@@ -9,9 +9,34 @@ import java.util.Locale;
import java.util.Objects;
import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
@SuppressWarnings("ConstantLocale")
public enum ClientType {
+ /**
+ * Video not playable: Paid, Movie, Private, Age-restricted.
+ * Uses non-adaptive bitrate.
+ * AV1 codec available.
+ */
+ ANDROID_REEL(
+ 3,
+ "ANDROID",
+ "com.google.android.youtube",
+ Build.MANUFACTURER,
+ Build.MODEL,
+ "Android",
+ Build.VERSION.RELEASE,
+ String.valueOf(Build.VERSION.SDK_INT),
+ Build.ID,
+ "20.44.38",
+ // This client has been used by most open-source YouTube stream extraction tools since 2024, including NewPipe Extractor, SmartTube, and Grayjay.
+ // This client can log in, but if an access token is used in the request, GVS can more easily identify the request as coming from ReVanced.
+ // This means that the GVS server can strengthen its validation of the ANDROID_REEL client.
+ true,
+ true,
+ false,
+ "Android Reel"
+ ),
/**
* Video not playable: Kids / Paid / Movie / Private / Age-restricted.
* This client can only be used when logged out.
@@ -28,10 +53,10 @@ public enum ClientType {
// Android 12.1
"32",
"SQ3A.220605.009.A1",
- "132.0.6808.3",
"1.61.48",
false,
false,
+ true,
"Android VR 1.61"
),
/**
@@ -48,39 +73,12 @@ public enum ClientType {
ANDROID_VR_1_61_48.osVersion,
Objects.requireNonNull(ANDROID_VR_1_61_48.androidSdkVersion),
Objects.requireNonNull(ANDROID_VR_1_61_48.buildId),
- "107.0.5284.2",
"1.43.32",
ANDROID_VR_1_61_48.useAuth,
ANDROID_VR_1_61_48.supportsMultiAudioTracks,
+ ANDROID_VR_1_61_48.usePlayerEndpoint,
"Android VR 1.43"
),
- /**
- * Video not playable: Paid / Movie / Private / Age-restricted.
- * Note: The 'Authorization' key must be excluded from the header.
- *
- * According to TeamNewPipe in 2022, if the 'androidSdkVersion' field is missing,
- * the GVS did not return a valid response:
- * [NewPipe#8713 (comment)](https://github.com/TeamNewPipe/NewPipe/issues/8713#issuecomment-1207443550).
- *
- * According to the latest commit in yt-dlp, the GVS returns a valid response
- * even if the 'androidSdkVersion' field is missing:
- * [yt-dlp#14693](https://github.com/yt-dlp/yt-dlp/pull/14693).
- *
- * For some reason, PoToken is not required.
- */
- ANDROID_NO_SDK(
- 3,
- "ANDROID",
- "",
- "",
- "",
- Build.VERSION.RELEASE,
- "20.05.46",
- "com.google.android.youtube/20.05.46 (Linux; U; Android " + Build.VERSION.RELEASE + ") gzip",
- false,
- true,
- "Android No SDK"
- ),
/**
* Cannot play livestreams and lacks HDR, but can play videos with music and labeled "for children".
* Google Pixel 9 Pro Fold
@@ -95,10 +93,10 @@ public enum ClientType {
"15",
"35",
"AP3A.241005.015.A2",
- "132.0.6779.0",
"23.47.101",
true,
false,
+ true,
"Android Studio"
),
/**
@@ -114,32 +112,8 @@ public enum ClientType {
"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Safari/605.1.15",
false,
false,
- "visionOS"
- ),
- /**
- * The device machine id for the iPad 6th Gen (iPad7,6).
- * AV1 hardware decoding is not supported.
- * See [this GitHub Gist](https://gist.github.com/adamawolf/3048717) for more information.
- *
- * Based on Google's actions to date, PoToken may not be required on devices with very low specs.
- * For example, suppose the User-Agent for a PlayStation 3 (with 256MB of RAM) is used.
- * Accessing 'Web' (https://www.youtube.com) will redirect to 'TV' (https://www.youtube.com/tv).
- * 'TV' target devices with very low specs, such as embedded devices, game consoles, and blu-ray players, so PoToken is not required.
- *
- * For this reason, the device machine id for the iPad 6th Gen (with 2GB of RAM),
- * the lowest spec device capable of running iPadOS 17, was used.
- */
- IPADOS(5,
- "IOS",
- "Apple",
- "iPad7,6",
- "iPadOS",
- "17.7.10.21H450",
- "19.22.3",
- "com.google.ios.youtube/19.22.3 (iPad7,6; U; CPU iPadOS 17_7_10 like Mac OS X; " + Locale.getDefault() + ")",
- false,
true,
- "iPadOS"
+ "visionOS"
);
/**
@@ -195,13 +169,6 @@ public enum ClientType {
@Nullable
private final String buildId;
- /**
- * Cronet release version, as found in decompiled client apk.
- * Field is null if not applicable.
- */
- @Nullable
- private final String cronetVersion;
-
/**
* App version.
*/
@@ -217,6 +184,11 @@ public enum ClientType {
*/
public final boolean supportsMultiAudioTracks;
+ /**
+ * If the client should use the player endpoint for stream extraction.
+ */
+ public final boolean usePlayerEndpoint;
+
/**
* Friendly name displayed in stats for nerds.
*/
@@ -234,10 +206,10 @@ public enum ClientType {
String osVersion,
@NonNull String androidSdkVersion,
@NonNull String buildId,
- @NonNull String cronetVersion,
String clientVersion,
boolean useAuth,
boolean supportsMultiAudioTracks,
+ boolean usePlayerEndpoint,
String friendlyName) {
this.id = id;
this.clientName = clientName;
@@ -248,21 +220,20 @@ public enum ClientType {
this.osVersion = osVersion;
this.androidSdkVersion = androidSdkVersion;
this.buildId = buildId;
- this.cronetVersion = cronetVersion;
this.clientVersion = clientVersion;
this.useAuth = useAuth;
this.supportsMultiAudioTracks = supportsMultiAudioTracks;
+ this.usePlayerEndpoint = usePlayerEndpoint;
this.friendlyName = friendlyName;
Locale defaultLocale = Locale.getDefault();
- this.userAgent = String.format("%s/%s (Linux; U; Android %s; %s; %s; Build/%s; Cronet/%s)",
+ this.userAgent = String.format("%s/%s (Linux; U; Android %s; %s; %s; Build/%s)",
packageName,
clientVersion,
osVersion,
defaultLocale,
deviceModel,
- Objects.requireNonNull(buildId),
- Objects.requireNonNull(cronetVersion)
+ buildId
);
Logger.printDebug(() -> "userAgent: " + this.userAgent);
}
@@ -278,6 +249,7 @@ public enum ClientType {
String userAgent,
boolean useAuth,
boolean supportsMultiAudioTracks,
+ boolean usePlayerEndpoint,
String friendlyName) {
this.id = id;
this.clientName = clientName;
@@ -289,10 +261,10 @@ public enum ClientType {
this.userAgent = userAgent;
this.useAuth = useAuth;
this.supportsMultiAudioTracks = supportsMultiAudioTracks;
+ this.usePlayerEndpoint = usePlayerEndpoint;
this.friendlyName = friendlyName;
this.packageName = null;
this.androidSdkVersion = null;
this.buildId = null;
- this.cronetVersion = null;
}
}
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/SpoofVideoStreamsPatch.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/SpoofVideoStreamsPatch.java
index 38fbac9938..0c861510fe 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/SpoofVideoStreamsPatch.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/SpoofVideoStreamsPatch.java
@@ -5,7 +5,6 @@ import android.text.TextUtils;
import androidx.annotation.Nullable;
-import java.nio.ByteBuffer;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -39,7 +38,7 @@ public class SpoofVideoStreamsPatch {
@Nullable
private static volatile AppLanguage languageOverride;
- private static volatile ClientType preferredClient = ClientType.ANDROID_VR_1_43_32;
+ private static volatile ClientType preferredClient = ClientType.ANDROID_REEL;
/**
* @return If this patch was included during patching.
@@ -250,7 +249,7 @@ public class SpoofVideoStreamsPatch {
* Called after {@link #fetchStreams(String, Map)}.
*/
@Nullable
- public static ByteBuffer getStreamingData(String videoId) {
+ public static byte[] getStreamingData(String videoId) {
if (SPOOF_STREAMING_DATA) {
try {
StreamingDataRequest request = StreamingDataRequest.getRequestForVideoId(videoId);
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/requests/PlayerRoutes.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/requests/PlayerRoutes.java
index 31e3f03034..959048d1e2 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/requests/PlayerRoutes.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/requests/PlayerRoutes.java
@@ -15,13 +15,20 @@ import app.revanced.extension.shared.spoof.ClientType;
import app.revanced.extension.shared.spoof.SpoofVideoStreamsPatch;
final class PlayerRoutes {
- static final Route.CompiledRoute GET_STREAMING_DATA = new Route(
+ static final Route.CompiledRoute GET_PLAYER_STREAMING_DATA = new Route(
Route.Method.POST,
"player" +
"?fields=streamingData" +
"&alt=proto"
).compile();
+ static final Route.CompiledRoute GET_REEL_STREAMING_DATA = new Route(
+ Route.Method.POST,
+ "reel/reel_item_watch" +
+ "?fields=playerResponse.playabilityStatus,playerResponse.streamingData" +
+ "&alt=proto"
+ ).compile();
+
private static final String YT_API_URL = "https://youtubei.googleapis.com/youtubei/v1/";
/**
@@ -47,6 +54,7 @@ final class PlayerRoutes {
Locale streamLocale = language.getLocale();
JSONObject client = new JSONObject();
+
client.put("deviceMake", clientType.deviceMake);
client.put("deviceModel", clientType.deviceModel);
client.put("clientName", clientType.clientName);
@@ -61,9 +69,19 @@ final class PlayerRoutes {
context.put("client", client);
innerTubeBody.put("context", context);
- innerTubeBody.put("contentCheckOk", true);
- innerTubeBody.put("racyCheckOk", true);
- innerTubeBody.put("videoId", videoId);
+
+ if (clientType.usePlayerEndpoint) {
+ innerTubeBody.put("contentCheckOk", true);
+ innerTubeBody.put("racyCheckOk", true);
+ innerTubeBody.put("videoId", videoId);
+ } else {
+ JSONObject playerRequest = new JSONObject();
+ playerRequest.put("contentCheckOk", true);
+ playerRequest.put("racyCheckOk", true);
+ playerRequest.put("videoId", videoId);
+ innerTubeBody.put("playerRequest", playerRequest);
+ innerTubeBody.put("disablePlayerResponse", false);
+ }
} catch (JSONException e) {
Logger.printException(() -> "Failed to create innerTubeBody", e);
}
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/requests/StreamingDataRequest.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/requests/StreamingDataRequest.java
index 5a4ebd1c3b..fb8a8e79e8 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/requests/StreamingDataRequest.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/requests/StreamingDataRequest.java
@@ -1,22 +1,20 @@
package app.revanced.extension.shared.spoof.requests;
import static app.revanced.extension.shared.ByteTrieSearch.convertStringsToBytes;
-import static app.revanced.extension.shared.spoof.requests.PlayerRoutes.GET_STREAMING_DATA;
+import static app.revanced.extension.shared.Utils.isNotEmpty;
+import static app.revanced.extension.shared.spoof.requests.PlayerRoutes.GET_PLAYER_STREAMING_DATA;
+import static app.revanced.extension.shared.spoof.requests.PlayerRoutes.GET_REEL_STREAMING_DATA;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import java.io.BufferedInputStream;
-import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.SocketTimeoutException;
-import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collections;
-import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -28,11 +26,16 @@ import java.util.concurrent.TimeoutException;
import app.revanced.extension.shared.ByteTrieSearch;
import app.revanced.extension.shared.Logger;
import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.innertube.PlayerResponseOuterClass;
+import app.revanced.extension.shared.innertube.PlayerResponseOuterClass.PlayerResponse;
+import app.revanced.extension.shared.innertube.PlayerResponseOuterClass.StreamingData;
+import app.revanced.extension.shared.innertube.ReelItemWatchResponseOuterClass.ReelItemWatchResponse;
+import app.revanced.extension.shared.requests.Route;
import app.revanced.extension.shared.settings.BaseSettings;
import app.revanced.extension.shared.spoof.ClientType;
/**
- * Video streaming data. Fetching is tied to the behavior YT uses,
+ * Video streaming data. Fetching is tied to the behavior YT uses,
* where this class fetches the streams only when YT fetches.
*
* Effectively the cache expiration of these fetches is the same as the stock app,
@@ -42,7 +45,7 @@ import app.revanced.extension.shared.spoof.ClientType;
*/
public class StreamingDataRequest {
- private static volatile ClientType[] clientOrderToUse = ClientType.values();
+ private static volatile ClientType[] clientOrderToUse = ClientType.values();
public static void setClientOrderToUse(List availableClients, ClientType preferredClient) {
Objects.requireNonNull(preferredClient);
@@ -83,22 +86,15 @@ public class StreamingDataRequest {
*/
private static final int MAX_MILLISECONDS_TO_WAIT_FOR_FETCH = 20 * 1000;
+ /**
+ * Cache limit must be greater than the maximum number of videos open at once,
+ * which theoretically is more than 4 (3 Shorts + one regular minimized video).
+ * But instead use a much larger value, to handle if a video viewed a while ago
+ * is somehow still referenced. Each stream is a small array of Strings
+ * so memory usage is not a concern.
+ */
private static final Map cache = Collections.synchronizedMap(
- new LinkedHashMap<>(100) {
- /**
- * Cache limit must be greater than the maximum number of videos open at once,
- * which theoretically is more than 4 (3 Shorts + one regular minimized video).
- * But instead use a much larger value, to handle if a video viewed a while ago
- * is somehow still referenced. Each stream is a small array of Strings
- * so memory usage is not a concern.
- */
- private static final int CACHE_LIMIT = 50;
-
- @Override
- protected boolean removeEldestEntry(Entry eldest) {
- return size() > CACHE_LIMIT; // Evict the oldest entry if over the cache limit.
- }
- });
+ Utils.createSizeRestrictedMap(50));
/**
* Strings found in the response if the video is a livestream.
@@ -119,7 +115,7 @@ public class StreamingDataRequest {
private final String videoId;
- private final Future future;
+ private final Future future;
private StreamingDataRequest(String videoId, Map playerHeaders) {
Objects.requireNonNull(playerHeaders);
@@ -142,6 +138,12 @@ public class StreamingDataRequest {
Logger.printInfo(() -> toastMessage, ex);
}
+ private static void handleDebugToast(String toastMessage, ClientType clientType) {
+ if (BaseSettings.DEBUG.get() && BaseSettings.DEBUG_TOAST_ON_ERROR.get()) {
+ Utils.showToastShort(String.format(toastMessage, clientType));
+ }
+ }
+
@Nullable
private static HttpURLConnection send(ClientType clientType,
String videoId,
@@ -154,7 +156,10 @@ public class StreamingDataRequest {
final long startTime = System.currentTimeMillis();
try {
- HttpURLConnection connection = PlayerRoutes.getPlayerResponseConnectionFromRoute(GET_STREAMING_DATA, clientType);
+ Route.CompiledRoute route = clientType.usePlayerEndpoint ?
+ GET_PLAYER_STREAMING_DATA : GET_REEL_STREAMING_DATA;
+
+ HttpURLConnection connection = PlayerRoutes.getPlayerResponseConnectionFromRoute(route, clientType);
connection.setConnectTimeout(HTTP_TIMEOUT_MILLISECONDS);
connection.setReadTimeout(HTTP_TIMEOUT_MILLISECONDS);
@@ -211,7 +216,7 @@ public class StreamingDataRequest {
return null;
}
- private static ByteBuffer fetch(String videoId, Map playerHeaders) {
+ private static byte[] fetch(String videoId, Map playerHeaders) {
final boolean debugEnabled = BaseSettings.DEBUG.get();
// Retry with different client if empty response body is received.
@@ -222,33 +227,11 @@ public class StreamingDataRequest {
HttpURLConnection connection = send(clientType, videoId, playerHeaders, showErrorToast);
if (connection != null) {
- try {
- // gzip encoding doesn't response with content length (-1),
- // but empty response body does.
- if (connection.getContentLength() == 0) {
- if (BaseSettings.DEBUG.get() && BaseSettings.DEBUG_TOAST_ON_ERROR.get()) {
- Utils.showToastShort("Debug: Ignoring empty spoof stream client " + clientType);
- }
- } else {
- try (InputStream inputStream = new BufferedInputStream(connection.getInputStream());
- ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+ byte[] playerResponseBuffer = buildPlayerResponseBuffer(clientType, connection);
+ if (playerResponseBuffer != null) {
+ lastSpoofedClientType = clientType;
- byte[] buffer = new byte[2048];
- int bytesRead;
- while ((bytesRead = inputStream.read(buffer)) >= 0) {
- baos.write(buffer, 0, bytesRead);
- }
- if (clientType == ClientType.ANDROID_CREATOR && liveStreamBufferSearch.matches(buffer)) {
- Logger.printDebug(() -> "Skipping Android Studio as video is a livestream: " + videoId);
- } else {
- lastSpoofedClientType = clientType;
-
- return ByteBuffer.wrap(baos.toByteArray());
- }
- }
- }
- } catch (IOException ex) {
- Logger.printException(() -> "Fetch failed while processing response data", ex);
+ return playerResponseBuffer;
}
}
}
@@ -258,12 +241,61 @@ public class StreamingDataRequest {
return null;
}
+ @Nullable
+ private static byte[] buildPlayerResponseBuffer(ClientType clientType,
+ HttpURLConnection connection) {
+ // gzip encoding doesn't response with content length (-1),
+ // but empty response body does.
+ if (connection.getContentLength() == 0) {
+ handleDebugToast("Debug: Ignoring empty spoof stream client (%s)", clientType);
+ return null;
+ }
+
+ try (InputStream inputStream = connection.getInputStream()) {
+ PlayerResponse playerResponse = clientType.usePlayerEndpoint
+ ? PlayerResponse.parseFrom(inputStream)
+ : ReelItemWatchResponse.parseFrom(inputStream).getPlayerResponse();
+
+ var playabilityStatus = playerResponse.getPlayabilityStatus();
+ if (playabilityStatus.getStatus() != PlayerResponseOuterClass.Status.OK) {
+ handleDebugToast("Debug: Ignoring unplayable video (%s)", clientType);
+ String reason = playabilityStatus.getReason();
+ if (isNotEmpty(reason)) {
+ Logger.printDebug(() -> String.format("Debug: Ignoring unplayable video (%s), reason: %s", clientType, reason));
+ }
+
+ return null;
+ }
+
+ PlayerResponse.Builder responseBuilder = playerResponse.toBuilder();
+ if (!playerResponse.hasStreamingData()) {
+ handleDebugToast("Debug: Ignoring empty streaming data (%s)", clientType);
+ return null;
+ }
+
+ // Android Studio only supports the HLS protocol for live streams.
+ // HLS protocol can theoretically be played with ExoPlayer,
+ // but the related code has not yet been implemented.
+ // If DASH protocol is not available, the client will be skipped.
+ StreamingData streamingData = playerResponse.getStreamingData();
+ if (streamingData.getAdaptiveFormatsCount() == 0) {
+ handleDebugToast("Debug: Ignoring empty adaptiveFormat (%s)", clientType);
+ return null;
+ }
+
+ return responseBuilder.build().toByteArray();
+ } catch (IOException ex) {
+ Logger.printException(() -> "Failed to write player response to buffer array", ex);
+ return null;
+ }
+ }
+
public boolean fetchCompleted() {
return future.isDone();
}
@Nullable
- public ByteBuffer getStream() {
+ public byte[] getStream() {
try {
return future.get(MAX_MILLISECONDS_TO_WAIT_FOR_FETCH, TimeUnit.MILLISECONDS);
} catch (TimeoutException ex) {
diff --git a/extensions/shared/protobuf/build.gradle.kts b/extensions/shared/protobuf/build.gradle.kts
new file mode 100644
index 0000000000..be3f7f6a08
--- /dev/null
+++ b/extensions/shared/protobuf/build.gradle.kts
@@ -0,0 +1,55 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+plugins {
+ kotlin("jvm")
+ alias(libs.plugins.protobuf)
+ alias(libs.plugins.shadow)
+}
+
+val shade: Configuration by configurations.creating {
+ configurations.getByName("compileClasspath").extendsFrom(this)
+ configurations.getByName("runtimeClasspath").extendsFrom(this)
+}
+
+dependencies {
+ compileOnly(libs.annotation)
+ compileOnly(libs.okhttp)
+ shade(libs.protobuf.javalite)
+}
+
+sourceSets {
+ // Make sure generated proto sources are compiled and end up in the shaded jar
+ main {
+ java.srcDir("$buildDir/generated/source/proto/main/java")
+ }
+}
+
+protobuf {
+ protoc {
+ artifact = libs.protobuf.protoc.get().toString()
+ }
+
+ generateProtoTasks {
+ all().forEach { task ->
+ task.builtins {
+ named("java") {
+ option("lite")
+ }
+ }
+ }
+ }
+}
+
+val shadowJar = tasks.named("shadowJar") {
+ configurations = listOf(shade)
+ relocate("com.google.protobuf", "app.revanced.com.google.protobuf")
+}
+
+configurations.named("runtimeElements") {
+ isCanBeConsumed = true
+ isCanBeResolved = false
+
+ outgoing.artifacts.clear()
+ outgoing.artifact(shadowJar)
+}!!.let { artifacts { add(it.name, shadowJar) } }
+
diff --git a/extensions/shared/protobuf/src/main/proto/app/revanced/extension/shared/innertube/player_response.proto b/extensions/shared/protobuf/src/main/proto/app/revanced/extension/shared/innertube/player_response.proto
new file mode 100644
index 0000000000..29f1a6d9bd
--- /dev/null
+++ b/extensions/shared/protobuf/src/main/proto/app/revanced/extension/shared/innertube/player_response.proto
@@ -0,0 +1,42 @@
+syntax = "proto3";
+
+package app.revanced.extension.shared.innertube;
+
+option optimize_for = LITE_RUNTIME;
+option java_package = "app.revanced.extension.shared.innertube";
+
+message PlayerResponse {
+ oneof data {
+ PlayabilityStatus playability_status = 2;
+ StreamingData streaming_data = 4;
+ }
+}
+
+message PlayabilityStatus {
+ Status status = 1;
+ string reason = 2;
+}
+
+enum Status {
+ OK = 0;
+ ERROR = 1;
+ UNPLAYABLE = 2;
+ LOGIN_REQUIRED = 3;
+ CONTENT_CHECK_REQUIRED = 4;
+ AGE_CHECK_REQUIRED = 5;
+ LIVE_STREAM_OFFLINE = 6;
+ FULLSCREEN_ONLY = 7;
+ GL_PLAYBACK_REQUIRED = 8;
+ AGE_VERIFICATION_REQUIRED = 9;
+}
+
+message StreamingData {
+ repeated Format formats = 2;
+ repeated Format adaptiveFormats = 3;
+ string serverAbrStreamingUrl = 15;
+}
+
+message Format {
+ string url = 2;
+ string signatureCipher = 48;
+}
diff --git a/extensions/shared/protobuf/src/main/proto/app/revanced/extension/shared/innertube/reel_item_watch_response.proto b/extensions/shared/protobuf/src/main/proto/app/revanced/extension/shared/innertube/reel_item_watch_response.proto
new file mode 100644
index 0000000000..e74f142533
--- /dev/null
+++ b/extensions/shared/protobuf/src/main/proto/app/revanced/extension/shared/innertube/reel_item_watch_response.proto
@@ -0,0 +1,14 @@
+syntax = "proto3";
+
+import "app/revanced/extension/shared/innertube/player_response.proto";
+
+package app.revanced.extension.shared.innertube;
+
+option optimize_for = LITE_RUNTIME;
+option java_package = "app.revanced.extension.shared.innertube";
+
+message ReelItemWatchResponse {
+ oneof data {
+ PlayerResponse player_response = 4;
+ }
+}
diff --git a/extensions/spotify/build.gradle.kts b/extensions/spotify/build.gradle.kts
index fd346d93b5..69206d623a 100644
--- a/extensions/spotify/build.gradle.kts
+++ b/extensions/spotify/build.gradle.kts
@@ -1,39 +1,11 @@
-plugins {
- alias(libs.plugins.protobuf)
-}
-
dependencies {
compileOnly(project(":extensions:shared:library"))
compileOnly(project(":extensions:spotify:stub"))
compileOnly(libs.annotation)
-
- implementation(libs.nanohttpd)
- implementation(libs.protobuf.javalite)
}
android {
defaultConfig {
- minSdk = 21
- }
-
- compileOptions {
- sourceCompatibility = JavaVersion.VERSION_1_8
- targetCompatibility = JavaVersion.VERSION_1_8
- }
-}
-
-protobuf {
- protoc {
- artifact = libs.protobuf.protoc.get().toString()
- }
-
- generateProtoTasks {
- all().forEach { task ->
- task.builtins {
- create("java") {
- option("lite")
- }
- }
- }
+ minSdk = 24
}
}
diff --git a/extensions/spotify/src/main/java/app/revanced/extension/spotify/layout/hide/createbutton/HideCreateButtonPatch.java b/extensions/spotify/src/main/java/app/revanced/extension/spotify/layout/hide/createbutton/HideCreateButtonPatch.java
index 47cfdf0858..29a1cc4729 100644
--- a/extensions/spotify/src/main/java/app/revanced/extension/spotify/layout/hide/createbutton/HideCreateButtonPatch.java
+++ b/extensions/spotify/src/main/java/app/revanced/extension/spotify/layout/hide/createbutton/HideCreateButtonPatch.java
@@ -1,6 +1,7 @@
package app.revanced.extension.spotify.layout.hide.createbutton;
import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.ResourceType;
import app.revanced.extension.spotify.shared.ComponentFilters.ComponentFilter;
import app.revanced.extension.spotify.shared.ComponentFilters.ResourceIdComponentFilter;
import app.revanced.extension.spotify.shared.ComponentFilters.StringComponentFilter;
@@ -16,7 +17,7 @@ public final class HideCreateButtonPatch {
* The main approach used is matching the resource id for the Create button title.
*/
private static final List CREATE_BUTTON_COMPONENT_FILTERS = List.of(
- new ResourceIdComponentFilter("navigationbar_musicappitems_create_title", "string"),
+ new ResourceIdComponentFilter(ResourceType.STRING, "navigationbar_musicappitems_create_title"),
// Temporary fallback and fix for APKs merged with AntiSplit-M not having resources properly encoded,
// and thus getting the resource identifier for the Create button title always return 0.
// FIXME: Remove this once the above issue is no longer relevant.
@@ -28,7 +29,7 @@ public final class HideCreateButtonPatch {
* Used in older versions of the app.
*/
private static final ResourceIdComponentFilter OLD_CREATE_BUTTON_COMPONENT_FILTER =
- new ResourceIdComponentFilter("bottom_navigation_bar_create_tab_title", "string");
+ new ResourceIdComponentFilter(ResourceType.STRING, "bottom_navigation_bar_create_tab_title");
/**
* Injection point. This method is called on every navigation bar item to check whether it is the Create button.
diff --git a/extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/fix/ClientTokenService.java b/extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/fix/ClientTokenService.java
deleted file mode 100644
index 0345b19ef6..0000000000
--- a/extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/fix/ClientTokenService.java
+++ /dev/null
@@ -1,115 +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.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;
- }
-}
diff --git a/extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/fix/Constants.java b/extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/fix/Constants.java
deleted file mode 100644
index 4928da7adc..0000000000
--- a/extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/fix/Constants.java
+++ /dev/null
@@ -1,26 +0,0 @@
-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 "";
- }
-}
diff --git a/extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/fix/RequestListener.java b/extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/fix/RequestListener.java
deleted file mode 100644
index 2de6caa3ee..0000000000
--- a/extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/fix/RequestListener.java
+++ /dev/null
@@ -1,94 +0,0 @@
-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);
- }
-}
diff --git a/extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/fix/SpoofClientPatch.java b/extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/fix/SpoofClientPatch.java
deleted file mode 100644
index fee58b26c0..0000000000
--- a/extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/fix/SpoofClientPatch.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package app.revanced.extension.spotify.misc.fix;
-
-import app.revanced.extension.shared.Logger;
-
-@SuppressWarnings("unused")
-public class SpoofClientPatch {
- private static RequestListener listener;
-
- /**
- * Injection point. Launch requests listener server.
- */
- public synchronized static void launchListener(int port) {
- if (listener != null) {
- Logger.printInfo(() -> "Listener already running on port " + port);
- return;
- }
-
- try {
- Logger.printInfo(() -> "Launching listener on port " + port);
- listener = new RequestListener(port);
- } catch (Exception ex) {
- Logger.printException(() -> "launchListener failure", ex);
- }
- }
-}
diff --git a/extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/privacy/SanitizeSharingLinksPatch.java b/extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/privacy/SanitizeSharingLinksPatch.java
index 61cb977a2f..9124b2f36f 100644
--- a/extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/privacy/SanitizeSharingLinksPatch.java
+++ b/extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/privacy/SanitizeSharingLinksPatch.java
@@ -14,6 +14,6 @@ public final class SanitizeSharingLinksPatch {
* Injection point.
*/
public static String sanitizeSharingLink(String url) {
- return sanitizer.sanitizeUrlString(url);
+ return sanitizer.sanitizeURLString(url);
}
}
diff --git a/extensions/spotify/src/main/java/app/revanced/extension/spotify/shared/ComponentFilters.java b/extensions/spotify/src/main/java/app/revanced/extension/spotify/shared/ComponentFilters.java
index 21f1dd3e31..599c397c90 100644
--- a/extensions/spotify/src/main/java/app/revanced/extension/spotify/shared/ComponentFilters.java
+++ b/extensions/spotify/src/main/java/app/revanced/extension/spotify/shared/ComponentFilters.java
@@ -3,6 +3,7 @@ package app.revanced.extension.spotify.shared;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.ResourceType;
import app.revanced.extension.shared.Utils;
public final class ComponentFilters {
@@ -19,21 +20,26 @@ public final class ComponentFilters {
public static final class ResourceIdComponentFilter implements ComponentFilter {
public final String resourceName;
- public final String resourceType;
+ public final ResourceType resourceType;
// Android resources are always positive, so -1 is a valid sentinel value to indicate it has not been loaded.
// 0 is returned when a resource has not been found.
private int resourceId = -1;
@Nullable
private String stringfiedResourceId;
+ @Deprecated
public ResourceIdComponentFilter(String resourceName, String resourceType) {
+ this(ResourceType.valueOf(resourceType), resourceName);
+ }
+
+ public ResourceIdComponentFilter(ResourceType resourceType, String resourceName) {
this.resourceName = resourceName;
this.resourceType = resourceType;
}
public int getResourceId() {
if (resourceId == -1) {
- resourceId = Utils.getResourceIdentifier(resourceName, resourceType);
+ resourceId = Utils.getResourceIdentifier(resourceType, resourceName);
}
return resourceId;
}
diff --git a/extensions/spotify/src/main/proto/app/revanced/extension/spotify/misc/fix/clienttoken_http.proto b/extensions/spotify/src/main/proto/app/revanced/extension/spotify/misc/fix/clienttoken_http.proto
deleted file mode 100644
index 8e7f242b76..0000000000
--- a/extensions/spotify/src/main/proto/app/revanced/extension/spotify/misc/fix/clienttoken_http.proto
+++ /dev/null
@@ -1,73 +0,0 @@
-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;
-}
diff --git a/extensions/spotify/stub/build.gradle.kts b/extensions/spotify/stub/build.gradle.kts
index e31f1e3226..51eeab78a6 100644
--- a/extensions/spotify/stub/build.gradle.kts
+++ b/extensions/spotify/stub/build.gradle.kts
@@ -7,11 +7,11 @@ android {
compileSdk = 34
defaultConfig {
- minSdk = 21
+ minSdk = 24
}
compileOptions {
- sourceCompatibility = JavaVersion.VERSION_1_8
- targetCompatibility = JavaVersion.VERSION_1_8
+ sourceCompatibility = JavaVersion.VERSION_17
+ targetCompatibility = JavaVersion.VERSION_17
}
}
diff --git a/extensions/strava/build.gradle.kts b/extensions/strava/build.gradle.kts
new file mode 100644
index 0000000000..dce8dfacac
--- /dev/null
+++ b/extensions/strava/build.gradle.kts
@@ -0,0 +1,11 @@
+dependencies {
+ compileOnly(project(":extensions:shared:library"))
+ compileOnly(project(":extensions:strava:stub"))
+ compileOnly(libs.okhttp)
+}
+
+android {
+ defaultConfig {
+ minSdk = 26
+ }
+}
diff --git a/extensions/strava/src/main/AndroidManifest.xml b/extensions/strava/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..9b65eb06cf
--- /dev/null
+++ b/extensions/strava/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+
diff --git a/extensions/strava/src/main/java/app/revanced/extension/strava/AddMediaDownloadPatch.java b/extensions/strava/src/main/java/app/revanced/extension/strava/AddMediaDownloadPatch.java
new file mode 100644
index 0000000000..f1c84e3040
--- /dev/null
+++ b/extensions/strava/src/main/java/app/revanced/extension/strava/AddMediaDownloadPatch.java
@@ -0,0 +1,214 @@
+package app.revanced.extension.strava;
+
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Environment;
+import android.provider.MediaStore;
+import android.webkit.MimeTypeMap;
+
+import app.revanced.extension.shared.ResourceType;
+import com.strava.mediamodels.data.MediaType;
+import com.strava.photos.data.Media;
+
+import okhttp3.*;
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import app.revanced.extension.shared.Utils;
+
+public final class AddMediaDownloadPatch {
+ public static final int ACTION_DOWNLOAD = -1;
+ public static final int ACTION_OPEN_LINK = -2;
+ public static final int ACTION_COPY_LINK = -3;
+
+ private static final OkHttpClient client = new OkHttpClient();
+
+ public static boolean handleAction(int actionId, Media media) {
+ String url = getUrl(media);
+ switch (actionId) {
+ case ACTION_DOWNLOAD:
+ String name = media.getId();
+ if (media.getType() == MediaType.VIDEO) {
+ downloadVideo(url, name);
+ } else {
+ downloadPhoto(url, name);
+ }
+ return true;
+ case ACTION_OPEN_LINK:
+ Utils.openLink(url);
+ return true;
+ case ACTION_COPY_LINK:
+ copyLink(url);
+ return true;
+ default:
+ return false;
+ }
+ }
+
+ public static void copyLink(CharSequence url) {
+ Utils.setClipboard(url);
+ showInfoToast("link_copied_to_clipboard", "🔗");
+ }
+
+ public static void downloadPhoto(String url, String name) {
+ showInfoToast("loading", "⏳");
+ Utils.runOnBackgroundThread(() -> {
+ try (Response response = fetch(url)) {
+ ResponseBody body = response.body();
+ String mimeType = body.contentType().toString();
+ String extension = MimeTypeMap.getSingleton().getExtensionFromMimeType(mimeType);
+ ContentResolver resolver = Utils.getContext().getContentResolver();
+ ContentValues values = new ContentValues();
+ values.put(MediaStore.Images.Media.DISPLAY_NAME, name + '.' + extension);
+ values.put(MediaStore.Images.Media.IS_PENDING, 1);
+ values.put(MediaStore.Images.Media.MIME_TYPE, mimeType);
+ values.put(MediaStore.Images.Media.RELATIVE_PATH, Environment.DIRECTORY_PICTURES + "/Strava");
+ Uri collection = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q
+ ? MediaStore.Images.Media.getContentUri(MediaStore.VOLUME_EXTERNAL)
+ : MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
+ Uri row = resolver.insert(collection, values);
+ try (OutputStream outputStream = resolver.openOutputStream(row)) {
+ transferTo(body.byteStream(), outputStream);
+ } finally {
+ values.clear();
+ values.put(MediaStore.Images.Media.IS_PENDING, 0);
+ resolver.update(row, values, null, null);
+ }
+ showInfoToast("yis_2024_local_save_image_success", "✔️");
+ } catch (IOException e) {
+ showErrorToast("download_failure", "❌", e);
+ }
+ });
+ }
+
+ /**
+ * Downloads a video in the M3U8 / HLS (HTTP Live Streaming) format.
+ */
+ public static void downloadVideo(String url, String name) {
+ // The first request yields multiple URLs with different stream options.
+ // In case of Strava, the first one is always of highest quality.
+ // Each stream can consist of multiple chunks.
+ // The second request yields the URLs of all of these chunks.
+ // Fetch all of them concurrently and pipe their streams into the file in order.
+ showInfoToast("loading", "⏳");
+ Utils.runOnBackgroundThread(() -> {
+ try {
+ String highestQualityStreamUrl;
+ try (Response response = fetch(url)) {
+ highestQualityStreamUrl = replaceFileName(url, lines(response).findFirst().get());
+ }
+ List> futures;
+ try (Response response = fetch(highestQualityStreamUrl)) {
+ futures = lines(response)
+ .map(line -> replaceFileName(highestQualityStreamUrl, line))
+ .map(chunkUrl -> Utils.submitOnBackgroundThread(() -> fetch(chunkUrl)))
+ .collect(Collectors.toList());
+ }
+ ContentResolver resolver = Utils.getContext().getContentResolver();
+ ContentValues values = new ContentValues();
+ values.put(MediaStore.Video.Media.DISPLAY_NAME, name + '.' + "mp4");
+ values.put(MediaStore.Video.Media.IS_PENDING, 1);
+ values.put(MediaStore.Video.Media.MIME_TYPE, MimeTypeMap.getSingleton().getMimeTypeFromExtension("mp4"));
+ values.put(MediaStore.Video.Media.RELATIVE_PATH, Environment.DIRECTORY_MOVIES + "/Strava");
+ Uri collection = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q
+ ? MediaStore.Video.Media.getContentUri(MediaStore.VOLUME_EXTERNAL)
+ : MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
+ Uri row = resolver.insert(collection, values);
+ try (OutputStream outputStream = resolver.openOutputStream(row)) {
+ Throwable error = null;
+ for (Future future : futures) {
+ if (error != null) {
+ if (future.cancel(true)) {
+ continue;
+ }
+ }
+ try (Response response = future.get()) {
+ if (error == null) {
+ transferTo(response.body().byteStream(), outputStream);
+ }
+ } catch (InterruptedException | IOException e) {
+ error = e;
+ } catch (ExecutionException e) {
+ error = e.getCause();
+ }
+ }
+ if (error != null) {
+ throw new IOException(error);
+ }
+ } finally {
+ values.clear();
+ values.put(MediaStore.Video.Media.IS_PENDING, 0);
+ resolver.update(row, values, null, null);
+ }
+ showInfoToast("yis_2024_local_save_video_success", "✔️");
+ } catch (IOException e) {
+ showErrorToast("download_failure", "❌", e);
+ }
+ });
+ }
+
+ private static String getUrl(Media media) {
+ return media.getType() == MediaType.VIDEO
+ ? ((Media.Video) media).getVideoUrl()
+ : media.getLargestUrl();
+ }
+
+ private static String getString(String name, String fallback) {
+ int id = Utils.getResourceIdentifier(ResourceType.STRING, name);
+ return id != 0
+ ? Utils.getResourceString(id)
+ : fallback;
+ }
+
+ private static void showInfoToast(String resourceName, String fallback) {
+ String text = getString(resourceName, fallback);
+ Utils.showToastShort(text);
+ }
+
+ private static void showErrorToast(String resourceName, String fallback, IOException exception) {
+ String text = getString(resourceName, fallback);
+ Utils.showToastLong(text + ' ' + exception.getLocalizedMessage());
+ }
+
+ private static Response fetch(String url) throws IOException {
+ Request request = new Request.Builder().url(url).build();
+ Response response = client.newCall(request).execute();
+ if (!response.isSuccessful()) {
+ throw new IOException("Got HTTP status code " + response.code());
+ }
+ return response;
+ }
+
+ /**
+ * {@code inputStream.transferTo(outputStream)} is "too new".
+ */
+ private static void transferTo(InputStream in, OutputStream out) throws IOException {
+ byte[] buffer = new byte[1024 * 8];
+ int length;
+ while ((length = in.read(buffer)) != -1) {
+ out.write(buffer, 0, length);
+ }
+ }
+
+ /**
+ * Gets all file names.
+ */
+ private static Stream lines(Response response) {
+ BufferedReader reader = new BufferedReader(response.body().charStream());
+ return reader.lines().filter(line -> !line.startsWith("#"));
+ }
+
+ private static String replaceFileName(String uri, String newName) {
+ return uri.substring(0, uri.lastIndexOf('/') + 1) + newName;
+ }
+}
diff --git a/extensions/strava/src/main/java/app/revanced/extension/strava/HideDistractionsPatch.java b/extensions/strava/src/main/java/app/revanced/extension/strava/HideDistractionsPatch.java
new file mode 100644
index 0000000000..63deb93af4
--- /dev/null
+++ b/extensions/strava/src/main/java/app/revanced/extension/strava/HideDistractionsPatch.java
@@ -0,0 +1,224 @@
+package app.revanced.extension.strava;
+
+import com.strava.modularframework.data.Destination;
+import com.strava.modularframework.data.GenericLayoutModule;
+import com.strava.modularframework.data.GenericModuleField;
+import com.strava.modularframework.data.ListField;
+import com.strava.modularframework.data.ListProperties;
+import com.strava.modularframework.data.ModularComponent;
+import com.strava.modularframework.data.ModularEntry;
+import com.strava.modularframework.data.ModularEntryContainer;
+import com.strava.modularframework.data.ModularMenuItem;
+import com.strava.modularframework.data.Module;
+import com.strava.modularframework.data.MultiStateFieldDescriptor;
+import com.strava.modularframeworknetwork.ModularEntryNetworkContainer;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public class HideDistractionsPatch {
+ public static boolean upselling;
+ public static boolean promo;
+ public static boolean followSuggestions;
+ public static boolean challengeSuggestions;
+ public static boolean joinChallenge;
+ public static boolean joinClub;
+ public static boolean activityLookback;
+
+ public static List filterChildrenEntries(ModularEntry modularEntry) {
+ if (hideModularEntry(modularEntry)) {
+ return Collections.emptyList();
+ }
+ return modularEntry.getChildrenEntries$original().stream()
+ .filter(childrenEntry -> !hideModularEntry(childrenEntry))
+ .collect(Collectors.toList());
+ }
+
+ public static List filterEntries(ModularEntryContainer modularEntryContainer) {
+ if (hideModularEntryContainer(modularEntryContainer)) {
+ return Collections.emptyList();
+ }
+ return modularEntryContainer.getEntries$original().stream()
+ .filter(entry -> !hideModularEntry(entry))
+ .collect(Collectors.toList());
+ }
+
+ public static List filterEntries(ModularEntryNetworkContainer modularEntryNetworkContainer) {
+ if (hideModularEntryNetworkContainer(modularEntryNetworkContainer)) {
+ return Collections.emptyList();
+ }
+ return modularEntryNetworkContainer.getEntries$original().stream()
+ .filter(entry -> !hideModularEntry(entry))
+ .collect(Collectors.toList());
+ }
+
+ public static List filterMenuItems(ModularEntryContainer modularEntryContainer) {
+ if (hideModularEntryContainer(modularEntryContainer)) {
+ return Collections.emptyList();
+ }
+ return modularEntryContainer.getMenuItems$original().stream()
+ .filter(menuItem -> !hideModularMenuItem(menuItem))
+ .collect(Collectors.toList());
+ }
+
+ public static ListProperties filterProperties(ModularEntryContainer modularEntryContainer) {
+ if (hideModularEntryContainer(modularEntryContainer)) {
+ return null;
+ }
+ return modularEntryContainer.getProperties$original();
+ }
+
+ public static ListProperties filterProperties(ModularEntryNetworkContainer modularEntryNetworkContainer) {
+ if (hideModularEntryNetworkContainer(modularEntryNetworkContainer)) {
+ return null;
+ }
+ return modularEntryNetworkContainer.getProperties$original();
+ }
+
+ public static ListField filterField(ListProperties listProperties, String key) {
+ ListField listField = listProperties.getField$original(key);
+ if (hideListField(listField)) {
+ return null;
+ }
+ return listField;
+ }
+
+ public static List filterFields(ListField listField) {
+ if (hideListField(listField)) {
+ return null;
+ }
+ return listField.getFields$original().stream()
+ .filter(field -> !hideListField(field))
+ .collect(Collectors.toList());
+ }
+
+ public static List filterModules(ModularEntry modularEntry) {
+ if (hideModularEntry(modularEntry)) {
+ return Collections.emptyList();
+ }
+ return modularEntry.getModules$original().stream()
+ .filter(module -> !hideModule(module))
+ .collect(Collectors.toList());
+ }
+
+ public static GenericModuleField filterField(GenericLayoutModule genericLayoutModule, String key) {
+ if (hideGenericLayoutModule(genericLayoutModule)) {
+ return null;
+ }
+ GenericModuleField field = genericLayoutModule.getField$original(key);
+ if (hideGenericModuleField(field)) {
+ return null;
+ }
+ return field;
+ }
+
+ public static GenericModuleField[] filterFields(GenericLayoutModule genericLayoutModule) {
+ if (hideGenericLayoutModule(genericLayoutModule)) {
+ return new GenericModuleField[0];
+ }
+ return Arrays.stream(genericLayoutModule.getFields$original())
+ .filter(field -> !hideGenericModuleField(field))
+ .toArray(GenericModuleField[]::new);
+ }
+
+ public static GenericLayoutModule[] filterSubmodules(GenericLayoutModule genericLayoutModule) {
+ if (hideGenericLayoutModule(genericLayoutModule)) {
+ return new GenericLayoutModule[0];
+ }
+ return Arrays.stream(genericLayoutModule.getSubmodules$original())
+ .filter(submodule -> !hideGenericLayoutModule(submodule))
+ .toArray(GenericLayoutModule[]::new);
+ }
+
+ public static List filterSubmodules(ModularComponent modularComponent) {
+ if (hideByName(modularComponent.getPage()) || hideByName(modularComponent.getElement())) {
+ return Collections.emptyList();
+ }
+ return modularComponent.getSubmodules$original().stream()
+ .filter(submodule -> !hideModule(submodule))
+ .collect(Collectors.toList());
+ }
+
+ public static Map filterStateMap(MultiStateFieldDescriptor multiStateFieldDescriptor) {
+ return multiStateFieldDescriptor.getStateMap$original().entrySet().stream()
+ .filter(entry -> !hideGenericModuleField(entry.getValue()))
+ .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+ }
+
+ private static boolean hideModule(Module module) {
+ return module == null ||
+ hideByName(module.getPage()) ||
+ hideByName(module.getElement());
+ }
+
+ private static boolean hideModularEntry(ModularEntry modularEntry) {
+ return modularEntry == null ||
+ hideByName(modularEntry.getPage()) ||
+ hideByName(modularEntry.getElement()) ||
+ hideByDestination(modularEntry.getDestination());
+ }
+
+ private static boolean hideGenericLayoutModule(GenericLayoutModule genericLayoutModule) {
+ try {
+ return genericLayoutModule == null ||
+ hideByName(genericLayoutModule.getPage()) ||
+ hideByName(genericLayoutModule.getElement()) ||
+ hideByDestination(genericLayoutModule.getDestination());
+ } catch (RuntimeException getParentEntryOrThrowException) {
+ return false;
+ }
+ }
+
+ private static boolean hideListField(ListField listField) {
+ return listField == null ||
+ hideByName(listField.getElement()) ||
+ hideByDestination(listField.getDestination());
+ }
+
+ private static boolean hideGenericModuleField(GenericModuleField genericModuleField) {
+ return genericModuleField == null ||
+ hideByName(genericModuleField.getElement()) ||
+ hideByDestination(genericModuleField.getDestination());
+ }
+
+ private static boolean hideModularEntryContainer(ModularEntryContainer modularEntryContainer) {
+ return modularEntryContainer == null ||
+ hideByName(modularEntryContainer.getPage());
+ }
+
+ private static boolean hideModularEntryNetworkContainer(ModularEntryNetworkContainer modularEntryNetworkContainer) {
+ return modularEntryNetworkContainer == null ||
+ hideByName(modularEntryNetworkContainer.getPage());
+ }
+
+ private static boolean hideModularMenuItem(ModularMenuItem modularMenuItem) {
+ return modularMenuItem == null ||
+ hideByName(modularMenuItem.getElementName()) ||
+ hideByDestination(modularMenuItem.getDestination());
+ }
+
+ private static boolean hideByName(String name) {
+ return name != null && (
+ upselling && name.contains("_upsell") ||
+ promo && (name.equals("promo") || name.equals("top_of_tab_promo")) ||
+ followSuggestions && name.equals("suggested_follows") ||
+ challengeSuggestions && name.equals("suggested_challenges") ||
+ joinChallenge && name.equals("challenge") ||
+ joinClub && name.equals("club") ||
+ activityLookback && name.equals("highlighted_activity_lookback")
+ );
+ }
+
+ private static boolean hideByDestination(Destination destination) {
+ if (destination == null) {
+ return false;
+ }
+ String url = destination.getUrl();
+ return url != null && (
+ upselling && url.startsWith("strava://subscription/checkout")
+ );
+ }
+}
diff --git a/extensions/strava/stub/build.gradle.kts b/extensions/strava/stub/build.gradle.kts
new file mode 100644
index 0000000000..72184a0466
--- /dev/null
+++ b/extensions/strava/stub/build.gradle.kts
@@ -0,0 +1,12 @@
+plugins {
+ alias(libs.plugins.android.library)
+}
+
+android {
+ namespace = "app.revanced.extension"
+ compileSdk = 34
+
+ defaultConfig {
+ minSdk = 26
+ }
+}
diff --git a/extensions/strava/stub/src/main/AndroidManifest.xml b/extensions/strava/stub/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..15e7c2ae67
--- /dev/null
+++ b/extensions/strava/stub/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/extensions/strava/stub/src/main/java/com/strava/mediamodels/data/MediaContent.java b/extensions/strava/stub/src/main/java/com/strava/mediamodels/data/MediaContent.java
new file mode 100644
index 0000000000..dfd2540ddc
--- /dev/null
+++ b/extensions/strava/stub/src/main/java/com/strava/mediamodels/data/MediaContent.java
@@ -0,0 +1,15 @@
+package com.strava.mediamodels.data;
+
+import java.io.Serializable;
+
+public interface MediaContent extends Serializable {
+ String getCaption();
+
+ String getId();
+
+ String getReferenceId();
+
+ MediaType getType();
+
+ void setCaption(String caption);
+}
diff --git a/extensions/strava/stub/src/main/java/com/strava/mediamodels/data/MediaDimension.java b/extensions/strava/stub/src/main/java/com/strava/mediamodels/data/MediaDimension.java
new file mode 100644
index 0000000000..e7b7862ef4
--- /dev/null
+++ b/extensions/strava/stub/src/main/java/com/strava/mediamodels/data/MediaDimension.java
@@ -0,0 +1,44 @@
+package com.strava.mediamodels.data;
+
+import java.io.Serializable;
+
+public final class MediaDimension implements Comparable, Serializable {
+ private final int height;
+ private final int width;
+
+ public MediaDimension(int width, int height) {
+ this.width = width;
+ this.height = height;
+ }
+
+ public int getHeight() {
+ return height;
+ }
+
+ public float getHeightScale() {
+ if (width <= 0 || height <= 0) {
+ return 1f;
+ }
+ return height / width;
+ }
+
+ public int getWidth() {
+ return width;
+ }
+
+ public float getWidthScale() {
+ if (width <= 0 || height <= 0) {
+ return 1f;
+ }
+ return width / height;
+ }
+
+ public boolean isLandscape() {
+ return width > 0 && width >= height;
+ }
+
+ @Override
+ public int compareTo(MediaDimension other) {
+ return 0;
+ }
+}
diff --git a/extensions/strava/stub/src/main/java/com/strava/mediamodels/data/MediaType.java b/extensions/strava/stub/src/main/java/com/strava/mediamodels/data/MediaType.java
new file mode 100644
index 0000000000..4b93893198
--- /dev/null
+++ b/extensions/strava/stub/src/main/java/com/strava/mediamodels/data/MediaType.java
@@ -0,0 +1,16 @@
+package com.strava.mediamodels.data;
+
+public enum MediaType {
+ PHOTO(1),
+ VIDEO(2);
+
+ private final int remoteValue;
+
+ private MediaType(int remoteValue) {
+ this.remoteValue = remoteValue;
+ }
+
+ public int getRemoteValue() {
+ return remoteValue;
+ }
+}
diff --git a/extensions/strava/stub/src/main/java/com/strava/mediamodels/data/RemoteMediaContent.java b/extensions/strava/stub/src/main/java/com/strava/mediamodels/data/RemoteMediaContent.java
new file mode 100644
index 0000000000..525a2c2e23
--- /dev/null
+++ b/extensions/strava/stub/src/main/java/com/strava/mediamodels/data/RemoteMediaContent.java
@@ -0,0 +1,17 @@
+package com.strava.mediamodels.data;
+
+import java.util.SortedMap;
+
+public interface RemoteMediaContent extends MediaContent {
+ MediaDimension getLargestSize();
+
+ String getLargestUrl();
+
+ SortedMap getSizes();
+
+ String getSmallestUrl();
+
+ RemoteMediaStatus getStatus();
+
+ SortedMap getUrls();
+}
diff --git a/extensions/strava/stub/src/main/java/com/strava/mediamodels/data/RemoteMediaStatus.java b/extensions/strava/stub/src/main/java/com/strava/mediamodels/data/RemoteMediaStatus.java
new file mode 100644
index 0000000000..b60572009b
--- /dev/null
+++ b/extensions/strava/stub/src/main/java/com/strava/mediamodels/data/RemoteMediaStatus.java
@@ -0,0 +1,11 @@
+package com.strava.mediamodels.data;
+
+public enum RemoteMediaStatus {
+ NEW,
+ PENDING,
+ PROCESSED,
+ REPORTED,
+ REINSTATED,
+ DELETED,
+ FAILED
+}
diff --git a/extensions/strava/stub/src/main/java/com/strava/modularframework/data/Destination.java b/extensions/strava/stub/src/main/java/com/strava/modularframework/data/Destination.java
new file mode 100644
index 0000000000..eb46d6e514
--- /dev/null
+++ b/extensions/strava/stub/src/main/java/com/strava/modularframework/data/Destination.java
@@ -0,0 +1,7 @@
+package com.strava.modularframework.data;
+
+import java.io.Serializable;
+
+public abstract class Destination implements Serializable {
+ public abstract String getUrl();
+}
diff --git a/extensions/strava/stub/src/main/java/com/strava/modularframework/data/GenericLayoutModule.java b/extensions/strava/stub/src/main/java/com/strava/modularframework/data/GenericLayoutModule.java
new file mode 100644
index 0000000000..1b9d5afdd4
--- /dev/null
+++ b/extensions/strava/stub/src/main/java/com/strava/modularframework/data/GenericLayoutModule.java
@@ -0,0 +1,28 @@
+package com.strava.modularframework.data;
+
+import java.io.Serializable;
+
+public abstract class GenericLayoutModule implements Serializable, Module {
+ public abstract Destination getDestination();
+
+ @Override
+ public abstract String getElement();
+
+ public abstract GenericModuleField getField(String key);
+
+ // Added by patch.
+ public abstract GenericModuleField getField$original(String key);
+
+ public abstract GenericModuleField[] getFields();
+
+ // Added by patch.
+ public abstract GenericModuleField[] getFields$original();
+
+ @Override
+ public abstract String getPage();
+
+ public abstract GenericLayoutModule[] getSubmodules();
+
+ // Added by patch.
+ public abstract GenericLayoutModule[] getSubmodules$original();
+}
diff --git a/extensions/strava/stub/src/main/java/com/strava/modularframework/data/GenericModuleField.java b/extensions/strava/stub/src/main/java/com/strava/modularframework/data/GenericModuleField.java
new file mode 100644
index 0000000000..f37d004627
--- /dev/null
+++ b/extensions/strava/stub/src/main/java/com/strava/modularframework/data/GenericModuleField.java
@@ -0,0 +1,9 @@
+package com.strava.modularframework.data;
+
+import java.io.Serializable;
+
+public abstract class GenericModuleField implements Serializable {
+ public abstract Destination getDestination();
+
+ public abstract String getElement();
+}
diff --git a/extensions/strava/stub/src/main/java/com/strava/modularframework/data/ListField.java b/extensions/strava/stub/src/main/java/com/strava/modularframework/data/ListField.java
new file mode 100644
index 0000000000..f639fbd85f
--- /dev/null
+++ b/extensions/strava/stub/src/main/java/com/strava/modularframework/data/ListField.java
@@ -0,0 +1,14 @@
+package com.strava.modularframework.data;
+
+import java.util.List;
+
+public abstract class ListField {
+ public abstract Destination getDestination();
+
+ public abstract String getElement();
+
+ public abstract List getFields();
+
+ // Added by patch.
+ public abstract List getFields$original();
+}
diff --git a/extensions/strava/stub/src/main/java/com/strava/modularframework/data/ListProperties.java b/extensions/strava/stub/src/main/java/com/strava/modularframework/data/ListProperties.java
new file mode 100644
index 0000000000..1af0959ed0
--- /dev/null
+++ b/extensions/strava/stub/src/main/java/com/strava/modularframework/data/ListProperties.java
@@ -0,0 +1,8 @@
+package com.strava.modularframework.data;
+
+public abstract class ListProperties {
+ public abstract ListField getField(String key);
+
+ // Added by patch.
+ public abstract ListField getField$original(String key);
+}
diff --git a/extensions/strava/stub/src/main/java/com/strava/modularframework/data/ModularComponent.java b/extensions/strava/stub/src/main/java/com/strava/modularframework/data/ModularComponent.java
new file mode 100644
index 0000000000..f17ad55667
--- /dev/null
+++ b/extensions/strava/stub/src/main/java/com/strava/modularframework/data/ModularComponent.java
@@ -0,0 +1,16 @@
+package com.strava.modularframework.data;
+
+import java.util.List;
+
+public abstract class ModularComponent implements Module {
+ @Override
+ public abstract String getElement();
+
+ @Override
+ public abstract String getPage();
+
+ public abstract List getSubmodules();
+
+ // Added by patch.
+ public abstract List getSubmodules$original();
+}
diff --git a/extensions/strava/stub/src/main/java/com/strava/modularframework/data/ModularEntry.java b/extensions/strava/stub/src/main/java/com/strava/modularframework/data/ModularEntry.java
new file mode 100644
index 0000000000..38c51f0c22
--- /dev/null
+++ b/extensions/strava/stub/src/main/java/com/strava/modularframework/data/ModularEntry.java
@@ -0,0 +1,21 @@
+package com.strava.modularframework.data;
+
+import java.util.List;
+
+public interface ModularEntry {
+ List getChildrenEntries();
+
+ // Added by patch.
+ List getChildrenEntries$original();
+
+ Destination getDestination();
+
+ String getElement();
+
+ List getModules();
+
+ // Added by patch.
+ List getModules$original();
+
+ String getPage();
+}
diff --git a/extensions/strava/stub/src/main/java/com/strava/modularframework/data/ModularEntryContainer.java b/extensions/strava/stub/src/main/java/com/strava/modularframework/data/ModularEntryContainer.java
new file mode 100644
index 0000000000..a7c1726455
--- /dev/null
+++ b/extensions/strava/stub/src/main/java/com/strava/modularframework/data/ModularEntryContainer.java
@@ -0,0 +1,22 @@
+package com.strava.modularframework.data;
+
+import java.util.List;
+
+public abstract class ModularEntryContainer {
+ public abstract List getEntries();
+
+ // Added by patch.
+ public abstract List getEntries$original();
+
+ public abstract List getMenuItems();
+
+ // Added by patch.
+ public abstract List getMenuItems$original();
+
+ public abstract String getPage();
+
+ public abstract ListProperties getProperties();
+
+ // Added by patch.
+ public abstract ListProperties getProperties$original();
+}
diff --git a/extensions/strava/stub/src/main/java/com/strava/modularframework/data/ModularMenuItem.java b/extensions/strava/stub/src/main/java/com/strava/modularframework/data/ModularMenuItem.java
new file mode 100644
index 0000000000..67c62b99be
--- /dev/null
+++ b/extensions/strava/stub/src/main/java/com/strava/modularframework/data/ModularMenuItem.java
@@ -0,0 +1,7 @@
+package com.strava.modularframework.data;
+
+public abstract class ModularMenuItem {
+ public abstract Destination getDestination();
+
+ public abstract String getElementName();
+}
diff --git a/extensions/strava/stub/src/main/java/com/strava/modularframework/data/Module.java b/extensions/strava/stub/src/main/java/com/strava/modularframework/data/Module.java
new file mode 100644
index 0000000000..7affc68677
--- /dev/null
+++ b/extensions/strava/stub/src/main/java/com/strava/modularframework/data/Module.java
@@ -0,0 +1,7 @@
+package com.strava.modularframework.data;
+
+public interface Module {
+ String getElement();
+
+ String getPage();
+}
diff --git a/extensions/strava/stub/src/main/java/com/strava/modularframework/data/MultiStateFieldDescriptor.java b/extensions/strava/stub/src/main/java/com/strava/modularframework/data/MultiStateFieldDescriptor.java
new file mode 100644
index 0000000000..e1501d8e12
--- /dev/null
+++ b/extensions/strava/stub/src/main/java/com/strava/modularframework/data/MultiStateFieldDescriptor.java
@@ -0,0 +1,10 @@
+package com.strava.modularframework.data;
+
+import java.util.Map;
+
+public abstract class MultiStateFieldDescriptor {
+ public abstract Map getStateMap();
+
+ // Added by patch.
+ public abstract Map getStateMap$original();
+}
diff --git a/extensions/strava/stub/src/main/java/com/strava/modularframeworknetwork/ModularEntryNetworkContainer.java b/extensions/strava/stub/src/main/java/com/strava/modularframeworknetwork/ModularEntryNetworkContainer.java
new file mode 100644
index 0000000000..4ae6891305
--- /dev/null
+++ b/extensions/strava/stub/src/main/java/com/strava/modularframeworknetwork/ModularEntryNetworkContainer.java
@@ -0,0 +1,19 @@
+package com.strava.modularframeworknetwork;
+
+import com.strava.modularframework.data.ListProperties;
+import com.strava.modularframework.data.ModularEntry;
+import java.util.List;
+
+public abstract class ModularEntryNetworkContainer {
+ public abstract List getEntries();
+
+ // Added by patch.
+ public abstract List getEntries$original();
+
+ public abstract String getPage();
+
+ public abstract ListProperties getProperties();
+
+ // Added by patch.
+ public abstract ListProperties getProperties$original();
+}
diff --git a/extensions/strava/stub/src/main/java/com/strava/photos/data/Media.java b/extensions/strava/stub/src/main/java/com/strava/photos/data/Media.java
new file mode 100644
index 0000000000..cadf60c9fd
--- /dev/null
+++ b/extensions/strava/stub/src/main/java/com/strava/photos/data/Media.java
@@ -0,0 +1,287 @@
+package com.strava.photos.data;
+
+import com.strava.mediamodels.data.MediaDimension;
+import com.strava.mediamodels.data.MediaType;
+import com.strava.mediamodels.data.RemoteMediaContent;
+import com.strava.mediamodels.data.RemoteMediaStatus;
+
+import java.util.SortedMap;
+
+public abstract class Media implements RemoteMediaContent {
+ public static final class Photo extends Media {
+ private final Long activityId;
+ private final String activityName;
+ private final long athleteId;
+ private String caption;
+ private final String createdAt;
+ private final String createdAtLocal;
+ private final String cursor;
+ private final String id;
+ private final SortedMap sizes;
+ private final RemoteMediaStatus status;
+ private final String tag;
+ private final MediaType type;
+ private final SortedMap urls;
+
+ @Override
+ public Long getActivityId() {
+ return activityId;
+ }
+
+ @Override
+ public String getActivityName() {
+ return activityName;
+ }
+
+ @Override
+ public long getAthleteId() {
+ return athleteId;
+ }
+
+ @Override
+ public String getCaption() {
+ return caption;
+ }
+
+ @Override
+ public String getCreatedAt() {
+ return createdAt;
+ }
+
+ @Override
+ public String getCreatedAtLocal() {
+ return createdAtLocal;
+ }
+
+ @Override
+ public String getCursor() {
+ return cursor;
+ }
+
+ @Override
+ public String getId() {
+ return id;
+ }
+
+ @Override
+ public SortedMap getSizes() {
+ return sizes;
+ }
+
+ @Override
+ public RemoteMediaStatus getStatus() {
+ return status;
+ }
+
+ @Override
+ public String getTag() {
+ return tag;
+ }
+
+ @Override
+ public MediaType getType() {
+ return type;
+ }
+
+ @Override
+ public SortedMap getUrls() {
+ return urls;
+ }
+
+ @Override
+ public void setCaption(String caption) {
+ this.caption = caption;
+ }
+
+ public Photo(String id,
+ String caption,
+ SortedMap urls,
+ SortedMap sizes,
+ long athleteId,
+ String createdAt,
+ String createdAtLocal,
+ Long activityId,
+ String activityName,
+ RemoteMediaStatus status,
+ String tag,
+ String cursor) {
+ this.id = id;
+ this.caption = caption;
+ this.urls = urls;
+ this.sizes = sizes;
+ this.athleteId = athleteId;
+ this.createdAt = createdAt;
+ this.createdAtLocal = createdAtLocal;
+ this.activityId = activityId;
+ this.activityName = activityName;
+ this.status = status;
+ this.tag = tag;
+ this.cursor = cursor;
+ this.type = MediaType.PHOTO;
+ }
+ }
+
+ public static final class Video extends Media {
+ private final Long activityId;
+ private final String activityName;
+ private final long athleteId;
+ private String caption;
+ private final String createdAt;
+ private final String createdAtLocal;
+ private final String cursor;
+ private final Float durationSeconds;
+ private final String id;
+ private final SortedMap sizes;
+ private final RemoteMediaStatus status;
+ private final String tag;
+ private final MediaType type;
+ private final SortedMap urls;
+ private final String videoUrl;
+
+ @Override
+ public Long getActivityId() {
+ return activityId;
+ }
+
+ @Override
+ public String getActivityName() {
+ return activityName;
+ }
+
+ @Override
+ public long getAthleteId() {
+ return athleteId;
+ }
+
+ @Override
+ public String getCaption() {
+ return caption;
+ }
+
+ @Override
+ public String getCreatedAt() {
+ return createdAt;
+ }
+
+ @Override
+ public String getCreatedAtLocal() {
+ return createdAtLocal;
+ }
+
+ @Override
+ public String getCursor() {
+ return cursor;
+ }
+
+ public final Float getDurationSeconds() {
+ return durationSeconds;
+ }
+
+ @Override
+ public String getId() {
+ return id;
+ }
+
+ @Override
+ public SortedMap getSizes() {
+ return sizes;
+ }
+
+ @Override
+ public RemoteMediaStatus getStatus() {
+ return status;
+ }
+
+ @Override
+ public String getTag() {
+ return tag;
+ }
+
+ @Override
+ public MediaType getType() {
+ return type;
+ }
+
+ @Override
+ public SortedMap getUrls() {
+ return urls;
+ }
+
+ public final String getVideoUrl() {
+ return videoUrl;
+ }
+
+ @Override
+ public void setCaption(String caption) {
+ this.caption = caption;
+ }
+
+ public Video(String id,
+ String caption,
+ SortedMap urls,
+ SortedMap sizes,
+ long athleteId,
+ String createdAt,
+ String createdAtLocal,
+ Long activityId,
+ String activityName,
+ RemoteMediaStatus status,
+ String videoUrl,
+ Float durationSeconds,
+ String tag,
+ String cursor) {
+ this.id = id;
+ this.caption = caption;
+ this.urls = urls;
+ this.sizes = sizes;
+ this.athleteId = athleteId;
+ this.createdAt = createdAt;
+ this.createdAtLocal = createdAtLocal;
+ this.activityId = activityId;
+ this.activityName = activityName;
+ this.status = status;
+ this.videoUrl = videoUrl;
+ this.durationSeconds = durationSeconds;
+ this.tag = tag;
+ this.cursor = cursor;
+ this.type = MediaType.VIDEO;
+ }
+ }
+
+ public abstract Long getActivityId();
+
+ public abstract String getActivityName();
+
+ public abstract long getAthleteId();
+
+ public abstract String getCreatedAt();
+
+ public abstract String getCreatedAtLocal();
+
+ public abstract String getCursor();
+
+ @Override
+ public MediaDimension getLargestSize() {
+ return null;
+ }
+
+ @Override
+ public String getLargestUrl() {
+ return null;
+ }
+
+ @Override
+ public String getReferenceId() {
+ return null;
+ }
+
+ @Override
+ public String getSmallestUrl() {
+ return null;
+ }
+
+ public abstract String getTag();
+
+ private Media() {
+ }
+}
diff --git a/extensions/syncforreddit/build.gradle.kts b/extensions/syncforreddit/build.gradle.kts
index ae95bb48f2..e2871f2390 100644
--- a/extensions/syncforreddit/build.gradle.kts
+++ b/extensions/syncforreddit/build.gradle.kts
@@ -4,3 +4,9 @@ dependencies {
compileOnly(libs.annotation)
compileOnly(libs.okhttp)
}
+
+android {
+ defaultConfig {
+ minSdk = 23
+ }
+}
diff --git a/extensions/tiktok/build.gradle.kts b/extensions/tiktok/build.gradle.kts
index 13e98ec39e..fa21489446 100644
--- a/extensions/tiktok/build.gradle.kts
+++ b/extensions/tiktok/build.gradle.kts
@@ -8,9 +8,4 @@ android {
defaultConfig {
minSdk = 22
}
-
- compileOptions {
- sourceCompatibility = JavaVersion.VERSION_11
- targetCompatibility = JavaVersion.VERSION_11
- }
}
diff --git a/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/TikTokActivityHook.java b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/TikTokActivityHook.java
index b9d6bc8ecb..045afafe96 100644
--- a/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/TikTokActivityHook.java
+++ b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/TikTokActivityHook.java
@@ -20,7 +20,7 @@ import java.lang.reflect.InvocationTargetException;
/**
* Hooks AdPersonalizationActivity to inject a custom {@link TikTokPreferenceFragment}.
*/
-@SuppressWarnings({"deprecation", "NewApi", "unused"})
+@SuppressWarnings({"deprecation", "unused"})
public class TikTokActivityHook {
public static Object createSettingsEntry(String entryClazzName, String entryInfoClazzName) {
try {
diff --git a/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/categories/ExtensionPreferenceCategory.java b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/categories/ExtensionPreferenceCategory.java
index 7383a5582c..efa11b210b 100644
--- a/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/categories/ExtensionPreferenceCategory.java
+++ b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/categories/ExtensionPreferenceCategory.java
@@ -26,7 +26,7 @@ public class ExtensionPreferenceCategory extends ConditionalPreferenceCategory {
addPreference(new TogglePreference(context,
"Sanitize sharing links",
"Remove tracking parameters from shared links.",
- BaseSettings.SANITIZE_SHARED_LINKS
+ BaseSettings.SANITIZE_SHARING_LINKS
));
addPreference(new TogglePreference(context,
diff --git a/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/share/ShareUrlSanitizer.java b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/share/ShareUrlSanitizer.java
index 5d09c10c0b..4b9b31dcd8 100644
--- a/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/share/ShareUrlSanitizer.java
+++ b/extensions/tiktok/src/main/java/app/revanced/extension/tiktok/share/ShareUrlSanitizer.java
@@ -1,6 +1,5 @@
package app.revanced.extension.tiktok.share;
-import app.revanced.extension.shared.Logger;
import app.revanced.extension.shared.privacy.LinkSanitizer;
import app.revanced.extension.shared.settings.BaseSettings;
@@ -13,7 +12,7 @@ public final class ShareUrlSanitizer {
* Injection point for setting check.
*/
public static boolean shouldSanitize() {
- return BaseSettings.SANITIZE_SHARED_LINKS.get();
+ return BaseSettings.SANITIZE_SHARING_LINKS.get();
}
/**
@@ -24,6 +23,6 @@ public final class ShareUrlSanitizer {
return url;
}
- return sanitizer.sanitizeUrlString(url);
+ return sanitizer.sanitizeURLString(url);
}
}
diff --git a/extensions/tudortmund/build.gradle.kts b/extensions/tudortmund/build.gradle.kts
index 1c9660b0ee..eb380fd6e5 100644
--- a/extensions/tudortmund/build.gradle.kts
+++ b/extensions/tudortmund/build.gradle.kts
@@ -1,3 +1,9 @@
dependencies {
compileOnly(libs.appcompat)
}
+
+android {
+ defaultConfig {
+ minSdk = 22
+ }
+}
diff --git a/extensions/twitch/build.gradle.kts b/extensions/twitch/build.gradle.kts
index 9051cb7d8a..34f2d8f113 100644
--- a/extensions/twitch/build.gradle.kts
+++ b/extensions/twitch/build.gradle.kts
@@ -11,9 +11,4 @@ android {
defaultConfig {
minSdk = 21
}
-
- compileOptions {
- sourceCompatibility = JavaVersion.VERSION_11
- targetCompatibility = JavaVersion.VERSION_11
- }
}
diff --git a/extensions/twitch/src/main/java/app/revanced/extension/twitch/Utils.java b/extensions/twitch/src/main/java/app/revanced/extension/twitch/Utils.java
index 73c363ff88..5db5b8b2ff 100644
--- a/extensions/twitch/src/main/java/app/revanced/extension/twitch/Utils.java
+++ b/extensions/twitch/src/main/java/app/revanced/extension/twitch/Utils.java
@@ -1,14 +1,18 @@
package app.revanced.extension.twitch;
+import app.revanced.extension.shared.ResourceType;
+
public class Utils {
/* Called from SettingsPatch smali */
public static int getStringId(String name) {
- return app.revanced.extension.shared.Utils.getResourceIdentifier(name, "string");
+ return app.revanced.extension.shared.Utils.getResourceIdentifier(
+ ResourceType.STRING, name);
}
/* Called from SettingsPatch smali */
public static int getDrawableId(String name) {
- return app.revanced.extension.shared.Utils.getResourceIdentifier(name, "drawable");
+ return app.revanced.extension.shared.Utils.getResourceIdentifier(
+ ResourceType.DRAWABLE, name);
}
}
diff --git a/extensions/twitch/src/main/java/app/revanced/extension/twitch/settings/TwitchActivityHook.java b/extensions/twitch/src/main/java/app/revanced/extension/twitch/settings/TwitchActivityHook.java
index edf8571dbc..463a2e761d 100644
--- a/extensions/twitch/src/main/java/app/revanced/extension/twitch/settings/TwitchActivityHook.java
+++ b/extensions/twitch/src/main/java/app/revanced/extension/twitch/settings/TwitchActivityHook.java
@@ -4,23 +4,25 @@ import static app.revanced.extension.twitch.Utils.getStringId;
import android.content.Intent;
import android.os.Bundle;
+
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AppCompatActivity;
+import java.util.ArrayList;
+import java.util.List;
+
import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.ResourceType;
import app.revanced.extension.shared.Utils;
import app.revanced.extension.twitch.settings.preference.TwitchPreferenceFragment;
import tv.twitch.android.feature.settings.menu.SettingsMenuGroup;
import tv.twitch.android.settings.SettingsActivity;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* Hooks AppCompatActivity to inject a custom {@link TwitchPreferenceFragment}.
*/
-@SuppressWarnings({"deprecation", "NewApi", "unused"})
+@SuppressWarnings({"deprecation", "unused"})
public class TwitchActivityHook {
private static final int REVANCED_SETTINGS_MENU_ITEM_ID = 0x7;
private static final String EXTRA_REVANCED_SETTINGS = "app.revanced.twitch.settings";
@@ -108,7 +110,7 @@ public class TwitchActivityHook {
base.getFragmentManager()
.beginTransaction()
- .replace(Utils.getResourceIdentifier("fragment_container", "id"), fragment)
+ .replace(Utils.getResourceIdentifier(ResourceType.ID, "fragment_container"), fragment)
.commit();
return true;
}
diff --git a/extensions/twitter/build.gradle.kts b/extensions/twitter/build.gradle.kts
index 8cf6305c11..9b476b1c81 100644
--- a/extensions/twitter/build.gradle.kts
+++ b/extensions/twitter/build.gradle.kts
@@ -1,3 +1,9 @@
dependencies {
compileOnly(project(":extensions:shared:library"))
}
+
+android {
+ defaultConfig {
+ minSdk = 26
+ }
+}
diff --git a/extensions/youtube/src/main/AndroidManifest.xml b/extensions/youtube/src/main/AndroidManifest.xml
index 9b65eb06cf..042e61a707 100644
--- a/extensions/youtube/src/main/AndroidManifest.xml
+++ b/extensions/youtube/src/main/AndroidManifest.xml
@@ -1 +1,4 @@
-
+
+
+
+
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/AlternativeThumbnailsPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/AlternativeThumbnailsPatch.java
index 5fa4836ccc..4b2cbd76c3 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/AlternativeThumbnailsPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/AlternativeThumbnailsPatch.java
@@ -36,7 +36,7 @@ import app.revanced.extension.youtube.shared.PlayerType;
* Can show YouTube provided screen captures of beginning/middle/end of the video.
* (ie: sd1.jpg, sd2.jpg, sd3.jpg).
*
- * Or can show crowd-sourced thumbnails provided by DeArrow (...).
+ * Or can show crowdsourced thumbnails provided by DeArrow (...).
*
* Or can use DeArrow and fall back to screen captures if DeArrow is not available.
*
@@ -135,12 +135,12 @@ public final class AlternativeThumbnailsPatch {
}
}
- private static final Uri dearrowApiUri;
+ private static final Uri dearrowAPIURI;
/**
- * The scheme and host of {@link #dearrowApiUri}.
+ * The scheme and host of {@link #dearrowAPIURI}.
*/
- private static final String deArrowApiUrlPrefix;
+ private static final String deArrowAPIURLPrefix;
/**
* How long to temporarily turn off DeArrow if it fails for any reason.
@@ -148,31 +148,31 @@ public final class AlternativeThumbnailsPatch {
private static final long DEARROW_FAILURE_API_BACKOFF_MILLISECONDS = 5 * 60 * 1000; // 5 Minutes.
/**
- * If non zero, then the system time of when DeArrow API calls can resume.
+ * If non-zero, then the system time of when DeArrow API calls can resume.
*/
private static volatile long timeToResumeDeArrowAPICalls;
static {
- dearrowApiUri = validateSettings();
- final int port = dearrowApiUri.getPort();
+ dearrowAPIURI = validateSettings();
+ final int port = dearrowAPIURI.getPort();
String portString = port == -1 ? "" : (":" + port);
- deArrowApiUrlPrefix = dearrowApiUri.getScheme() + "://" + dearrowApiUri.getHost() + portString + "/";
- Logger.printDebug(() -> "Using DeArrow API address: " + deArrowApiUrlPrefix);
+ deArrowAPIURLPrefix = dearrowAPIURI.getScheme() + "://" + dearrowAPIURI.getHost() + portString + "/";
+ Logger.printDebug(() -> "Using DeArrow API address: " + deArrowAPIURLPrefix);
}
/**
* Fix any bad imported data.
*/
private static Uri validateSettings() {
- Uri apiUri = Uri.parse(Settings.ALT_THUMBNAIL_DEARROW_API_URL.get());
+ Uri apiURI = Uri.parse(Settings.ALT_THUMBNAIL_DEARROW_API_URL.get());
// Cannot use unsecured 'http', otherwise the connections fail to start and no callbacks hooks are made.
- String scheme = apiUri.getScheme();
- if (scheme == null || scheme.equals("http") || apiUri.getHost() == null) {
+ String scheme = apiURI.getScheme();
+ if (scheme == null || scheme.equals("http") || apiURI.getHost() == null) {
Utils.showToastLong("Invalid DeArrow API URL. Using default");
Settings.ALT_THUMBNAIL_DEARROW_API_URL.resetToDefault();
return validateSettings();
}
- return apiUri;
+ return apiURI;
}
private static ThumbnailOption optionSettingForCurrentNavigation() {
@@ -209,16 +209,16 @@ public final class AlternativeThumbnailsPatch {
}
/**
- * Build the alternative thumbnail url using YouTube provided still video captures.
+ * Build the alternative thumbnail URL using YouTube provided still video captures.
*
- * @param decodedUrl Decoded original thumbnail request url.
- * @return The alternative thumbnail url, or if not available NULL.
+ * @param decodedURL Decoded original thumbnail request url.
+ * @return The alternative thumbnail URL, or if not available NULL.
*/
@Nullable
- private static String buildYouTubeVideoStillURL(@NonNull DecodedThumbnailUrl decodedUrl,
+ private static String buildYouTubeVideoStillURL(@NonNull DecodedThumbnailURL decodedURL,
@NonNull ThumbnailQuality qualityToUse) {
- String sanitizedReplacement = decodedUrl.createStillsUrl(qualityToUse, false);
- if (VerifiedQualities.verifyAltThumbnailExist(decodedUrl.videoId, qualityToUse, sanitizedReplacement)) {
+ String sanitizedReplacement = decodedURL.createStillsURL(qualityToUse, false);
+ if (VerifiedQualities.verifyAltThumbnailExist(decodedURL.videoId, qualityToUse, sanitizedReplacement)) {
return sanitizedReplacement;
}
@@ -226,26 +226,26 @@ public final class AlternativeThumbnailsPatch {
}
/**
- * Build the alternative thumbnail url using DeArrow thumbnail cache.
+ * Build the alternative thumbnail URL using DeArrow thumbnail cache.
*
* @param videoId ID of the video to get a thumbnail of. Can be any video (regular or Short).
- * @param fallbackUrl URL to fall back to in case.
- * @return The alternative thumbnail url, without tracking parameters.
+ * @param fallbackURL URL to fall back to in case.
+ * @return The alternative thumbnail URL, without tracking parameters.
*/
@NonNull
- private static String buildDeArrowThumbnailURL(String videoId, String fallbackUrl) {
- // Build thumbnail request url.
+ private static String buildDeArrowThumbnailURL(String videoId, String fallbackURL) {
+ // Build thumbnail request URL.
// See https://github.com/ajayyy/DeArrowThumbnailCache/blob/29eb4359ebdf823626c79d944a901492d760bbbc/app.py#L29.
- return dearrowApiUri
+ return dearrowAPIURI
.buildUpon()
.appendQueryParameter("videoID", videoId)
- .appendQueryParameter("redirectUrl", fallbackUrl)
+ .appendQueryParameter("redirectUrl", fallbackURL)
.build()
.toString();
}
- private static boolean urlIsDeArrow(@NonNull String imageUrl) {
- return imageUrl.startsWith(deArrowApiUrlPrefix);
+ private static boolean urlIsDeArrow(@NonNull String imageURL) {
+ return imageURL.startsWith(deArrowAPIURLPrefix);
}
/**
@@ -264,7 +264,7 @@ public final class AlternativeThumbnailsPatch {
}
private static void handleDeArrowError(@NonNull String url, int statusCode) {
- Logger.printDebug(() -> "Encountered DeArrow error. Url: " + url);
+ Logger.printDebug(() -> "Encountered DeArrow error. URL: " + url);
final long now = System.currentTimeMillis();
if (timeToResumeDeArrowAPICalls < now) {
timeToResumeDeArrowAPICalls = now + DEARROW_FAILURE_API_BACKOFF_MILLISECONDS;
@@ -278,63 +278,63 @@ public final class AlternativeThumbnailsPatch {
}
/**
- * Injection point. Called off the main thread and by multiple threads at the same time.
+ * Injection point. Called off the main thread and by multiple threads at the same time.
*
- * @param originalUrl Image url for all url images loaded, including video thumbnails.
+ * @param originalURL Image URL for all URL images loaded, including video thumbnails.
*/
- public static String overrideImageURL(String originalUrl) {
+ public static String overrideImageURL(String originalURL) {
try {
ThumbnailOption option = optionSettingForCurrentNavigation();
if (option == ThumbnailOption.ORIGINAL) {
- return originalUrl;
+ return originalURL;
}
- final var decodedUrl = DecodedThumbnailUrl.decodeImageUrl(originalUrl);
- if (decodedUrl == null) {
- return originalUrl; // Not a thumbnail.
+ final var decodedURL = DecodedThumbnailURL.decodeImageURL(originalURL);
+ if (decodedURL == null) {
+ return originalURL; // Not a thumbnail.
}
- Logger.printDebug(() -> "Original url: " + decodedUrl.sanitizedUrl);
+ Logger.printDebug(() -> "Original URL: " + decodedURL.sanitizedURL);
- ThumbnailQuality qualityToUse = ThumbnailQuality.getQualityToUse(decodedUrl.imageQuality);
+ ThumbnailQuality qualityToUse = ThumbnailQuality.getQualityToUse(decodedURL.imageQuality);
if (qualityToUse == null) {
// Thumbnail is a Short or a Storyboard image used for seekbar thumbnails (must not replace these).
- return originalUrl;
+ return originalURL;
}
- String sanitizedReplacementUrl;
+ String sanitizedReplacementURL;
final boolean includeTracking;
if (option.useDeArrow && canUseDeArrowAPI()) {
includeTracking = false; // Do not include view tracking parameters with API call.
- String fallbackUrl = null;
+ String fallbackURL = null;
if (option.useStillImages) {
- fallbackUrl = buildYouTubeVideoStillURL(decodedUrl, qualityToUse);
+ fallbackURL = buildYouTubeVideoStillURL(decodedURL, qualityToUse);
}
- if (fallbackUrl == null) {
- fallbackUrl = decodedUrl.sanitizedUrl;
+ if (fallbackURL == null) {
+ fallbackURL = decodedURL.sanitizedURL;
}
- sanitizedReplacementUrl = buildDeArrowThumbnailURL(decodedUrl.videoId, fallbackUrl);
+ sanitizedReplacementURL = buildDeArrowThumbnailURL(decodedURL.videoId, fallbackURL);
} else if (option.useStillImages) {
includeTracking = true; // Include view tracking parameters if present.
- sanitizedReplacementUrl = buildYouTubeVideoStillURL(decodedUrl, qualityToUse);
- if (sanitizedReplacementUrl == null) {
- return originalUrl; // Still capture is not available. Return the untouched original url.
+ sanitizedReplacementURL = buildYouTubeVideoStillURL(decodedURL, qualityToUse);
+ if (sanitizedReplacementURL == null) {
+ return originalURL; // Still capture is not available. Return the untouched original url.
}
} else {
- return originalUrl; // Recently experienced DeArrow failure and video stills are not enabled.
+ return originalURL; // Recently experienced DeArrow failure and video stills are not enabled.
}
// Do not log any tracking parameters.
- Logger.printDebug(() -> "Replacement url: " + sanitizedReplacementUrl);
+ Logger.printDebug(() -> "Replacement URL: " + sanitizedReplacementURL);
return includeTracking
- ? sanitizedReplacementUrl + decodedUrl.viewTrackingParameters
- : sanitizedReplacementUrl;
+ ? sanitizedReplacementURL + decodedURL.viewTrackingParameters
+ : sanitizedReplacementURL;
} catch (Exception ex) {
Logger.printException(() -> "overrideImageURL failure", ex);
- return originalUrl;
+ return originalURL;
}
}
@@ -370,21 +370,21 @@ public final class AlternativeThumbnailsPatch {
// - very old
// - very low view count
// Take note of this, so if the image reloads the original thumbnail will be used.
- DecodedThumbnailUrl decodedUrl = DecodedThumbnailUrl.decodeImageUrl(url);
- if (decodedUrl == null) {
+ DecodedThumbnailURL decodedURL = DecodedThumbnailURL.decodeImageURL(url);
+ if (decodedURL == null) {
return; // Not a thumbnail.
}
- Logger.printDebug(() -> "handleCronetSuccess, image not available: " + decodedUrl.sanitizedUrl);
+ Logger.printDebug(() -> "handleCronetSuccess, image not available: " + decodedURL.sanitizedURL);
- ThumbnailQuality quality = ThumbnailQuality.altImageNameToQuality(decodedUrl.imageQuality);
+ ThumbnailQuality quality = ThumbnailQuality.altImageNameToQuality(decodedURL.imageQuality);
if (quality == null) {
// Video is a short or a seekbar thumbnail, but somehow did not load. Should not happen.
- Logger.printDebug(() -> "Failed to recognize image quality of url: " + decodedUrl.sanitizedUrl);
+ Logger.printDebug(() -> "Failed to recognize image quality of URL: " + decodedURL.sanitizedURL);
return;
}
- VerifiedQualities.setAltThumbnailDoesNotExist(decodedUrl.videoId, quality);
+ VerifiedQualities.setAltThumbnailDoesNotExist(decodedURL.videoId, quality);
}
} catch (Exception ex) {
Logger.printException(() -> "Callback success error", ex);
@@ -482,7 +482,7 @@ public final class AlternativeThumbnailsPatch {
// (even though search and subscriptions use the exact same layout as the home feed).
// Of note, this image quality issue only appears with the alt thumbnail images,
// and the regular thumbnails have identical color/contrast quality for all sizes.
- // Fix this by falling thru and upgrading SD to 720.
+ // Fix this by falling through and upgrading SD to 720.
case SDDEFAULT, HQ720 -> { // SD is max resolution for fast alt images.
if (useFastQuality) {
yield SDDEFAULT;
@@ -525,17 +525,11 @@ public final class AlternativeThumbnailsPatch {
private static final long NOT_AVAILABLE_TIMEOUT_MILLISECONDS = 10 * 60 * 1000; // 10 minutes.
/**
- * Cache used to verify if an alternative thumbnails exists for a given video id.
+ * Cache used to verify if an alternative thumbnails exists for a given video ID.
*/
@GuardedBy("itself")
- private static final Map altVideoIdLookup = new LinkedHashMap<>(100) {
- private static final int CACHE_LIMIT = 1000;
-
- @Override
- protected boolean removeEldestEntry(Entry eldest) {
- return size() > CACHE_LIMIT; // Evict the oldest entry if over the cache limit.
- }
- };
+ private static final Map altVideoIdLookup =
+ Utils.createSizeRestrictedMap(1000);
private static VerifiedQualities getVerifiedQualities(@NonNull String videoId, boolean returnNullIfDoesNotExist) {
synchronized (altVideoIdLookup) {
@@ -552,10 +546,10 @@ public final class AlternativeThumbnailsPatch {
}
static boolean verifyAltThumbnailExist(@NonNull String videoId, @NonNull ThumbnailQuality quality,
- @NonNull String imageUrl) {
+ @NonNull String imageURL) {
VerifiedQualities verified = getVerifiedQualities(videoId, Settings.ALT_THUMBNAIL_STILLS_FAST.get());
if (verified == null) return true; // Fast alt thumbnails is enabled.
- return verified.verifyYouTubeThumbnailExists(videoId, quality, imageUrl);
+ return verified.verifyYouTubeThumbnailExists(videoId, quality, imageURL);
}
static void setAltThumbnailDoesNotExist(@NonNull String videoId, @NonNull ThumbnailQuality quality) {
@@ -596,10 +590,10 @@ public final class AlternativeThumbnailsPatch {
}
/**
- * Verify if a video alt thumbnail exists. Does so by making a minimal HEAD http request.
+ * Verify if a video alt thumbnail exists. Does so by making a minimal HEAD HTTP request.
*/
synchronized boolean verifyYouTubeThumbnailExists(@NonNull String videoId, @NonNull ThumbnailQuality quality,
- @NonNull String imageUrl) {
+ @NonNull String imageURL) {
if (highestQualityVerified != null && highestQualityVerified.ordinal() >= quality.ordinal()) {
return true; // Previously verified as existing.
}
@@ -615,7 +609,7 @@ public final class AlternativeThumbnailsPatch {
}
if (fastQuality) {
- return true; // Unknown if it exists or not. Use the URL anyways and update afterwards if loading fails.
+ return true; // Unknown if it exists or not. Use the URL anyway and update afterward if loading fails.
}
boolean imageFileFound;
@@ -625,7 +619,7 @@ public final class AlternativeThumbnailsPatch {
final long start = System.currentTimeMillis();
imageFileFound = Utils.submitOnBackgroundThread(() -> {
final int connectionTimeoutMillis = 10000; // 10 seconds.
- HttpURLConnection connection = (HttpURLConnection) new URL(imageUrl).openConnection();
+ HttpURLConnection connection = (HttpURLConnection) new URL(imageURL).openConnection();
connection.setConnectTimeout(connectionTimeoutMillis);
connection.setReadTimeout(connectionTimeoutMillis);
connection.setRequestMethod("HEAD");
@@ -638,13 +632,13 @@ public final class AlternativeThumbnailsPatch {
return (contentType != null && contentType.startsWith("image"));
}
if (responseCode != HttpURLConnection.HTTP_NOT_FOUND) {
- Logger.printDebug(() -> "Unexpected response code: " + responseCode + " for url: " + imageUrl);
+ Logger.printDebug(() -> "Unexpected response code: " + responseCode + " for URL: " + imageURL);
}
return false;
}).get();
- Logger.printDebug(() -> "Verification took: " + (System.currentTimeMillis() - start) + "ms for image: " + imageUrl);
+ Logger.printDebug(() -> "Verification took: " + (System.currentTimeMillis() - start) + "ms for image: " + imageURL);
} catch (ExecutionException | InterruptedException ex) {
- Logger.printInfo(() -> "Could not verify alt url: " + imageUrl, ex);
+ Logger.printInfo(() -> "Could not verify alt URL: " + imageURL, ex);
imageFileFound = false;
}
@@ -656,11 +650,11 @@ public final class AlternativeThumbnailsPatch {
/**
* YouTube video thumbnail url, decoded into it's relevant parts.
*/
- private static class DecodedThumbnailUrl {
+ private static class DecodedThumbnailURL {
private static final String YOUTUBE_THUMBNAIL_DOMAIN = "https://i.ytimg.com/";
@Nullable
- static DecodedThumbnailUrl decodeImageUrl(String url) {
+ static DecodedThumbnailURL decodeImageURL(String url) {
final int urlPathStartIndex = url.indexOf('/', "https://".length()) + 1;
if (urlPathStartIndex <= 0) return null;
@@ -680,14 +674,14 @@ public final class AlternativeThumbnailsPatch {
int imageExtensionEndIndex = url.indexOf('?', imageSizeEndIndex);
if (imageExtensionEndIndex < 0) imageExtensionEndIndex = url.length();
- return new DecodedThumbnailUrl(url, urlPathStartIndex, urlPathEndIndex, videoIdStartIndex, videoIdEndIndex,
+ return new DecodedThumbnailURL(url, urlPathStartIndex, urlPathEndIndex, videoIdStartIndex, videoIdEndIndex,
imageSizeStartIndex, imageSizeEndIndex, imageExtensionEndIndex);
}
- final String originalFullUrl;
+ final String originalFullURL;
/** Full usable url, but stripped of any tracking information. */
- final String sanitizedUrl;
- /** Url path, such as 'vi' or 'vi_webp' */
+ final String sanitizedURL;
+ /** URL path, such as 'vi' or 'vi_webp' */
final String urlPath;
final String videoId;
/** Quality, such as hq720 or sddefault. */
@@ -697,25 +691,25 @@ public final class AlternativeThumbnailsPatch {
/** User view tracking parameters, only present on some images. */
final String viewTrackingParameters;
- DecodedThumbnailUrl(String fullUrl, int urlPathStartIndex, int urlPathEndIndex, int videoIdStartIndex, int videoIdEndIndex,
+ DecodedThumbnailURL(String fullURL, int urlPathStartIndex, int urlPathEndIndex, int videoIdStartIndex, int videoIdEndIndex,
int imageSizeStartIndex, int imageSizeEndIndex, int imageExtensionEndIndex) {
- originalFullUrl = fullUrl;
- sanitizedUrl = fullUrl.substring(0, imageExtensionEndIndex);
- urlPath = fullUrl.substring(urlPathStartIndex, urlPathEndIndex);
- videoId = fullUrl.substring(videoIdStartIndex, videoIdEndIndex);
- imageQuality = fullUrl.substring(imageSizeStartIndex, imageSizeEndIndex);
- imageExtension = fullUrl.substring(imageSizeEndIndex + 1, imageExtensionEndIndex);
- viewTrackingParameters = (imageExtensionEndIndex == fullUrl.length())
- ? "" : fullUrl.substring(imageExtensionEndIndex);
+ originalFullURL = fullURL;
+ sanitizedURL = fullURL.substring(0, imageExtensionEndIndex);
+ urlPath = fullURL.substring(urlPathStartIndex, urlPathEndIndex);
+ videoId = fullURL.substring(videoIdStartIndex, videoIdEndIndex);
+ imageQuality = fullURL.substring(imageSizeStartIndex, imageSizeEndIndex);
+ imageExtension = fullURL.substring(imageSizeEndIndex + 1, imageExtensionEndIndex);
+ viewTrackingParameters = (imageExtensionEndIndex == fullURL.length())
+ ? "" : fullURL.substring(imageExtensionEndIndex);
}
@SuppressWarnings("SameParameterValue")
- String createStillsUrl(@NonNull ThumbnailQuality qualityToUse, boolean includeViewTracking) {
+ String createStillsURL(@NonNull ThumbnailQuality qualityToUse, boolean includeViewTracking) {
// Images could be upgraded to webp if they are not already, but this fails quite often,
// especially for new videos uploaded in the last hour.
// And even if alt webp images do exist, sometimes they can load much slower than the original jpg alt images.
// (as much as 4x slower network response has been observed, despite the alt webp image being a smaller file).
- StringBuilder builder = new StringBuilder(originalFullUrl.length() + 2);
+ StringBuilder builder = new StringBuilder(originalFullURL.length() + 2);
// Many different "i.ytimage.com" domains exist such as "i9.ytimg.com",
// but still captures are frequently not available on the other domains (especially newly uploaded videos).
// So always use the primary domain for a higher success rate.
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/BackgroundPlaybackPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/BackgroundPlaybackPatch.java
index 7575414ba1..87af8b0ccf 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/BackgroundPlaybackPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/BackgroundPlaybackPatch.java
@@ -15,7 +15,7 @@ public class BackgroundPlaybackPatch {
// Steps to verify most edge cases (with Shorts background playback set to off):
// 1. Open a regular video
- // 2. Minimize app (PIP should appear)
+ // 2. Minimize app (PiP should appear)
// 3. Reopen app
// 4. Open a Short (without closing the regular video)
// (try opening both Shorts in the video player suggestions AND Shorts from the home feed)
@@ -23,7 +23,7 @@ public class BackgroundPlaybackPatch {
// 6. Reopen app
// 7. Close the Short
// 8. Resume playing the regular video
- // 9. Minimize the app (PIP should appear)
+ // 9. Minimize the app (PiP should appear)
if (ShortsPlayerState.isOpen()) {
return false;
}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/BypassImageRegionRestrictionsPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/BypassImageRegionRestrictionsPatch.java
index ccc853d4c3..1272992993 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/BypassImageRegionRestrictionsPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/BypassImageRegionRestrictionsPatch.java
@@ -15,24 +15,24 @@ public final class BypassImageRegionRestrictionsPatch {
private static final String REPLACEMENT_IMAGE_DOMAIN = "https://yt4.ggpht.com";
/**
- * YouTube static images domain. Includes user and channel avatar images and community post images.
+ * YouTube static images' domain. Includes user and channel avatar images and community post images.
*/
private static final Pattern YOUTUBE_STATIC_IMAGE_DOMAIN_PATTERN
= Pattern.compile("^https://(yt3|lh[3-6]|play-lh)\\.(ggpht|googleusercontent)\\.com");
/**
- * Injection point. Called off the main thread and by multiple threads at the same time.
+ * Injection point. Called off the main thread and by multiple threads at the same time.
*
- * @param originalUrl Image url for all image urls loaded.
+ * @param originalURL Image URL for all image URLs loaded.
*/
- public static String overrideImageURL(String originalUrl) {
+ public static String overrideImageURL(String originalURL) {
try {
if (BYPASS_IMAGE_REGION_RESTRICTIONS_ENABLED) {
String replacement = YOUTUBE_STATIC_IMAGE_DOMAIN_PATTERN
- .matcher(originalUrl).replaceFirst(REPLACEMENT_IMAGE_DOMAIN);
+ .matcher(originalURL).replaceFirst(REPLACEMENT_IMAGE_DOMAIN);
- if (Settings.DEBUG.get() && !replacement.equals(originalUrl)) {
- Logger.printDebug(() -> "Replaced: '" + originalUrl + "' with: '" + replacement + "'");
+ if (Settings.DEBUG.get() && !replacement.equals(originalURL)) {
+ Logger.printDebug(() -> "Replaced: '" + originalURL + "' with: '" + replacement + "'");
}
return replacement;
@@ -41,6 +41,6 @@ public final class BypassImageRegionRestrictionsPatch {
Logger.printException(() -> "overrideImageURL failure", ex);
}
- return originalUrl;
+ return originalURL;
}
}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ChangeFormFactorPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ChangeFormFactorPatch.java
index 706b135aff..d7cf0faba1 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ChangeFormFactorPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ChangeFormFactorPatch.java
@@ -94,7 +94,7 @@ public class ChangeFormFactorPatch {
public static void navigationTabCreated(NavigationButton button, View tabView) {
// On first startup of the app the navigation buttons are fetched and updated.
// If the user immediately opens the 'You' or opens a video, then the call to
- // update the navigtation buttons will use the non automotive form factor
+ // update the navigation buttons will use the non-automotive form factor
// and the explore tab is missing.
// Fixing this is not so simple because of the concurrent calls for the player and You tab.
// For now, always hide the explore tab.
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ChangeHeaderPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ChangeHeaderPatch.java
index 8d74621192..ca6bf43b12 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ChangeHeaderPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ChangeHeaderPatch.java
@@ -7,6 +7,7 @@ import androidx.annotation.Nullable;
import java.util.Objects;
import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.ResourceType;
import app.revanced.extension.shared.Utils;
import app.revanced.extension.youtube.settings.Settings;
@@ -50,7 +51,7 @@ public class ChangeHeaderPatch {
return null;
}
- final int identifier = Utils.getResourceIdentifier(attributeName, "attr");
+ final int identifier = Utils.getResourceIdentifier(ResourceType.ATTR, attributeName);
if (identifier == 0) {
// Should never happen.
Logger.printException(() -> "Could not find attribute: " + drawableName);
@@ -71,7 +72,7 @@ public class ChangeHeaderPatch {
? "_dark"
: "_light");
- final int identifier = Utils.getResourceIdentifier(drawableFullName, "drawable");
+ final int identifier = Utils.getResourceIdentifier(ResourceType.DRAWABLE, drawableFullName);
if (identifier != 0) {
return Utils.getContext().getDrawable(identifier);
}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ChangeStartPagePatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ChangeStartPagePatch.java
index 9748a3d68f..b21ad89923 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ChangeStartPagePatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ChangeStartPagePatch.java
@@ -24,7 +24,7 @@ public final class ChangeStartPagePatch {
DEFAULT("", null),
/**
- * Browse id.
+ * BrowseId.
*/
ALL_SUBSCRIPTIONS("FEchannels", TRUE),
BROWSE("FEguide_builder", TRUE),
@@ -39,7 +39,7 @@ public final class ChangeStartPagePatch {
YOUR_CLIPS("FEclips", TRUE),
/**
- * Channel id, this can be used as a browseId.
+ * Channel ID, this can be used as a browseId.
*/
COURSES("UCtFRv9O2AHqOZjjynzrv-xg", TRUE),
FASHION("UCrpQ4p1Ql_hG8rKXIKM1MOQ", TRUE),
@@ -52,7 +52,7 @@ public final class ChangeStartPagePatch {
VIRTUAL_REALITY("UCzuqhhs6NWbgTzMuM09WKDQ", TRUE),
/**
- * Playlist id, this can be used as a browseId.
+ * Playlist ID, this can be used as a browseId.
*/
LIKED_VIDEO("VLLL", TRUE),
WATCH_LATER("VLWL", TRUE),
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/CopyVideoUrlPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/CopyVideoURLPatch.java
similarity index 93%
rename from extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/CopyVideoUrlPatch.java
rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/CopyVideoURLPatch.java
index db3338f527..cae9bb3df1 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/CopyVideoUrlPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/CopyVideoURLPatch.java
@@ -7,9 +7,9 @@ import android.os.Build;
import app.revanced.extension.shared.Logger;
import app.revanced.extension.shared.Utils;
-public class CopyVideoUrlPatch {
+public class CopyVideoURLPatch {
- public static void copyUrl(boolean withTimestamp) {
+ public static void copyURL(boolean withTimestamp) {
try {
StringBuilder builder = new StringBuilder("https://youtu.be/");
builder.append(VideoInformation.getVideoId());
@@ -31,7 +31,7 @@ public class CopyVideoUrlPatch {
}
Utils.setClipboard(builder.toString());
- // Do not show a toast if using Android 13+ as it shows it's own toast.
+ // Do not show a toast if using Android 13+ as it shows its own toast.
// But if the user copied with a timestamp then show a toast.
// Unfortunately this will show 2 toasts on Android 13+, but no way around this.
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S_V2 || (withTimestamp && currentVideoTimeInSeconds > 0)) {
@@ -40,7 +40,7 @@ public class CopyVideoUrlPatch {
: str("revanced_share_copy_url_success"));
}
} catch (Exception e) {
- Logger.printException(() -> "Failed to generate video url", e);
+ Logger.printException(() -> "Failed to generate video URL", e);
}
}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisableHapticFeedbackPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisableHapticFeedbackPatch.java
index 6ae49427af..f466bf9a62 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisableHapticFeedbackPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisableHapticFeedbackPatch.java
@@ -1,5 +1,8 @@
package app.revanced.extension.youtube.patches;
+import android.os.VibrationEffect;
+import android.os.Vibrator;
+
import app.revanced.extension.youtube.settings.Settings;
@SuppressWarnings("unused")
@@ -12,6 +15,13 @@ public class DisableHapticFeedbackPatch {
return Settings.DISABLE_HAPTIC_FEEDBACK_CHAPTERS.get();
}
+ /**
+ * Injection point.
+ */
+ public static boolean disablePreciseSeekingVibrate() {
+ return Settings.DISABLE_HAPTIC_FEEDBACK_PRECISE_SEEKING.get();
+ }
+
/**
* Injection point.
*/
@@ -22,8 +32,10 @@ public class DisableHapticFeedbackPatch {
/**
* Injection point.
*/
- public static boolean disablePreciseSeekingVibrate() {
- return Settings.DISABLE_HAPTIC_FEEDBACK_PRECISE_SEEKING.get();
+ public static Object disableTapAndHoldVibrate(Object vibrator) {
+ return Settings.DISABLE_HAPTIC_FEEDBACK_TAP_AND_HOLD.get()
+ ? null
+ : vibrator;
}
/**
@@ -32,4 +44,29 @@ public class DisableHapticFeedbackPatch {
public static boolean disableZoomVibrate() {
return Settings.DISABLE_HAPTIC_FEEDBACK_ZOOM.get();
}
+
+ /**
+ * Injection point.
+ */
+ public static void vibrate(Vibrator vibrator, VibrationEffect vibrationEffect) {
+ if (disableVibrate()) return;
+ vibrator.vibrate(vibrationEffect);
+ }
+
+ /**
+ * Injection point.
+ */
+ @SuppressWarnings("deprecation")
+ public static void vibrate(Vibrator vibrator, long milliseconds) {
+ if (disableVibrate()) return;
+ vibrator.vibrate(milliseconds);
+ }
+
+ private static boolean disableVibrate() {
+ return Settings.DISABLE_HAPTIC_FEEDBACK_CHAPTERS.get()
+ && Settings.DISABLE_HAPTIC_FEEDBACK_PRECISE_SEEKING.get()
+ && Settings.DISABLE_HAPTIC_FEEDBACK_SEEK_UNDO.get()
+ && Settings.DISABLE_HAPTIC_FEEDBACK_TAP_AND_HOLD.get()
+ && Settings.DISABLE_HAPTIC_FEEDBACK_ZOOM.get();
+ }
}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisablePlayerPopupPanelsPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisablePlayerPopupPanelsPatch.java
index dd2e0ca8f9..b33b2c25cc 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisablePlayerPopupPanelsPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisablePlayerPopupPanelsPatch.java
@@ -4,8 +4,10 @@ import app.revanced.extension.youtube.settings.Settings;
@SuppressWarnings("unused")
public class DisablePlayerPopupPanelsPatch {
- //Used by app.revanced.patches.youtube.layout.playerpopuppanels.patch.PlayerPopupPanelsPatch
+ /**
+ * Injection point.
+ */
public static boolean disablePlayerPopupPanels() {
- return Settings.PLAYER_POPUP_PANELS.get();
+ return Settings.DISABLE_PLAYER_POPUP_PANELS.get();
}
}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisableSignInToTvPopupPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisableSignInToTVPopupPatch.java
similarity index 69%
rename from extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisableSignInToTvPopupPatch.java
rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisableSignInToTVPopupPatch.java
index f6298ce8b6..baceefa1ab 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisableSignInToTvPopupPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisableSignInToTVPopupPatch.java
@@ -3,12 +3,12 @@ package app.revanced.extension.youtube.patches;
import app.revanced.extension.youtube.settings.Settings;
@SuppressWarnings("unused")
-public class DisableSignInToTvPopupPatch {
+public class DisableSignInToTVPopupPatch {
/**
* Injection point.
*/
public static boolean disableSignInToTvPopup() {
- return Settings.DISABLE_SIGNIN_TO_TV_POPUP.get();
+ return Settings.DISABLE_SIGN_IN_TO_TV_POPUP.get();
}
}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DownloadsPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DownloadsPatch.java
index e953a74cf6..715d349e1d 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DownloadsPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DownloadsPatch.java
@@ -21,14 +21,14 @@ public final class DownloadsPatch {
/**
* Injection point.
*/
- public static void activityCreated(Activity mainActivity) {
+ public static void setMainActivity(Activity mainActivity) {
activityRef = new WeakReference<>(mainActivity);
}
/**
* Injection point.
*
- * Called from the in app download hook,
+ * Called from the in-app download hook,
* for both the player action button (below the video)
* and the 'Download video' flyout option for feed videos.
*
@@ -41,7 +41,7 @@ public final class DownloadsPatch {
}
// If possible, use the main activity as the context.
- // Otherwise fall back on using the application context.
+ // Otherwise, fall back on using the application context.
Context context = activityRef.get();
boolean isActivityContext = true;
if (context == null) {
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ExitFullscreenPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ExitFullscreenPatch.java
index 972c2cd924..1666860287 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ExitFullscreenPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ExitFullscreenPatch.java
@@ -1,6 +1,6 @@
package app.revanced.extension.youtube.patches;
-import android.widget.ImageView;
+import android.view.View;
import app.revanced.extension.shared.Logger;
import app.revanced.extension.shared.Utils;
@@ -20,8 +20,10 @@ public class ExitFullscreenPatch {
/**
* Injection point.
*/
- public static void endOfVideoReached() {
+ public static void endOfVideoReached(Enum status) {
try {
+ if (status == null || !"ENDED".equals(status.name())) return;
+
FullscreenMode mode = Settings.EXIT_FULLSCREEN.get();
if (mode == FullscreenMode.DISABLED) {
return;
@@ -43,8 +45,8 @@ public class ExitFullscreenPatch {
// set because the overlay controls are not attached.
// To fix this, push the perform click to the back fo the main thread,
// and by then the overlay controls will be visible since the video is now finished.
- Utils.runOnMainThread(() -> {
- ImageView button = PlayerControlsPatch.fullscreenButtonRef.get();
+ Utils.runOnMainThreadDelayed(() -> {
+ View button = PlayerControlsPatch.fullscreenButtonRef.get();
if (button == null) {
Logger.printDebug(() -> "Fullscreen button is null, cannot click");
} else {
@@ -54,7 +56,7 @@ public class ExitFullscreenPatch {
button.performClick();
button.setSoundEffectsEnabled(soundEffectsEnabled);
}
- });
+ }, 10);
}
} catch (Exception ex) {
Logger.printException(() -> "endOfVideoReached failure", ex);
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/FixContentProviderPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/FixContentProviderPatch.java
new file mode 100644
index 0000000000..e3bf0478a8
--- /dev/null
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/FixContentProviderPatch.java
@@ -0,0 +1,24 @@
+package app.revanced.extension.youtube.patches;
+
+import java.util.Map;
+
+import app.revanced.extension.shared.Logger;
+
+@SuppressWarnings("unused")
+public class FixContentProviderPatch {
+
+ /**
+ * Injection point.
+ */
+ public static void removeNullMapEntries(Map map) {
+ map.entrySet().removeIf(entry -> {
+ Object value = entry.getValue();
+ if (value == null) {
+ Logger.printDebug(() -> "Removing content provider key with null value: " + entry.getKey());
+ return true;
+ }
+ return false;
+ });
+ }
+}
+
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HideGetPremiumPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HideAutoplayPreviewPatch.java
similarity index 55%
rename from extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HideGetPremiumPatch.java
rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HideAutoplayPreviewPatch.java
index 35592c0ff8..293fe9b151 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HideGetPremiumPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HideAutoplayPreviewPatch.java
@@ -3,11 +3,11 @@ package app.revanced.extension.youtube.patches;
import app.revanced.extension.youtube.settings.Settings;
@SuppressWarnings("unused")
-public class HideGetPremiumPatch {
+public final class HideAutoplayPreviewPatch {
/**
* Injection point.
*/
- public static boolean hideGetPremiumView() {
- return Settings.HIDE_GET_PREMIUM.get();
+ public static boolean hideAutoplayPreview() {
+ return Settings.HIDE_AUTOPLAY_PREVIEW.get();
}
}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HideEndScreenCardsPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HideEndScreenCardsPatch.java
index 03668aa735..55dab84a55 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HideEndScreenCardsPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HideEndScreenCardsPatch.java
@@ -12,13 +12,13 @@ public class HideEndScreenCardsPatch {
* Injection point.
*/
public static void hideEndScreenCardView(View view) {
- Utils.hideViewUnderCondition(Settings.HIDE_ENDSCREEN_CARDS, view);
+ Utils.hideViewUnderCondition(Settings.HIDE_END_SCREEN_CARDS, view);
}
/**
* Injection point.
*/
public static boolean hideEndScreenCards() {
- return Settings.HIDE_ENDSCREEN_CARDS.get();
+ return Settings.HIDE_END_SCREEN_CARDS.get();
}
}
\ No newline at end of file
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HidePlayerOverlayButtonsPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HidePlayerOverlayButtonsPatch.java
index 7bf99f4798..3c6937a996 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HidePlayerOverlayButtonsPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HidePlayerOverlayButtonsPatch.java
@@ -7,6 +7,7 @@ import android.view.ViewGroup;
import android.widget.ImageView;
import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.ResourceType;
import app.revanced.extension.shared.Utils;
import app.revanced.extension.youtube.settings.Settings;
@@ -18,7 +19,7 @@ public final class HidePlayerOverlayButtonsPatch {
/**
* Injection point.
*/
- public static boolean hideAutoPlayButton() {
+ public static boolean hideAutoplayButton() {
return HIDE_AUTOPLAY_BUTTON_ENABLED;
}
@@ -29,6 +30,15 @@ public final class HidePlayerOverlayButtonsPatch {
return Settings.HIDE_CAST_BUTTON.get() ? View.GONE : original;
}
+ /**
+ * Injection point.
+ */
+ public static boolean getCastButtonOverrideV2(boolean original) {
+ if (Settings.HIDE_CAST_BUTTON.get()) return false;
+
+ return original;
+ }
+
/**
* Injection point.
*/
@@ -36,14 +46,49 @@ public final class HidePlayerOverlayButtonsPatch {
imageView.setVisibility(Settings.HIDE_CAPTIONS_BUTTON.get() ? ImageView.GONE : ImageView.VISIBLE);
}
+ /**
+ * Injection point.
+ */
+ public static void hideCollapseButton(ImageView imageView) {
+ if (!Settings.HIDE_COLLAPSE_BUTTON.get()) return;
+
+ // Make the collapse button invisible
+ imageView.setImageResource(android.R.color.transparent);
+ imageView.setImageAlpha(0);
+ imageView.setEnabled(false);
+
+ // Adjust layout params if RelativeLayout
+ var layoutParams = imageView.getLayoutParams();
+ if (layoutParams instanceof android.widget.RelativeLayout.LayoutParams) {
+ android.widget.RelativeLayout.LayoutParams lp = new android.widget.RelativeLayout.LayoutParams(0, 0);
+ imageView.setLayoutParams(lp);
+ } else {
+ Logger.printDebug(() -> "Unknown collapse button layout params: " + layoutParams);
+ }
+ }
+
+ /**
+ * Injection point.
+ */
+ public static void setTitleAnchorStartMargin(View titleAnchorView) {
+ if (!Settings.HIDE_COLLAPSE_BUTTON.get()) return;
+
+ var layoutParams = titleAnchorView.getLayoutParams();
+ if (layoutParams instanceof android.widget.RelativeLayout.LayoutParams relativeParams) {
+ relativeParams.setMarginStart(0);
+ } else {
+ Logger.printDebug(() -> "Unknown title anchor layout params: " + layoutParams);
+ }
+ }
+
private static final boolean HIDE_PLAYER_PREVIOUS_NEXT_BUTTONS_ENABLED
= Settings.HIDE_PLAYER_PREVIOUS_NEXT_BUTTONS.get();
private static final int PLAYER_CONTROL_PREVIOUS_BUTTON_TOUCH_AREA_ID = getResourceIdentifierOrThrow(
- "player_control_previous_button_touch_area", "id");
+ ResourceType.ID, "player_control_previous_button_touch_area");
private static final int PLAYER_CONTROL_NEXT_BUTTON_TOUCH_AREA_ID = getResourceIdentifierOrThrow(
- "player_control_next_button_touch_area", "id");
+ ResourceType.ID, "player_control_next_button_touch_area");
/**
* Injection point.
@@ -54,13 +99,28 @@ public final class HidePlayerOverlayButtonsPatch {
}
// Must use a deferred call to main thread to hide the button.
- // Otherwise the layout crashes if set to hidden now.
+ // Otherwise, the layout crashes if set to hidden now.
Utils.runOnMainThread(() -> {
hideView(parentView, PLAYER_CONTROL_PREVIOUS_BUTTON_TOUCH_AREA_ID);
hideView(parentView, PLAYER_CONTROL_NEXT_BUTTON_TOUCH_AREA_ID);
});
}
+ /**
+ * Injection point.
+ */
+ public static View hideFullscreenButton(View view) {
+ if (!Settings.HIDE_FULLSCREEN_BUTTON.get()) {
+ return view;
+ }
+
+ if (view != null) {
+ view.setVisibility(View.GONE);
+ }
+
+ return null;
+ }
+
/**
* Injection point.
*/
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HideSeekbarPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HideSeekbarPatch.java
index 98065d7ec0..521e7812b0 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HideSeekbarPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HideSeekbarPatch.java
@@ -4,7 +4,17 @@ import app.revanced.extension.youtube.settings.Settings;
@SuppressWarnings("unused")
public class HideSeekbarPatch {
+ /**
+ * Injection point.
+ */
public static boolean hideSeekbar() {
return Settings.HIDE_SEEKBAR.get();
}
+
+ /**
+ * Injection point.
+ */
+ public static boolean useFullscreenLargeSeekbar(boolean original) {
+ return Settings.FULLSCREEN_LARGE_SEEKBAR.get();
+ }
}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/LoopVideoPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/LoopVideoPatch.java
index 8504aad931..425d719f33 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/LoopVideoPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/LoopVideoPatch.java
@@ -7,7 +7,12 @@ public class LoopVideoPatch {
/**
* Injection point
*/
- public static boolean shouldLoopVideo() {
- return Settings.LOOP_VIDEO.get();
+ public static boolean shouldLoopVideo(Enum status) {
+ boolean shouldLoop = status != null && "ENDED".equals(status.name())
+ && Settings.LOOP_VIDEO.get();
+
+ // Instead of calling a method to loop the video, just seek to 00:00.
+ if (shouldLoop) VideoInformation.seekTo(0);
+ return shouldLoop;
}
}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/MiniplayerPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/MiniplayerPatch.java
index ac05e1540d..84fb868ac9 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/MiniplayerPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/MiniplayerPatch.java
@@ -13,8 +13,10 @@ import android.widget.TextView;
import androidx.annotation.Nullable;
import java.util.List;
+import java.util.Objects;
import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.ResourceType;
import app.revanced.extension.shared.Utils;
import app.revanced.extension.shared.settings.Setting;
import app.revanced.extension.youtube.settings.Settings;
@@ -28,7 +30,6 @@ public final class MiniplayerPatch {
public enum MiniplayerType {
/**
* Disabled. When swiped down the miniplayer is immediately closed.
- * Only available with 19.43+
*/
DISABLED(false, null),
/** Unmodified type, and same as un-patched. */
@@ -88,9 +89,9 @@ public final class MiniplayerPatch {
final int HORIZONTAL_PADDING_DIP = 15; // Estimated padding.
// Round down to the nearest 5 pixels, to keep any error toasts easier to read.
final int estimatedWidthDipMax = 5 * ((deviceDipWidth - HORIZONTAL_PADDING_DIP) / 5);
- // On some ultra low end devices the pixel width and density are the same number,
+ // On some ultra-low-end devices the pixel width and density are the same number,
// which causes the estimate to always give a value of 1.
- // Fix this by using a fixed size of double the min width.
+ // Fix this by using a fixed size twice the minimum width.
final int WIDTH_DIP_MAX = estimatedWidthDipMax <= WIDTH_DIP_MIN
? 2 * WIDTH_DIP_MIN
: estimatedWidthDipMax;
@@ -115,7 +116,7 @@ public final class MiniplayerPatch {
* Resource is not present in older targets, and this field will be zero.
*/
private static final int MODERN_OVERLAY_SUBTITLE_TEXT
- = Utils.getResourceIdentifier("modern_miniplayer_subtitle_text", "id");
+ = Utils.getResourceIdentifier(ResourceType.ID, "modern_miniplayer_subtitle_text");
private static final MiniplayerType CURRENT_TYPE = Settings.MINIPLAYER_TYPE.get();
@@ -139,8 +140,8 @@ public final class MiniplayerPatch {
(CURRENT_TYPE == MODERN_1 || CURRENT_TYPE == MODERN_3 || CURRENT_TYPE == MODERN_4)
&& Settings.MINIPLAYER_HIDE_SUBTEXT.get();
- // 19.25 is last version that has forward/back buttons for phones,
- // but buttons still show for tablets/foldable devices and they don't work well so always hide.
+ // 19.25 is last version that uses forward/back buttons for phones,
+ // but buttons still show for tablets/foldable devices, and they don't work well so always hide.
private static final boolean HIDE_REWIND_FORWARD_ENABLED = CURRENT_TYPE == MODERN_1
&& (VersionCheckPatch.IS_19_34_OR_GREATER || Settings.MINIPLAYER_HIDE_REWIND_FORWARD.get());
@@ -280,6 +281,12 @@ public final class MiniplayerPatch {
* Injection point.
*/
public static int getModernMiniplayerOverrideType(int original) {
+ if (CURRENT_TYPE == MINIMAL) {
+ // In newer app targets the minimal player can show the wrong icon if modern 4 is allowed.
+ // Forcing to modern 1 seems to work.
+ return Objects.requireNonNull(MODERN_1.modernPlayerType);
+ }
+
Integer modernValue = CURRENT_TYPE.modernPlayerType;
return modernValue == null
? original
@@ -378,6 +385,19 @@ public final class MiniplayerPatch {
return original;
}
+ /**
+ * Injection point.
+ */
+ public static boolean allowBoldIcons(boolean original) {
+ if (CURRENT_TYPE == MINIMAL) {
+ // Minimal player does not have the correct pause/play icon (it's too large).
+ // Use the non-bold icons instead.
+ return false;
+ }
+
+ return original;
+ }
+
/**
* Injection point.
*/
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/NavigationBarPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/NavigationBarPatch.java
new file mode 100644
index 0000000000..7de8bce90c
--- /dev/null
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/NavigationBarPatch.java
@@ -0,0 +1,205 @@
+package app.revanced.extension.youtube.patches;
+
+import static app.revanced.extension.shared.Utils.hideViewUnderCondition;
+import static app.revanced.extension.youtube.shared.NavigationBar.NavigationButton;
+
+import android.os.Build;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.TextView;
+
+import java.util.EnumMap;
+import java.util.Map;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.ui.Dim;
+import app.revanced.extension.youtube.settings.Settings;
+
+@SuppressWarnings("unused")
+public final class NavigationBarPatch {
+
+ private static final Map shouldHideMap = new EnumMap<>(NavigationButton.class) {
+ {
+ put(NavigationButton.HOME, Settings.HIDE_HOME_BUTTON.get());
+ put(NavigationButton.CREATE, Settings.HIDE_CREATE_BUTTON.get());
+ put(NavigationButton.NOTIFICATIONS, Settings.HIDE_NOTIFICATIONS_BUTTON.get());
+ put(NavigationButton.SHORTS, Settings.HIDE_SHORTS_BUTTON.get());
+ put(NavigationButton.SUBSCRIPTIONS, Settings.HIDE_SUBSCRIPTIONS_BUTTON.get());
+ }
+ };
+
+ private static final boolean SWITCH_CREATE_WITH_NOTIFICATIONS_BUTTON
+ = Settings.SWITCH_CREATE_WITH_NOTIFICATIONS_BUTTON.get();
+
+ private static final boolean DISABLE_TRANSLUCENT_STATUS_BAR
+ = Settings.DISABLE_TRANSLUCENT_STATUS_BAR.get();
+
+ private static final boolean DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT
+ = Settings.DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT.get();
+
+ private static final boolean DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK
+ = Settings.DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK.get();
+
+ private static final boolean NARROW_NAVIGATION_BUTTONS
+ = Settings.NARROW_NAVIGATION_BUTTONS.get();
+
+ /**
+ * Injection point.
+ */
+ public static String switchCreateWithNotificationButton(String osName) {
+ return SWITCH_CREATE_WITH_NOTIFICATIONS_BUTTON
+ ? "Android Automotive"
+ : osName;
+ }
+
+ /**
+ * Injection point.
+ */
+ public static void navigationTabCreated(NavigationButton button, View tabView) {
+ if (Boolean.TRUE.equals(shouldHideMap.get(button))) {
+ tabView.setVisibility(View.GONE);
+ }
+ }
+
+ /**
+ * Injection point.
+ */
+ public static void hideNavigationButtonLabels(TextView navigationLabelsView) {
+ hideViewUnderCondition(Settings.HIDE_NAVIGATION_BUTTON_LABELS, navigationLabelsView);
+ }
+
+ /**
+ * Injection point.
+ */
+ public static boolean useAnimatedNavigationButtons(boolean original) {
+ return Settings.NAVIGATION_BAR_ANIMATIONS.get();
+ }
+
+ /**
+ * Injection point.
+ */
+ public static boolean enableNarrowNavigationButton(boolean original) {
+ return NARROW_NAVIGATION_BUTTONS || original;
+ }
+
+ /**
+ * Injection point.
+ */
+ public static boolean useTranslucentNavigationStatusBar(boolean original) {
+ // Must check Android version, as forcing this on Android 11 or lower causes app hang and crash.
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
+ return original;
+ }
+
+ if (DISABLE_TRANSLUCENT_STATUS_BAR) {
+ return false;
+ }
+
+ return original;
+ }
+
+ /**
+ * Injection point.
+ */
+ public static boolean useTranslucentNavigationButtons(boolean original) {
+ // Feature requires Android 13+
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+ return original;
+ }
+
+ if (!DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK && !DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT) {
+ return original;
+ }
+
+ if (DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK && DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT) {
+ return false;
+ }
+
+ return Utils.isDarkModeEnabled()
+ ? !DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK
+ : !DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT;
+ }
+
+ // Toolbar
+
+ public static void hideCreateButton(String enumString, View view) {
+ if (!Settings.HIDE_TOOLBAR_CREATE_BUTTON.get())
+ return;
+
+ hideViewUnderCondition(isCreateButton(enumString), view);
+ }
+
+ public static void hideNotificationButton(String enumString, View view) {
+ if (!Settings.HIDE_TOOLBAR_NOTIFICATION_BUTTON.get())
+ return;
+
+ hideViewUnderCondition(isNotificationButton(enumString), view);
+ }
+
+ public static void hideSearchButton(String enumString, View view) {
+ if (!Settings.HIDE_TOOLBAR_SEARCH_BUTTON.get())
+ return;
+
+ hideViewUnderCondition(isSearchButton(enumString), view);
+ }
+
+ public static void hideSearchButton(MenuItem menuItem, int original) {
+ menuItem.setShowAsAction(
+ Settings.HIDE_TOOLBAR_SEARCH_BUTTON.get()
+ ? MenuItem.SHOW_AS_ACTION_NEVER
+ : original
+ );
+ }
+
+ private static boolean isCreateButton(String enumString) {
+ return "CREATION_ENTRY".equals(enumString) // Create button for Phone layout.
+ || "FAB_CAMERA".equals(enumString); // Create button for Tablet layout.
+ }
+
+ private static boolean isNotificationButton(String enumString) {
+ return "TAB_ACTIVITY".equals(enumString) // Notification button.
+ || "TAB_ACTIVITY_CAIRO".equals(enumString); // Notification button (New layout).
+ }
+
+ private static boolean isSearchButton(String enumString) {
+ return "SEARCH".equals(enumString) // Search button.
+ || "SEARCH_CAIRO".equals(enumString) // Search button (New layout).
+ || "SEARCH_BOLD".equals(enumString); // Search button (Shorts).
+ }
+
+ // Wide searchbar
+ private static final Boolean WIDE_SEARCHBAR_ENABLED = Settings.WIDE_SEARCHBAR.get();
+
+ /**
+ * Injection point.
+ */
+ public static boolean enableWideSearchbar(boolean original) {
+ return WIDE_SEARCHBAR_ENABLED || original;
+ }
+
+ /**
+ * Injection point.
+ */
+ public static void setActionBar(View view) {
+ try {
+ if (!WIDE_SEARCHBAR_ENABLED) return;
+
+ View searchBarView = Utils.getChildViewByResourceName(view, "search_bar");
+
+ final int paddingLeft = searchBarView.getPaddingLeft();
+ final int paddingRight = searchBarView.getPaddingRight();
+ final int paddingTop = searchBarView.getPaddingTop();
+ final int paddingBottom = searchBarView.getPaddingBottom();
+ final int paddingStart = Dim.dp8;
+
+ if (Utils.isRightToLeftLocale()) {
+ searchBarView.setPadding(paddingLeft, paddingTop, paddingStart, paddingBottom);
+ } else {
+ searchBarView.setPadding(paddingStart, paddingTop, paddingRight, paddingBottom);
+ }
+ } catch (Exception ex) {
+ Logger.printException(() -> "setActionBar failure", ex);
+ }
+ }
+}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/NavigationButtonsPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/NavigationButtonsPatch.java
deleted file mode 100644
index 7021cc6f9f..0000000000
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/NavigationButtonsPatch.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package app.revanced.extension.youtube.patches;
-
-import static app.revanced.extension.shared.Utils.hideViewUnderCondition;
-import static app.revanced.extension.youtube.shared.NavigationBar.NavigationButton;
-
-import android.os.Build;
-import android.view.View;
-
-import java.util.EnumMap;
-import java.util.Map;
-
-import android.widget.TextView;
-
-import app.revanced.extension.shared.Utils;
-import app.revanced.extension.youtube.settings.Settings;
-
-@SuppressWarnings("unused")
-public final class NavigationButtonsPatch {
-
- private static final Map shouldHideMap = new EnumMap<>(NavigationButton.class) {
- {
- put(NavigationButton.HOME, Settings.HIDE_HOME_BUTTON.get());
- put(NavigationButton.CREATE, Settings.HIDE_CREATE_BUTTON.get());
- put(NavigationButton.NOTIFICATIONS, Settings.HIDE_NOTIFICATIONS_BUTTON.get());
- put(NavigationButton.SHORTS, Settings.HIDE_SHORTS_BUTTON.get());
- put(NavigationButton.SUBSCRIPTIONS, Settings.HIDE_SUBSCRIPTIONS_BUTTON.get());
- }
- };
-
- private static final boolean SWITCH_CREATE_WITH_NOTIFICATIONS_BUTTON
- = Settings.SWITCH_CREATE_WITH_NOTIFICATIONS_BUTTON.get();
-
- private static final Boolean DISABLE_TRANSLUCENT_STATUS_BAR
- = Settings.DISABLE_TRANSLUCENT_STATUS_BAR.get();
-
- private static final Boolean DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT
- = Settings.DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT.get();
-
- private static final Boolean DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK
- = Settings.DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK.get();
-
- /**
- * Injection point.
- */
- public static boolean switchCreateWithNotificationButton() {
- return SWITCH_CREATE_WITH_NOTIFICATIONS_BUTTON;
- }
-
- /**
- * Injection point.
- */
- public static void navigationTabCreated(NavigationButton button, View tabView) {
- if (Boolean.TRUE.equals(shouldHideMap.get(button))) {
- tabView.setVisibility(View.GONE);
- }
- }
-
- /**
- * Injection point.
- */
- public static void hideNavigationButtonLabels(TextView navigationLabelsView) {
- hideViewUnderCondition(Settings.HIDE_NAVIGATION_BUTTON_LABELS, navigationLabelsView);
- }
-
- /**
- * Injection point.
- */
- public static boolean useTranslucentNavigationStatusBar(boolean original) {
- // Must check Android version, as forcing this on Android 11 or lower causes app hang and crash.
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
- return original;
- }
-
- if (DISABLE_TRANSLUCENT_STATUS_BAR) {
- return false;
- }
-
- return original;
- }
-
- /**
- * Injection point.
- */
- public static boolean useTranslucentNavigationButtons(boolean original) {
- // Feature requires Android 13+
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
- return original;
- }
-
- if (!DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK && !DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT) {
- return original;
- }
-
- if (DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK && DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT) {
- return false;
- }
-
- return Utils.isDarkModeEnabled()
- ? !DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK
- : !DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT;
- }
-}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/OpenShortsInRegularPlayerPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/OpenShortsInRegularPlayerPatch.java
index e0a1e3c700..937d35260b 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/OpenShortsInRegularPlayerPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/OpenShortsInRegularPlayerPatch.java
@@ -20,15 +20,6 @@ public class OpenShortsInRegularPlayerPatch {
REGULAR_PLAYER_FULLSCREEN
}
- static {
- if (!VersionCheckPatch.IS_19_46_OR_GREATER
- && Settings.SHORTS_PLAYER_TYPE.get() == ShortsPlayerType.REGULAR_PLAYER_FULLSCREEN) {
- // User imported newer settings to an older app target.
- Logger.printInfo(() -> "Resetting " + Settings.SHORTS_PLAYER_TYPE);
- Settings.SHORTS_PLAYER_TYPE.resetToDefault();
- }
- }
-
private static WeakReference mainActivityRef = new WeakReference<>(null);
private static volatile boolean overrideBackPressToExit;
@@ -40,6 +31,13 @@ public class OpenShortsInRegularPlayerPatch {
mainActivityRef = new WeakReference<>(activity);
}
+ /**
+ * Injection point.
+ */
+ public static boolean overrideBackPressToExit() {
+ return overrideBackPressToExit(true);
+ }
+
/**
* Injection point.
*/
@@ -55,7 +53,7 @@ public class OpenShortsInRegularPlayerPatch {
/**
* Injection point.
*/
- public static boolean openShort(String videoID) {
+ public static boolean openShort(String videoId) {
try {
ShortsPlayerType type = Settings.SHORTS_PLAYER_TYPE.get();
if (type == ShortsPlayerType.SHORTS_PLAYER) {
@@ -63,7 +61,7 @@ public class OpenShortsInRegularPlayerPatch {
return false; // Default unpatched behavior.
}
- if (videoID.isEmpty()) {
+ if (videoId.isEmpty()) {
// Shorts was opened using launcher app shortcut.
//
// This check will not detect if the Shorts app shortcut is used
@@ -93,12 +91,12 @@ public class OpenShortsInRegularPlayerPatch {
// Can use the application context and add intent flags of
// FLAG_ACTIVITY_NEW_TASK and FLAG_ACTIVITY_CLEAR_TOP
// But the activity context seems to fix random app crashes
- // if Shorts urls are opened outside the app.
+ // if Shorts URLs are opened outside the app.
var context = mainActivityRef.get();
Intent videoPlayerIntent = new Intent(
Intent.ACTION_VIEW,
- Uri.parse("https://youtube.com/watch?v=" + videoID)
+ Uri.parse("https://youtube.com/watch?v=" + videoId)
);
videoPlayerIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
videoPlayerIntent.setPackage(context.getPackageName());
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/OpenVideosFullscreenHookPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/OpenVideosFullscreenHookPatch.java
index ff2d778741..9a7989d9a1 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/OpenVideosFullscreenHookPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/OpenVideosFullscreenHookPatch.java
@@ -24,18 +24,20 @@ public class OpenVideosFullscreenHookPatch {
/**
* Injection point.
+ *
+ * Returns negated value.
*/
- public static boolean openVideoFullscreenPortrait(boolean original) {
+ public static boolean doNotOpenVideoFullscreenPortrait(boolean original) {
Boolean openFullscreen = openNextVideoFullscreen;
if (openFullscreen != null) {
openNextVideoFullscreen = null;
- return openFullscreen;
+ return !openFullscreen;
}
if (!isFullScreenPatchIncluded()) {
return original;
}
- return Settings.OPEN_VIDEOS_FULLSCREEN_PORTRAIT.get();
+ return !Settings.OPEN_VIDEOS_FULLSCREEN_PORTRAIT.get();
}
}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/PauseOnAudioInterruptPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/PauseOnAudioInterruptPatch.java
new file mode 100644
index 0000000000..cf010a151a
--- /dev/null
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/PauseOnAudioInterruptPatch.java
@@ -0,0 +1,30 @@
+package app.revanced.extension.youtube.patches;
+
+import app.revanced.extension.youtube.settings.Settings;
+
+@SuppressWarnings("unused")
+public class PauseOnAudioInterruptPatch {
+
+ private static final int AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK = -3;
+ private static final int AUDIOFOCUS_LOSS_TRANSIENT = -2;
+
+ /**
+ * Injection point for AudioFocusRequest builder.
+ * Returns true if audio ducking should be disabled (willPauseWhenDucked = true).
+ */
+ public static boolean shouldPauseOnAudioInterrupt() {
+ return Settings.PAUSE_ON_AUDIO_INTERRUPT.get();
+ }
+
+ /**
+ * Injection point for onAudioFocusChange callback.
+ * Converts AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK to AUDIOFOCUS_LOSS_TRANSIENT
+ * when the setting is enabled, causing YouTube to pause instead of ducking.
+ */
+ public static int overrideAudioFocusChange(int focusChange) {
+ if (Settings.PAUSE_ON_AUDIO_INTERRUPT.get() && focusChange == AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK) {
+ return AUDIOFOCUS_LOSS_TRANSIENT;
+ }
+ return focusChange;
+ }
+}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/PlayerControlsPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/PlayerControlsPatch.java
index a969996837..482c0c3c49 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/PlayerControlsPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/PlayerControlsPatch.java
@@ -2,7 +2,6 @@ package app.revanced.extension.youtube.patches;
import android.view.View;
import android.view.ViewTreeObserver;
-import android.widget.ImageView;
import java.lang.ref.WeakReference;
@@ -11,7 +10,7 @@ import app.revanced.extension.shared.Logger;
@SuppressWarnings("unused")
public class PlayerControlsPatch {
- public static WeakReference fullscreenButtonRef = new WeakReference<>(null);
+ public static WeakReference fullscreenButtonRef = new WeakReference<>(null);
private static boolean fullscreenButtonVisibilityCallbacksExist() {
return false; // Modified during patching if needed.
@@ -20,8 +19,8 @@ public class PlayerControlsPatch {
/**
* Injection point.
*/
- public static void setFullscreenCloseButton(ImageView imageButton) {
- fullscreenButtonRef = new WeakReference<>(imageButton);
+ public static void setFullscreenCloseButton(View button) {
+ fullscreenButtonRef = new WeakReference<>(button);
Logger.printDebug(() -> "Fullscreen button set");
if (!fullscreenButtonVisibilityCallbacksExist()) {
@@ -30,19 +29,19 @@ public class PlayerControlsPatch {
// Add a global listener, since the protected method
// View#onVisibilityChanged() does not have any call backs.
- imageButton.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+ button.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
int lastVisibility = View.VISIBLE;
@Override
public void onGlobalLayout() {
try {
- final int visibility = imageButton.getVisibility();
+ final int visibility = button.getVisibility();
if (lastVisibility != visibility) {
lastVisibility = visibility;
Logger.printDebug(() -> "fullscreen button visibility: "
+ (visibility == View.VISIBLE ? "VISIBLE" :
- visibility == View.GONE ? "GONE" : "INVISIBLE"));
+ visibility == View.GONE ? "GONE" : "INVISIBLE"));
fullscreenButtonVisibilityChanged(visibility == View.VISIBLE);
}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/RemoveViewerDiscretionDialogPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/RemoveViewerDiscretionDialogPatch.java
index 0260b2c69d..8b3437316f 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/RemoveViewerDiscretionDialogPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/RemoveViewerDiscretionDialogPatch.java
@@ -1,19 +1,102 @@
package app.revanced.extension.youtube.patches;
import android.app.AlertDialog;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.Button;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
import app.revanced.extension.youtube.settings.Settings;
-/** @noinspection unused*/
+@SuppressWarnings("unused")
public class RemoveViewerDiscretionDialogPatch {
+ private static final String[] VIEWER_DISCRETION_DIALOG_PLAYABILITY_STATUS = {
+ "AGE_CHECK_REQUIRED",
+ "AGE_VERIFICATION_REQUIRED",
+ "CONTENT_CHECK_REQUIRED",
+ "LOGIN_REQUIRED"
+ };
+ @NonNull
+ private static volatile String playabilityStatus = "";
+
+ /**
+ * Injection point.
+ */
public static void confirmDialog(AlertDialog dialog) {
- if (!Settings.REMOVE_VIEWER_DISCRETION_DIALOG.get()) {
+ // The dialog may already be shown due to the AlertDialog#create() method.
+ // Call the AlertDialog#show() method only when the dialog is not shown.
+ if (!dialog.isShowing()) {
// Since the patch replaces the AlertDialog#show() method, we need to call the original method here.
dialog.show();
- return;
}
- final var button = dialog.getButton(AlertDialog.BUTTON_POSITIVE);
- button.setSoundEffectsEnabled(false);
- button.performClick();
+ if (shouldConfirmDialog()) {
+ Button button = dialog.getButton(AlertDialog.BUTTON_POSITIVE);
+ if (button != null) {
+ Window window = dialog.getWindow();
+ if (window != null) {
+ // Resize the dialog to 0 before clicking the button.
+ // If the dialog is not resized to 0, it will remain visible for about a second before closing.
+ WindowManager.LayoutParams params = window.getAttributes();
+ params.height = 0;
+ params.width = 0;
+
+ // Change the size of AlertDialog to 0.
+ window.setAttributes(params);
+
+ // Disable AlertDialog's background dim.
+ window.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
+ }
+ Logger.printDebug(() -> "Clicking alert dialog dismiss button");
+ button.callOnClick();
+ }
+ }
+ }
+
+ /**
+ * Injection point.
+ */
+ public static AlertDialog confirmDialog(AlertDialog.Builder builder) {
+ AlertDialog dialog = builder.create();
+ confirmDialog(dialog);
+ return dialog;
+ }
+
+ /**
+ * Injection point.
+ * Modern-style dialog is controlled by an obfuscated class and require additional hooking to get the buttons.
+ * Disabling the modern-style dialog is the simplest workaround.
+ * Since the purpose of the patch is to close the dialog immediately, this isn't a problem.
+ *
+ * @return Whether to use modern-style dialog.
+ * If false, AlertDialog is used.
+ */
+ public static boolean disableModernDialog(boolean original) {
+ return !shouldConfirmDialog() && original;
+ }
+
+ /**
+ * Injection point.
+ *
+ * @param status Enum value of 'playabilityStatus.status' in '/player' endpoint responses.
+ */
+ public static void setPlayabilityStatus(@Nullable Enum status) {
+ playabilityStatus = status == null ? "" : status.name();
+ }
+
+ /**
+ * The viewer discretion dialog shows when the playability status is
+ * [AGE_CHECK_REQUIRED], [AGE_VERIFICATION_REQUIRED], [CONTENT_CHECK_REQUIRED], or [LOGIN_REQUIRED].
+ * Verify the playability status to prevent unintended dialog closures.
+ *
+ * @return Whether to close the dialog.
+ */
+ private static boolean shouldConfirmDialog() {
+ return Settings.REMOVE_VIEWER_DISCRETION_DIALOG.get()
+ && Utils.containsAny(playabilityStatus, VIEWER_DISCRETION_DIALOG_PLAYABILITY_STATUS);
}
}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ReturnYouTubeDislikePatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ReturnYouTubeDislikePatch.java
index f7c0bee2d3..beaa3eac82 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ReturnYouTubeDislikePatch.java
+++ b/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.ReturnYouTubeDislikeFilter;
+import app.revanced.extension.youtube.patches.litho.ReturnYouTubeDislikeFilter;
import app.revanced.extension.youtube.returnyoutubedislike.ReturnYouTubeDislike;
import app.revanced.extension.youtube.settings.Settings;
import app.revanced.extension.youtube.shared.PlayerType;
@@ -49,21 +49,21 @@ public class ReturnYouTubeDislikePatch {
/**
* The last litho based Shorts loaded.
- * May be the same value as {@link #currentVideoData}, but usually is the next short to swipe to.
+ * Maybe the same value as {@link #currentVideoData}, but usually is the next short to swipe to.
*/
@Nullable
private static volatile ReturnYouTubeDislike lastLithoShortsVideoData;
/**
* Because litho Shorts spans are created offscreen after {@link ReturnYouTubeDislikeFilter}
- * detects the video ids, but the current Short can arbitrarily reload the same span,
+ * 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.
*/
@GuardedBy("ReturnYouTubeDislikePatch.class")
private static int useLithoShortsVideoDataCount;
/**
- * Last video id prefetched. Field is to prevent prefetching the same video id multiple times in a row.
+ * Last video ID prefetched. Field is to prevent prefetching the same video ID multiple times in a row.
*/
@Nullable
private static volatile String lastPrefetchedVideoId;
@@ -98,6 +98,19 @@ public class ReturnYouTubeDislikePatch {
// Litho player for both regular videos and Shorts.
//
+ /**
+ * Injection point.
+ *
+ * Logs if new litho text layout is used.
+ */
+ public static boolean useNewLithoTextCreation(boolean useNewLithoTextCreation) {
+ // Don't force flag on/off unless debugging patch hooks,
+ // because forcing off with newer YT targets causes Shorts player to show no buttons,
+ // presumably because the old litho data isn't in the layout data.
+ Logger.printDebug(() -> "useNewLithoTextCreation: " + useNewLithoTextCreation);
+ return useNewLithoTextCreation;
+ }
+
/**
* Injection point.
*
@@ -113,7 +126,7 @@ public class ReturnYouTubeDislikePatch {
* Called when a litho text component is initially created,
* and also when a Span is later reused again (such as scrolling off/on screen).
*
- * This method is sometimes called on the main thread, but it usually is called _off_ the main thread.
+ * This method is sometimes called on the main thread, but it is usually called _off_ the main thread.
* This method can be called multiple times for the same UI element (including after dislikes was added).
*
* @param original Original char sequence was created or reused by Litho.
@@ -131,6 +144,10 @@ public class ReturnYouTubeDislikePatch {
String conversionContextString = conversionContext.toString();
+ if (Settings.RYD_ENABLED.get()) { // FIXME: Remove this.
+ Logger.printDebug(() -> "RYD conversion context: " + conversionContext);
+ }
+
if (isRollingNumber && !conversionContextString.contains("video_action_bar.e")) {
return original;
}
@@ -181,14 +198,14 @@ public class ReturnYouTubeDislikePatch {
final ReturnYouTubeDislike videoData;
if (decrementUseLithoDataIfNeeded()) {
- // New Short is loading off screen.
+ // New Short is loading off-screen.
videoData = lastLithoShortsVideoData;
} else {
videoData = currentVideoData;
}
if (videoData == null) {
- // The Shorts litho video id filter did not detect the video id.
+ // The Shorts litho video ID filter did not detect the video ID.
// This is normal in incognito mode, but otherwise is abnormal.
Logger.printDebug(() -> "Cannot modify Shorts litho span, data is null");
return original;
@@ -288,7 +305,7 @@ public class ReturnYouTubeDislikePatch {
/**
* Remove Rolling Number text view modifications made by this patch.
- * Required as it appears text views can be reused for other rolling numbers (view count, upload time, etc).
+ * Required as it appears text views can be reused for other rolling numbers (view count, upload time, etc.).
*/
private static void removeRollingNumberPatchChanges(TextView view) {
if (view.getCompoundDrawablePadding() != 0) {
@@ -310,7 +327,7 @@ public class ReturnYouTubeDislikePatch {
return original;
}
// Called for all instances of RollingNumber, so must check if text is for a dislikes.
- // Text will already have the correct content but it's missing the drawable separators.
+ // Text will already have the correct content, but it's missing the drawable separators.
if (!ReturnYouTubeDislike.isPreviouslyCreatedSegmentedSpan(original.toString())) {
// The text is the video view count, upload time, or some other text.
removeRollingNumberPatchChanges(view);
@@ -347,13 +364,13 @@ public class ReturnYouTubeDislikePatch {
}
//
- // Video Id and voting hooks (all players).
+ // Video ID and voting hooks (all players).
//
private static volatile boolean lastPlayerResponseWasShort;
/**
- * Injection point. Uses 'playback response' video id hook to preload RYD.
+ * Injection point. Uses 'playback response' video ID hook to preload RYD.
*/
public static void preloadVideoId(@NonNull String videoId, boolean isShortAndOpeningOrPlaying) {
try {
@@ -383,7 +400,7 @@ public class ReturnYouTubeDislikePatch {
if (waitForFetchToComplete && !fetch.fetchCompleted()) {
// This call is off the main thread, so wait until the RYD fetch completely finishes,
// otherwise if this returns before the fetch completes then the UI can
- // become frozen when the main thread tries to modify the litho Shorts dislikes and
+ // become frozen when the main thread tries to modify the litho Shorts dislikes, and
// it must wait for the fetch.
// Only need to do this for the first Short opened, as the next Short to swipe to
// are preloaded in the background.
@@ -402,7 +419,7 @@ public class ReturnYouTubeDislikePatch {
}
/**
- * Injection point. Uses 'current playing' video id hook. Always called on main thread.
+ * Injection point. Uses 'current playing' video ID hook. Always called on main thread.
*/
public static void newVideoLoaded(@NonNull String videoId) {
try {
@@ -420,7 +437,7 @@ public class ReturnYouTubeDislikePatch {
if (videoIdIsSame(currentVideoData, videoId)) {
return;
}
- Logger.printDebug(() -> "New video id: " + videoId + " playerType: " + currentPlayerType);
+ Logger.printDebug(() -> "New video ID: " + videoId + " playerType: " + currentPlayerType);
if (!Utils.isNetworkConnected()) {
Logger.printDebug(() -> "Cannot fetch RYD, network is not connected");
@@ -446,16 +463,16 @@ public class ReturnYouTubeDislikePatch {
}
if (videoId == null) {
- // Litho filter did not detect the video id. App is in incognito mode,
- // or the proto buffer structure was changed and the video id is no longer present.
+ // Litho filter did not detect the video ID. App is in incognito mode,
+ // or the proto buffer structure was changed and the video ID is no longer present.
// Must clear both currently playing and last litho data otherwise the
// next regular video may use the wrong data.
- Logger.printDebug(() -> "Litho filter did not find any video ids");
+ Logger.printDebug(() -> "Litho filter did not find any video IDs");
clearData();
return;
}
- Logger.printDebug(() -> "New litho Shorts video id: " + videoId);
+ Logger.printDebug(() -> "New litho Shorts video ID: " + videoId);
ReturnYouTubeDislike videoData = ReturnYouTubeDislike.getFetchForVideoId(videoId);
videoData.setVideoIdIsShort(true);
lastLithoShortsVideoData = videoData;
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/SeekbarThumbnailsPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/SeekbarThumbnailsPatch.java
deleted file mode 100644
index 30722c0878..0000000000
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/SeekbarThumbnailsPatch.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package app.revanced.extension.youtube.patches;
-
-import app.revanced.extension.shared.settings.Setting;
-import app.revanced.extension.youtube.settings.Settings;
-
-import java.util.List;
-
-@SuppressWarnings("unused")
-public class SeekbarThumbnailsPatch {
-
- public static final class SeekbarThumbnailsHighQualityAvailability implements Setting.Availability {
- @Override
- public boolean isAvailable() {
- return VersionCheckPatch.IS_19_17_OR_GREATER || !Settings.RESTORE_OLD_SEEKBAR_THUMBNAILS.get();
- }
-
- @Override
- public List> getParentSettings() {
- return List.of(Settings.RESTORE_OLD_SEEKBAR_THUMBNAILS);
- }
- }
-
- private static final boolean SEEKBAR_THUMBNAILS_HIGH_QUALITY_ENABLED
- = Settings.SEEKBAR_THUMBNAILS_HIGH_QUALITY.get();
-
- /**
- * Injection point.
- */
- public static boolean useHighQualityFullscreenThumbnails() {
- return SEEKBAR_THUMBNAILS_HIGH_QUALITY_ENABLED;
- }
-
- /**
- * Injection point.
- */
- public static boolean useFullscreenSeekbarThumbnails() {
- return !Settings.RESTORE_OLD_SEEKBAR_THUMBNAILS.get();
- }
-}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ShortsAutoplayPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ShortsAutoplayPatch.java
index 9e5aff20b1..905ca6dfa0 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ShortsAutoplayPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ShortsAutoplayPatch.java
@@ -2,8 +2,6 @@ package app.revanced.extension.youtube.patches;
import android.app.Activity;
-import androidx.annotation.Nullable;
-
import java.lang.ref.WeakReference;
import java.util.Objects;
@@ -78,7 +76,7 @@ public class ShortsAutoplayPatch {
/**
* Injection point.
*/
- public static Enum changeShortsRepeatBehavior(@Nullable Enum original) {
+ public static Enum changeShortsRepeatBehavior(Enum original) {
try {
final boolean autoplay;
@@ -95,36 +93,35 @@ public class ShortsAutoplayPatch {
autoplay = Settings.SHORTS_AUTOPLAY.get();
}
- final ShortsLoopBehavior behavior = autoplay
+ Enum overrideBehavior = (autoplay
? ShortsLoopBehavior.SINGLE_PLAY
- : ShortsLoopBehavior.REPEAT;
+ : ShortsLoopBehavior.REPEAT).ytEnumValue;
- if (behavior.ytEnumValue != null) {
+ if (overrideBehavior != null) {
Logger.printDebug(() -> {
String name = (original == null ? "unknown (null)" : original.name());
- return behavior == original
+ return overrideBehavior == original
? "Behavior setting is same as original. Using original: " + name
- : "Changing Shorts repeat behavior from: " + name + " to: " + behavior.name();
+ : "Changing Shorts repeat behavior from: " + name + " to: " + overrideBehavior.name();
});
- return behavior.ytEnumValue;
+ return overrideBehavior;
}
if (original == null) {
- // Cannot return null, as null is used to indicate Short was auto played.
+ // Cannot return null, as null is used to indicate the Short was autoplayed.
// Unpatched app replaces null with unknown enum type (appears to fix for bad api data).
Enum unknown = ShortsLoopBehavior.UNKNOWN.ytEnumValue;
Logger.printDebug(() -> "Original is null, returning: " + unknown.name());
return unknown;
}
} catch (Exception ex) {
- Logger.printException(() -> "changeShortsRepeatBehavior failure", ex);
+ Logger.printException(() -> "changeShortsRepeatState failure", ex);
}
return original;
}
-
/**
* Injection point.
*/
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/SeekbarTappingPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/TapToSeekPatch.java
similarity index 50%
rename from extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/SeekbarTappingPatch.java
rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/TapToSeekPatch.java
index dbbb363e1f..4fbc8fdf2c 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/SeekbarTappingPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/TapToSeekPatch.java
@@ -3,8 +3,8 @@ package app.revanced.extension.youtube.patches;
import app.revanced.extension.youtube.settings.Settings;
@SuppressWarnings("unused")
-public final class SeekbarTappingPatch {
- public static boolean seekbarTappingEnabled() {
- return Settings.SEEKBAR_TAPPING.get();
+public final class TapToSeekPatch {
+ public static boolean tapToSeekEnabled() {
+ return Settings.TAP_TO_SEEK.get();
}
}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ToolbarPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ToolbarPatch.java
new file mode 100644
index 0000000000..c33e54e5b2
--- /dev/null
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ToolbarPatch.java
@@ -0,0 +1,33 @@
+package app.revanced.extension.youtube.patches;
+
+import android.view.View;
+import android.widget.ImageView;
+
+import app.revanced.extension.shared.Logger;
+
+@SuppressWarnings("unused")
+public class ToolbarPatch {
+
+ /**
+ * Injection point.
+ */
+ public static void hookToolbar(Enum buttonEnum, ImageView imageView) {
+ final String enumString = buttonEnum.name();
+ if (enumString.isEmpty() ||
+ imageView == null ||
+ !(imageView.getParent() instanceof View view)) {
+ return;
+ }
+
+ Logger.printDebug(() -> "enumString: " + enumString);
+
+ hookToolbar(enumString, view);
+ }
+
+ /**
+ * Injection point.
+ */
+ private static void hookToolbar(String enumString, View parentView) {
+ // Code added by patch.
+ }
+}
\ No newline at end of file
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/VersionCheckPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/VersionCheckPatch.java
index 2844b53db7..77d85737b5 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/VersionCheckPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/VersionCheckPatch.java
@@ -19,5 +19,12 @@ public class VersionCheckPatch {
public static final boolean IS_19_29_OR_GREATER = isVersionOrGreater("19.29.00");
@Deprecated
public static final boolean IS_19_34_OR_GREATER = isVersionOrGreater("19.34.00");
- public static final boolean IS_19_46_OR_GREATER = isVersionOrGreater("19.46.00");
+
+ public static final boolean IS_20_21_OR_GREATER = isVersionOrGreater("20.21.00");
+
+ public static final boolean IS_20_22_OR_GREATER = isVersionOrGreater("20.22.00");
+
+ public static final boolean IS_20_31_OR_GREATER = isVersionOrGreater("20.31.00");
+
+ public static final boolean IS_20_37_OR_GREATER = isVersionOrGreater("20.37.00");
}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/VideoAdsPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/VideoAdsPatch.java
index ce07d8d16d..22447193c9 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/VideoAdsPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/VideoAdsPatch.java
@@ -14,4 +14,13 @@ public class VideoAdsPatch {
return SHOW_VIDEO_ADS;
}
+ /**
+ * Injection point.
+ */
+ public static String hideShortsAds(String osName) {
+ return SHOW_VIDEO_ADS
+ ? osName
+ : "Android Automotive";
+ }
+
}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/VideoInformation.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/VideoInformation.java
index 9c9b060a7b..934876578b 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/VideoInformation.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/VideoInformation.java
@@ -3,15 +3,13 @@ package app.revanced.extension.youtube.patches;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import com.google.android.libraries.youtube.innertube.model.media.VideoQuality;
-
import java.lang.ref.WeakReference;
import java.util.Arrays;
import java.util.Objects;
import app.revanced.extension.shared.Logger;
import app.revanced.extension.shared.Utils;
-import app.revanced.extension.youtube.Event;
+import app.revanced.extension.youtube.shared.Event;
import app.revanced.extension.youtube.shared.ShortsPlayerState;
import app.revanced.extension.youtube.shared.VideoState;
@@ -32,11 +30,20 @@ public final class VideoInformation {
*/
public interface VideoQualityMenuInterface {
// Method is added during patching.
- void patch_setQuality(VideoQuality quality);
+ void patch_setQuality(VideoQualityInterface quality);
}
/**
- * Video resolution of the automatic quality option..
+ * Interface to use obfuscated methods.
+ */
+ public interface VideoQualityInterface {
+ // Methods are added during patching.
+ String patch_getQualityName();
+ int patch_getResolution();
+ }
+
+ /**
+ * Video resolution of the automatic quality option.
*/
public static final int AUTOMATIC_VIDEO_QUALITY_VALUE = -2;
@@ -44,7 +51,7 @@ public final class VideoInformation {
* Video quality names are the same text for all languages.
* Premium can be "1080p Premium" or "1080p60 Premium"
*/
- public static final String VIDEO_QUALITY_PREMIUM_NAME = "Premium";
+ private static final String VIDEO_QUALITY_PREMIUM_NAME = "Premium";
private static final float DEFAULT_YOUTUBE_PLAYBACK_SPEED = 1.0f;
/**
@@ -76,14 +83,14 @@ public final class VideoInformation {
* The available qualities of the current video.
*/
@Nullable
- private static VideoQuality[] currentQualities;
+ private static VideoQualityInterface[] currentQualities;
/**
* The current quality of the video playing.
* This is always the actual quality even if Automatic quality is active.
*/
@Nullable
- private static VideoQuality currentQuality;
+ private static VideoQualityInterface currentQuality;
/**
* The current VideoQualityMenuInterface, set during setVideoQuality.
@@ -94,15 +101,15 @@ public final class VideoInformation {
/**
* Callback for when the current quality changes.
*/
- public static final Event onQualityChange = new Event<>();
+ public static final Event onQualityChange = new Event<>();
@Nullable
- public static VideoQuality[] getCurrentQualities() {
+ public static VideoQualityInterface[] getCurrentQualities() {
return currentQualities;
}
@Nullable
- public static VideoQuality getCurrentQuality() {
+ public static VideoQualityInterface getCurrentQuality() {
return currentQuality;
}
@@ -133,7 +140,7 @@ public final class VideoInformation {
*
* @param mdxPlayerDirector MDX player director object (casting mode).
*/
- public static void initializeMdx(@NonNull PlaybackController mdxPlayerDirector) {
+ public static void initializeMDX(@NonNull PlaybackController mdxPlayerDirector) {
try {
mdxPlayerDirectorRef = new WeakReference<>(Objects.requireNonNull(mdxPlayerDirector));
} catch (Exception ex) {
@@ -144,11 +151,11 @@ public final class VideoInformation {
/**
* Injection point.
*
- * @param newlyLoadedVideoId id of the current video
+ * @param newlyLoadedVideoId ID of the current video
*/
public static void setVideoId(@NonNull String newlyLoadedVideoId) {
if (!videoId.equals(newlyLoadedVideoId)) {
- Logger.printDebug(() -> "New video id: " + newlyLoadedVideoId);
+ Logger.printDebug(() -> "New video ID: " + newlyLoadedVideoId);
videoId = newlyLoadedVideoId;
}
}
@@ -178,11 +185,11 @@ public final class VideoInformation {
/**
* Injection point. Called off the main thread.
*
- * @param videoId The id of the last video loaded.
+ * @param videoId The ID of the last video loaded.
*/
public static void setPlayerResponseVideoId(@NonNull String videoId, boolean isShortAndOpeningOrPlaying) {
if (!playerResponseVideoId.equals(videoId)) {
- Logger.printDebug(() -> "New player response video id: " + videoId);
+ Logger.printDebug(() -> "New player response video ID: " + videoId);
playerResponseVideoId = videoId;
}
}
@@ -273,7 +280,7 @@ public final class VideoInformation {
// The difference has to be a different second mark in order to avoid infinite skip loops
// as the Lounge API only supports whole seconds.
if (adjustedSeekTime / 1000 == videoTime / 1000) {
- Logger.printDebug(() -> "Skipping seekTo for MDX because seek time is too small "
+ Logger.printDebug(() -> "Skipping seekTo for MDX because seek time is too small"
+ "(" + (adjustedSeekTime - videoTime) + "ms)");
return false;
}
@@ -301,7 +308,7 @@ public final class VideoInformation {
Logger.printDebug(() -> "Seeking relative to: " + seekTime);
// 19.39+ does not have a boolean return type for relative seek.
- // But can call both methods and it works correctly for both situations.
+ // But can call both methods, and it works correctly for both situations.
PlaybackController controller = playerControllerRef.get();
if (controller == null) {
Logger.printDebug(() -> "Cannot seek relative as player controller is null");
@@ -310,7 +317,7 @@ public final class VideoInformation {
}
// Adjust the fine adjustment function so it's at least 1 second before/after.
- // Otherwise the fine adjustment will do nothing when casting.
+ // Otherwise, the fine adjustment will do nothing when casting.
final long adjustedSeekTime;
if (seekTime < 0) {
adjustedSeekTime = Math.min(seekTime, -1000);
@@ -330,9 +337,9 @@ public final class VideoInformation {
}
/**
- * Id of the last video opened. Includes Shorts.
+ * ID of the last video opened. Includes Shorts.
*
- * @return The id of the video, or an empty string if no videos have been opened yet.
+ * @return The ID of the video, or an empty string if no videos have been opened yet.
*/
@NonNull
public static String getVideoId() {
@@ -340,7 +347,7 @@ public final class VideoInformation {
}
/**
- * Differs from {@link #videoId} as this is the video id for the
+ * Differs from {@link #videoId} as this is the video ID for the
* last player response received, which may not be the last video opened.
*
* If Shorts are loading the background, this commonly will be
@@ -348,7 +355,7 @@ public final class VideoInformation {
*
* For most use cases, you should instead use {@link #getVideoId()}.
*
- * @return The id of the last video loaded, or an empty string if no videos have been loaded yet.
+ * @return The ID of the last video loaded, or an empty string if no videos have been loaded yet.
*/
@NonNull
public static String getPlayerResponseVideoId() {
@@ -356,8 +363,8 @@ public final class VideoInformation {
}
/**
- * @return If the last player response video id was a Short.
- * Includes Shorts shelf items appearing in the feed that are not opened.
+ * @return If the last player response video ID was a Short.
+ * Include Shorts shelf items appearing in the feed that are not opened.
* @see #lastVideoIdIsShort()
*/
public static boolean lastPlayerResponseIsShort() {
@@ -365,7 +372,7 @@ public final class VideoInformation {
}
/**
- * @return If the last player response video id _that was opened_ was a Short.
+ * @return If the last player response video ID _that was opened_ was a Short.
*/
public static boolean lastVideoIdIsShort() {
return videoIdIsShort;
@@ -450,7 +457,7 @@ public final class VideoInformation {
qualityNeedsUpdating = true;
}
- private static void setCurrentQuality(@Nullable VideoQuality quality) {
+ private static void setCurrentQuality(@Nullable VideoQualityInterface quality) {
Utils.verifyOnMainThread();
if (currentQuality != quality) {
Logger.printDebug(() -> "Current quality changed to: " + quality);
@@ -462,7 +469,7 @@ public final class VideoInformation {
/**
* Forcefully changes the video quality of the currently playing video.
*/
- public static void changeQuality(VideoQuality quality) {
+ public static void changeQuality(VideoQualityInterface quality) {
Utils.verifyOnMainThread();
if (currentMenuInterface == null) {
@@ -501,7 +508,7 @@ public final class VideoInformation {
* @param qualities Video qualities available, ordered from largest to smallest, with index 0 being the 'automatic' value of -2
* @param originalQualityIndex quality index to use, as chosen by YouTube
*/
- public static int setVideoQuality(VideoQuality[] qualities, VideoQualityMenuInterface menu, int originalQualityIndex) {
+ public static int setVideoQuality(VideoQualityInterface[] qualities, VideoQualityMenuInterface menu, int originalQualityIndex) {
try {
Utils.verifyOnMainThread();
currentMenuInterface = menu;
@@ -516,7 +523,7 @@ public final class VideoInformation {
// On extremely slow internet connections the index can initially be -1
originalQualityIndex = Math.max(0, originalQualityIndex);
- VideoQuality updatedCurrentQuality = qualities[originalQualityIndex];
+ VideoQualityInterface updatedCurrentQuality = qualities[originalQualityIndex];
if (updatedCurrentQuality.patch_getResolution() != AUTOMATIC_VIDEO_QUALITY_VALUE
&& (currentQuality == null || currentQuality != updatedCurrentQuality)) {
setCurrentQuality(updatedCurrentQuality);
@@ -538,7 +545,7 @@ public final class VideoInformation {
// Find the highest quality that is equal to or less than the preferred.
int i = 0;
final int lastQualityIndex = qualities.length - 1;
- for (VideoQuality quality : qualities) {
+ for (VideoQualityInterface quality : qualities) {
final int qualityResolution = quality.patch_getResolution();
if ((qualityResolution != AUTOMATIC_VIDEO_QUALITY_VALUE && qualityResolution <= preferredQuality)
// Use the lowest video quality if the default is lower than all available.
@@ -572,4 +579,9 @@ public final class VideoInformation {
}
return originalQualityIndex;
}
+
+ public static boolean isPremiumVideoQuality(@NonNull VideoQualityInterface quality) {
+ String qualityName = quality.patch_getQualityName();
+ return qualityName != null && qualityName.contains(VIDEO_QUALITY_PREMIUM_NAME);
+ }
}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/WideSearchbarPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/WideSearchbarPatch.java
deleted file mode 100644
index 094ce457e7..0000000000
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/WideSearchbarPatch.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package app.revanced.extension.youtube.patches;
-
-import android.view.View;
-
-import app.revanced.extension.shared.Logger;
-import app.revanced.extension.shared.Utils;
-import app.revanced.extension.shared.ui.Dim;
-import app.revanced.extension.youtube.settings.Settings;
-
-@SuppressWarnings("unused")
-public final class WideSearchbarPatch {
-
- private static final Boolean WIDE_SEARCHBAR_ENABLED = Settings.WIDE_SEARCHBAR.get();
-
- /**
- * Injection point.
- */
- public static boolean enableWideSearchbar(boolean original) {
- return WIDE_SEARCHBAR_ENABLED || original;
- }
-
- /**
- * Injection point.
- */
- public static void setActionBar(View view) {
- try {
- if (!WIDE_SEARCHBAR_ENABLED) return;
-
- View searchBarView = Utils.getChildViewByResourceName(view, "search_bar");
-
- final int paddingLeft = searchBarView.getPaddingLeft();
- final int paddingRight = searchBarView.getPaddingRight();
- final int paddingTop = searchBarView.getPaddingTop();
- final int paddingBottom = searchBarView.getPaddingBottom();
- final int paddingStart = Dim.dp8;
-
- if (Utils.isRightToLeftLocale()) {
- searchBarView.setPadding(paddingLeft, paddingTop, paddingStart, paddingBottom);
- } else {
- searchBarView.setPadding(paddingStart, paddingTop, paddingRight, paddingBottom);
- }
- } catch (Exception ex) {
- Logger.printException(() -> "setActionBar failure", ex);
- }
- }
-}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/announcements/AnnouncementsPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/announcements/AnnouncementsPatch.java
index b19aa7a901..8e24d65ec5 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/announcements/AnnouncementsPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/announcements/AnnouncementsPatch.java
@@ -14,7 +14,9 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import app.revanced.extension.shared.ui.CustomDialog;
+
import org.json.JSONArray;
+import org.json.JSONObject;
import java.io.IOException;
import java.net.HttpURLConnection;
@@ -29,14 +31,25 @@ import app.revanced.extension.youtube.settings.Settings;
@SuppressWarnings("unused")
public final class AnnouncementsPatch {
+ private static final String[] ANNOUNCEMENT_TAGS = {
+ "\uD83C\uDF9E\uFE0F YouTube",
+ };
+
private AnnouncementsPatch() {
}
+ private static boolean hasSupportedTag(String wrapperTag) {
+ if (wrapperTag == null) return false;
+ for (var tag : ANNOUNCEMENT_TAGS) if (tag.equals(wrapperTag)) return true;
+
+ return false;
+ }
+
private static boolean isLatestAlready() throws IOException {
HttpURLConnection connection =
AnnouncementsRoutes.getAnnouncementsConnectionFromRoute(GET_LATEST_ANNOUNCEMENT_IDS);
- Logger.printDebug(() -> "Get latest announcement IDs route connection url: " + connection.getURL());
+ Logger.printDebug(() -> "Get latest announcement IDs route connection URL: " + connection.getURL());
try {
// Do not show the announcement if the request failed.
@@ -56,19 +69,30 @@ public final class AnnouncementsPatch {
var jsonString = Requester.parseStringAndDisconnect(connection);
- // Parse the ID. Fall-back to raw string if it fails.
- int id = Settings.ANNOUNCEMENT_LAST_ID.defaultValue;
+ var id = -1;
try {
- final var announcementIds = new JSONArray(jsonString);
- if (announcementIds.length() == 0) return true;
-
- id = announcementIds.getJSONObject(0).getInt("id");
+ final var announcementIDTagPairs = new JSONArray(jsonString);
+ if (announcementIDTagPairs.length() == 0) return true;
+
+ JSONObject latest = null;
+ for (int i = 0, entryCount = announcementIDTagPairs.length(); i < entryCount; i++) {
+ var pair = announcementIDTagPairs.optJSONObject(i);
+ if (pair != null && hasSupportedTag(pair.optString("tag", null))) {
+ latest = pair;
+ break;
+ }
+ }
+
+ if (latest == null || latest.isNull("id")) return true;
+
+ id = latest.getInt("id");
} catch (Throwable ex) {
Logger.printException(() -> "Failed to parse announcement ID", ex);
+ return true;
}
// Do not show the announcement, if the last announcement id is the same as the current one.
- return Settings.ANNOUNCEMENT_LAST_ID.get() == id;
+ return Settings.ANNOUNCEMENT_LAST_ID.get().equals(id);
}
public static void showAnnouncement(final Activity context) {
@@ -84,7 +108,7 @@ public final class AnnouncementsPatch {
HttpURLConnection connection = AnnouncementsRoutes
.getAnnouncementsConnectionFromRoute(GET_LATEST_ANNOUNCEMENTS);
- Logger.printDebug(() -> "Get latest announcements route connection url: " + connection.getURL());
+ Logger.printDebug(() -> "Get latest announcements route connection URL: " + connection.getURL());
var jsonString = Requester.parseStringAndDisconnect(connection);
@@ -95,7 +119,22 @@ public final class AnnouncementsPatch {
LocalDateTime archivedAt = LocalDateTime.MAX;
Level level = Level.INFO;
try {
- final var announcement = new JSONArray(jsonString).getJSONObject(0);
+ final var announcements = new JSONArray(jsonString);
+ JSONObject latestAnnouncement = null;
+ for (int i = 0, entryCount = announcements.length(); i < entryCount; i++) {
+ var announcementTagPair = announcements.optJSONObject(i);
+ if (announcementTagPair != null && hasSupportedTag(announcementTagPair.optString("tag", null))) {
+ latestAnnouncement = announcementTagPair;
+ break;
+ }
+ }
+
+ if (latestAnnouncement == null || latestAnnouncement.isNull("announcement")) {
+ Logger.printDebug(() -> "No YouTube announcement found in latest announcements response");
+ return;
+ }
+
+ final var announcement = latestAnnouncement.getJSONObject("announcement");
id = announcement.getInt("id");
title = announcement.getString("title");
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/announcements/requests/AnnouncementsRoutes.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/announcements/requests/AnnouncementsRoutes.java
index d89a2d3403..aa63ae864c 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/announcements/requests/AnnouncementsRoutes.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/announcements/requests/AnnouncementsRoutes.java
@@ -9,9 +9,9 @@ import java.net.HttpURLConnection;
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=\uD83C\uDF9E\uFE0F%20YouTube");
- public static final Route GET_LATEST_ANNOUNCEMENTS = new Route(GET, "/announcements/latest?tag=\uD83C\uDF9E\uFE0F%20YouTube");
+ private static final String ANNOUNCEMENTS_PROVIDER = "https://api.revanced.app/v5";
+ public static final Route GET_LATEST_ANNOUNCEMENT_IDS = new Route(GET, "/announcements/latest/id");
+ public static final Route GET_LATEST_ANNOUNCEMENTS = new Route(GET, "/announcements/latest");
private AnnouncementsRoutes() {
}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/ButtonsFilter.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/ButtonsFilter.java
deleted file mode 100644
index 3ca59ea0b1..0000000000
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/ButtonsFilter.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package app.revanced.extension.youtube.patches.components;
-
-import app.revanced.extension.youtube.settings.Settings;
-
-@SuppressWarnings("unused")
-final class ButtonsFilter extends Filter {
- private static final String COMPACT_CHANNEL_BAR_PATH_PREFIX = "compact_channel_bar.e";
- private static final String VIDEO_ACTION_BAR_PATH_PREFIX = "video_action_bar.e";
- private static final String VIDEO_ACTION_BAR_PATH = "video_action_bar.e";
- /**
- * Video bar path when the video information is collapsed. Seems to shown only with 20.14+
- */
- private static final String COMPACTIFY_VIDEO_ACTION_BAR_PATH = "compactify_video_action_bar.e";
- private static final String ANIMATED_VECTOR_TYPE_PATH = "AnimatedVectorType";
-
- private final StringFilterGroup likeSubscribeGlow;
- private final StringFilterGroup actionBarGroup;
- private final StringFilterGroup bufferFilterPathGroup;
- private final ByteArrayFilterGroupList bufferButtonsGroupList = new ByteArrayFilterGroupList();
-
- public ButtonsFilter() {
- actionBarGroup = new StringFilterGroup(
- null,
- VIDEO_ACTION_BAR_PATH
- );
- addIdentifierCallbacks(actionBarGroup);
-
-
- likeSubscribeGlow = new StringFilterGroup(
- Settings.DISABLE_LIKE_SUBSCRIBE_GLOW,
- "animated_button_border.e"
- );
-
- bufferFilterPathGroup = new StringFilterGroup(
- null,
- "|ContainerType|button.e"
- );
-
- addPathCallbacks(
- likeSubscribeGlow,
- bufferFilterPathGroup,
- new StringFilterGroup(
- Settings.HIDE_LIKE_DISLIKE_BUTTON,
- "|segmented_like_dislike_button"
- ),
- new StringFilterGroup(
- Settings.HIDE_DOWNLOAD_BUTTON,
- "|download_button.e"
- ),
- new StringFilterGroup(
- Settings.HIDE_SAVE_BUTTON,
- "|save_to_playlist_button"
- ),
- new StringFilterGroup(
- Settings.HIDE_CLIP_BUTTON,
- "|clip_button.e"
- )
- );
-
- bufferButtonsGroupList.addAll(
- new ByteArrayFilterGroup(
- Settings.HIDE_REPORT_BUTTON,
- "yt_outline_flag"
- ),
- new ByteArrayFilterGroup(
- Settings.HIDE_SHARE_BUTTON,
- "yt_outline_share"
- ),
- new ByteArrayFilterGroup(
- Settings.HIDE_REMIX_BUTTON,
- "yt_outline_youtube_shorts_plus"
- ),
- new ByteArrayFilterGroup(
- Settings.HIDE_THANKS_BUTTON,
- "yt_outline_dollar_sign_heart"
- ),
- new ByteArrayFilterGroup(
- Settings.HIDE_ASK_BUTTON,
- "yt_fill_spark"
- ),
- new ByteArrayFilterGroup(
- Settings.HIDE_SHOP_BUTTON,
- "yt_outline_bag"
- ),
- new ByteArrayFilterGroup(
- Settings.HIDE_STOP_ADS_BUTTON,
- "yt_outline_slash_circle_left"
- ),
- new ByteArrayFilterGroup(
- Settings.HIDE_COMMENTS_BUTTON,
- "yt_outline_message_bubble_right"
- ),
- // Check for clip button both here and using a path filter,
- // as there's a chance the path is a generic action button and won't contain 'clip_button'
- new ByteArrayFilterGroup(
- Settings.HIDE_CLIP_BUTTON,
- "yt_outline_scissors"
- ),
- new ByteArrayFilterGroup(
- Settings.HIDE_HYPE_BUTTON,
- "yt_outline_star_shooting"
- ),
- new ByteArrayFilterGroup(
- Settings.HIDE_PROMOTE_BUTTON,
- "yt_outline_megaphone"
- )
- );
- }
-
- private boolean isEveryFilterGroupEnabled() {
- for (var group : pathCallbacks)
- if (!group.isEnabled()) return false;
-
- for (var group : bufferButtonsGroupList)
- if (!group.isEnabled()) return false;
-
- return true;
- }
-
- @Override
- boolean isFiltered(String identifier, String path, byte[] buffer,
- StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
- if (matchedGroup == likeSubscribeGlow) {
- return (path.startsWith(VIDEO_ACTION_BAR_PATH_PREFIX) || path.startsWith(COMPACT_CHANNEL_BAR_PATH_PREFIX))
- && path.contains(ANIMATED_VECTOR_TYPE_PATH);
- }
-
- // If the current matched group is the action bar group,
- // in case every filter group is enabled, hide the action bar.
- if (matchedGroup == actionBarGroup) {
- return isEveryFilterGroupEnabled();
- }
-
- if (matchedGroup == bufferFilterPathGroup) {
- // Make sure the current path is the right one to avoid false positives.
- return (path.startsWith(VIDEO_ACTION_BAR_PATH) || path.startsWith(COMPACTIFY_VIDEO_ACTION_BAR_PATH))
- && bufferButtonsGroupList.check(buffer).isFiltered();
- }
-
- return true;
- }
-}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/DescriptionComponentsFilter.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/DescriptionComponentsFilter.java
deleted file mode 100644
index e7b1af55b6..0000000000
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/DescriptionComponentsFilter.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package app.revanced.extension.youtube.patches.components;
-
-import app.revanced.extension.shared.StringTrieSearch;
-import app.revanced.extension.youtube.settings.Settings;
-import app.revanced.extension.youtube.shared.PlayerType;
-
-@SuppressWarnings("unused")
-final class DescriptionComponentsFilter extends Filter {
-
- private static final String INFOCARDS_SECTION_PATH = "infocards_section.e";
-
- private final StringTrieSearch exceptions = new StringTrieSearch();
- private final StringFilterGroup macroMarkersCarousel;
- private final ByteArrayFilterGroupList macroMarkersCarouselGroupList = new ByteArrayFilterGroupList();
- private final StringFilterGroup horizontalShelf;
- private final ByteArrayFilterGroup cellVideoAttribute;
- private final StringFilterGroup infoCardsSection;
- private final StringFilterGroup subscribeButton;
- private final StringFilterGroup aiGeneratedVideoSummarySection;
- private final StringFilterGroup hypePoints;
-
- public DescriptionComponentsFilter() {
- exceptions.addPatterns(
- "compact_channel",
- "description",
- "grid_video",
- "inline_expander",
- "metadata"
- );
-
- aiGeneratedVideoSummarySection = new StringFilterGroup(
- Settings.HIDE_AI_GENERATED_VIDEO_SUMMARY_SECTION,
- "cell_expandable_metadata.e"
- );
-
- final StringFilterGroup askSection = new StringFilterGroup(
- Settings.HIDE_ASK_SECTION,
- "youchat_entrypoint.e"
- );
-
- final StringFilterGroup attributesSection = new StringFilterGroup(
- Settings.HIDE_ATTRIBUTES_SECTION,
- // "gaming_section", "music_section"
- "video_attributes_section"
- );
-
- final StringFilterGroup featuredLinksSection = new StringFilterGroup(
- Settings.HIDE_FEATURED_LINKS_SECTION,
- "media_lockup"
- );
-
- final StringFilterGroup featuredVideosSection = new StringFilterGroup(
- Settings.HIDE_FEATURED_VIDEOS_SECTION,
- "structured_description_video_lockup"
- );
-
- final StringFilterGroup podcastSection = new StringFilterGroup(
- Settings.HIDE_PODCAST_SECTION,
- "playlist_section"
- );
-
- final StringFilterGroup transcriptSection = new StringFilterGroup(
- Settings.HIDE_TRANSCRIPT_SECTION,
- "transcript_section"
- );
-
- final StringFilterGroup howThisWasMadeSection = new StringFilterGroup(
- Settings.HIDE_HOW_THIS_WAS_MADE_SECTION,
- "how_this_was_made_section"
- );
-
- hypePoints = new StringFilterGroup(
- Settings.HIDE_HYPE_POINTS,
- "hype_points_factoid"
- );
-
- infoCardsSection = new StringFilterGroup(
- Settings.HIDE_INFO_CARDS_SECTION,
- INFOCARDS_SECTION_PATH
- );
-
- subscribeButton = new StringFilterGroup(
- Settings.HIDE_SUBSCRIBE_BUTTON,
- "subscribe_button"
- );
-
- macroMarkersCarousel = new StringFilterGroup(
- null,
- "macro_markers_carousel.e"
- );
-
- macroMarkersCarouselGroupList.addAll(
- new ByteArrayFilterGroup(
- Settings.HIDE_CHAPTERS_SECTION,
- "chapters_horizontal_shelf"
- ),
- new ByteArrayFilterGroup(
- Settings.HIDE_KEY_CONCEPTS_SECTION,
- "learning_concept_macro_markers_carousel_shelf"
- )
- );
-
- horizontalShelf = new StringFilterGroup(
- Settings.HIDE_ATTRIBUTES_SECTION,
- "horizontal_shelf.e"
- );
-
- cellVideoAttribute = new ByteArrayFilterGroup(
- null,
- "cell_video_attribute"
- );
-
- addPathCallbacks(
- aiGeneratedVideoSummarySection,
- askSection,
- attributesSection,
- featuredLinksSection,
- featuredVideosSection,
- horizontalShelf,
- howThisWasMadeSection,
- hypePoints,
- infoCardsSection,
- macroMarkersCarousel,
- podcastSection,
- subscribeButton,
- transcriptSection
- );
- }
-
- @Override
- boolean isFiltered(String identifier, String path, byte[] buffer,
- StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
-
- if (matchedGroup == aiGeneratedVideoSummarySection || matchedGroup == hypePoints) {
- // Only hide if player is open, in case this component is used somewhere else.
- return PlayerType.getCurrent().isMaximizedOrFullscreen();
- }
-
- if (matchedGroup == subscribeButton) {
- return path.startsWith(INFOCARDS_SECTION_PATH);
- }
-
- if (exceptions.matches(path)) return false;
-
- if (matchedGroup == macroMarkersCarousel) {
- return contentIndex == 0 && macroMarkersCarouselGroupList.check(buffer).isFiltered();
- }
-
- if (matchedGroup == horizontalShelf) {
- return cellVideoAttribute.check(buffer).isFiltered();
- }
-
- return true;
- }
-}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/FilterGroup.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/FilterGroup.java
deleted file mode 100644
index cf880b4685..0000000000
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/FilterGroup.java
+++ /dev/null
@@ -1,214 +0,0 @@
-package app.revanced.extension.youtube.patches.components;
-
-import androidx.annotation.NonNull;
-
-import app.revanced.extension.shared.Logger;
-import app.revanced.extension.shared.settings.BooleanSetting;
-import app.revanced.extension.shared.ByteTrieSearch;
-
-abstract class FilterGroup {
- final static class FilterGroupResult {
- private BooleanSetting setting;
- private int matchedIndex;
- private int matchedLength;
- // In the future it might be useful to include which pattern matched,
- // but for now that is not needed.
-
- FilterGroupResult() {
- this(null, -1, 0);
- }
-
- FilterGroupResult(BooleanSetting setting, int matchedIndex, int matchedLength) {
- setValues(setting, matchedIndex, matchedLength);
- }
-
- public void setValues(BooleanSetting setting, int matchedIndex, int matchedLength) {
- this.setting = setting;
- this.matchedIndex = matchedIndex;
- this.matchedLength = matchedLength;
- }
-
- /**
- * A null value if the group has no setting,
- * or if no match is returned from {@link FilterGroupList#check(Object)}.
- */
- public BooleanSetting getSetting() {
- return setting;
- }
-
- public boolean isFiltered() {
- return matchedIndex >= 0;
- }
-
- /**
- * Matched index of first pattern that matched, or -1 if nothing matched.
- */
- public int getMatchedIndex() {
- return matchedIndex;
- }
-
- /**
- * Length of the matched filter pattern.
- */
- public int getMatchedLength() {
- return matchedLength;
- }
- }
-
- protected final BooleanSetting setting;
- protected final T[] filters;
-
- /**
- * Initialize a new filter group.
- *
- * @param setting The associated setting.
- * @param filters The filters.
- */
- @SafeVarargs
- public FilterGroup(final BooleanSetting setting, final T... filters) {
- this.setting = setting;
- this.filters = filters;
- if (filters.length == 0) {
- throw new IllegalArgumentException("Must use one or more filter patterns (zero specified)");
- }
- }
-
- public boolean isEnabled() {
- return setting == null || setting.get();
- }
-
- /**
- * @return If {@link FilterGroupList} should include this group when searching.
- * By default, all filters are included except non enabled settings that require reboot.
- */
- @SuppressWarnings("BooleanMethodIsAlwaysInverted")
- public boolean includeInSearch() {
- return isEnabled() || !setting.rebootApp;
- }
-
- @NonNull
- @Override
- public String toString() {
- return getClass().getSimpleName() + ": " + (setting == null ? "(null setting)" : setting);
- }
-
- public abstract FilterGroupResult check(final T stack);
-}
-
-class StringFilterGroup extends FilterGroup {
-
- public StringFilterGroup(final BooleanSetting setting, final String... filters) {
- super(setting, filters);
- }
-
- @Override
- public FilterGroupResult check(final String string) {
- int matchedIndex = -1;
- int matchedLength = 0;
- if (isEnabled()) {
- for (String pattern : filters) {
- if (!string.isEmpty()) {
- final int indexOf = string.indexOf(pattern);
- if (indexOf >= 0) {
- matchedIndex = indexOf;
- matchedLength = pattern.length();
- break;
- }
- }
- }
- }
- return new FilterGroupResult(setting, matchedIndex, matchedLength);
- }
-}
-
-/**
- * If you have more than 1 filter patterns, then all instances of
- * this class should filtered using {@link ByteArrayFilterGroupList#check(byte[])},
- * which uses a prefix tree to give better performance.
- */
-class ByteArrayFilterGroup extends FilterGroup {
-
- private volatile int[][] failurePatterns;
-
- // Modified implementation from https://stackoverflow.com/a/1507813
- private static int indexOf(final byte[] data, final byte[] pattern, final int[] failure) {
- // Finds the first occurrence of the pattern in the byte array using
- // KMP matching algorithm.
- int patternLength = pattern.length;
- for (int i = 0, j = 0, dataLength = data.length; i < dataLength; i++) {
- while (j > 0 && pattern[j] != data[i]) {
- j = failure[j - 1];
- }
- if (pattern[j] == data[i]) {
- j++;
- }
- if (j == patternLength) {
- return i - patternLength + 1;
- }
- }
- return -1;
- }
-
- private static int[] createFailurePattern(byte[] pattern) {
- // Computes the failure function using a boot-strapping process,
- // where the pattern is matched against itself.
- final int patternLength = pattern.length;
- final int[] failure = new int[patternLength];
-
- for (int i = 1, j = 0; i < patternLength; i++) {
- while (j > 0 && pattern[j] != pattern[i]) {
- j = failure[j - 1];
- }
- if (pattern[j] == pattern[i]) {
- j++;
- }
- failure[i] = j;
- }
- return failure;
- }
-
- public ByteArrayFilterGroup(BooleanSetting setting, byte[]... filters) {
- super(setting, filters);
- }
-
- /**
- * Converts the Strings into byte arrays. Used to search for text in binary data.
- */
- public ByteArrayFilterGroup(BooleanSetting setting, String... filters) {
- super(setting, ByteTrieSearch.convertStringsToBytes(filters));
- }
-
- private synchronized void buildFailurePatterns() {
- if (failurePatterns != null) return; // Thread race and another thread already initialized the search.
- Logger.printDebug(() -> "Building failure array for: " + this);
- int[][] failurePatterns = new int[filters.length][];
- int i = 0;
- for (byte[] pattern : filters) {
- failurePatterns[i++] = createFailurePattern(pattern);
- }
- this.failurePatterns = failurePatterns; // Must set after initialization finishes.
- }
-
- @Override
- public FilterGroupResult check(final byte[] bytes) {
- int matchedLength = 0;
- int matchedIndex = -1;
- if (isEnabled()) {
- int[][] failures = failurePatterns;
- if (failures == null) {
- buildFailurePatterns(); // Lazy load.
- failures = failurePatterns;
- }
- for (int i = 0, length = filters.length; i < length; i++) {
- byte[] filter = filters[i];
- matchedIndex = indexOf(bytes, filter, failures[i]);
- if (matchedIndex >= 0) {
- matchedLength = filter.length;
- break;
- }
- }
- }
- return new FilterGroupResult(setting, matchedIndex, matchedLength);
- }
-}
-
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/LithoFilterPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/LithoFilterPatch.java
deleted file mode 100644
index 2777dec111..0000000000
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/LithoFilterPatch.java
+++ /dev/null
@@ -1,250 +0,0 @@
-package app.revanced.extension.youtube.patches.components;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import java.nio.ByteBuffer;
-import java.util.List;
-
-import app.revanced.extension.shared.Logger;
-import app.revanced.extension.shared.settings.BaseSettings;
-import app.revanced.extension.shared.StringTrieSearch;
-import app.revanced.extension.youtube.settings.Settings;
-
-@SuppressWarnings("unused")
-public final class LithoFilterPatch {
- /**
- * Simple wrapper to pass the litho parameters through the prefix search.
- */
- private static final class LithoFilterParameters {
- final String identifier;
- final String path;
- final byte[] buffer;
-
- LithoFilterParameters(String lithoIdentifier, String lithoPath, byte[] buffer) {
- this.identifier = lithoIdentifier;
- this.path = lithoPath;
- this.buffer = buffer;
- }
-
- @NonNull
- @Override
- public String toString() {
- // Estimate the percentage of the buffer that are Strings.
- StringBuilder builder = new StringBuilder(Math.max(100, buffer.length / 2));
- builder.append( "ID: ");
- builder.append(identifier);
- builder.append(" Path: ");
- builder.append(path);
- if (Settings.DEBUG_PROTOBUFFER.get()) {
- builder.append(" BufferStrings: ");
- findAsciiStrings(builder, buffer);
- }
-
- return builder.toString();
- }
-
- /**
- * Search through a byte array for all ASCII strings.
- */
- static void findAsciiStrings(StringBuilder builder, byte[] buffer) {
- // Valid ASCII values (ignore control characters).
- final int minimumAscii = 32; // 32 = space character
- final int maximumAscii = 126; // 127 = delete character
- final int minimumAsciiStringLength = 4; // Minimum length of an ASCII string to include.
- String delimitingCharacter = "❙"; // Non ascii character, to allow easier log filtering.
-
- final int length = buffer.length;
- int start = 0;
- int end = 0;
- while (end < length) {
- int value = buffer[end];
- if (value < minimumAscii || value > maximumAscii || end == length - 1) {
- if (end - start >= minimumAsciiStringLength) {
- for (int i = start; i < end; i++) {
- builder.append((char) buffer[i]);
- }
- builder.append(delimitingCharacter);
- }
- start = end + 1;
- }
- end++;
- }
- }
- }
-
- /**
- * Litho layout fixed thread pool size override.
- *
- * Unpatched YouTube uses a layout fixed thread pool between 1 and 3 threads:
- *
- * 1 thread - > Device has less than 6 cores
- * 2 threads -> Device has over 6 cores and less than 6GB of memory
- * 3 threads -> Device has over 6 cores and more than 6GB of memory
- *
- *
- * Using more than 1 thread causes layout issues such as the You tab watch/playlist shelf
- * that is sometimes incorrectly hidden (ReVanced is not hiding it), and seems to
- * fix a race issue if using the active navigation tab status with litho filtering.
- */
- private static final int LITHO_LAYOUT_THREAD_POOL_SIZE = 1;
-
- /**
- * Placeholder for actual filters.
- */
- private static final class DummyFilter extends Filter { }
-
- private static final Filter[] filters = new Filter[] {
- new DummyFilter() // Replaced patching, do not touch.
- };
-
- private static final StringTrieSearch pathSearchTree = new StringTrieSearch();
- private static final StringTrieSearch identifierSearchTree = new StringTrieSearch();
-
- private static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
-
- /**
- * Because litho filtering is multi-threaded and the buffer is passed in from a different injection point,
- * the buffer is saved to a ThreadLocal so each calling thread does not interfere with other threads.
- */
- private static final ThreadLocal bufferThreadLocal = new ThreadLocal<>();
-
- static {
- for (Filter filter : filters) {
- filterUsingCallbacks(identifierSearchTree, filter,
- filter.identifierCallbacks, Filter.FilterContentType.IDENTIFIER);
- filterUsingCallbacks(pathSearchTree, filter,
- filter.pathCallbacks, Filter.FilterContentType.PATH);
- }
-
- Logger.printDebug(() -> "Using: "
- + identifierSearchTree.numberOfPatterns() + " identifier filters"
- + " (" + identifierSearchTree.getEstimatedMemorySize() + " KB), "
- + pathSearchTree.numberOfPatterns() + " path filters"
- + " (" + pathSearchTree.getEstimatedMemorySize() + " KB)");
- }
-
- private static void filterUsingCallbacks(StringTrieSearch pathSearchTree,
- Filter filter, List groups,
- Filter.FilterContentType type) {
- String filterSimpleName = filter.getClass().getSimpleName();
-
- for (StringFilterGroup group : groups) {
- if (!group.includeInSearch()) {
- continue;
- }
-
- for (String pattern : group.filters) {
- pathSearchTree.addPattern(pattern, (textSearched, matchedStartIndex,
- matchedLength, callbackParameter) -> {
- if (!group.isEnabled()) return false;
-
- LithoFilterParameters parameters = (LithoFilterParameters) callbackParameter;
- final boolean isFiltered = filter.isFiltered(parameters.identifier,
- parameters.path, parameters.buffer, group, type, matchedStartIndex);
-
- if (isFiltered && BaseSettings.DEBUG.get()) {
- if (type == Filter.FilterContentType.IDENTIFIER) {
- Logger.printDebug(() -> "Filtered " + filterSimpleName
- + " identifier: " + parameters.identifier);
- } else {
- Logger.printDebug(() -> "Filtered " + filterSimpleName
- + " path: " + parameters.path);
- }
- }
-
- return isFiltered;
- }
- );
- }
- }
- }
-
- /**
- * Injection point. Called off the main thread.
- * Targets 20.22+
- */
- public static void setProtoBuffer(byte[] buffer) {
- // Set the buffer to a thread local. The buffer will remain in memory, even after the call to #filter completes.
- // This is intentional, as it appears the buffer can be set once and then filtered multiple times.
- // The buffer will be cleared from memory after a new buffer is set by the same thread,
- // or when the calling thread eventually dies.
- bufferThreadLocal.set(buffer);
- }
-
- /**
- * Injection point. Called off the main thread.
- * Targets 20.21 and lower.
- */
- public static void setProtoBuffer(@Nullable ByteBuffer buffer) {
- // Set the buffer to a thread local. The buffer will remain in memory, even after the call to #filter completes.
- // This is intentional, as it appears the buffer can be set once and then filtered multiple times.
- // The buffer will be cleared from memory after a new buffer is set by the same thread,
- // or when the calling thread eventually dies.
- if (buffer == null || !buffer.hasArray()) {
- // It appears the buffer can be cleared out just before the call to #filter()
- // Ignore this null value and retain the last buffer that was set.
- Logger.printDebug(() -> "Ignoring null or empty buffer: " + buffer);
- } else {
- setProtoBuffer(buffer.array());
- }
- }
-
- /**
- * Injection point.
- */
- public static boolean isFiltered(String lithoIdentifier, StringBuilder pathBuilder) {
- try {
- if (lithoIdentifier.isEmpty() && pathBuilder.length() == 0) {
- return false;
- }
-
- byte[] buffer = bufferThreadLocal.get();
- // Potentially the buffer may have been null or never set up until now.
- // Use an empty buffer so the litho id/path filters still work correctly.
- if (buffer == null) {
- buffer = EMPTY_BYTE_ARRAY;
- }
-
- LithoFilterParameters parameter = new LithoFilterParameters(
- lithoIdentifier, pathBuilder.toString(), buffer);
- Logger.printDebug(() -> "Searching " + parameter);
-
- if (identifierSearchTree.matches(parameter.identifier, parameter)) {
- return true;
- }
-
- if (pathSearchTree.matches(parameter.path, parameter)) {
- return true;
- }
- } catch (Exception ex) {
- Logger.printException(() -> "isFiltered failure", ex);
- }
-
- return false;
- }
-
- /**
- * Injection point.
- */
- public static int getExecutorCorePoolSize(int originalCorePoolSize) {
- if (originalCorePoolSize != LITHO_LAYOUT_THREAD_POOL_SIZE) {
- Logger.printDebug(() -> "Overriding core thread pool size from: " + originalCorePoolSize
- + " to: " + LITHO_LAYOUT_THREAD_POOL_SIZE);
- }
-
- return LITHO_LAYOUT_THREAD_POOL_SIZE;
- }
-
- /**
- * Injection point.
- */
- public static int getExecutorMaxThreads(int originalMaxThreads) {
- if (originalMaxThreads != LITHO_LAYOUT_THREAD_POOL_SIZE) {
- Logger.printDebug(() -> "Overriding max thread pool size from: " + originalMaxThreads
- + " to: " + LITHO_LAYOUT_THREAD_POOL_SIZE);
- }
-
- return LITHO_LAYOUT_THREAD_POOL_SIZE;
- }
-}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/AdsFilter.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/litho/AdsFilter.java
similarity index 51%
rename from extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/AdsFilter.java
rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/litho/AdsFilter.java
index 01f82f5cf5..cb262e0165 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/AdsFilter.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/litho/AdsFilter.java
@@ -1,27 +1,40 @@
-package app.revanced.extension.youtube.patches.components;
+package app.revanced.extension.youtube.patches.litho;
import static app.revanced.extension.shared.StringRef.str;
-import android.app.Instrumentation;
+import android.app.Dialog;
import android.view.KeyEvent;
import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+
+import androidx.annotation.Nullable;
import java.util.List;
+import app.revanced.extension.shared.patches.litho.Filter;
import app.revanced.extension.shared.Logger;
import app.revanced.extension.shared.Utils;
import app.revanced.extension.shared.StringTrieSearch;
+import app.revanced.extension.shared.patches.litho.FilterGroup.ByteArrayFilterGroup;
+import app.revanced.extension.shared.patches.litho.FilterGroup.StringFilterGroup;
import app.revanced.extension.youtube.settings.Settings;
@SuppressWarnings("unused")
public final class AdsFilter extends Filter {
// region Fullscreen ad
- private static volatile long lastTimeClosedFullscreenAd;
- private static final Instrumentation instrumentation = new Instrumentation();
- private final StringFilterGroup fullscreenAd;
+ private static final ByteArrayFilterGroup fullscreenAd = new ByteArrayFilterGroup(
+ null,
+ "_interstitial"
+ );
// endregion
+ private static final String[] PLAYER_POPUP_AD_PANEL_IDS = {
+ "PAproduct", // Shopping.
+ "jumpahead" // Premium promotion.
+ };
+
// https://encrypted-tbn0.gstatic.com/shopping?q=abc
private static final String STORE_BANNER_DOMAIN = "gstatic.com/shopping";
private static final boolean HIDE_END_SCREEN_STORE_BANNER =
@@ -29,9 +42,10 @@ public final class AdsFilter extends Filter {
private final StringTrieSearch exceptions = new StringTrieSearch();
- private final StringFilterGroup playerShoppingShelf;
- private final ByteArrayFilterGroup playerShoppingShelfBuffer;
-
+ private final StringFilterGroup promotionBanner;
+ private final ByteArrayFilterGroup promotionBannerBuffer;
+ private final StringFilterGroup buyMovieAd;
+ private final ByteArrayFilterGroup buyMovieAdBuffer;
public AdsFilter() {
exceptions.addPatterns(
@@ -44,7 +58,6 @@ public final class AdsFilter extends Filter {
// Identifiers.
-
final var carouselAd = new StringFilterGroup(
Settings.HIDE_GENERAL_ADS,
"carousel_ad"
@@ -53,11 +66,6 @@ public final class AdsFilter extends Filter {
// Paths.
- fullscreenAd = new StringFilterGroup(
- Settings.HIDE_FULLSCREEN_ADS,
- "_interstitial"
- );
-
final var generalAds = new StringFilterGroup(
Settings.HIDE_GENERAL_ADS,
"_ad_with",
@@ -76,11 +84,11 @@ public final class AdsFilter extends Filter {
"hero_promo_image",
// text_image_button_group_layout, landscape_image_button_group_layout, full_width_square_image_button_group_layout
"image_button_group_layout",
+ "landscape_image_carousel_layout",
"landscape_image_wide_button_layout",
"primetime_promo",
"product_details",
"square_image_layout",
- "statement_banner",
"text_image_button_layout",
"text_image_no_button_layout", // Tablet layout search results.
"video_display_button_group_layout",
@@ -88,7 +96,8 @@ public final class AdsFilter extends Filter {
"video_display_carousel_buttoned_short_dr_layout",
"video_display_full_buttoned_short_dr_layout",
"video_display_full_layout",
- "watch_metadata_app_promo"
+ "watch_metadata_app_promo",
+ "shopping_timely_shelf." // Injection point below hides the empty space.
);
final var movieAds = new StringFilterGroup(
@@ -101,6 +110,16 @@ public final class AdsFilter extends Filter {
"offer_module_root"
);
+ buyMovieAd = new StringFilterGroup(
+ Settings.HIDE_MOVIES_SECTION,
+ "video_lockup_with_attachment.e"
+ );
+
+ buyMovieAdBuffer = new ByteArrayFilterGroup(
+ null,
+ "FEstorefront"
+ );
+
final var viewProducts = new StringFilterGroup(
Settings.HIDE_VIEW_PRODUCTS_BANNER,
"product_item",
@@ -113,64 +132,126 @@ public final class AdsFilter extends Filter {
"shopping_description_shelf.e"
);
- playerShoppingShelf = new StringFilterGroup(
- Settings.HIDE_CREATOR_STORE_SHELF,
- "horizontal_shelf.e"
- );
-
- playerShoppingShelfBuffer = new ByteArrayFilterGroup(
- null,
- "shopping_item_card_list"
- );
-
- final var webLinkPanel = new StringFilterGroup(
- Settings.HIDE_WEB_SEARCH_RESULTS,
- "web_link_panel"
- );
-
final var merchandise = new StringFilterGroup(
Settings.HIDE_MERCHANDISE_BANNERS,
"product_carousel",
"shopping_carousel.e" // Channel profile shopping shelf.
);
+ promotionBanner = new StringFilterGroup(
+ Settings.HIDE_YOUTUBE_PREMIUM_PROMOTIONS,
+ "statement_banner"
+ );
+
+ promotionBannerBuffer = new ByteArrayFilterGroup(
+ null,
+ "img/promos/growth/", // Link, https://www.gstatic.com/youtube/img/promos/growth/ is only used for ads.
+ "SPunlimited" // Word associated with Premium, should be unique to differentiate Doodle from ad banner.
+ );
+
final var selfSponsor = new StringFilterGroup(
Settings.HIDE_SELF_SPONSOR,
"cta_shelf_card"
);
addPathCallbacks(
- fullscreenAd,
+ buyMovieAd,
generalAds,
merchandise,
movieAds,
- playerShoppingShelf,
+ promotionBanner,
selfSponsor,
shoppingLinks,
- viewProducts,
- webLinkPanel
+ viewProducts
);
}
@Override
- boolean isFiltered(String identifier, String path, byte[] buffer,
- StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
- if (matchedGroup == playerShoppingShelf) {
- return contentIndex == 0 && playerShoppingShelfBuffer.check(buffer).isFiltered();
+ public boolean isFiltered(String identifier, String accessibility, String path, byte[] buffer,
+ StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
+ if (matchedGroup == buyMovieAd) {
+ return contentIndex == 0 && buyMovieAdBuffer.check(buffer).isFiltered();
}
- if (exceptions.matches(path)) {
- return false;
+ if (matchedGroup == promotionBanner) {
+ return contentIndex == 0 && promotionBannerBuffer.check(buffer).isFiltered();
}
- if (matchedGroup == fullscreenAd) {
- if (path.contains("|ImageType|")) closeFullscreenAd();
+ return !exceptions.matches(path);
+ }
- // Do not actually filter the fullscreen ad otherwise it will leave a dimmed screen.
- return false;
+ /**
+ * Injection point.
+ * Called from a different place then the other filters.
+ */
+ public static void closeFullscreenAd(Object customDialog, @Nullable byte[] buffer) {
+ try {
+ if (!Settings.HIDE_FULLSCREEN_ADS.get()) {
+ return;
+ }
+
+ if (buffer == null) {
+ Logger.printDebug(() -> "buffer is null");
+ return;
+ }
+
+ if (fullscreenAd.check(buffer).isFiltered() &&
+ customDialog instanceof Dialog dialog) {
+ Logger.printDebug(() -> "Closing fullscreen ad");
+
+ Window window = dialog.getWindow();
+
+ if (window != null) {
+ // Set the dialog size to 0 before closing
+ // If the dialog is not resized to 0, it will remain visible for about a second before closing
+ WindowManager.LayoutParams params = window.getAttributes();
+ params.height = 0;
+ params.width = 0;
+
+ // Change the size of dialog to 0
+ window.setAttributes(params);
+
+ // Disable dialog's background dim
+ window.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
+
+ // Restore window flags
+ window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_UNSPECIFIED);
+
+ // Restore decorView visibility
+ window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
+ }
+
+ // Dismiss dialog
+ dialog.dismiss();
+ }
+ } catch (Exception ex) {
+ Logger.printException(() -> "closeFullscreenAd failure", ex);
}
+ }
- return true;
+ /**
+ * Injection point.
+ */
+ public static boolean hideAds() {
+ return Settings.HIDE_GENERAL_ADS.get();
+ }
+
+ /**
+ * Injection point.
+ */
+ public static String hideAds(String osName) {
+ return Settings.HIDE_GENERAL_ADS.get()
+ ? "Android Automotive"
+ : osName;
+ }
+
+ /**
+ * Hide the view, which shows ads in the homepage.
+ *
+ * @param view The view, which shows ads.
+ */
+ public static void hideAdAttributionView(View view) {
+ Utils.hideViewBy0dpUnderCondition(Settings.HIDE_GENERAL_ADS, view);
}
/**
@@ -188,50 +269,18 @@ public final class AdsFilter extends Filter {
elementsList.add(protobufList);
}
-
/**
- * Hide the view, which shows ads in the homepage.
- *
- * @param view The view, which shows ads.
+ * Injection point.
*/
- public static void hideAdAttributionView(View view) {
- Utils.hideViewBy0dpUnderCondition(Settings.HIDE_GENERAL_ADS, view);
+ public static boolean hideGetPremiumView() {
+ return Settings.HIDE_YOUTUBE_PREMIUM_PROMOTIONS.get();
}
/**
- * Close the fullscreen ad.
- *
- * The strategy is to send a back button event to the app to close the fullscreen ad using the back button event.
+ * Injection point.
*/
- private static void closeFullscreenAd() {
- final var currentTime = System.currentTimeMillis();
-
- // Prevent spamming the back button.
- if (currentTime - lastTimeClosedFullscreenAd < 10000) return;
- lastTimeClosedFullscreenAd = currentTime;
-
- Logger.printDebug(() -> "Closing fullscreen ad");
-
- Utils.runOnMainThreadDelayed(() -> {
- // Must run off main thread (Odd, but whatever).
- Utils.runOnBackgroundThread(() -> {
- try {
- instrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_BACK);
- } catch (Exception ex) {
- // Injecting user events on Android 10+ requires the manifest to include
- // INJECT_EVENTS, and it's usage is heavily restricted
- // and requires the user to manually approve the permission in the device settings.
- //
- // And no matter what, permissions cannot be added for root installations
- // as manifest changes are ignored for mount installations.
- //
- // Instead, catch the SecurityException and turn off hide full screen ads
- // since this functionality does not work for these devices.
- Logger.printInfo(() -> "Could not inject back button event", ex);
- Settings.HIDE_FULLSCREEN_ADS.save(false);
- Utils.showToastLong(str("revanced_hide_fullscreen_ads_feature_not_available_toast"));
- }
- });
- }, 1000);
+ public static boolean hidePlayerPopupAds(String panelId) {
+ return Settings.HIDE_PLAYER_POPUP_ADS.get()
+ && Utils.containsAny(panelId, PLAYER_POPUP_AD_PANEL_IDS);
}
}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/AdvancedVideoQualityMenuFilter.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/litho/AdvancedVideoQualityMenuFilter.java
similarity index 75%
rename from extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/AdvancedVideoQualityMenuFilter.java
rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/litho/AdvancedVideoQualityMenuFilter.java
index d2bbad012a..a969c9b0e0 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/AdvancedVideoQualityMenuFilter.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/litho/AdvancedVideoQualityMenuFilter.java
@@ -1,5 +1,7 @@
-package app.revanced.extension.youtube.patches.components;
+package app.revanced.extension.youtube.patches.litho;
+import app.revanced.extension.shared.patches.litho.Filter;
+import app.revanced.extension.shared.patches.litho.FilterGroup.StringFilterGroup;
import app.revanced.extension.youtube.patches.playback.quality.AdvancedVideoQualityMenuPatch;
import app.revanced.extension.youtube.settings.Settings;
@@ -19,7 +21,7 @@ public final class AdvancedVideoQualityMenuFilter extends Filter {
}
@Override
- boolean isFiltered(String identifier, String path, byte[] buffer,
+ public boolean isFiltered(String identifier, String accessibility, String path, byte[] buffer,
StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
isVideoQualityMenuVisible = true;
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/CommentsFilter.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/litho/CommentsFilter.java
similarity index 77%
rename from extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/CommentsFilter.java
rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/litho/CommentsFilter.java
index 2af8d1a908..70330c843f 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/CommentsFilter.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/litho/CommentsFilter.java
@@ -1,15 +1,19 @@
-package app.revanced.extension.youtube.patches.components;
+package app.revanced.extension.youtube.patches.litho;
+import app.revanced.extension.shared.patches.litho.Filter;
+import app.revanced.extension.shared.patches.litho.FilterGroup.*;
import app.revanced.extension.youtube.settings.Settings;
import app.revanced.extension.youtube.shared.PlayerType;
@SuppressWarnings("unused")
-final class CommentsFilter extends Filter {
+public final class CommentsFilter extends Filter {
private static final String COMMENT_COMPOSER_PATH = "comment_composer.e";
+ private static final String VIDEO_LOCKUP_WITH_ATTACHMENT_PATH = "video_lockup_with_attachment.e";
private final StringFilterGroup chipBar;
private final ByteArrayFilterGroup aiCommentsSummary;
+ private final StringFilterGroup comments;
private final StringFilterGroup emojiAndTimestampButtons;
public CommentsFilter() {
@@ -39,7 +43,7 @@ final class CommentsFilter extends Filter {
"sponsorships_comments_footer.e"
);
- var comments = new StringFilterGroup(
+ comments = new StringFilterGroup(
Settings.HIDE_COMMENTS_SECTION,
"video_metadata_carousel",
"_comments"
@@ -88,14 +92,21 @@ final class CommentsFilter extends Filter {
}
@Override
- boolean isFiltered(String identifier, String path, byte[] buffer,
- StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
+ public boolean isFiltered(String identifier, String accessibility, String path, byte[] buffer,
+ StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
if (matchedGroup == chipBar) {
// Playlist sort button uses same components and must only filter if the player is opened.
return PlayerType.getCurrent().isMaximizedOrFullscreen()
&& aiCommentsSummary.check(buffer).isFiltered();
}
+ if (matchedGroup == comments) {
+ if (path.startsWith(VIDEO_LOCKUP_WITH_ATTACHMENT_PATH)) {
+ return Settings.HIDE_COMMENTS_SECTION_IN_HOME_FEED.get();
+ }
+ return Settings.HIDE_COMMENTS_SECTION.get();
+ }
+
if (matchedGroup == emojiAndTimestampButtons) {
return path.startsWith(COMMENT_COMPOSER_PATH);
}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/litho/DescriptionComponentsFilter.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/litho/DescriptionComponentsFilter.java
new file mode 100644
index 0000000000..9990aa46a4
--- /dev/null
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/litho/DescriptionComponentsFilter.java
@@ -0,0 +1,175 @@
+package app.revanced.extension.youtube.patches.litho;
+
+import app.revanced.extension.shared.patches.litho.Filter;
+import app.revanced.extension.youtube.settings.Settings;
+import app.revanced.extension.shared.patches.litho.FilterGroup.*;
+import app.revanced.extension.shared.patches.litho.FilterGroupList.ByteArrayFilterGroupList;
+import app.revanced.extension.youtube.shared.EngagementPanel;
+import app.revanced.extension.youtube.shared.PlayerType;
+
+@SuppressWarnings("unused")
+public final class DescriptionComponentsFilter extends Filter {
+
+ private static final String INFOCARDS_SECTION_PATH = "infocards_section.e";
+
+ private final StringFilterGroup macroMarkersCarousel;
+ private final ByteArrayFilterGroupList macroMarkersCarouselGroupList = new ByteArrayFilterGroupList();
+ private final StringFilterGroup playlistSection;
+ private final ByteArrayFilterGroupList playlistSectionGroupList = new ByteArrayFilterGroupList();
+ private final StringFilterGroup featuredLinksSection;
+ private final StringFilterGroup featuredVideosSection;
+ private final StringFilterGroup subscribeButton;
+
+ public DescriptionComponentsFilter() {
+ final StringFilterGroup aiGeneratedVideoSummarySection = new StringFilterGroup(
+ Settings.HIDE_AI_GENERATED_VIDEO_SUMMARY_SECTION,
+ "cell_expandable_metadata.e"
+ );
+
+ final StringFilterGroup askSection = new StringFilterGroup(
+ Settings.HIDE_ASK_SECTION,
+ "youchat_entrypoint.e"
+ );
+
+ final StringFilterGroup attributesSection = new StringFilterGroup(
+ Settings.HIDE_ATTRIBUTES_SECTION,
+ // "gaming_section", "music_section"
+ "video_attributes_section"
+ );
+
+ featuredLinksSection = new StringFilterGroup(
+ Settings.HIDE_FEATURED_LINKS_SECTION,
+ "media_lockup"
+ );
+
+ featuredVideosSection = new StringFilterGroup(
+ Settings.HIDE_FEATURED_VIDEOS_SECTION,
+ "structured_description_video_lockup"
+ );
+
+ playlistSection = new StringFilterGroup(
+ // YT v20.14.43 doesn't use any buffer for Courses and Podcasts.
+ // So this component is also needed.
+ null,
+ "playlist_section.e"
+ );
+
+ playlistSectionGroupList.addAll(
+ new ByteArrayFilterGroup(
+ Settings.HIDE_EXPLORE_COURSE_SECTION,
+ "yt_outline_creator_academy", // For Disable bold icons.
+ "yt_outline_experimental_graduation_cap"
+ ),
+ new ByteArrayFilterGroup(
+ Settings.HIDE_EXPLORE_PODCAST_SECTION,
+ "FEpodcasts_destination"
+ )
+ );
+
+ final StringFilterGroup transcriptSection = new StringFilterGroup(
+ Settings.HIDE_TRANSCRIPT_SECTION,
+ "transcript_section"
+ );
+
+ final StringFilterGroup howThisWasMadeSection = new StringFilterGroup(
+ Settings.HIDE_HOW_THIS_WAS_MADE_SECTION,
+ "how_this_was_made_section"
+ );
+
+ final StringFilterGroup courseProgressSection = new StringFilterGroup(
+ Settings.HIDE_COURSE_PROGRESS_SECTION,
+ "course_progress"
+ );
+
+ final StringFilterGroup hypePoints = new StringFilterGroup(
+ Settings.HIDE_HYPE_POINTS,
+ "hype_points_factoid"
+ );
+
+ final StringFilterGroup infoCardsSection = new StringFilterGroup(
+ Settings.HIDE_INFO_CARDS_SECTION,
+ INFOCARDS_SECTION_PATH
+ );
+
+ subscribeButton = new StringFilterGroup(
+ Settings.HIDE_SUBSCRIBE_BUTTON,
+ "subscribe_button"
+ );
+
+ macroMarkersCarousel = new StringFilterGroup(
+ null,
+ "macro_markers_carousel.e"
+ );
+
+ macroMarkersCarouselGroupList.addAll(
+ new ByteArrayFilterGroup(
+ Settings.HIDE_CHAPTERS_SECTION,
+ "chapters_horizontal_shelf",
+ "auto-chapters",
+ "description-chapters"
+ ),
+ new ByteArrayFilterGroup(
+ Settings.HIDE_KEY_CONCEPTS_SECTION,
+ "learning_concept_macro_markers_carousel_shelf",
+ "learning-concept"
+ )
+ );
+
+ addPathCallbacks(
+ aiGeneratedVideoSummarySection,
+ askSection,
+ courseProgressSection,
+ featuredLinksSection,
+ featuredVideosSection,
+ howThisWasMadeSection,
+ hypePoints,
+ infoCardsSection,
+ macroMarkersCarousel,
+ playlistSection,
+ subscribeButton,
+ transcriptSection
+ );
+ }
+
+ @Override
+ public boolean isFiltered(String identifier, String accessibility, String path, byte[] buffer,
+ StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
+ // The description panel can be opened in both the regular player and Shorts.
+ // If the description panel is opened in a Shorts, PlayerType is 'HIDDEN',
+ // so 'PlayerType.getCurrent().isMaximizedOrFullscreen()' does not guarantee that the description panel is open.
+ // Instead, use the engagement id to check if the description panel is opened.
+ if (!EngagementPanel.isDescription()
+ // The user can minimize the player while the engagement panel is open.
+ //
+ // In this case, the engagement panel is treated as open.
+ // (If the player is dismissed, the engagement panel is considered closed)
+ //
+ // Therefore, the following exceptions can occur:
+ // 1. The user opened a regular video and opened the description panel.
+ // 2. The 'horizontalShelf' elements were hidden.
+ // 3. The user minimized the player.
+ // 4. The user manually refreshed the library tab without dismissing the player.
+ // 5. Since the engagement panel is treated as open, the history shelf is filtered.
+ //
+ // To handle these exceptions, filtering is not performed even when the player is minimized.
+ || PlayerType.getCurrent() == PlayerType.WATCH_WHILE_MINIMIZED
+ ) {
+ return false;
+ }
+
+ if (matchedGroup == featuredLinksSection || matchedGroup == featuredVideosSection || matchedGroup == subscribeButton) {
+ return path.startsWith(INFOCARDS_SECTION_PATH);
+ }
+
+ if (matchedGroup == playlistSection) {
+ if (contentIndex != 0) return false;
+ return Settings.HIDE_EXPLORE_SECTION.get() || playlistSectionGroupList.check(buffer).isFiltered();
+ }
+
+ if (matchedGroup == macroMarkersCarousel) {
+ return contentIndex == 0 && macroMarkersCarouselGroupList.check(buffer).isFiltered();
+ }
+
+ return true;
+ }
+}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/HideInfoCardsFilter.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/litho/HideInfoCardsFilter.java
similarity index 66%
rename from extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/HideInfoCardsFilter.java
rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/litho/HideInfoCardsFilter.java
index ca88f834f3..3a14a052c9 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/HideInfoCardsFilter.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/litho/HideInfoCardsFilter.java
@@ -1,6 +1,8 @@
-package app.revanced.extension.youtube.patches.components;
+package app.revanced.extension.youtube.patches.litho;
+import app.revanced.extension.shared.patches.litho.FilterGroup.StringFilterGroup;
import app.revanced.extension.youtube.settings.Settings;
+import app.revanced.extension.shared.patches.litho.Filter;
@SuppressWarnings("unused")
public final class HideInfoCardsFilter extends Filter {
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/KeywordContentFilter.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/litho/KeywordContentFilter.java
similarity index 96%
rename from extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/KeywordContentFilter.java
rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/litho/KeywordContentFilter.java
index 8f9d99b6ec..4f18eb412d 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/KeywordContentFilter.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/litho/KeywordContentFilter.java
@@ -1,4 +1,4 @@
-package app.revanced.extension.youtube.patches.components;
+package app.revanced.extension.youtube.patches.litho;
import static app.revanced.extension.shared.StringRef.str;
import static app.revanced.extension.youtube.shared.NavigationBar.NavigationButton;
@@ -17,6 +17,8 @@ import app.revanced.extension.shared.Utils;
import app.revanced.extension.shared.ByteTrieSearch;
import app.revanced.extension.shared.StringTrieSearch;
import app.revanced.extension.shared.TrieSearch;
+import app.revanced.extension.shared.patches.litho.Filter;
+import app.revanced.extension.shared.patches.litho.FilterGroup.*;
import app.revanced.extension.youtube.settings.Settings;
import app.revanced.extension.youtube.shared.NavigationBar;
import app.revanced.extension.youtube.shared.PlayerType;
@@ -34,17 +36,17 @@ import app.revanced.extension.youtube.shared.PlayerType;
* - Some layout component residue will remain, such as the video chapter previews for some search results.
* These components do not include the video title or channel name, and they
* appear outside the filtered components so they are not caught.
- * - Keywords are case sensitive, but some casing variation is manually added.
+ * - Keywords are case-sensitive, but some casing variation is manually added.
* (ie: "mr beast" automatically filters "Mr Beast" and "MR BEAST").
* - Keywords present in the layout or video data cannot be used as filters, otherwise all videos
* will always be hidden. This patch checks for some words of these words.
* - When using whole word syntax, some keywords may need additional pluralized variations.
*/
@SuppressWarnings("unused")
-final class KeywordContentFilter extends Filter {
+public final class KeywordContentFilter extends Filter {
/**
- * Strings found in the buffer for every videos. Full strings should be specified.
+ * Strings found in the buffer for every video. Full strings should be specified.
*
* This list does not include every common buffer string, and this can be added/changed as needed.
* Words must be entered with the exact casing as found in the buffer.
@@ -188,7 +190,7 @@ final class KeywordContentFilter extends Filter {
return sentence;
}
final int firstCodePoint = sentence.codePointAt(0);
- // In some non English languages title case is different than uppercase.
+ // In some non-English languages title case is different from uppercase.
return new StringBuilder()
.appendCodePoint(Character.toTitleCase(firstCodePoint))
.append(sentence, Character.charCount(firstCodePoint), sentence.length())
@@ -204,7 +206,7 @@ final class KeywordContentFilter extends Filter {
}
final int delimiter = ' ';
- // Use code points and not characters to handle unicode surrogates.
+ // Use code points and not characters to handle Unicode surrogates.
int[] codePoints = sentence.codePoints().toArray();
boolean capitalizeNext = true;
for (int i = 0, length = codePoints.length; i < length; i++) {
@@ -374,7 +376,7 @@ final class KeywordContentFilter extends Filter {
return phrase.substring(1, phrase.length() - 1);
}
- private synchronized void parseKeywords() { // Must be synchronized since Litho is multi-threaded.
+ private synchronized void parseKeywords() { // Must be synchronized since Litho is multithreaded.
String rawKeywords = Settings.HIDE_KEYWORD_CONTENT_PHRASES.get();
//noinspection StringEquality
@@ -415,14 +417,14 @@ final class KeywordContentFilter extends Filter {
// Common casing that might appear.
//
- // This could be simplified by adding case insensitive search to the prefix search,
+ // This could be simplified by adding case-insensitive search to the prefix search,
// which is very simple to add to StringTreSearch for Unicode and ByteTrieSearch for ASCII.
//
// But to support Unicode with ByteTrieSearch would require major changes because
// UTF-8 characters can be different byte lengths, which does
// not allow comparing two different byte arrays using simple plain array indexes.
//
- // Instead use all common case variations of the words.
+ // Instead, use all common case variations of the words.
String[] phraseVariations = {
phrase,
phrase.toLowerCase(),
@@ -554,8 +556,8 @@ final class KeywordContentFilter extends Filter {
}
@Override
- boolean isFiltered(String identifier, String path, byte[] buffer,
- StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
+ public boolean isFiltered(String identifier, String accessibility, String path, byte[] buffer,
+ StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
if (contentIndex != 0 && matchedGroup == startsWithFilter) {
return false;
}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/LayoutComponentsFilter.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/litho/LayoutComponentsFilter.java
similarity index 50%
rename from extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/LayoutComponentsFilter.java
rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/litho/LayoutComponentsFilter.java
index 33ac4adc44..dda1f46e95 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/LayoutComponentsFilter.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/litho/LayoutComponentsFilter.java
@@ -1,19 +1,36 @@
-package app.revanced.extension.youtube.patches.components;
+package app.revanced.extension.youtube.patches.litho;
+import static app.revanced.extension.youtube.patches.VersionCheckPatch.IS_20_21_OR_GREATER;
import static app.revanced.extension.youtube.shared.NavigationBar.NavigationButton;
import android.graphics.drawable.Drawable;
import android.text.SpannableString;
import android.text.SpannableStringBuilder;
import android.text.TextUtils;
+import android.util.Pair;
import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
import android.widget.ImageView;
+import android.widget.TextView;
import androidx.annotation.Nullable;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+
+import app.revanced.extension.shared.ByteTrieSearch;
import app.revanced.extension.shared.Logger;
-import app.revanced.extension.shared.Utils;
import app.revanced.extension.shared.StringTrieSearch;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.BooleanSetting;
+import app.revanced.extension.shared.patches.litho.Filter;
+import app.revanced.extension.shared.patches.litho.FilterGroup.ByteArrayFilterGroup;
+import app.revanced.extension.shared.patches.litho.FilterGroup.StringFilterGroup;
+import app.revanced.extension.shared.patches.litho.FilterGroupList.StringFilterGroupList;
+import app.revanced.extension.shared.settings.StringSetting;
import app.revanced.extension.youtube.patches.ChangeHeaderPatch;
import app.revanced.extension.youtube.settings.Settings;
import app.revanced.extension.youtube.shared.NavigationBar;
@@ -22,7 +39,7 @@ import app.revanced.extension.youtube.shared.PlayerType;
@SuppressWarnings("unused")
public final class LayoutComponentsFilter extends Filter {
private static final StringTrieSearch mixPlaylistsContextExceptions = new StringTrieSearch(
- "V.ED", // Playlist browse id.
+ "V.ED", // Playlist browseId.
"java.lang.ref.WeakReference"
);
private static final ByteArrayFilterGroup mixPlaylistsBufferExceptions = new ByteArrayFilterGroup(
@@ -35,24 +52,43 @@ public final class LayoutComponentsFilter extends Filter {
"&list="
);
- private static final String PAGE_HEADER_PATH = "page_header.e";
+ private static final List channelTabFilterStrings;
+ private static final List flyoutMenuFilterStrings;
+
+ static {
+ channelTabFilterStrings = getFilterStrings(Settings.HIDE_CHANNEL_TAB_FILTER_STRINGS);
+ flyoutMenuFilterStrings = getFilterStrings(Settings.HIDE_FEED_FLYOUT_MENU_FILTER_STRINGS);
+ }
+
+ private static List getFilterStrings(StringSetting setting) {
+ String[] filterArray = setting.get().split("\\n");
+ List filters = new ArrayList<>(filterArray.length);
+
+ for (String line : filterArray) {
+ String trimmed = line.trim();
+ if (!trimmed.isEmpty()) filters.add(trimmed);
+ }
+
+ return filters;
+ }
private final StringTrieSearch exceptions = new StringTrieSearch();
private final StringFilterGroup communityPosts;
private final StringFilterGroup surveys;
- private final StringFilterGroup subscribeButton;
private final StringFilterGroup notifyMe;
private final StringFilterGroup singleItemInformationPanel;
private final StringFilterGroup expandableMetadata;
private final StringFilterGroup compactChannelBarInner;
private final StringFilterGroup compactChannelBarInnerButton;
private final ByteArrayFilterGroup joinMembershipButton;
- private final StringFilterGroup horizontalShelves;
- private final ByteArrayFilterGroup ticketShelf;
private final StringFilterGroup chipBar;
private final StringFilterGroup channelProfile;
- private final ByteArrayFilterGroupList channelProfileBuffer;
+ private final StringFilterGroupList channelProfileGroupList;
+ private final StringFilterGroup horizontalShelves;
private final ByteArrayFilterGroup playablesBuffer;
+ private final ByteArrayFilterGroup ticketShelfBuffer;
+ private final ByteArrayFilterGroup playerShoppingShelfBuffer;
+ private final ByteTrieSearch descriptionSearch;
public LayoutComponentsFilter() {
exceptions.addPatterns(
@@ -66,11 +102,28 @@ public final class LayoutComponentsFilter extends Filter {
// Identifiers.
+ final var cellDivider = new StringFilterGroup(
+ Settings.HIDE_COMPACT_BANNER,
+ // Empty padding and a relic from very old YT versions. Not related to compact banner but included here to avoid adding another setting.
+ "cell_divider"
+ );
+
final var chipsShelf = new StringFilterGroup(
Settings.HIDE_CHIPS_SHELF,
"chips_shelf"
);
+ final var liveChatReplay = new StringFilterGroup(
+ Settings.HIDE_LIVE_CHAT_REPLAY_BUTTON,
+ "live_chat_ep_entrypoint.e"
+ );
+
+ addIdentifierCallbacks(
+ cellDivider,
+ chipsShelf,
+ liveChatReplay
+ );
+
final var visualSpacer = new StringFilterGroup(
Settings.HIDE_VISUAL_SPACER,
"cell_divider"
@@ -78,6 +131,7 @@ public final class LayoutComponentsFilter extends Filter {
addIdentifierCallbacks(
chipsShelf,
+ liveChatReplay,
visualSpacer
);
@@ -121,6 +175,11 @@ public final class LayoutComponentsFilter extends Filter {
"subscriptions_chip_bar"
);
+ final var subscribedChannelsBar = new StringFilterGroup(
+ Settings.HIDE_SUBSCRIBED_CHANNELS_BAR,
+ "subscriptions_channel_bar"
+ );
+
chipBar = new StringFilterGroup(
Settings.HIDE_FILTER_BAR_FEED_IN_HISTORY,
"chip_bar"
@@ -207,7 +266,7 @@ public final class LayoutComponentsFilter extends Filter {
// Playable horizontal shelf header.
playablesBuffer = new ByteArrayFilterGroup(
- Settings.HIDE_PLAYABLES,
+ null,
"FEmini_app_destination"
);
@@ -247,8 +306,13 @@ public final class LayoutComponentsFilter extends Filter {
"sponsorships"
);
+ final var crowdfundingBox = new StringFilterGroup(
+ Settings.HIDE_CROWDFUNDING_BOX,
+ "donation_shelf"
+ );
+
final var channelWatermark = new StringFilterGroup(
- Settings.HIDE_VIDEO_CHANNEL_WATERMARK,
+ Settings.HIDE_CHANNEL_WATERMARK,
"featured_channel_watermark_overlay"
);
@@ -262,44 +326,86 @@ public final class LayoutComponentsFilter extends Filter {
"endorsement_header_footer.e"
);
+ final var videoTitle = new StringFilterGroup(
+ Settings.HIDE_VIDEO_TITLE,
+ "player_overlay_video_heading.e"
+ );
+
+ final var webLinkPanel = new StringFilterGroup(
+ Settings.HIDE_WEB_SEARCH_RESULTS,
+ "web_link_panel",
+ "web_result_panel"
+ );
+
channelProfile = new StringFilterGroup(
null,
"channel_profile.e",
- PAGE_HEADER_PATH
+ "page_header.e"
);
- channelProfileBuffer = new ByteArrayFilterGroupList();
- channelProfileBuffer.addAll(new ByteArrayFilterGroup(
- Settings.HIDE_STORE_BUTTON,
- "store_button"
- ),
- new ByteArrayFilterGroup(
+ channelProfileGroupList = new StringFilterGroupList();
+ channelProfileGroupList.addAll(new StringFilterGroup(
Settings.HIDE_COMMUNITY_BUTTON,
"community_button"
),
- new ByteArrayFilterGroup(
+ new StringFilterGroup(
Settings.HIDE_JOIN_BUTTON,
"sponsor_button"
+ ),
+ new StringFilterGroup(
+ Settings.HIDE_STORE_BUTTON,
+ "header_store_button"
+ ),
+ new StringFilterGroup(
+ Settings.HIDE_SUBSCRIBE_BUTTON_IN_CHANNEL_PAGE,
+ "subscribe_button"
)
);
- subscribeButton = new StringFilterGroup(
- Settings.HIDE_SUBSCRIBE_BUTTON_IN_CHANNEL_PAGE,
- "subscribe_button"
- );
-
horizontalShelves = new StringFilterGroup(
- Settings.HIDE_HORIZONTAL_SHELVES,
+ null, // Setting is checked in isFiltered()
"horizontal_video_shelf.e",
"horizontal_shelf.e",
"horizontal_shelf_inline.e",
"horizontal_tile_shelf.e"
);
- ticketShelf = new ByteArrayFilterGroup(
- Settings.HIDE_TICKET_SHELF,
+ ticketShelfBuffer = new ByteArrayFilterGroup(
+ null,
"ticket_item.e"
);
+ playerShoppingShelfBuffer = new ByteArrayFilterGroup(
+ null,
+ "shopping_item_card_list"
+ );
+
+ // Work around for unique situation where filtering is based on the setting,
+ // but it must not fall over to other filters if the setting is _not_ enabled.
+ // This is only needed for the horizontal shelf that is used so extensively everywhere.
+ descriptionSearch = new ByteTrieSearch();
+ List.of(
+ new Pair<>(Settings.HIDE_FEATURED_PLACES_SECTION, "yt_fill_star"),
+ new Pair<>(Settings.HIDE_FEATURED_PLACES_SECTION, "yt_fill_experimental_star"),
+ new Pair<>(Settings.HIDE_GAMING_SECTION, "yt_outline_gaming"),
+ new Pair<>(Settings.HIDE_GAMING_SECTION, "yt_outline_experimental_gaming"),
+ new Pair<>(Settings.HIDE_MUSIC_SECTION, "yt_outline_audio"),
+ new Pair<>(Settings.HIDE_MUSIC_SECTION, "yt_outline_experimental_audio"),
+ new Pair<>(Settings.HIDE_QUIZZES_SECTION, "post_base_wrapper_slim"),
+ // May no longer work on v20.31+, even though the component is still there.
+ new Pair<>(Settings.HIDE_ATTRIBUTES_SECTION, "cell_video_attribute")
+ ).forEach(pair -> {
+ BooleanSetting setting = pair.first;
+ descriptionSearch.addPattern(pair.second.getBytes(StandardCharsets.UTF_8),
+ (textSearched, matchedStartIndex, matchedLength, callbackParameter) -> {
+ //noinspection unchecked
+ AtomicReference hide = (AtomicReference) callbackParameter;
+ hide.set(setting.get());
+ return true;
+ }
+ );
+ }
+ );
+
addPathCallbacks(
artistCard,
audioTrackButton,
@@ -312,6 +418,7 @@ public final class LayoutComponentsFilter extends Filter {
compactChannelBar,
compactChannelBarInner,
communityPosts,
+ crowdfundingBox,
emergencyBox,
expandableMetadata,
forYouShelf,
@@ -326,21 +433,23 @@ public final class LayoutComponentsFilter extends Filter {
quickActions,
relatedVideos,
singleItemInformationPanel,
- subscribeButton,
+ subscribedChannelsBar,
subscribersCommunityGuidelines,
subscriptionsChipBar,
surveys,
timedReactions,
- videoRecommendationLabels
+ videoTitle,
+ videoRecommendationLabels,
+ webLinkPanel
);
}
@Override
- boolean isFiltered(String identifier, String path, byte[] buffer,
- StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
+ public boolean isFiltered(String identifier, String accessibility, String path, byte[] buffer,
+ StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
// This identifier is used not only in players but also in search results:
// https://github.com/ReVanced/revanced-patches/issues/3245
- // Until 2024, medical information panels such as Covid 19 also used this identifier and were shown in the search results.
+ // Until 2024, medical information panels such as Covid-19 also used this identifier and were shown in the search results.
// From 2025, the medical information panel is no longer shown in the search results.
// Therefore, this identifier does not filter when the search bar is activated.
if (matchedGroup == singleItemInformationPanel) {
@@ -354,14 +463,13 @@ public final class LayoutComponentsFilter extends Filter {
}
if (matchedGroup == channelProfile) {
- return channelProfileBuffer.check(buffer).isFiltered();
+ return channelProfileGroupList.check(accessibility).isFiltered();
}
- if (matchedGroup == subscribeButton) {
- return path.startsWith(PAGE_HEADER_PATH);
- }
-
- if (matchedGroup == communityPosts && NavigationBar.isBackButtonVisible()) {
+ if (matchedGroup == communityPosts
+ && NavigationBar.isBackButtonVisible()
+ && !NavigationBar.isSearchBarActive()
+ && PlayerType.getCurrent() != PlayerType.WATCH_WHILE_MAXIMIZED) {
// Allow community posts on channel profile page,
// or if viewing an individual channel in the feed.
return false;
@@ -376,10 +484,45 @@ public final class LayoutComponentsFilter extends Filter {
&& joinMembershipButton.check(buffer).isFiltered();
}
+ // Horizontal shelves are used everywhere in the app. And to prevent the generic "hide shelves"
+ // from incorrectly hiding other stuff that has its own hide filters,
+ // the more specific shelf filters must check first _and_ they must halt falling over
+ // to other filters if the buffer matches but the setting is off.
if (matchedGroup == horizontalShelves) {
- return contentIndex == 0 && (hideShelves()
- || ticketShelf.check(buffer).isFiltered()
- || playablesBuffer.check(buffer).isFiltered());
+ if (contentIndex != 0) return false;
+
+ AtomicReference descriptionFilterResult = new AtomicReference<>(null);
+ if (descriptionSearch.matches(buffer, descriptionFilterResult)) {
+ return descriptionFilterResult.get();
+ }
+
+ // Check if others are off before searching.
+ final boolean hideShelves = Settings.HIDE_HORIZONTAL_SHELVES.get();
+ final boolean hideTickets = Settings.HIDE_TICKET_SHELF.get();
+ final boolean hidePlayables = Settings.HIDE_PLAYABLES.get();
+ final boolean hidePlayerShoppingShelf = Settings.HIDE_CREATOR_STORE_SHELF.get();
+ if (!hideShelves && !hideTickets && !hidePlayables && !hidePlayerShoppingShelf)
+ return false;
+
+ if (ticketShelfBuffer.check(buffer).isFiltered()) return hideTickets;
+ if (playablesBuffer.check(buffer).isFiltered()) return hidePlayables;
+ if (playerShoppingShelfBuffer.check(buffer).isFiltered())
+ return hidePlayerShoppingShelf;
+
+ // 20.31+ when exiting fullscreen after watching for a while or when resuming the app,
+ // then sometimes the buffer isn't correct and the player shopping shelf is shown.
+ // If filtering reaches this point then there are no more shelves that could be in the player.
+ // If shopping shelves are set to hidden and the player is active, then assume
+ // it's the shopping shelf.
+ if (hidePlayerShoppingShelf) {
+ PlayerType type = PlayerType.getCurrent();
+ if (type == PlayerType.WATCH_WHILE_MAXIMIZED || type == PlayerType.WATCH_WHILE_FULLSCREEN
+ || type == PlayerType.WATCH_WHILE_SLIDING_MAXIMIZED_FULLSCREEN) {
+ return true;
+ }
+ }
+
+ return hideShelves && hideShelves();
}
if (matchedGroup == chipBar) {
@@ -393,20 +536,22 @@ public final class LayoutComponentsFilter extends Filter {
* Injection point.
* Called from a different place then the other filters.
*/
- public static boolean filterMixPlaylists(Object conversionContext, @Nullable final byte[] bytes) {
+ public static boolean filterMixPlaylists(Object conversionContext, @Nullable byte[] buffer) {
+ // Edit: This hook may no longer be needed, and mix playlist filtering
+ // might be possible using the existing litho filters.
try {
if (!Settings.HIDE_MIX_PLAYLISTS.get()) {
return false;
}
- if (bytes == null) {
- Logger.printDebug(() -> "bytes is null");
+ if (buffer == null) {
+ Logger.printDebug(() -> "buffer is null");
return false;
}
- if (mixPlaylists.check(bytes).isFiltered()
+ if (mixPlaylists.check(buffer).isFiltered()
// Prevent hiding the description of some videos accidentally.
- && !mixPlaylistsBufferExceptions.check(bytes).isFiltered()
+ && !mixPlaylistsBufferExceptions.check(buffer).isFiltered()
// Prevent playlist items being hidden, if a mix playlist is present in it.
// Check last since it requires creating a context string.
//
@@ -427,7 +572,7 @@ public final class LayoutComponentsFilter extends Filter {
* Injection point.
*/
public static boolean showWatermark() {
- return !Settings.HIDE_VIDEO_CHANNEL_WATERMARK.get();
+ return !Settings.HIDE_CHANNEL_WATERMARK.get();
}
/**
@@ -451,6 +596,13 @@ public final class LayoutComponentsFilter extends Filter {
return original || Settings.HIDE_FLOATING_MICROPHONE_BUTTON.get();
}
+ /**
+ * Injection point.
+ */
+ public static void hideLatestVideosButton(View view) {
+ Utils.hideViewUnderCondition(Settings.HIDE_LATEST_VIDEOS_BUTTON.get(), view);
+ }
+
/**
* Injection point.
*/
@@ -469,11 +621,23 @@ public final class LayoutComponentsFilter extends Filter {
: height;
}
+ private static final boolean HIDE_FILTER_BAR_FEED_IN_RELATED_VIDEOS_ENABLED
+ = Settings.HIDE_FILTER_BAR_FEED_IN_RELATED_VIDEOS.get();
+
/**
* Injection point.
*/
public static void hideInRelatedVideos(View chipView) {
- Utils.hideViewBy0dpUnderCondition(Settings.HIDE_FILTER_BAR_FEED_IN_RELATED_VIDEOS, chipView);
+ // Cannot use 0dp hide with later targets, otherwise the suggested videos
+ // can be shown in full screen mode.
+ // This behavior may also be present in earlier app targets.
+ if (IS_20_21_OR_GREATER) {
+ // FIXME: The filter bar is still briefly shown when dragging the suggested videos
+ // below the video player.
+ Utils.hideViewUnderCondition(HIDE_FILTER_BAR_FEED_IN_RELATED_VIDEOS_ENABLED, chipView);
+ } else {
+ Utils.hideViewBy0dpUnderCondition(HIDE_FILTER_BAR_FEED_IN_RELATED_VIDEOS_ENABLED, chipView);
+ }
}
private static final boolean HIDE_DOODLES_ENABLED = Settings.HIDE_DOODLES.get();
@@ -488,20 +652,111 @@ public final class LayoutComponentsFilter extends Filter {
imageView.setImageDrawable(replacement);
}
+ private static final FrameLayout.LayoutParams EMPTY_LAYOUT_PARAMS = new FrameLayout.LayoutParams(0, 0);
private static final boolean HIDE_SHOW_MORE_BUTTON_ENABLED = Settings.HIDE_SHOW_MORE_BUTTON.get();
+ /**
+ * The ShowMoreButton should not always be hidden.
+ * According to the preference summary, only the ShowMoreButton in search results is hidden.
+ * Since the ShowMoreButton should be visible on other pages, such as channels,
+ * the original values of the Views are saved in fields.
+ */
+ private static FrameLayout.LayoutParams cachedLayoutParams;
+ private static int cachedButtonContainerMinimumHeight = -1;
+ private static int cachedPlaceHolderMinimumHeight = -1;
+ private static int cachedRootViewMinimumHeight = -1;
+
/**
* Injection point.
*/
- public static void hideShowMoreButton(View view) {
+ public static void hideShowMoreButton(View view, View buttonContainer, TextView textView) {
if (HIDE_SHOW_MORE_BUTTON_ENABLED
- && NavigationBar.isSearchBarActive()
- // Search bar can be active but behind the player.
- && !PlayerType.getCurrent().isMaximizedOrFullscreen()) {
- Utils.hideViewByLayoutParams(view);
+ && view instanceof ViewGroup rootView
+ && buttonContainer != null
+ && textView != null
+ && buttonContainer.getLayoutParams() instanceof FrameLayout.LayoutParams lp
+ ) {
+ View placeHolder = rootView.getChildAt(0);
+
+ // For some users, ShowMoreButton has a PlaceHolder ViewGroup (A/B tests).
+ // When a PlaceHolder is present, a different method is used to hide or show the ViewGroup.
+ boolean hasPlaceHolder = placeHolder instanceof FrameLayout;
+
+ // Only in search results, the content description of RootView and the text of TextView match.
+ // Hide ShowMoreButton in search results, but show ShowMoreButton in other pages (e.g. channels).
+ boolean isSearchResults = TextUtils.equals(rootView.getContentDescription(), textView.getText());
+
+ if (hasPlaceHolder) {
+ hideShowMoreButtonWithPlaceHolder(placeHolder, isSearchResults);
+ } else {
+ hideShowMoreButtonWithOutPlaceHolder(buttonContainer, lp, isSearchResults);
+ }
+
+ if (cachedRootViewMinimumHeight == -1) {
+ cachedRootViewMinimumHeight = rootView.getMinimumHeight();
+ }
+
+ if (isSearchResults) {
+ rootView.setMinimumHeight(0);
+ rootView.setVisibility(View.GONE);
+ } else {
+ rootView.setMinimumHeight(cachedRootViewMinimumHeight);
+ rootView.setVisibility(View.VISIBLE);
+ }
}
}
+ private static void hideShowMoreButtonWithPlaceHolder(View placeHolder, boolean isSearchResults) {
+ if (cachedPlaceHolderMinimumHeight == -1) {
+ cachedPlaceHolderMinimumHeight = placeHolder.getMinimumHeight();
+ }
+
+ if (isSearchResults) {
+ placeHolder.setMinimumHeight(0);
+ placeHolder.setVisibility(View.GONE);
+ } else {
+ placeHolder.setMinimumHeight(cachedPlaceHolderMinimumHeight);
+ placeHolder.setVisibility(View.VISIBLE);
+ }
+ }
+
+ private static void hideShowMoreButtonWithOutPlaceHolder(View buttonContainer, FrameLayout.LayoutParams lp,
+ boolean isSearchResults) {
+ if (cachedButtonContainerMinimumHeight == -1) {
+ cachedButtonContainerMinimumHeight = buttonContainer.getMinimumHeight();
+ }
+
+ if (cachedLayoutParams == null) {
+ cachedLayoutParams = lp;
+ }
+
+ if (isSearchResults) {
+ buttonContainer.setMinimumHeight(0);
+ buttonContainer.setLayoutParams(EMPTY_LAYOUT_PARAMS);
+ buttonContainer.setVisibility(View.GONE);
+ } else {
+ buttonContainer.setMinimumHeight(cachedButtonContainerMinimumHeight);
+ buttonContainer.setLayoutParams(cachedLayoutParams);
+ buttonContainer.setVisibility(View.VISIBLE);
+ }
+ }
+
+ /**
+ * Injection point.
+ */
+ public static void hideSubscribedChannelsBar(View view) {
+ Utils.hideViewByRemovingFromParentUnderCondition(Settings.HIDE_SUBSCRIBED_CHANNELS_BAR, view);
+ }
+
+ /**
+ * Injection point.
+ */
+ public static int hideSubscribedChannelsBar(int original) {
+ return Settings.HIDE_SUBSCRIBED_CHANNELS_BAR.get()
+ ? 0
+ : original;
+ }
+
private static boolean hideShelves() {
// Horizontal shelves are used for music/game links in video descriptions,
// such as https://youtube.com/watch?v=W8kI1na3S2M
@@ -584,4 +839,112 @@ public final class LayoutComponentsFilter extends Filter {
return original;
}
+
+ /**
+ *
+ * Injection point.
+ *
+ * Rather than simply hiding the channel tab view, completely remove the channel tab from the list.
+ * If a channel tab is removed from the list, users will not be able to open it by swiping.
+ *
+ * @param channelTabText Text assigned to the channel tab, such as "Shorts", "Playlists",
+ * "Community", "Store". This text follows the user's language.
+ * @return Whether to remove the channel tab from the list.
+ */
+ public static boolean hideChannelTab(@Nullable String channelTabText) {
+ if (channelTabText == null || !Settings.HIDE_CHANNEL_TAB.get()
+ || channelTabFilterStrings.isEmpty()) {
+ return false;
+ }
+
+ for (String filter : channelTabFilterStrings) {
+ if (channelTabText.equalsIgnoreCase(filter)) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Injection point.
+ *
+ * @param typedString Keywords typed in the search bar.
+ * @return Whether the setting is enabled and the typed string is empty.
+ */
+ public static boolean hideYouMayLikeSection(String typedString) {
+ return Settings.HIDE_YOU_MAY_LIKE_SECTION.get()
+ // The 'You may like' section is only visible when no search terms are entered.
+ // To avoid unnecessary collection traversals, filtering is performed only when the typedString is empty.
+ && TextUtils.isEmpty(typedString);
+ }
+
+ /**
+ * Injection point.
+ *
+ * @param searchTerm This class contains information related to search terms.
+ * The {@code toString()} method of this class overrides the search term.
+ * @param endpoint Endpoint related with the search term.
+ * For search history, this value is:
+ * '/complete/deleteitems?client=youtube-android-pb&delq=${searchTerm}&deltok=${token}'.
+ * For search suggestions, this value is null or empty.
+ * @return Whether search term is a search history or not.
+ */
+ public static boolean isSearchHistory(Object searchTerm, String endpoint) {
+ boolean isSearchHistory = endpoint != null && endpoint.contains("/delete");
+ if (!isSearchHistory) {
+ Logger.printDebug(() -> "Remove search suggestion: " + searchTerm);
+ }
+ return isSearchHistory;
+ }
}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/PlaybackSpeedMenuFilter.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/litho/PlaybackSpeedMenuFilter.java
similarity index 83%
rename from extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/PlaybackSpeedMenuFilter.java
rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/litho/PlaybackSpeedMenuFilter.java
index d33dae8f28..e1752f184b 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/PlaybackSpeedMenuFilter.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/litho/PlaybackSpeedMenuFilter.java
@@ -1,5 +1,7 @@
-package app.revanced.extension.youtube.patches.components;
+package app.revanced.extension.youtube.patches.litho;
+import app.revanced.extension.shared.patches.litho.Filter;
+import app.revanced.extension.shared.patches.litho.FilterGroup.*;
import app.revanced.extension.youtube.patches.playback.speed.CustomPlaybackSpeedPatch;
import app.revanced.extension.youtube.settings.Settings;
@@ -36,7 +38,7 @@ public final class PlaybackSpeedMenuFilter extends Filter {
}
@Override
- boolean isFiltered(String identifier, String path, byte[] buffer,
+ public boolean isFiltered(String identifier, String accessibility, String path, byte[] buffer,
StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
if (matchedGroup == oldPlaybackMenuGroup) {
isOldPlaybackSpeedMenuVisible = true;
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/PlayerFlyoutMenuItemsFilter.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/litho/PlayerFlyoutMenuItemsFilter.java
similarity index 63%
rename from extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/PlayerFlyoutMenuItemsFilter.java
rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/litho/PlayerFlyoutMenuItemsFilter.java
index eae4eacfc7..c1edd9a0dc 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/PlayerFlyoutMenuItemsFilter.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/litho/PlayerFlyoutMenuItemsFilter.java
@@ -1,15 +1,20 @@
-package app.revanced.extension.youtube.patches.components;
+package app.revanced.extension.youtube.patches.litho;
+import app.revanced.extension.shared.patches.litho.Filter;
+import app.revanced.extension.shared.patches.litho.FilterGroup.ByteArrayFilterGroup;
+import app.revanced.extension.shared.patches.litho.FilterGroup.StringFilterGroup;
+import app.revanced.extension.shared.patches.litho.FilterGroupList.ByteArrayFilterGroupList;
import app.revanced.extension.shared.settings.BaseSettings;
import app.revanced.extension.shared.settings.Setting;
import app.revanced.extension.shared.spoof.SpoofVideoStreamsPatch;
+import app.revanced.extension.youtube.patches.VersionCheckPatch;
import app.revanced.extension.youtube.settings.Settings;
import app.revanced.extension.youtube.shared.ShortsPlayerState;
import java.util.List;
@SuppressWarnings("unused")
-public class PlayerFlyoutMenuItemsFilter extends Filter {
+public final class PlayerFlyoutMenuItemsFilter extends Filter {
public static final class HideAudioFlyoutMenuAvailability implements Setting.Availability {
@Override
@@ -40,61 +45,74 @@ public class PlayerFlyoutMenuItemsFilter extends Filter {
flyoutFilterGroupList.addAll(
new ByteArrayFilterGroup(
Settings.HIDE_PLAYER_FLYOUT_CAPTIONS,
- "closed_caption_"
- ),
- new ByteArrayFilterGroup(
- Settings.HIDE_PLAYER_FLYOUT_ADDITIONAL_SETTINGS,
- "yt_outline_gear_"
- ),
- new ByteArrayFilterGroup(
- Settings.HIDE_PLAYER_FLYOUT_LOOP_VIDEO,
- "yt_outline_arrow_repeat_1_"
- ),
- new ByteArrayFilterGroup(
- Settings.HIDE_PLAYER_FLYOUT_AMBIENT_MODE,
- "yt_outline_screen_light_"
- ),
- new ByteArrayFilterGroup(
- Settings.HIDE_PLAYER_FLYOUT_STABLE_VOLUME,
- "volume_stable_"
+ "closed_caption_",
+ "yt_outline_experimental_closed_captions_"
),
new ByteArrayFilterGroup(
Settings.HIDE_PLAYER_FLYOUT_LISTEN_WITH_YOUTUBE_MUSIC,
- "yt_outline_youtube_music_"
+ "yt_outline_youtube_music_",
+ "yt_outline_experimental_youtube_music_"
),
new ByteArrayFilterGroup(
Settings.HIDE_PLAYER_FLYOUT_HELP,
- "yt_outline_question_circle_"
+ "yt_outline_question_circle_",
+ "yt_outline_experimental_help_circle_"
),
new ByteArrayFilterGroup(
Settings.HIDE_PLAYER_FLYOUT_LOCK_SCREEN,
- "yt_outline_lock_"
+ "yt_outline_lock_",
+ "yt_outline_experimental_lock_"
),
new ByteArrayFilterGroup(
Settings.HIDE_PLAYER_FLYOUT_SPEED,
- "yt_outline_play_arrow_half_circle_"
+ "yt_outline_play_arrow_half_circle_",
+ "yt_outline_experimental_play_circle_half_dashed_"
),
new ByteArrayFilterGroup(
Settings.HIDE_PLAYER_FLYOUT_AUDIO_TRACK,
- "yt_outline_person_radar_"
+ "yt_outline_person_radar_",
+ "yt_outline_experimental_person_radar_"
+ ),
+ new ByteArrayFilterGroup(
+ Settings.HIDE_PLAYER_FLYOUT_ADDITIONAL_SETTINGS,
+ "yt_outline_gear_",
+ "yt_outline_experimental_gear_"
+ ),
+ new ByteArrayFilterGroup(
+ Settings.HIDE_PLAYER_FLYOUT_AMBIENT_MODE,
+ "yt_outline_screen_light_",
+ "yt_outline_experimental_ambient_mode_"
+ ),
+ new ByteArrayFilterGroup(
+ Settings.HIDE_PLAYER_FLYOUT_LOOP_VIDEO,
+ "yt_outline_arrow_repeat_1_",
+ "yt_outline_experimental_repeat1_"
+ ),
+ new ByteArrayFilterGroup(
+ Settings.HIDE_PLAYER_FLYOUT_STABLE_VOLUME,
+ "volume_stable_",
+ "yt_outline_experimental_stable_volume_"
),
new ByteArrayFilterGroup(
Settings.HIDE_PLAYER_FLYOUT_SLEEP_TIMER,
- "yt_outline_moon_z_"
+ "yt_outline_moon_z_",
+ "yt_outline_experimental_sleep_timer_"
),
new ByteArrayFilterGroup(
Settings.HIDE_PLAYER_FLYOUT_WATCH_IN_VR,
- "yt_outline_vr_"
+ "yt_outline_vr_",
+ "yt_outline_experimental_vr_"
),
new ByteArrayFilterGroup(
Settings.HIDE_PLAYER_FLYOUT_VIDEO_QUALITY,
- "yt_outline_adjust_"
+ "yt_outline_adjust_",
+ "yt_outline_experimental_adjust_"
)
);
}
@Override
- boolean isFiltered(String identifier, String path, byte[] buffer,
+ public boolean isFiltered(String identifier, String accessibility, String path, byte[] buffer,
StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
if (matchedGroup == videoQualityMenuFooter) {
return true;
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/ReturnYouTubeDislikeFilter.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/litho/ReturnYouTubeDislikeFilter.java
similarity index 66%
rename from extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/ReturnYouTubeDislikeFilter.java
rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/litho/ReturnYouTubeDislikeFilter.java
index 58e3af5e6a..a9513f28e0 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/ReturnYouTubeDislikeFilter.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/litho/ReturnYouTubeDislikeFilter.java
@@ -1,50 +1,42 @@
-package app.revanced.extension.youtube.patches.components;
+package app.revanced.extension.youtube.patches.litho;
import androidx.annotation.GuardedBy;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.Map;
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.TrieSearch;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.patches.litho.Filter;
+import app.revanced.extension.shared.patches.litho.FilterGroup.*;
+import app.revanced.extension.shared.patches.litho.FilterGroupList.ByteArrayFilterGroupList;
import app.revanced.extension.youtube.patches.ReturnYouTubeDislikePatch;
import app.revanced.extension.youtube.patches.VideoInformation;
import app.revanced.extension.youtube.settings.Settings;
-import app.revanced.extension.shared.Logger;
-import app.revanced.extension.shared.TrieSearch;
/**
- * Searches for video id's in the proto buffer of Shorts dislike.
+ * Searches for video IDs in the proto buffer of Shorts dislike.
*
* Because multiple litho dislike spans are created in the background
* (and also anytime litho refreshes the components, which is somewhat arbitrary),
* that makes the value of {@link VideoInformation#getVideoId()} and {@link VideoInformation#getPlayerResponseVideoId()}
- * unreliable to determine which video id a Shorts litho span belongs to.
+ * unreliable to determine which video ID a Shorts litho span belongs to.
*
- * But the correct video id does appear in the protobuffer just before a Shorts litho span is created.
+ * But the correct video ID does appear in the protobuffer just before a Shorts litho span is created.
*
* Once a way to asynchronously update litho text is found, this strategy will no longer be needed.
*/
public final class ReturnYouTubeDislikeFilter extends Filter {
/**
- * Last unique video id's loaded. Value is ignored and Map is treated as a Set.
+ * Last unique video IDs loaded. Value is ignored and Map is treated as a Set.
* Cannot use {@link LinkedHashSet} because it's missing #removeEldestEntry().
*/
@GuardedBy("itself")
- private static final Map lastVideoIds = new LinkedHashMap<>() {
- /**
- * Number of video id's to keep track of for searching thru the buffer.
- * A minimum value of 3 should be sufficient, but check a few more just in case.
- */
- private static final int NUMBER_OF_LAST_VIDEO_IDS_TO_TRACK = 5;
-
- @Override
- protected boolean removeEldestEntry(Entry eldest) {
- return size() > NUMBER_OF_LAST_VIDEO_IDS_TO_TRACK;
- }
- };
+ private static final Map lastVideoIds = Utils.createSizeRestrictedMap(5);
/**
* Injection point.
@@ -57,7 +49,7 @@ public final class ReturnYouTubeDislikeFilter extends Filter {
}
synchronized (lastVideoIds) {
if (lastVideoIds.put(videoId, Boolean.TRUE) == null) {
- Logger.printDebug(() -> "New Short video id: " + videoId);
+ Logger.printDebug(() -> "New Short video ID: " + videoId);
}
}
} catch (Exception ex) {
@@ -72,30 +64,42 @@ public final class ReturnYouTubeDislikeFilter extends Filter {
// But if swiping back to a previous video and liking/disliking, then only that single button reloads.
// So must check for both buttons.
addPathCallbacks(
- new StringFilterGroup(null, "|shorts_like_button.e"),
- new StringFilterGroup(null, "|shorts_dislike_button.e")
+ new StringFilterGroup(
+ null,
+ "shorts_like_button.e",
+ "reel_like_button.e",
+ "reel_like_toggled_button.e",
+ "shorts_dislike_button.e",
+ "reel_dislike_button.e",
+ "reel_dislike_toggled_button.e"
+ )
);
- // After the button identifiers is binary data and then the video id for that specific short.
+ // After the button identifiers is binary data and then the video ID for that specific short.
videoIdFilterGroup.addAll(
- new ByteArrayFilterGroup(null, "id.reel_like_button"),
- new ByteArrayFilterGroup(null, "id.reel_dislike_button")
+ new ByteArrayFilterGroup(
+ null,
+ "id.reel_like_button",
+ "id.reel_dislike_button",
+ "ic_right_like",
+ "ic_right_dislike"
+ )
);
}
@Override
- boolean isFiltered(String identifier, String path, byte[] buffer,
- StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
+ public boolean isFiltered(String identifier, String accessibility, String path, byte[] buffer,
+ StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
if (!Settings.RYD_ENABLED.get() || !Settings.RYD_SHORTS.get()) {
return false;
}
- FilterGroup.FilterGroupResult result = videoIdFilterGroup.check(buffer);
+ FilterGroupResult result = videoIdFilterGroup.check(buffer);
if (result.isFiltered()) {
String matchedVideoId = findVideoId(buffer);
// Matched video will be null if in incognito mode.
- // Must pass a null id to correctly clear out the current video data.
- // Otherwise if a Short is opened in non-incognito, then incognito is enabled and another Short is opened,
+ // Must pass a null ID to correctly clear out the current video data.
+ // Otherwise, if a Short is opened in non-incognito, then incognito is enabled and another Short is opened,
// the new incognito Short will show the old prior data.
ReturnYouTubeDislikePatch.setLastLithoShortsVideoId(matchedVideoId);
}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/ShortsFilter.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/litho/ShortsFilter.java
similarity index 58%
rename from extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/ShortsFilter.java
rename to extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/litho/ShortsFilter.java
index f2dea7af46..462cd8c2e1 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/ShortsFilter.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/litho/ShortsFilter.java
@@ -1,29 +1,60 @@
-package app.revanced.extension.youtube.patches.components;
+package app.revanced.extension.youtube.patches.litho;
import static app.revanced.extension.youtube.shared.NavigationBar.NavigationButton;
import android.view.View;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.patches.litho.Filter;
+import app.revanced.extension.shared.patches.litho.FilterGroup.*;
+import app.revanced.extension.shared.patches.litho.FilterGroup.ByteArrayFilterGroup;
+import app.revanced.extension.shared.patches.litho.FilterGroupList.ByteArrayFilterGroupList;
+import app.revanced.extension.shared.patches.litho.LithoFilterPatch;
+import app.revanced.extension.shared.settings.BooleanSetting;
import com.google.android.libraries.youtube.rendering.ui.pivotbar.PivotBar;
import java.lang.ref.WeakReference;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import app.revanced.extension.shared.Logger;
+import app.revanced.extension.youtube.patches.VersionCheckPatch;
import app.revanced.extension.youtube.settings.Settings;
+import app.revanced.extension.youtube.shared.EngagementPanel;
import app.revanced.extension.youtube.shared.NavigationBar;
import app.revanced.extension.youtube.shared.PlayerType;
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "FieldCanBeLocal"})
public final class ShortsFilter extends Filter {
private static final boolean HIDE_SHORTS_NAVIGATION_BAR = Settings.HIDE_SHORTS_NAVIGATION_BAR.get();
- private static final String REEL_CHANNEL_BAR_PATH = "reel_channel_bar.e";
+ private static final String COMPONENT_TYPE = "ComponentType";
+ private static final String[] REEL_ACTION_BAR_PATHS = {
+ "reel_action_bar.", // Regular Shorts.
+ "reels_player_overlay_layout." // Shorts ads.
+ };
+ private static final Map REEL_ACTION_BUTTONS_MAP = new HashMap<>() {
+ {
+ // Like button and Dislike button can be hidden with Litho filter.
+ // put(0, Settings.HIDE_SHORTS_LIKE_BUTTON);
+ // put(1, Settings.HIDE_SHORTS_DISLIKE_BUTTON);
+ put(2, Settings.HIDE_SHORTS_COMMENTS_BUTTON);
+ put(3, Settings.HIDE_SHORTS_SHARE_BUTTON);
+ put(4, Settings.HIDE_SHORTS_REMIX_BUTTON);
+ }
+ };
+ private final String REEL_CHANNEL_BAR_PATH = "reel_channel_bar.e";
/**
* For paid promotion label and subscribe button that appears in the channel bar.
*/
- private static final String REEL_METAPANEL_PATH = "reel_metapanel.e";
+ private final String REEL_METAPANEL_PATH = "reel_metapanel.e";
+
+ /**
+ * For paid promotion label and subscribe button that appears in the channel bar.
+ */
+ private final String REEL_PLAYER_OVERLAY_PATH = "reel_player_overlay.e";
/**
* Tags that appears when opening the Shorts player.
@@ -39,6 +70,8 @@ public final class ShortsFilter extends Filter {
private final StringFilterGroup shortsCompactFeedVideo;
private final ByteArrayFilterGroup shortsCompactFeedVideoBuffer;
+ private final StringFilterGroup channelProfile;
+ private final ByteArrayFilterGroup channelProfileShelfHeaderBuffer;
private final StringFilterGroup useSoundButton;
private final ByteArrayFilterGroup useSoundButtonBuffer;
private final StringFilterGroup useTemplateButton;
@@ -48,7 +81,11 @@ public final class ShortsFilter extends Filter {
private final StringFilterGroup subscribeButton;
private final StringFilterGroup joinButton;
private final StringFilterGroup paidPromotionLabel;
- private final StringFilterGroup shelfHeader;
+ private final StringFilterGroup shelfHeaderIdentifier;
+ private final StringFilterGroup shelfHeaderPath;
+
+ private final StringFilterGroup reelCarousel;
+ private final ByteArrayFilterGroupList reelCarouselBuffer = new ByteArrayFilterGroupList();
private final StringFilterGroup suggestedAction;
private final ByteArrayFilterGroupList suggestedActionsBuffer = new ByteArrayFilterGroupList();
@@ -67,24 +104,34 @@ public final class ShortsFilter extends Filter {
"shorts_shelf",
"inline_shorts",
"shorts_grid",
- "shorts_video_cell",
+ "shorts_video_cell"
+ );
+
+ channelProfile = new StringFilterGroup(
+ Settings.HIDE_SHORTS_CHANNEL,
"shorts_pivot_item"
);
+ channelProfileShelfHeaderBuffer = new ByteArrayFilterGroup(
+ Settings.HIDE_SHORTS_CHANNEL,
+ "Shorts"
+ );
+
// Feed Shorts shelf header.
// Use a different filter group for this pattern, as it requires an additional check after matching.
- shelfHeader = new StringFilterGroup(
+ shelfHeaderIdentifier = new StringFilterGroup(
null,
"shelf_header.e"
);
- addIdentifierCallbacks(shortsIdentifiers, shelfHeader);
+ addIdentifierCallbacks(shortsIdentifiers, channelProfile, shelfHeaderIdentifier);
//
// Path components.
//
- shortsCompactFeedVideo = new StringFilterGroup(null,
+ shortsCompactFeedVideo = new StringFilterGroup(
+ null,
// Shorts that appear in the feed/search when the device is using tablet layout.
"compact_video.e",
// 'video_lockup_with_attachment.e' is shown instead of 'compact_video.e' for some users
@@ -95,7 +142,14 @@ public final class ShortsFilter extends Filter {
// Filter out items that use the 'frame0' thumbnail.
// This is a valid thumbnail for both regular videos and Shorts,
// but it appears these thumbnails are used only for Shorts.
- shortsCompactFeedVideoBuffer = new ByteArrayFilterGroup(null, "/frame0.jpg");
+ shortsCompactFeedVideoBuffer = new ByteArrayFilterGroup(
+ null,
+ "/frame0.jpg");
+
+ shelfHeaderPath = new StringFilterGroup(
+ null,
+ "shelf_header.e"
+ );
// Shorts player components.
StringFilterGroup pausedOverlayButtons = new StringFilterGroup(
@@ -146,13 +200,15 @@ public final class ShortsFilter extends Filter {
StringFilterGroup likeButton = new StringFilterGroup(
Settings.HIDE_SHORTS_LIKE_BUTTON,
"shorts_like_button.e",
- "reel_like_button.e"
+ "reel_like_button.e",
+ "reel_like_toggled_button.e"
);
StringFilterGroup dislikeButton = new StringFilterGroup(
Settings.HIDE_SHORTS_DISLIKE_BUTTON,
"shorts_dislike_button.e",
- "reel_dislike_button.e"
+ "reel_dislike_button.e",
+ "reel_dislike_toggled_button.e"
);
StringFilterGroup previewComment = new StringFilterGroup(
@@ -171,7 +227,7 @@ public final class ShortsFilter extends Filter {
autoDubbedLabel = new StringFilterGroup(
Settings.HIDE_SHORTS_AUTO_DUBBED_LABEL,
- "badge."
+ "badge.e"
);
joinButton = new StringFilterGroup(
@@ -196,6 +252,24 @@ public final class ShortsFilter extends Filter {
"reel_action_bar.e"
);
+ reelCarousel = new StringFilterGroup(
+ null,
+ "reel_carousel.e"
+ );
+
+ reelCarouselBuffer.addAll(
+ new ByteArrayFilterGroup(
+ Settings.HIDE_SHORTS_AI_BUTTON,
+ "yt_outline_info_circle",
+ "yt_outline_experimental_info_circle"
+ ),
+ new ByteArrayFilterGroup(
+ Settings.HIDE_SHORTS_SOUND_METADATA_LABEL,
+ "yt_outline_audio", // Doesn't seem to be needed as v20.14.43 uses 'yt_outline_experimental_audio' as well. But still just in case.
+ "yt_outline_experimental_audio"
+ )
+ );
+
useSoundButton = new StringFilterGroup(
Settings.HIDE_SHORTS_USE_SOUND_BUTTON,
// First filter needed for "Use this sound" that can appear when viewing Shorts
@@ -223,7 +297,11 @@ public final class ShortsFilter extends Filter {
videoActionButton = new StringFilterGroup(
null,
- // Can be simply 'button.e', 'shorts_video_action_button.e' or 'reel_action_button.e'
+ // Can be any of:
+ // button.eml
+ // shorts_video_action_button.eml
+ // reel_action_button.eml
+ // reel_pivot_button.eml
"button.e"
);
@@ -233,32 +311,39 @@ public final class ShortsFilter extends Filter {
);
addPathCallbacks(
- shortsCompactFeedVideo, joinButton, subscribeButton, paidPromotionLabel, autoDubbedLabel,
- shortsActionBar, suggestedAction, pausedOverlayButtons, channelBar, previewComment,
- fullVideoLinkLabel, videoTitle, useSoundButton, reelSoundMetadata, soundButton, infoPanel,
- stickers, likeFountain, likeButton, dislikeButton, livePreview
+ shortsCompactFeedVideo, shelfHeaderPath, joinButton, subscribeButton, paidPromotionLabel,
+ livePreview, suggestedAction, pausedOverlayButtons, channelBar, infoPanel, previewComment,
+ autoDubbedLabel, fullVideoLinkLabel, videoTitle, useSoundButton, soundButton, stickers,
+ reelCarousel, reelSoundMetadata, likeFountain, likeButton, dislikeButton
);
- //
- // All other action buttons.
- //
- videoActionButtonBuffer.addAll(
- new ByteArrayFilterGroup(
- Settings.HIDE_SHORTS_COMMENTS_BUTTON,
- "reel_comment_button",
- "youtube_shorts_comment_outline"
- ),
- new ByteArrayFilterGroup(
- Settings.HIDE_SHORTS_SHARE_BUTTON,
- "reel_share_button",
- "youtube_shorts_share_outline"
- ),
- new ByteArrayFilterGroup(
- Settings.HIDE_SHORTS_REMIX_BUTTON,
- "reel_remix_button",
- "youtube_shorts_remix_outline"
- )
- );
+ // Legacy hiding of Shorts action buttons. Because of 20.31+ buffer changes
+ // it's currently not possible to hide these using buffer filtering.
+ // See alternative hiding strategy in hideActionButtons().
+ if (!VersionCheckPatch.IS_20_22_OR_GREATER) {
+ addPathCallbacks(shortsActionBar);
+
+ //
+ // All other action buttons.
+ //
+ videoActionButtonBuffer.addAll(
+ new ByteArrayFilterGroup(
+ Settings.HIDE_SHORTS_COMMENTS_BUTTON,
+ "reel_comment_button",
+ "youtube_shorts_comment_outline"
+ ),
+ new ByteArrayFilterGroup(
+ Settings.HIDE_SHORTS_SHARE_BUTTON,
+ "reel_share_button",
+ "youtube_shorts_share_outline"
+ ),
+ new ByteArrayFilterGroup(
+ Settings.HIDE_SHORTS_REMIX_BUTTON,
+ "reel_remix_button",
+ "youtube_shorts_remix_outline"
+ )
+ );
+ }
//
// Suggested actions.
@@ -272,41 +357,49 @@ public final class ShortsFilter extends Filter {
),
new ByteArrayFilterGroup(
Settings.HIDE_SHORTS_SHOP_BUTTON,
- "yt_outline_bag_"
+ "yt_outline_bag_",
+ "yt_outline_experimental_bag_"
),
new ByteArrayFilterGroup(
Settings.HIDE_SHORTS_TAGGED_PRODUCTS,
// Product buttons show pictures of the products, and does not have any unique icons to identify.
- // Instead use a unique identifier found in the buffer.
+ // Instead, use a unique identifier found in the buffer.
"PAproduct_listZ"
),
new ByteArrayFilterGroup(
Settings.HIDE_SHORTS_LOCATION_LABEL,
- "yt_outline_location_point_"
+ "yt_outline_location_point_",
+ "yt_outline_experimental_location_point_"
),
new ByteArrayFilterGroup(
Settings.HIDE_SHORTS_SAVE_SOUND_BUTTON,
"yt_outline_bookmark_",
// 'Save sound' button. It seems this has been removed and only 'Save music' is used.
// Still hide this in case it's still present.
- "yt_outline_list_add_"
+ "yt_outline_list_add_",
+ "yt_outline_experimental_list_add_"
),
new ByteArrayFilterGroup(
Settings.HIDE_SHORTS_SEARCH_SUGGESTIONS,
- "yt_outline_search_"
+ "yt_outline_search_",
+ "yt_outline_experimental_search_"
+
),
new ByteArrayFilterGroup(
Settings.HIDE_SHORTS_SUPER_THANKS_BUTTON,
- "yt_outline_dollar_sign_heart_"
+ "yt_outline_dollar_sign_heart_",
+ "yt_outline_experimental_dollar_sign_heart_"
),
new ByteArrayFilterGroup(
Settings.HIDE_SHORTS_USE_TEMPLATE_BUTTON,
// "Use this template" can appear in two different places.
- "yt_outline_template_add_"
+ "yt_outline_template_add_",
+ "yt_outline_experimental_template_add_"
),
new ByteArrayFilterGroup(
Settings.HIDE_SHORTS_UPCOMING_BUTTON,
- "yt_outline_bell_"
+ "yt_outline_bell_",
+ "yt_outline_experimental_bell_"
),
new ByteArrayFilterGroup(
Settings.HIDE_SHORTS_EFFECT_BUTTON,
@@ -319,11 +412,13 @@ public final class ShortsFilter extends Filter {
),
new ByteArrayFilterGroup(
Settings.HIDE_SHORTS_NEW_POSTS_BUTTON,
- "yt_outline_box_pencil"
+ "yt_outline_box_pencil",
+ "yt_outline_experimental_box_pencil"
),
new ByteArrayFilterGroup(
Settings.HIDE_SHORTS_HASHTAG_BUTTON,
- "yt_outline_hashtag_"
+ "yt_outline_hashtag_",
+ "yt_outline_experimental_hashtag_"
)
);
}
@@ -339,13 +434,33 @@ public final class ShortsFilter extends Filter {
}
@Override
- boolean isFiltered(String identifier, String path, byte[] buffer,
- StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
+ public boolean isFiltered(String identifier, String accessibility, String path, byte[] buffer,
+ StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
+ if (contentType == FilterContentType.IDENTIFIER) {
+ if (matchedGroup == shelfHeaderIdentifier) {
+ // Shelf header reused in history/channel/etc.
+ // Shorts header is always index 0
+ if (contentIndex != 0) {
+ return false;
+ }
+ }
+ if (matchedGroup == channelProfile) {
+ return true;
+ }
+
+ return shouldHideShortsFeedItems();
+ }
+
if (contentType == FilterContentType.PATH) {
if (matchedGroup == subscribeButton || matchedGroup == joinButton
|| matchedGroup == paidPromotionLabel || matchedGroup == autoDubbedLabel) {
// Selectively filter to avoid false positive filtering of other subscribe/join buttons.
- return path.startsWith(REEL_CHANNEL_BAR_PATH) || path.startsWith(REEL_METAPANEL_PATH);
+ return path.startsWith(REEL_CHANNEL_BAR_PATH) || path.startsWith(REEL_METAPANEL_PATH)
+ || path.startsWith(REEL_PLAYER_OVERLAY_PATH);
+ }
+
+ if (matchedGroup == reelCarousel) {
+ return reelCarouselBuffer.check(buffer).isFiltered();
}
if (matchedGroup == useSoundButton) {
@@ -360,6 +475,19 @@ public final class ShortsFilter extends Filter {
return shouldHideShortsFeedItems() && shortsCompactFeedVideoBuffer.check(buffer).isFiltered();
}
+ if (matchedGroup == shelfHeaderPath) {
+ // Shelf header reused in history/channel/etc.
+ // Shorts header is always index 0
+ if (contentIndex != 0) {
+ return false;
+ }
+ if (!channelProfileShelfHeaderBuffer.check(buffer).isFiltered()) {
+ return false;
+ }
+
+ return shouldHideShortsFeedItems();
+ }
+
// Video action buttons (comment, share, remix) have the same path.
// Like and dislike are separate path filters and don't require buffer searching.
if (matchedGroup == shortsActionBar) {
@@ -381,40 +509,35 @@ public final class ShortsFilter extends Filter {
return true;
}
- // Feed/search identifier components.
- if (matchedGroup == shelfHeader) {
- // Because the header is used in watch history and possibly other places, check for the index,
- // which is 0 when the shelf header is used for Shorts.
- if (contentIndex != 0) return false;
- }
-
- return shouldHideShortsFeedItems();
+ return false;
}
- private static boolean shouldHideShortsFeedItems() {
+ private boolean shouldHideShortsFeedItems() {
// Known issue if hide home is on but at least one other hide is off:
//
// Shorts suggestions will load in the background if a video is opened and
// immediately minimized before any suggestions are loaded.
// In this state the player type will show minimized, which cannot
// distinguish between Shorts suggestions loading in the player and between
- // scrolling thru search/home/subscription tabs while a player is minimized.
+ // scrolling through search/home/subscription tabs while a player is minimized.
final boolean hideHome = Settings.HIDE_SHORTS_HOME.get();
final boolean hideSubscriptions = Settings.HIDE_SHORTS_SUBSCRIPTIONS.get();
final boolean hideSearch = Settings.HIDE_SHORTS_SEARCH.get();
+ final boolean hideVideoDescription = Settings.HIDE_SHORTS_VIDEO_DESCRIPTION.get();
final boolean hideHistory = Settings.HIDE_SHORTS_HISTORY.get();
- if (!hideHome && !hideSubscriptions && !hideSearch && !hideHistory) {
+ if (!hideHome && !hideSubscriptions && !hideSearch && !hideVideoDescription && !hideHistory) {
return false;
}
- if (hideHome && hideSubscriptions && hideSearch && hideHistory) {
+ if (hideHome && hideSubscriptions && hideSearch && hideVideoDescription && hideHistory) {
return true;
}
// Must check player type first, as search bar can be active behind the player.
if (PlayerType.getCurrent().isMaximizedOrFullscreen()) {
- // For now, consider the under video results the same as the home feed.
- return hideHome;
+ return EngagementPanel.isDescription()
+ ? hideVideoDescription // Player video description panel opened.
+ : hideHome; // For now, consider Shorts under video player the same as the home feed.
}
// Must check second, as search can be from any tab.
@@ -441,6 +564,61 @@ public final class ShortsFilter extends Filter {
};
}
+ /**
+ * Injection point.
+ *
+ * Hide action buttons by index.
+ *
+ * Regular video action buttons vary in order by video, country, and account.
+ * Therefore, hiding buttons by index may hide unintended buttons.
+ *
+ * Shorts action buttons are almost always in the same order.
+ * (From top to bottom: Like, Dislike, Comment, Share, Remix).
+ * Therefore, we can hide Shorts action buttons by index.
+ *
+ * @param pathBuilder Same as pathBuilder used in {@link LithoFilterPatch}.
+ * @param treeNodeResultList List containing Litho components.
+ */
+ public static void hideActionButtons(StringBuilder pathBuilder, List