feat: Add Strip platform libraries patch

.github/workflows/build_pull_request.yml

@@ -25,8 +25,7 @@ jobs:
 
       - name: Build
         env:
-          ORG_GRADLE_PROJECT_githubPackagesUsername: ${{ env.GITHUB_ACTOR }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          ORG_GRADLE_PROJECT_githubPackagesPassword: ${{ secrets.GITHUB_TOKEN }}
         run: ./gradlew :patches:buildAndroid --no-daemon
 
       - name: Upload artifacts

.github/workflows/pull_strings.yml

@@ -2,7 +2,7 @@ name: Pull strings
 
 on:
   schedule:
-    - cron: "0 0 * * 0"
+    - cron: "0 */12 * * *"
   workflow_dispatch:
 
 jobs:

.github/workflows/push_strings.yml

@@ -16,11 +16,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v5
 
-      - name: Process strings
+      - name: Preprocess strings
         env:
-          ORG_GRADLE_PROJECT_githubPackagesUsername: ${{ github.actor }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          ORG_GRADLE_PROJECT_githubPackagesPassword: ${{ secrets.GITHUB_TOKEN }}
+        run: ./gradlew clean preprocessCrowdinStrings
-        run: ./gradlew processStringsForCrowdin
 
       - name: Push strings
         uses: crowdin/github-action@v2

.github/workflows/release.yml

@@ -31,8 +31,7 @@ jobs:
 
       - name: Build
         env:
-          ORG_GRADLE_PROJECT_githubPackagesUsername: ${{ github.actor }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          ORG_GRADLE_PROJECT_githubPackagesPassword: ${{ secrets.GITHUB_TOKEN }}
         run: ./gradlew :patches:buildAndroid clean
 
       - name: Setup Node.js
@@ -56,8 +55,6 @@ 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'

CHANGELOG.md

@@ -1,158 +1,3 @@
-# [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)
 
 

crowdin.yml

@@ -1,9 +1,8 @@
 project_id_env: "CROWDIN_PROJECT_ID"
 api_token_env: "CROWDIN_PERSONAL_TOKEN"
 
-preserve_hierarchy: true
+preserve_hierarchy: false
 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

extensions/all/misc/disable-play-integrity/build.gradle.kts

@@ -1,20 +0,0 @@
-android {
-    namespace = "app.revanced.extension"
-
-    defaultConfig {
-        minSdk = 21
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-    }
-
-    buildFeatures {
-        aidl = true
-    }
-}
-
-dependencies {
-    compileOnly(libs.annotation)
-}

extensions/all/misc/disable-play-integrity/src/main/AndroidManifest.xml

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

extensions/all/misc/disable-play-integrity/src/main/aidl/com/google/android/play/core/integrity/protocol/IExpressIntegrityService.aidl

@@ -1,8 +0,0 @@
-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;
-}

extensions/all/misc/disable-play-integrity/src/main/aidl/com/google/android/play/core/integrity/protocol/IExpressIntegrityServiceCallback.aidl

@@ -1,5 +0,0 @@
-package com.google.android.play.core.integrity.protocol;
-
-interface IExpressIntegrityServiceCallback {
-    oneway void onRequestExpressIntegrityTokenResult(in Bundle result) = 2;
-}

extensions/all/misc/disable-play-integrity/src/main/aidl/com/google/android/play/core/integrity/protocol/IIntegrityService.aidl

@@ -1,8 +0,0 @@
-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;
-}

extensions/all/misc/disable-play-integrity/src/main/aidl/com/google/android/play/core/integrity/protocol/IIntegrityServiceCallback.aidl

@@ -1,7 +0,0 @@
-package com.google.android.play.core.integrity.protocol;
-
-import android.os.Bundle;
-
-interface IIntegrityServiceCallback {
-    oneway void onResult(in Bundle result) = 1;
-}

extensions/all/misc/disable-play-integrity/src/main/java/android/ext/PackageId.java

@@ -1,10 +0,0 @@
-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";
-}

extensions/all/misc/disable-play-integrity/src/main/java/android/os/BinderWrapper.java

@@ -1,62 +0,0 @@
-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);
-    }
-}

extensions/all/misc/disable-play-integrity/src/main/java/app/grapheneos/gmscompat/lib/playintegrity/ClassicPlayIntegrityServiceWrapper.java

@@ -1,41 +0,0 @@
-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();
-    }
-}

extensions/all/misc/disable-play-integrity/src/main/java/app/grapheneos/gmscompat/lib/playintegrity/PlayIntegrityServiceWrapper.java

@@ -1,48 +0,0 @@
-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;
-    }
-}

extensions/all/misc/disable-play-integrity/src/main/java/app/grapheneos/gmscompat/lib/playintegrity/PlayIntegrityUtils.java

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

extensions/all/misc/disable-play-integrity/src/main/java/app/grapheneos/gmscompat/lib/playintegrity/StandardPlayIntegrityServiceWrapper.java

@@ -1,42 +0,0 @@
-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();
-    }
-}

extensions/all/misc/disable-play-integrity/src/main/java/app/grapheneos/gmscompat/lib/util/ServiceConnectionWrapper.java

@@ -1,49 +0,0 @@
-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<IBinder> binderOverride;
-
-    public ServiceConnectionWrapper(ServiceConnection base, UnaryOperator<IBinder> 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);
-        }
-    }
-}

extensions/all/misc/disable-play-integrity/src/main/java/app/revanced/extension/playintegrity/DisablePlayIntegrityPatch.java

@@ -1,17 +0,0 @@
-package app.revanced.extension.playintegrity;
-
-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);
-    }
-}

extensions/all/misc/disable-play-integrity/src/main/java/com/android/internal/os/FakeBackgroundHandler.java

@@ -1,11 +0,0 @@
-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());
-    }
-}

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.YouTubeAndMusicSettings;
+import app.revanced.extension.shared.settings.BaseSettings;
 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 YouTubeAndMusicSettings {
+public class Settings extends BaseSettings {
 
     // Ads
     public static final BooleanSetting HIDE_VIDEO_ADS = new BooleanSetting("revanced_music_hide_video_ads", TRUE, true);

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

@@ -311,10 +311,6 @@ public class Utils {
         return resourceId;
     }
 
-    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"));
     }

extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/litho/FilterGroup.java

@@ -1,213 +0,0 @@
-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<T> {
-    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;
-    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);
-
-
-    public static class StringFilterGroup extends FilterGroup<String> {
-
-        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 FilterGroupList.ByteArrayFilterGroupList#check(byte[])},
-     * which uses a prefix tree to give better performance.
-     */
-    public static class ByteArrayFilterGroup extends FilterGroup<byte[]> {
-
-        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);
-        }
-    }
-}

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

@@ -1,14 +0,0 @@
-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_PROTOBUFFER = new BooleanSetting("revanced_debug_protobuffer", FALSE, false,
-            "revanced_debug_protobuffer_user_dialog_message", parent(BaseSettings.DEBUG));
-}

extensions/strava/build.gradle.kts

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

extensions/strava/src/main/AndroidManifest.xml

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

extensions/strava/src/main/java/app/revanced/extension/strava/AddMediaDownloadPatch.java

@@ -1,216 +0,0 @@
-package app.revanced.extension.strava;
-
-import android.annotation.SuppressLint;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Environment;
-import android.provider.MediaStore;
-import android.webkit.MimeTypeMap;
-
-import com.strava.core.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;
-
-@SuppressLint("NewApi")
-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);
-                }
-                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<Future<Response>> 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<Response> 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);
-                }
-                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(name, "string");
-        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<String> 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;
-    }
-}

extensions/strava/stub/build.gradle.kts

@@ -1,12 +0,0 @@
-plugins {
-    alias(libs.plugins.android.library)
-}
-
-android {
-    namespace = "app.revanced.extension"
-    compileSdk = 34
-
-    defaultConfig {
-        minSdk = 21
-    }
-}

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

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

extensions/strava/stub/src/main/java/com/strava/core/data/MediaContent.java

@@ -1,15 +0,0 @@
-package com.strava.core.data;
-
-import java.io.Serializable;
-
-public interface MediaContent extends Serializable {
-    String getCaption();
-
-    String getId();
-
-    String getReferenceId();
-
-    MediaType getType();
-
-    void setCaption(String caption);
-}

extensions/strava/stub/src/main/java/com/strava/core/data/MediaDimension.java

@@ -1,44 +0,0 @@
-package com.strava.core.data;
-
-import java.io.Serializable;
-
-public final class MediaDimension implements Comparable<MediaDimension>, 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;
-    }
-}

extensions/strava/stub/src/main/java/com/strava/core/data/MediaType.java

@@ -1,16 +0,0 @@
-package com.strava.core.data;
-
-public enum MediaType {
-    PHOTO(1),
-    VIDEO(2);
-
-    private final int remoteValue;
-
-    private MediaType(int remoteValue) {
-        this.remoteValue = remoteValue;
-    }
-
-    public int getRemoteValue() {
-        return remoteValue;
-    }
-}

extensions/strava/stub/src/main/java/com/strava/core/data/RemoteMediaContent.java

@@ -1,17 +0,0 @@
-package com.strava.core.data;
-
-import java.util.SortedMap;
-
-public interface RemoteMediaContent extends MediaContent {
-    MediaDimension getLargestSize();
-
-    String getLargestUrl();
-
-    SortedMap<Integer, MediaDimension> getSizes();
-
-    String getSmallestUrl();
-
-    RemoteMediaStatus getStatus();
-
-    SortedMap<Integer, String> getUrls();
-}

extensions/strava/stub/src/main/java/com/strava/core/data/RemoteMediaStatus.java

@@ -1,11 +0,0 @@
-package com.strava.core.data;
-
-public enum RemoteMediaStatus {
-    NEW,
-    PENDING,
-    PROCESSED,
-    REPORTED,
-    REINSTATED,
-    DELETED,
-    FAILED
-}

extensions/strava/stub/src/main/java/com/strava/photos/data/Media.java

@@ -1,286 +0,0 @@
-package com.strava.photos.data;
-
-import com.strava.core.data.MediaDimension;
-import com.strava.core.data.MediaType;
-import com.strava.core.data.RemoteMediaContent;
-import com.strava.core.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<Integer, MediaDimension> sizes;
-        private final RemoteMediaStatus status;
-        private final String tag;
-        private final MediaType type;
-        private final SortedMap<Integer, String> 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<Integer, MediaDimension> getSizes() {
-            return sizes;
-        }
-
-        @Override
-        public RemoteMediaStatus getStatus() {
-            return status;
-        }
-
-        @Override
-        public String getTag() {
-            return tag;
-        }
-
-        @Override
-        public MediaType getType() {
-            return type;
-        }
-
-        @Override
-        public SortedMap<Integer, String> getUrls() {
-            return urls;
-        }
-
-        @Override
-        public void setCaption(String caption) {
-            this.caption = caption;
-        }
-
-        public Photo(String id,
-                     String caption,
-                     SortedMap<Integer, String> urls,
-                     SortedMap<Integer, MediaDimension> 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<Integer, MediaDimension> sizes;
-        private final RemoteMediaStatus status;
-        private final String tag;
-        private final MediaType type;
-        private final SortedMap<Integer, String> 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<Integer, MediaDimension> getSizes() {
-            return sizes;
-        }
-
-        @Override
-        public RemoteMediaStatus getStatus() {
-            return status;
-        }
-
-        @Override
-        public String getTag() {
-            return tag;
-        }
-
-        @Override
-        public MediaType getType() {
-            return type;
-        }
-
-        @Override
-        public SortedMap<Integer, String> 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<Integer, String> urls,
-                     SortedMap<Integer, MediaDimension> 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() {
-    }
-}

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

@@ -1,30 +0,0 @@
-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;
-    }
-}

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

@@ -11,9 +11,6 @@ import java.util.List;
 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.Filter;
-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")
@@ -156,8 +153,8 @@ public final class AdsFilter extends Filter {
     }
 
     @Override
-    public boolean isFiltered(String identifier, String path, byte[] buffer,
+    boolean isFiltered(String identifier, String path, byte[] buffer,
-                              StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
+                       StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
         if (matchedGroup == playerShoppingShelf) {
             return contentIndex == 0 && playerShoppingShelfBuffer.check(buffer).isFiltered();
         }

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

@@ -1,7 +1,5 @@
 package app.revanced.extension.youtube.patches.components;
 
-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;
 
@@ -21,7 +19,7 @@ public final class AdvancedVideoQualityMenuFilter extends Filter {
     }
 
     @Override
-    public boolean isFiltered(String identifier, String path, byte[] buffer,
+    boolean isFiltered(String identifier, String path, byte[] buffer,
                        StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
         isVideoQualityMenuVisible = true;
 

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

@@ -1,13 +1,9 @@
 package app.revanced.extension.youtube.patches.components;
 
-import app.revanced.extension.shared.patches.litho.FilterGroupList.ByteArrayFilterGroupList;
-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.youtube.settings.Settings;
 
 @SuppressWarnings("unused")
-public final class ButtonsFilter extends Filter {
+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";
@@ -122,7 +118,7 @@ public final class ButtonsFilter extends Filter {
     }
 
     @Override
-    public boolean isFiltered(String identifier, String path, byte[] buffer,
+    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))

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

@@ -1,12 +1,10 @@
 package app.revanced.extension.youtube.patches.components;
 
-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")
-public final class CommentsFilter extends Filter {
+final class CommentsFilter extends Filter {
 
     private static final String COMMENT_COMPOSER_PATH = "comment_composer.e";
 
@@ -90,8 +88,8 @@ public final class CommentsFilter extends Filter {
     }
 
     @Override
-    public boolean isFiltered(String identifier, String path, byte[] buffer,
+    boolean isFiltered(String identifier, String path, byte[] buffer,
-                              StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
+                       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()

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

@@ -1,4 +1,4 @@
-package app.revanced.extension.shared.patches.components;
+package app.revanced.extension.youtube.patches.components;
 
 import static app.revanced.extension.shared.StringRef.str;
 
@@ -15,15 +15,13 @@ import java.util.regex.Pattern;
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.ByteTrieSearch;
-import app.revanced.extension.shared.patches.litho.FilterGroup.StringFilterGroup;
+import app.revanced.extension.youtube.settings.Settings;
-import app.revanced.extension.shared.settings.YouTubeAndMusicSettings;
-import app.revanced.extension.shared.patches.litho.Filter;
 
 /**
  * Allows custom filtering using a path and optionally a proto buffer string.
  */
 @SuppressWarnings("unused")
-public final class CustomFilter extends Filter {
+final class CustomFilter extends Filter {
 
     private static void showInvalidSyntaxToast(@NonNull String expression) {
         Utils.showToastLong(str("revanced_custom_filter_toast_invalid_syntax", expression));
@@ -47,7 +45,7 @@ public final class CustomFilter extends Filter {
         @NonNull
         @SuppressWarnings("ConstantConditions")
         static Collection<CustomFilterGroup> parseCustomFilterGroups() {
-            String rawCustomFilterText = YouTubeAndMusicSettings.CUSTOM_FILTER_STRINGS.get();
+            String rawCustomFilterText = Settings.CUSTOM_FILTER_STRINGS.get();
             if (rawCustomFilterText.isBlank()) {
                 return Collections.emptyList();
             }
@@ -102,7 +100,7 @@ public final class CustomFilter extends Filter {
         ByteTrieSearch bufferSearch;
 
         CustomFilterGroup(boolean startsWith, @NonNull String path) {
-            super(YouTubeAndMusicSettings.CUSTOM_FILTER, path);
+            super(Settings.CUSTOM_FILTER, path);
             this.startsWith = startsWith;
         }
 
@@ -147,7 +145,7 @@ public final class CustomFilter extends Filter {
     }
 
     @Override
-    public boolean isFiltered(String identifier, String path, byte[] buffer,
+    boolean isFiltered(String identifier, String path, byte[] buffer,
                        StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
         // All callbacks are custom filter groups.
         CustomFilterGroup custom = (CustomFilterGroup) matchedGroup;
@@ -161,4 +159,4 @@ public final class CustomFilter extends Filter {
 
         return custom.bufferSearch.matches(buffer);
     }
-}
+}

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

@@ -1,14 +1,11 @@
 package app.revanced.extension.youtube.patches.components;
 
 import app.revanced.extension.shared.StringTrieSearch;
-import app.revanced.extension.shared.patches.litho.Filter;
-import app.revanced.extension.shared.patches.litho.FilterGroup.*;
-import app.revanced.extension.shared.patches.litho.FilterGroupList.*;
 import app.revanced.extension.youtube.settings.Settings;
 import app.revanced.extension.youtube.shared.PlayerType;
 
 @SuppressWarnings("unused")
-public final class DescriptionComponentsFilter extends Filter {
+final class DescriptionComponentsFilter extends Filter {
 
     private static final String INFOCARDS_SECTION_PATH = "infocards_section.e";
 
@@ -131,8 +128,8 @@ public final class DescriptionComponentsFilter extends Filter {
     }
 
     @Override
-    public boolean isFiltered(String identifier, String path, byte[] buffer,
+    boolean isFiltered(String identifier, String path, byte[] buffer,
-                              StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
+                       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.

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

@@ -1,12 +1,9 @@
-package app.revanced.extension.shared.patches.litho;
+package app.revanced.extension.youtube.patches.components;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import app.revanced.extension.shared.patches.litho.FilterGroup.StringFilterGroup;
-import app.revanced.extension.shared.patches.litho.FilterGroup.ByteArrayFilterGroup;
-
 /**
  * Filters litho based components.
  *
@@ -17,11 +14,11 @@ import app.revanced.extension.shared.patches.litho.FilterGroup.ByteArrayFilterGr
  * either an identifier or a path.
  * Then inside {@link #isFiltered(String, String, byte[], StringFilterGroup, FilterContentType, int)}
  * search for the buffer content using either a {@link ByteArrayFilterGroup} (if searching for 1 pattern)
- * or a {@link FilterGroupList.ByteArrayFilterGroupList} (if searching for more than 1 pattern).
+ * or a {@link ByteArrayFilterGroupList} (if searching for more than 1 pattern).
  *
  * All callbacks must be registered before the constructor completes.
  */
-public abstract class Filter {
+abstract class Filter {
 
     public enum FilterContentType {
         IDENTIFIER,
@@ -68,7 +65,7 @@ public abstract class Filter {
      * @param contentIndex Matched index of the identifier or path.
      * @return True if the litho component should be filtered out.
      */
-    public boolean isFiltered(String identifier, String path, byte[] buffer,
+    boolean isFiltered(String identifier, String path, byte[] buffer,
                        StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
         return true;
     }

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

@@ -0,0 +1,214 @@
+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<T> {
+    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<String> {
+
+    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<byte[]> {
+
+    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);
+    }
+}
+

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

@@ -1,22 +1,21 @@
-package app.revanced.extension.shared.patches.litho;
+package app.revanced.extension.youtube.patches.components;
 
 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;
 
-public abstract class FilterGroupList<V, T extends FilterGroup<V>> implements Iterable<T> {
+abstract class FilterGroupList<V, T extends FilterGroup<V>> implements Iterable<T> {
 
     private final List<T> filterGroups = new ArrayList<>();
     private final TrieSearch<V> search = createSearchGraph();
 
     @SafeVarargs
-    public final void addAll(final T... groups) {
+    protected final void addAll(final T... groups) {
         filterGroups.addAll(Arrays.asList(groups));
 
         for (T group : groups) {
@@ -42,7 +41,18 @@ public abstract class FilterGroupList<V, T extends FilterGroup<V>> implements It
         return filterGroups.iterator();
     }
 
-    public FilterGroup.FilterGroupResult check(V stack) {
+    @Override
+    public void forEach(@NonNull Consumer<? super T> action) {
+        filterGroups.forEach(action);
+    }
+
+    @NonNull
+    @Override
+    public Spliterator<T> spliterator() {
+        return filterGroups.spliterator();
+    }
+
+    protected FilterGroup.FilterGroupResult check(V stack) {
         FilterGroup.FilterGroupResult result = new FilterGroup.FilterGroupResult();
         search.matches(stack, result);
         return result;
@@ -50,21 +60,21 @@ public abstract class FilterGroupList<V, T extends FilterGroup<V>> implements It
     }
 
     protected abstract TrieSearch<V> createSearchGraph();
+}
 
-    public static final class StringFilterGroupList extends FilterGroupList<String, StringFilterGroup> {
+final class StringFilterGroupList extends FilterGroupList<String, StringFilterGroup> {
-        protected StringTrieSearch createSearchGraph() {
+    protected StringTrieSearch createSearchGraph() {
-            return new StringTrieSearch();
+        return new StringTrieSearch();
-        }
     }
+}
 
-    /**
+/**
-     * If searching for a single byte pattern, then it is slightly better to use
+ * 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
+ * {@link ByteArrayFilterGroup#check(byte[])} as it uses KMP which is faster
-     * than a prefix tree to search for only 1 pattern.
+ * than a prefix tree to search for only 1 pattern.
-     */
+ */
-    public static final class ByteArrayFilterGroupList extends FilterGroupList<byte[], ByteArrayFilterGroup> {
+final class ByteArrayFilterGroupList extends FilterGroupList<byte[], ByteArrayFilterGroup> {
-        protected ByteTrieSearch createSearchGraph() {
+    protected ByteTrieSearch createSearchGraph() {
-            return new ByteTrieSearch();
+        return new ByteTrieSearch();
-        }
     }
 }

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

@@ -1,8 +1,6 @@
 package app.revanced.extension.youtube.patches.components;
 
 import app.revanced.extension.youtube.settings.Settings;
-import app.revanced.extension.shared.patches.litho.Filter;
-import app.revanced.extension.shared.patches.litho.FilterGroup.*;
 
 @SuppressWarnings("unused")
 public final class HideInfoCardsFilter extends Filter {

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

@@ -17,8 +17,6 @@ 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;
@@ -43,7 +41,7 @@ import app.revanced.extension.youtube.shared.PlayerType;
  * - When using whole word syntax, some keywords may need additional pluralized variations.
  */
 @SuppressWarnings("unused")
-public final class KeywordContentFilter extends Filter {
+final class KeywordContentFilter extends Filter {
 
     /**
      * Strings found in the buffer for every videos.  Full strings should be specified.
@@ -556,8 +554,8 @@ public final class KeywordContentFilter extends Filter {
     }
 
     @Override
-    public boolean isFiltered(String identifier, String path, byte[] buffer,
+    boolean isFiltered(String identifier, String path, byte[] buffer,
-                              StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
+                       StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
         if (contentIndex != 0 && matchedGroup == startsWithFilter) {
             return false;
         }

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

@@ -14,9 +14,6 @@ import androidx.annotation.Nullable;
 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.Filter;
-import app.revanced.extension.shared.patches.litho.FilterGroup.*;
-import app.revanced.extension.shared.patches.litho.FilterGroupList.*;
 import app.revanced.extension.youtube.patches.ChangeHeaderPatch;
 import app.revanced.extension.youtube.settings.Settings;
 import app.revanced.extension.youtube.shared.NavigationBar;
@@ -345,7 +342,7 @@ public final class LayoutComponentsFilter extends Filter {
     }
 
     @Override
-    public boolean isFiltered(String identifier, String path, byte[] buffer,
+    boolean isFiltered(String identifier, 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

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

@@ -1,4 +1,4 @@
-package app.revanced.extension.shared.patches.litho;
+package app.revanced.extension.youtube.patches.components;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -7,11 +7,9 @@ import java.nio.ByteBuffer;
 import java.util.List;
 
 import app.revanced.extension.shared.Logger;
-import app.revanced.extension.shared.StringTrieSearch;
 import app.revanced.extension.shared.settings.BaseSettings;
-import app.revanced.extension.shared.settings.YouTubeAndMusicSettings;
+import app.revanced.extension.shared.StringTrieSearch;
-
+import app.revanced.extension.youtube.settings.Settings;
-import app.revanced.extension.shared.patches.litho.FilterGroup.StringFilterGroup;
 
 @SuppressWarnings("unused")
 public final class LithoFilterPatch {
@@ -38,7 +36,7 @@ public final class LithoFilterPatch {
             builder.append(identifier);
             builder.append(" Path: ");
             builder.append(path);
-            if (YouTubeAndMusicSettings.DEBUG_PROTOBUFFER.get()) {
+            if (Settings.DEBUG_PROTOBUFFER.get()) {
                 builder.append(" BufferStrings: ");
                 findAsciiStrings(builder, buffer);
             }

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

@@ -1,7 +1,5 @@
 package app.revanced.extension.youtube.patches.components;
 
-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;
 
@@ -38,7 +36,7 @@ public final class PlaybackSpeedMenuFilter extends Filter {
     }
 
     @Override
-    public boolean isFiltered(String identifier, String path, byte[] buffer,
+    boolean isFiltered(String identifier, String path, byte[] buffer,
                        StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
         if (matchedGroup == oldPlaybackMenuGroup) {
             isOldPlaybackSpeedMenuVisible = true;

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

@@ -3,16 +3,13 @@ package app.revanced.extension.youtube.patches.components;
 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.shared.patches.litho.Filter;
-import app.revanced.extension.shared.patches.litho.FilterGroup.*;
-import app.revanced.extension.shared.patches.litho.FilterGroupList.*;
 import app.revanced.extension.youtube.settings.Settings;
 import app.revanced.extension.youtube.shared.ShortsPlayerState;
 
 import java.util.List;
 
 @SuppressWarnings("unused")
-public final class PlayerFlyoutMenuItemsFilter extends Filter {
+public class PlayerFlyoutMenuItemsFilter extends Filter {
 
     public static final class HideAudioFlyoutMenuAvailability implements Setting.Availability {
         @Override
@@ -97,7 +94,7 @@ public final class PlayerFlyoutMenuItemsFilter extends Filter {
     }
 
     @Override
-    public boolean isFiltered(String identifier, String path, byte[] buffer,
+    boolean isFiltered(String identifier, String path, byte[] buffer,
                        StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
         if (matchedGroup == videoQualityMenuFooter) {
             return true;

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

@@ -13,9 +13,6 @@ 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;
-import app.revanced.extension.shared.patches.litho.Filter;
-import app.revanced.extension.shared.patches.litho.FilterGroup.*;
-import app.revanced.extension.shared.patches.litho.FilterGroupList.*;
 
 /**
  * Searches for video id's in the proto buffer of Shorts dislike.
@@ -87,13 +84,13 @@ public final class ReturnYouTubeDislikeFilter extends Filter {
     }
 
     @Override
-    public boolean isFiltered(String identifier, String path, byte[] buffer,
+    boolean isFiltered(String identifier, String path, byte[] buffer,
                        StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
         if (!Settings.RYD_ENABLED.get() || !Settings.RYD_SHORTS.get()) {
             return false;
         }
 
-        FilterGroupResult result = videoIdFilterGroup.check(buffer);
+        FilterGroup.FilterGroupResult result = videoIdFilterGroup.check(buffer);
         if (result.isFiltered()) {
             String matchedVideoId = findVideoId(buffer);
             // Matched video will be null if in incognito mode.

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

@@ -11,9 +11,6 @@ import java.util.Arrays;
 import java.util.List;
 
 import app.revanced.extension.shared.Logger;
-import app.revanced.extension.shared.patches.litho.Filter;
-import app.revanced.extension.shared.patches.litho.FilterGroup.*;
-import app.revanced.extension.shared.patches.litho.FilterGroupList.*;
 import app.revanced.extension.youtube.settings.Settings;
 import app.revanced.extension.youtube.shared.NavigationBar;
 import app.revanced.extension.youtube.shared.PlayerType;
@@ -342,7 +339,7 @@ public final class ShortsFilter extends Filter {
     }
 
     @Override
-    public boolean isFiltered(String identifier, String path, byte[] buffer,
+    boolean isFiltered(String identifier, String path, byte[] buffer,
                        StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
         if (contentType == FilterContentType.PATH) {
             if (matchedGroup == subscribeButton || matchedGroup == joinButton

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

@@ -32,7 +32,6 @@ import android.graphics.Color;
 
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
-import app.revanced.extension.shared.settings.YouTubeAndMusicSettings;
 import app.revanced.extension.shared.settings.BaseSettings;
 import app.revanced.extension.shared.settings.BooleanSetting;
 import app.revanced.extension.shared.settings.EnumSetting;
@@ -50,7 +49,7 @@ import app.revanced.extension.youtube.patches.MiniplayerPatch;
 import app.revanced.extension.youtube.sponsorblock.SponsorBlockSettings;
 import app.revanced.extension.youtube.swipecontrols.SwipeControlsConfigurationProvider.SwipeOverlayStyle;
 
-public class Settings extends YouTubeAndMusicSettings {
+public class Settings extends BaseSettings {
     // Video
     public static final BooleanSetting ADVANCED_VIDEO_QUALITY_MENU = new BooleanSetting("revanced_advanced_video_quality_menu", TRUE);
     public static final BooleanSetting DISABLE_HDR_VIDEO = new BooleanSetting("revanced_disable_hdr_video", FALSE);
@@ -275,6 +274,11 @@ public class Settings extends YouTubeAndMusicSettings {
     public static final BooleanSetting CHANGE_START_PAGE_ALWAYS = new BooleanSetting("revanced_change_start_page_always", FALSE, true,
             new ChangeStartPageTypeAvailability());
     public static final StringSetting SPOOF_APP_VERSION_TARGET = new StringSetting("revanced_spoof_app_version_target", "19.01.34", true, parent(SPOOF_APP_VERSION));
+
+    // Custom filter
+    public static final BooleanSetting CUSTOM_FILTER = new BooleanSetting("revanced_custom_filter", FALSE);
+    public static final StringSetting CUSTOM_FILTER_STRINGS = new StringSetting("revanced_custom_filter_strings", "", true, parent(CUSTOM_FILTER));
+
     // Navigation buttons
     public static final BooleanSetting HIDE_HOME_BUTTON = new BooleanSetting("revanced_hide_home_button", FALSE, true);
     public static final BooleanSetting HIDE_CREATE_BUTTON = new BooleanSetting("revanced_hide_create_button", TRUE, true);
@@ -352,7 +356,6 @@ public class Settings extends YouTubeAndMusicSettings {
     public static final IntegerSetting ANNOUNCEMENT_LAST_ID = new IntegerSetting("revanced_announcement_last_id", -1, false, false);
     public static final BooleanSetting LOOP_VIDEO = new BooleanSetting("revanced_loop_video", FALSE);
     public static final BooleanSetting LOOP_VIDEO_BUTTON = new BooleanSetting("revanced_loop_video_button", FALSE);
-    public static final BooleanSetting PAUSE_ON_AUDIO_INTERRUPT = new BooleanSetting("revanced_pause_on_audio_interrupt", FALSE, true);
     public static final BooleanSetting BYPASS_URL_REDIRECTS = new BooleanSetting("revanced_bypass_url_redirects", TRUE);
     public static final BooleanSetting DISABLE_HAPTIC_FEEDBACK_CHAPTERS = new BooleanSetting("revanced_disable_haptic_feedback_chapters", FALSE);
     public static final BooleanSetting DISABLE_HAPTIC_FEEDBACK_PRECISE_SEEKING = new BooleanSetting("revanced_disable_haptic_feedback_precise_seeking", FALSE);
@@ -364,6 +367,8 @@ public class Settings extends YouTubeAndMusicSettings {
     public static final EnumSetting<ClientType> SPOOF_VIDEO_STREAMS_CLIENT_TYPE = new EnumSetting<>("revanced_spoof_video_streams_client_type", ClientType.ANDROID_VR_1_43_32, true, parent(SPOOF_VIDEO_STREAMS));
     public static final BooleanSetting SPOOF_VIDEO_STREAMS_AV1 = new BooleanSetting("revanced_spoof_video_streams_av1", FALSE, true,
             "revanced_spoof_video_streams_av1_user_dialog_message", new SpoofClientAv1Availability());
+    public static final BooleanSetting DEBUG_PROTOBUFFER = new BooleanSetting("revanced_debug_protobuffer", FALSE, false,
+            "revanced_debug_protobuffer_user_dialog_message", parent(BaseSettings.DEBUG));
 
     // Swipe controls
     public static final BooleanSetting SWIPE_CHANGE_VIDEO = new BooleanSetting("revanced_swipe_change_video", FALSE, true);
@@ -376,7 +381,7 @@ public class Settings extends YouTubeAndMusicSettings {
     public static final IntegerSetting SWIPE_MAGNITUDE_THRESHOLD = new IntegerSetting("revanced_swipe_threshold", 30, true,
             parentsAny(SWIPE_BRIGHTNESS, SWIPE_VOLUME));
     public static final IntegerSetting SWIPE_VOLUME_SENSITIVITY = new IntegerSetting("revanced_swipe_volume_sensitivity", 1, true, parent(SWIPE_VOLUME));
-    public static final EnumSetting<SwipeOverlayStyle> SWIPE_OVERLAY_STYLE = new EnumSetting<>("revanced_swipe_overlay_style", SwipeOverlayStyle.HORIZONTAL, true,
+    public static final EnumSetting<SwipeOverlayStyle> SWIPE_OVERLAY_STYLE = new EnumSetting<>("revanced_swipe_overlay_style", SwipeOverlayStyle.HORIZONTAL,true,
             parentsAny(SWIPE_BRIGHTNESS, SWIPE_VOLUME));
     public static final IntegerSetting SWIPE_OVERLAY_TEXT_SIZE = new IntegerSetting("revanced_swipe_text_overlay_size", 14, true,
             parentsAny(SWIPE_BRIGHTNESS, SWIPE_VOLUME));
@@ -405,9 +410,7 @@ public class Settings extends YouTubeAndMusicSettings {
 
     // SponsorBlock
     public static final BooleanSetting SB_ENABLED = new BooleanSetting("sb_enabled", TRUE);
-    /**
+    /** Do not use id setting directly. Instead use {@link SponsorBlockSettings}. */
-     * Do not use id setting directly. Instead use {@link SponsorBlockSettings}.
-     */
     public static final StringSetting SB_PRIVATE_USER_ID = new StringSetting("sb_private_user_id_Do_Not_Share", "", parent(SB_ENABLED));
     public static final IntegerSetting SB_CREATE_NEW_SEGMENT_STEP = new IntegerSetting("sb_create_new_segment_step", 150, parent(SB_ENABLED));
     public static final BooleanSetting SB_VOTING_BUTTON = new BooleanSetting("sb_voting_button", FALSE, parent(SB_ENABLED));
@@ -456,7 +459,7 @@ public class Settings extends YouTubeAndMusicSettings {
     public static final StringSetting SB_CATEGORY_UNSUBMITTED_COLOR = new StringSetting("sb_unsubmitted_color", "#FFFFFFFF", false, false);
 
     // Deprecated migrations
-    private static final StringSetting DEPRECATED_SEEKBAR_CUSTOM_COLOR_PRIMARY = new StringSetting("revanced_seekbar_custom_color_value", "#FF0033");
+    private static final StringSetting  DEPRECATED_SEEKBAR_CUSTOM_COLOR_PRIMARY = new StringSetting("revanced_seekbar_custom_color_value", "#FF0033");
 
     private static final FloatSetting DEPRECATED_SB_CATEGORY_SPONSOR_OPACITY = new FloatSetting("sb_sponsor_opacity", 0.8f, false, false);
     private static final FloatSetting DEPRECATED_SB_CATEGORY_SELF_PROMO_OPACITY = new FloatSetting("sb_selfpromo_opacity", 0.8f, false, false);
@@ -508,7 +511,7 @@ public class Settings extends YouTubeAndMusicSettings {
         // or is spoofing to a version the same or newer than this app.
         if (!SPOOF_APP_VERSION_TARGET.isSetToDefault() &&
                 (SPOOF_APP_VERSION_TARGET.get().compareTo(SPOOF_APP_VERSION_TARGET.defaultValue) < 0
-                        || (Utils.getAppVersionName().compareTo(SPOOF_APP_VERSION_TARGET.get()) <= 0))) {
+                || (Utils.getAppVersionName().compareTo(SPOOF_APP_VERSION_TARGET.get()) <= 0))) {
             Logger.printInfo(() -> "Resetting spoof app version");
             SPOOF_APP_VERSION_TARGET.resetToDefault();
             SPOOF_APP_VERSION.resetToDefault();

gradle.properties

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

patches/api/patches.api

@@ -96,6 +96,10 @@ public final class app/revanced/patches/all/misc/network/OverrideCertificatePinn
 	public static final fun getOverrideCertificatePinningPatch ()Lapp/revanced/patcher/patch/ResourcePatch;
 }
 
+public final class app/revanced/patches/all/misc/optimization/StripPlatformLibrariesPatchKt {
+	public static final fun getStripPlatformLibrariesPatch ()Lapp/revanced/patcher/patch/RawResourcePatch;
+}
+
 public final class app/revanced/patches/all/misc/packagename/ChangePackageNamePatchKt {
 	public static field packageNameOption Lapp/revanced/patcher/patch/Option;
 	public static final fun getChangePackageNamePatch ()Lapp/revanced/patcher/patch/ResourcePatch;
@@ -104,10 +108,6 @@ public final class app/revanced/patches/all/misc/packagename/ChangePackageNamePa
 	public static final fun setPackageNameOption (Lapp/revanced/patcher/patch/Option;)V
 }
 
-public final class app/revanced/patches/all/misc/playintegrity/DisablePlayIntegrityKt {
-	public static final fun getDisablePlayIntegrityPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
-}
-
 public final class app/revanced/patches/all/misc/resources/AddResourcesPatchKt {
 	public static final fun addResource (Ljava/lang/String;Lapp/revanced/util/resource/BaseResource;)Z
 	public static final fun addResources (Lapp/revanced/patcher/patch/Patch;Lkotlin/jvm/functions/Function1;)Z
@@ -124,10 +124,6 @@ public final class app/revanced/patches/all/misc/screencapture/RemoveScreenCaptu
 	public static final fun getRemoveScreenCaptureRestrictionPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
-public final class app/revanced/patches/all/misc/screenshot/PreventScreenshotDetectionPatchKt {
-	public static final fun getPreventScreenshotDetectionPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
-}
-
 public final class app/revanced/patches/all/misc/screenshot/RemoveScreenshotRestrictionPatchKt {
 	public static final fun getRemoveScreenshotRestrictionPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -312,10 +308,6 @@ public final class app/revanced/patches/instagram/hide/explore/HideExploreFeedKt
 	public static final fun getHideExploreFeedPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
-public final class app/revanced/patches/instagram/hide/highlightsTray/HideHighlightsTrayPatchKt {
-	public static final fun getHideHighlightsTrayPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
-}
-
 public final class app/revanced/patches/instagram/hide/navigation/HideNavigationButtonsKt {
 	public static final fun getHideNavigationButtonsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -340,10 +332,6 @@ public final class app/revanced/patches/instagram/misc/links/OpenLinksExternally
 	public static final fun getOpenLinksExternallyPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
-public final class app/revanced/patches/instagram/misc/removeBuildExpiredPopup/RemoveBuildExpiredPopupPatchKt {
-	public static final fun getRemoveBuildExpiredPopupPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
-}
-
 public final class app/revanced/patches/instagram/misc/share/domain/ChangeLinkSharingDomainPatchKt {
 	public static final fun getChangeLinkSharingDomainPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -368,10 +356,6 @@ public final class app/revanced/patches/letterboxd/ads/HideAdsPatchKt {
 	public static final fun getHideAdsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
-public final class app/revanced/patches/letterboxd/unlock/unlockAppIcons/UnlockAppIconsPatchKt {
-	public static final fun getUnlockAppIconsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
-}
-
 public final class app/revanced/patches/lightroom/misc/login/DisableMandatoryLoginPatchKt {
 	public static final fun getDisableMandatoryLoginPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -472,10 +456,6 @@ public final class app/revanced/patches/music/layout/compactheader/HideCategoryB
 	public static final fun getHideCategoryBar ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
-public final class app/revanced/patches/music/layout/hide/general/HideLayoutComponentsPatchKt {
-	public static final fun getHideLayoutComponentsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
-}
-
 public final class app/revanced/patches/music/layout/miniplayercolor/ChangeMiniplayerColorKt {
 	public static final fun getChangeMiniplayerColor ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -501,10 +481,6 @@ public final class app/revanced/patches/music/misc/androidauto/BypassCertificate
 	public static final fun getBypassCertificateChecksPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
-public final class app/revanced/patches/music/misc/androidauto/UnlockAndroidAutoMediaBrowserPatchKt {
-	public static final fun getUnlockAndroidAutoMediaBrowserPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
-}
-
 public final class app/revanced/patches/music/misc/backgroundplayback/BackgroundPlaybackPatchKt {
 	public static final fun getBackgroundPlaybackPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -529,10 +505,6 @@ public final class app/revanced/patches/music/misc/gms/GmsCoreSupportPatchKt {
 	public static final fun getGmsCoreSupportPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
-public final class app/revanced/patches/music/misc/litho/filter/LithoFilterPatchKt {
-	public static final fun getLithoFilterPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
-}
-
 public final class app/revanced/patches/music/misc/privacy/SanitizeSharingLinksPatchKt {
 	public static final fun getSanitizeSharingLinksPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -944,12 +916,6 @@ public final class app/revanced/patches/shared/misc/hex/Replacement {
 	public final fun getReplacementBytesPadded ()[B
 }
 
-public final class app/revanced/patches/shared/misc/litho/filter/LithoFilterPatchKt {
-	public static final fun getAddLithoFilter ()Lkotlin/jvm/functions/Function1;
-	public static final fun lithoFilterPatch (Lkotlin/jvm/functions/Function1;Lapp/revanced/patcher/Fingerprint;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Lapp/revanced/patcher/patch/BytecodePatch;
-	public static synthetic fun lithoFilterPatch$default (Lkotlin/jvm/functions/Function1;Lapp/revanced/patcher/Fingerprint;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lapp/revanced/patcher/patch/BytecodePatch;
-}
-
 public final class app/revanced/patches/shared/misc/mapping/ResourceElement {
 	public final fun component1 ()Ljava/lang/String;
 	public final fun component2 ()Ljava/lang/String;
@@ -974,10 +940,6 @@ public final class app/revanced/patches/shared/misc/pairip/license/DisableLicens
 	public static final fun getDisableLicenseCheckPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
-public final class app/revanced/patches/shared/misc/privacy/DisableSentryTelemetryKt {
-	public static final fun getDisableSentryTelemetryPatch ()Lapp/revanced/patcher/patch/ResourcePatch;
-}
-
 public final class app/revanced/patches/shared/misc/settings/SettingsPatchKt {
 	public static final fun overrideThemeColors (Ljava/lang/String;Ljava/lang/String;)V
 	public static final fun settingsPatch (Ljava/util/List;Ljava/util/Set;)Lapp/revanced/patcher/patch/ResourcePatch;
@@ -1230,34 +1192,6 @@ public final class app/revanced/patches/stocard/layout/HideStoryBubblesPatchKt {
 	public static final fun getHideStoryBubblesPatch ()Lapp/revanced/patcher/patch/ResourcePatch;
 }
 
-public final class app/revanced/patches/strava/groupkudos/AddGiveGroupKudosButtonToGroupActivityKt {
-	public static final fun getAddGiveGroupKudosButtonToGroupActivity ()Lapp/revanced/patcher/patch/BytecodePatch;
-}
-
-public final class app/revanced/patches/strava/media/download/AddMediaDownloadPatchKt {
-	public static final fun getAddMediaDownloadPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
-}
-
-public final class app/revanced/patches/strava/media/upload/OverwriteMediaUploadParametersPatchKt {
-	public static final fun getOverwriteMediaUploadParametersPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
-}
-
-public final class app/revanced/patches/strava/misc/extension/SharedExtensionPatchKt {
-	public static final fun getSharedExtensionPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
-}
-
-public final class app/revanced/patches/strava/password/EnablePasswordLoginPatchKt {
-	public static final fun getEnablePasswordLoginPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
-}
-
-public final class app/revanced/patches/strava/privacy/BlockSnowplowTrackingPatchKt {
-	public static final fun getBlockSnowplowTrackingPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
-}
-
-public final class app/revanced/patches/strava/quickedit/DisableQuickEditPatchKt {
-	public static final fun getDisableQuickEditPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
-}
-
 public final class app/revanced/patches/strava/subscription/UnlockSubscriptionPatchKt {
 	public static final fun getUnlockSubscriptionPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -1738,10 +1672,6 @@ public final class app/revanced/patches/youtube/misc/announcements/Announcements
 	public static final fun getAnnouncementsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
-public final class app/revanced/patches/youtube/misc/audiofocus/PauseOnAudioInterruptPatchKt {
-	public static final fun getPauseOnAudioInterruptPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
-}
-
 public final class app/revanced/patches/youtube/misc/autorepeat/AutoRepeatPatchKt {
 	public static final fun getAutoRepeatPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -2037,7 +1967,6 @@ public final class app/revanced/util/BytecodeUtilsKt {
 	public static final fun indexOfFirstResourceIdOrThrow (Lcom/android/tools/smali/dexlib2/iface/Method;Ljava/lang/String;)I
 	public static final fun injectHideViewCall (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;IILjava/lang/String;Ljava/lang/String;)V
 	public static final fun literal (Lapp/revanced/patcher/FingerprintBuilder;Lkotlin/jvm/functions/Function0;)V
-	public static final fun returnEarly (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;)V
 	public static final fun returnEarly (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;B)V
 	public static final fun returnEarly (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;C)V
 	public static final fun returnEarly (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;D)V
@@ -2047,6 +1976,7 @@ public final class app/revanced/util/BytecodeUtilsKt {
 	public static final fun returnEarly (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;Ljava/lang/String;)V
 	public static final fun returnEarly (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;S)V
 	public static final fun returnEarly (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;Z)V
+	public static synthetic fun returnEarly$default (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;ZILjava/lang/Object;)V
 	public static final fun returnLate (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;B)V
 	public static final fun returnLate (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;C)V
 	public static final fun returnLate (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;D)V

patches/build.gradle.kts

@@ -1,10 +1,3 @@
-import org.w3c.dom.*
-import javax.xml.parsers.DocumentBuilderFactory
-import javax.xml.transform.OutputKeys
-import javax.xml.transform.TransformerFactory
-import javax.xml.transform.dom.DOMSource
-import javax.xml.transform.stream.StreamResult
-
 group = "app.revanced"
 
 patches {
@@ -29,6 +22,25 @@ dependencies {
     compileOnly(project(":patches:stub"))
 }
 
+tasks {
+    register<JavaExec>("preprocessCrowdinStrings") {
+        description = "Preprocess strings for Crowdin push"
+
+        dependsOn(compileKotlin)
+
+        classpath = sourceSets["main"].runtimeClasspath
+        mainClass.set("app.revanced.util.CrowdinPreprocessorKt")
+
+        args = listOf(
+            "src/main/resources/addresources/values/strings.xml",
+            // Ideally this would use build/tmp/crowdin/strings.xml
+            // But using that does not work with Crowdin pull because
+            // it does not recognize the strings.xml file belongs to this project.
+            "src/main/resources/addresources/values/strings.xml"
+        )
+    }
+}
+
 kotlin {
     compilerOptions {
         freeCompilerArgs = listOf("-Xcontext-receivers")
@@ -38,96 +50,12 @@ kotlin {
 publishing {
     repositories {
         maven {
-            name = "githubPackages"
+            name = "GitHubPackages"
             url = uri("https://maven.pkg.github.com/revanced/revanced-patches")
-            credentials(PasswordCredentials::class)
+            credentials {
+                username = System.getenv("GITHUB_ACTOR")
+                password = System.getenv("GITHUB_TOKEN")
+            }
         }
     }
-}
+}
-
-tasks.register("processStringsForCrowdin") {
-    description = "Process strings file for Crowdin by commenting out non-standard tags."
-
-    doLast {
-        // Comment out the non-standard tags. Otherwise, Crowdin interprets the file
-        // not as Android but instead a generic xml file where strings are
-        // identified by xml position and not key
-        val stringsXmlFile = project.projectDir.resolve("src/main/resources/addresources/values/strings.xml")
-
-        val builder = DocumentBuilderFactory.newInstance().apply {
-            isIgnoringComments = false
-            isCoalescing = false
-            isNamespaceAware = false
-        }.newDocumentBuilder()
-
-        val document = builder.newDocument()
-        val root = document.createElement("resources").also(document::appendChild)
-
-        fun walk(node: Node, appId: String? = null, patchId: String? = null, insideResources: Boolean = false) {
-            fun walkChildren(el: Element, appId: String?, patchId: String?, insideResources: Boolean) {
-                val children = el.childNodes
-                for (i in 0 until children.length) {
-                    walk(children.item(i), appId, patchId, insideResources)
-                }
-            }
-            when (node.nodeType) {
-                Node.COMMENT_NODE -> {
-                    val comment = document.createComment(node.nodeValue)
-                    if (insideResources) root.appendChild(comment) else document.insertBefore(comment, root)
-                }
-
-                Node.ELEMENT_NODE -> {
-                    val element = node as Element
-
-                    when (element.tagName) {
-                        "resources" -> walkChildren(element, appId, patchId, insideResources = true)
-
-                        "app" -> {
-                            val newAppId = element.getAttribute("id")
-
-                            root.appendChild(document.createComment(" <app id=\"$newAppId\"> "))
-                            walkChildren(element, newAppId, patchId, insideResources)
-                            root.appendChild(document.createComment(" </app> "))
-                        }
-
-                        "patch" -> {
-                            val newPatchId = element.getAttribute("id")
-
-                            root.appendChild(document.createComment(" <patch id=\"$newPatchId\"> "))
-                            walkChildren(element, appId, newPatchId, insideResources)
-                            root.appendChild(document.createComment(" </patch> "))
-                        }
-
-                        "string" -> {
-                            val name = element.getAttribute("name")
-                            val value = element.textContent
-                            val fullName = "$appId.$patchId.$name"
-
-                            val stringElement = document.createElement("string")
-                            stringElement.setAttribute("name", fullName)
-                            stringElement.appendChild(document.createTextNode(value))
-                            root.appendChild(stringElement)
-                        }
-
-                        else -> walkChildren(element, appId, patchId, insideResources)
-                    }
-                }
-            }
-        }
-
-        builder.parse(stringsXmlFile).let {
-            val topLevel = it.childNodes
-            for (i in 0 until topLevel.length) {
-                val node = topLevel.item(i)
-                if (node != it.documentElement) walk(node)
-            }
-
-            walk(it.documentElement)
-        }
-
-        TransformerFactory.newInstance().newTransformer().apply {
-            setOutputProperty(OutputKeys.INDENT, "yes")
-            setOutputProperty(OutputKeys.ENCODING, "utf-8")
-        }.transform(DOMSource(document), StreamResult(stringsXmlFile))
-    }
-}

patches/src/main/kotlin/app/revanced/patches/all/misc/customcertificates/CustomCertificatesPatch.kt

@@ -4,7 +4,7 @@ import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.booleanOption
 import app.revanced.patcher.patch.resourcePatch
 import app.revanced.patcher.patch.stringsOption
-import app.revanced.util.Utils.trimIndentMultiline
+import app.revanced.util.trimIndentMultiline
 import app.revanced.util.getNode
 import org.w3c.dom.Element
 import java.io.File

patches/src/main/kotlin/app/revanced/patches/all/misc/hex/HexPatch.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.patch.rawResourcePatch
 import app.revanced.patcher.patch.stringsOption
 import app.revanced.patches.shared.misc.hex.HexPatchBuilder
 import app.revanced.patches.shared.misc.hex.hexPatch
-import app.revanced.util.Utils.trimIndentMultiline
+import app.revanced.util.trimIndentMultiline
 
 @Suppress("unused")
 val hexPatch = rawResourcePatch(

patches/src/main/kotlin/app/revanced/patches/all/misc/network/OverrideCertificatePinningPatch.kt

@@ -2,7 +2,7 @@ package app.revanced.patches.all.misc.network
 
 import app.revanced.patcher.patch.resourcePatch
 import app.revanced.patches.all.misc.debugging.enableAndroidDebuggingPatch
-import app.revanced.util.Utils.trimIndentMultiline
+import app.revanced.util.trimIndentMultiline
 import org.w3c.dom.Element
 import java.io.File
 

patches/src/main/kotlin/app/revanced/patches/all/misc/optimization/StripPlatformLibrariesPatch.kt

@@ -0,0 +1,30 @@
+package app.revanced.patches.all.misc.optimization
+
+import android.os.Build.SUPPORTED_ABIS
+import app.revanced.patcher.patch.rawResourcePatch
+import app.revanced.patcher.patch.stringsOption
+import app.revanced.util.isAndroid
+
+@Suppress("unused")
+val stripPlatformLibrariesPatch = rawResourcePatch(
+    "Strip platform libraries",
+    "Removes unused platform-native libraries from the APK to reduce package size" +
+            "- if detected automatically, the device's unsupported ABIs by default."
+) {
+    val allAbis = listOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
+    val supportedAbis = if (isAndroid) SUPPORTED_ABIS.toList() else allAbis
+
+    val platformsToKeep by stringsOption(
+        key = "platformsToKeep",
+        title = "Platforms to keep",
+        description = "The platforms to keep in the APK.",
+        default = supportedAbis,
+        values = mapOf("Keep all" to allAbis) + allAbis.associate { "Only $it" to listOf(it) },
+        required = true
+    )
+    
+    execute {
+        val platforms = platformsToKeep!!
+        get("libs").listFiles { it.name !in platforms }?.forEach { it.deleteRecursively() }
+    }
+}

patches/src/main/kotlin/app/revanced/patches/all/misc/playintegrity/DisablePlayIntegrity.kt

@@ -1,55 +0,0 @@
-package app.revanced.patches.all.misc.playintegrity
-
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.patch.bytecodePatch
-import app.revanced.patches.all.misc.transformation.transformInstructionsPatch
-import app.revanced.util.getReference
-import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
-import com.android.tools.smali.dexlib2.iface.reference.MethodReference
-import com.android.tools.smali.dexlib2.immutable.reference.ImmutableMethodReference
-import com.android.tools.smali.dexlib2.util.MethodUtil
-
-private const val EXTENSION_CLASS_DESCRIPTOR = "Lapp/revanced/extension/playintegrity/DisablePlayIntegrityPatch;"
-
-private val CONTEXT_BIND_SERVICE_METHOD_REFERENCE = ImmutableMethodReference(
-    "Landroid/content/Context;",
-    "bindService",
-    listOf("Landroid/content/Intent;", "Landroid/content/ServiceConnection;", "I"),
-    "Z"
-)
-
-
-@Suppress("unused")
-val disablePlayIntegrityPatch = bytecodePatch(
-    name = "Disable Play Integrity",
-    description = "Prevents apps from using Play Integrity by pretending it is not available.",
-    use = false,
-) {
-    extendWith("extensions/all/misc/disable-play-integrity.rve")
-
-    dependsOn(
-        transformInstructionsPatch(
-            filterMap = filterMap@{ classDef, method, instruction, instructionIndex ->
-                val reference = instruction
-                    .getReference<MethodReference>()
-                    ?.takeIf {
-                        MethodUtil.methodSignaturesMatch(CONTEXT_BIND_SERVICE_METHOD_REFERENCE, it)
-                    }
-                    ?: return@filterMap null
-
-                Triple(instruction as Instruction35c, instructionIndex, reference.parameterTypes)
-            },
-            transform = { method, entry ->
-                val (instruction, index, parameterTypes) = entry
-                val parameterString = parameterTypes.joinToString(separator = "")
-                val registerString = "v${instruction.registerC}, v${instruction.registerD}, v${instruction.registerE}, v${instruction.registerF}"
-
-                method.replaceInstruction(
-                    index,
-                    "invoke-static { $registerString }, $EXTENSION_CLASS_DESCRIPTOR->bindService(Landroid/content/Context;$parameterString)Z"
-                )
-            }
-        )
-    )
-}

patches/src/main/kotlin/app/revanced/patches/all/misc/screenshot/PreventScreenshotDetectionPatch.kt

@@ -1,52 +0,0 @@
-package app.revanced.patches.all.misc.screenshot
-
-import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
-import app.revanced.patcher.patch.bytecodePatch
-import app.revanced.patches.all.misc.transformation.transformInstructionsPatch
-import app.revanced.util.getReference
-import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.iface.reference.MethodReference
-import com.android.tools.smali.dexlib2.immutable.reference.ImmutableMethodReference
-import com.android.tools.smali.dexlib2.util.MethodUtil
-
-private val registerScreenCaptureCallbackMethodReference = ImmutableMethodReference(
-    "Landroid/app/Activity;",
-    "registerScreenCaptureCallback",
-    listOf(
-        "Ljava/util/concurrent/Executor;",
-        "Landroid/app/Activity\$ScreenCaptureCallback;",
-    ),
-    "V"
-)
-
-private val unregisterScreenCaptureCallbackMethodReference = ImmutableMethodReference(
-    "Landroid/app/Activity;",
-    "unregisterScreenCaptureCallback",
-    listOf(
-        "Landroid/app/Activity\$ScreenCaptureCallback;",
-    ),
-    "V"
-)
-
-@Suppress("unused")
-val preventScreenshotDetectionPatch = bytecodePatch(
-    name = "Prevent screenshot detection",
-    description = "Removes the registration of all screen capture callbacks. This prevents the app from detecting screenshots.",
-	use = false
-) {
-    dependsOn(transformInstructionsPatch(
-        filterMap = { _, _, instruction, instructionIndex ->
-            if (instruction.opcode != Opcode.INVOKE_VIRTUAL) return@transformInstructionsPatch null
-            
-            val reference = instruction.getReference<MethodReference>() ?: return@transformInstructionsPatch null
-
-			instructionIndex.takeIf {
-				MethodUtil.methodSignaturesMatch(reference, registerScreenCaptureCallbackMethodReference) ||
-					MethodUtil.methodSignaturesMatch(reference, unregisterScreenCaptureCallbackMethodReference)
-			}
-        },
-        transform = { mutableMethod, instructionIndex ->
-            mutableMethod.removeInstruction(instructionIndex)
-        }
-    ))
-}

patches/src/main/kotlin/app/revanced/patches/disneyplus/SkipAdsPatch.kt

@@ -8,7 +8,11 @@ val skipAdsPatch = bytecodePatch(
     name = "Skip ads",
     description = "Automatically skips ads.",
 ) {
-    compatibleWith("com.disney.disneyplus")
+    compatibleWith(
+        "com.disney.disneyplus",
+        "in.startv.hotstar",
+        "in.startv.hotstaronly",
+    )
 
     execute {
         arrayOf(insertionGetPointsFingerprint, insertionGetRangesFingerprint).forEach {

patches/src/main/kotlin/app/revanced/patches/instagram/ghost/story/AnonymousStoryViewingPatch.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.instagram.ghost.story
 
 import app.revanced.patcher.patch.bytecodePatch
-import app.revanced.util.Utils.trimIndentMultiline
+import app.revanced.util.trimIndentMultiline
 import app.revanced.util.returnEarly
 
 @Suppress("unused")

patches/src/main/kotlin/app/revanced/patches/instagram/hide/explore/HideExploreFeed.kt

@@ -1,7 +1,29 @@
 package app.revanced.patches.instagram.hide.explore
 
+import app.revanced.patcher.Fingerprint
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patcher.patch.BytecodePatchContext
 import app.revanced.patcher.patch.bytecodePatch
-import app.revanced.patches.instagram.shared.replaceStringWithBogus
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+
+context(BytecodePatchContext)
+internal fun Fingerprint.replaceJsonFieldWithBogus(
+    key: String,
+) {
+    val targetStringIndex = stringMatches!!.first { match -> match.string == key }.index
+    val targetStringRegister = method.getInstruction<OneRegisterInstruction>(targetStringIndex).registerA
+
+    /**
+     * Replacing the JSON key we want to skip with a random string that is not a valid JSON key.
+     * This way the feeds array will never be populated.
+     * Received JSON keys that are not handled are simply ignored, so there are no side effects.
+     */
+    method.replaceInstruction(
+        targetStringIndex,
+        "const-string v$targetStringRegister, \"BOGUS\"",
+    )
+}
 
 @Suppress("unused")
 val hideExploreFeedPatch = bytecodePatch(
@@ -12,6 +34,6 @@ val hideExploreFeedPatch = bytecodePatch(
     compatibleWith("com.instagram.android")
 
     execute {
-        exploreResponseJsonParserFingerprint.replaceStringWithBogus(EXPLORE_KEY_TO_BE_HIDDEN)
+        exploreResponseJsonParserFingerprint.replaceJsonFieldWithBogus(EXPLORE_KEY_TO_BE_HIDDEN)
     }
 }

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

@@ -1,9 +0,0 @@
-package app.revanced.patches.instagram.hide.highlightsTray
-
-import app.revanced.patcher.fingerprint
-
-internal const val TARGET_STRING = "highlights_tray"
-
-internal val highlightsUrlBuilderFingerprint = fingerprint {
-    strings(TARGET_STRING,"X-IG-Accept-Hint")
-}

patches/src/main/kotlin/app/revanced/patches/instagram/hide/highlightsTray/HideHighlightsTrayPatch.kt

@@ -1,17 +0,0 @@
-package app.revanced.patches.instagram.hide.highlightsTray
-
-import app.revanced.patcher.patch.bytecodePatch
-import app.revanced.patches.instagram.shared.replaceStringWithBogus
-
-@Suppress("unused")
-val hideHighlightsTrayPatch = bytecodePatch(
-    name = "Hide highlights tray",
-    description = "Hides the highlights tray in profile section.",
-    use = false
-) {
-    compatibleWith("com.instagram.android")
-
-    execute {
-        highlightsUrlBuilderFingerprint.replaceStringWithBogus(TARGET_STRING)
-    }
-}

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

@@ -28,13 +28,6 @@ val hideNavigationButtonsPatch = bytecodePatch(
 
     dependsOn(sharedExtensionPatch)
 
-    val hideHome by booleanOption(
-        key = "hideHome",
-        default = false,
-        title = "Hide Home",
-        description = "Permanently hides the Home button. App starts at next available tab." // On the "homecoming" / current instagram layout.
-    )
-
     val hideReels by booleanOption(
         key = "hideReels",
         default = true,
@@ -42,27 +35,6 @@ val hideNavigationButtonsPatch = bytecodePatch(
         description = "Permanently hides the Reels button."
     )
 
-    val hideDirect by booleanOption(
-        key = "hideDirect",
-        default = false,
-        title = "Hide Direct",
-        description = "Permanently hides the Direct button."
-    )
-
-    val hideSearch by booleanOption(
-        key = "hideSearch",
-        default = false,
-        title = "Hide Search",
-        description = "Permanently hides the Search button."
-    )
-
-    val hideProfile by booleanOption(
-        key = "hideProfile",
-        default = false,
-        title = "Hide Profile",
-        description = "Permanently hides the Profile button."
-    )
-
     val hideCreate by booleanOption(
         key = "hideCreate",
         default = true,
@@ -71,7 +43,7 @@ val hideNavigationButtonsPatch = bytecodePatch(
     )
 
     execute {
-        if (!hideHome!! &&!hideReels!! && !hideDirect!! && !hideSearch!! && !hideProfile!! && !hideCreate!!) {
+        if (!hideReels!! && !hideCreate!!) {
             return@execute Logger.getLogger(this::class.java.name).warning(
                 "No hide navigation buttons options are enabled. No changes made."
             )
@@ -104,13 +76,6 @@ val hideNavigationButtonsPatch = bytecodePatch(
                 """
             }
 
-            if (hideHome!!) {
-                addInstructionsAtControlFlowLabel(
-                    returnIndex,
-                    instructionsRemoveButtonByName("fragment_feed")
-                )
-            }
-
             if (hideReels!!) {
                 addInstructionsAtControlFlowLabel(
                     returnIndex,
@@ -118,33 +83,12 @@ val hideNavigationButtonsPatch = bytecodePatch(
                 )
             }
 
-            if (hideDirect!!) {
-                addInstructionsAtControlFlowLabel(
-                    returnIndex,
-                    instructionsRemoveButtonByName("fragment_direct_tab")
-                )
-            }
-            if (hideSearch!!) {
-                addInstructionsAtControlFlowLabel(
-                    returnIndex,
-                    instructionsRemoveButtonByName("fragment_search")
-                )
-            }
-
             if (hideCreate!!) {
                 addInstructionsAtControlFlowLabel(
                     returnIndex,
                     instructionsRemoveButtonByName("fragment_share")
                 )
             }
-
-            if (hideProfile!!) {
-                addInstructionsAtControlFlowLabel(
-                    returnIndex,
-                    instructionsRemoveButtonByName("fragment_profile")
-                )
-            }
-
         }
     }
 }

patches/src/main/kotlin/app/revanced/patches/instagram/hide/suggestions/HideSuggestedContent.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.instagram.hide.suggestions
 
 import app.revanced.patcher.patch.bytecodePatch
-import app.revanced.patches.instagram.shared.replaceStringWithBogus
+import app.revanced.patches.instagram.hide.explore.replaceJsonFieldWithBogus
 
 @Suppress("unused")
 val hideSuggestedContent = bytecodePatch(
@@ -13,7 +13,7 @@ val hideSuggestedContent = bytecodePatch(
 
     execute {
         FEED_ITEM_KEYS_TO_BE_HIDDEN.forEach { key ->
-            feedItemParseFromJsonFingerprint.replaceStringWithBogus(key)
+            feedItemParseFromJsonFingerprint.replaceJsonFieldWithBogus(key)
         }
     }
 }

patches/src/main/kotlin/app/revanced/patches/instagram/misc/devmenu/EnableDeveloperMenuPatch.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.instagram.misc.devmenu
 
 import app.revanced.patcher.patch.bytecodePatch
-import app.revanced.util.Utils.trimIndentMultiline
+import app.revanced.util.trimIndentMultiline
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionReversedOrThrow
 import app.revanced.util.returnEarly

patches/src/main/kotlin/app/revanced/patches/instagram/misc/removeBuildExpiredPopup/Fingerprints.kt

@@ -1,12 +0,0 @@
-
-package app.revanced.patches.instagram.misc.removeBuildExpiredPopup
-
-import app.revanced.patcher.fingerprint
-import app.revanced.util.literal
-
-internal const val MILLISECOND_IN_A_DAY_LITERAL = 0x5265c00L
-
-internal val appUpdateLockoutBuilderFingerprint = fingerprint {
-    strings("android.hardware.sensor.hinge_angle")
-    literal { MILLISECOND_IN_A_DAY_LITERAL }
-}

patches/src/main/kotlin/app/revanced/patches/instagram/misc/removeBuildExpiredPopup/RemoveBuildExpiredPopupPatch.kt

@@ -1,27 +0,0 @@
-package app.revanced.patches.instagram.misc.removeBuildExpiredPopup
-
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.instructions
-import app.revanced.patcher.patch.bytecodePatch
-import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
-
-@Suppress("unused")
-val removeBuildExpiredPopupPatch = bytecodePatch(
-    name = "Remove build expired popup",
-    description = "Removes the popup that appears after a while, when the app version ages.",
-) {
-    compatibleWith("com.instagram.android")
-
-    execute {
-        appUpdateLockoutBuilderFingerprint.method.apply {
-            val longToIntIndex = instructions.first { it.opcode == Opcode.LONG_TO_INT }.location.index
-            val appAgeRegister = getInstruction<TwoRegisterInstruction>(longToIntIndex).registerA
-
-            // Set app age to 0 days old such that the build expired popup doesn't appear.
-            addInstruction(longToIntIndex + 1, "const v$appAgeRegister, 0x0")
-        }
-    }
-}
-

patches/src/main/kotlin/app/revanced/patches/instagram/misc/share/PermalinkResponseJsonParserFingerprint.kt

@@ -13,7 +13,7 @@ internal val storyUrlResponseJsonParserFingerprint = fingerprint {
 }
 
 internal val profileUrlResponseJsonParserFingerprint = fingerprint {
-    strings("profile_to_share_url")
+    strings("profile_to_share_url", "ProfileUrlResponse")
     custom { method, _ -> method.name == "parseFromJson" }
 }
 

patches/src/main/kotlin/app/revanced/patches/instagram/reels/DisableReelsScrollingPatch.kt

@@ -9,7 +9,7 @@ val disableReelsScrollingPatch = bytecodePatch(
     name = "Disable Reels scrolling",
     description = "Disables the endless scrolling behavior in Instagram Reels, preventing swiping to the next Reel. " +
             "Note: On a clean install, the 'Tip' animation may appear but will stop on its own after a few seconds.",
-    use = false
+    use = true
 ) {
     compatibleWith("com.instagram.android")
 
@@ -31,4 +31,4 @@ val disableReelsScrollingPatch = bytecodePatch(
         // Return false in onInterceptTouchEvent to disable pull-to-refresh.
         clipsSwipeRefreshLayoutOnInterceptTouchEventFingerprint.method.returnEarly(false)
     }
-}
+}

patches/src/main/kotlin/app/revanced/patches/instagram/shared/Utils.kt

@@ -1,25 +0,0 @@
-package app.revanced.patches.instagram.shared
-
-import app.revanced.patcher.Fingerprint
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.patch.BytecodePatchContext
-import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
-
-context(BytecodePatchContext)
-internal fun Fingerprint.replaceStringWithBogus(
-    targetString: String,
-) {
-    val targetStringIndex = stringMatches!!.first { match -> match.string == targetString }.index
-    val targetStringRegister = method.getInstruction<OneRegisterInstruction>(targetStringIndex).registerA
-
-    /**
-     * Replaces the 'target string' with 'BOGUS'.
-     * This is usually done when we need to override a JSON key or url,
-     * to skip with a random string that is not a valid JSON key.
-     */
-    method.replaceInstruction(
-        targetStringIndex,
-        "const-string v$targetStringRegister, \"BOGUS\"",
-    )
-}

patches/src/main/kotlin/app/revanced/patches/letterboxd/unlock/unlockAppIcons/Fingerprints.kt

@@ -1,9 +0,0 @@
-package app.revanced.patches.letterboxd.unlock.unlockAppIcons
-
-import app.revanced.patcher.fingerprint
-
-internal val getCanChangeAppIconFingerprint = fingerprint {
-    custom { method, classDef ->
-        method.name == "getCanChangeAppIcon" && classDef.type.endsWith("SettingsAppIconFragment;")
-    }
-}

patches/src/main/kotlin/app/revanced/patches/letterboxd/unlock/unlockAppIcons/UnlockAppIconsPatch.kt

@@ -1,16 +0,0 @@
-
-package app.revanced.patches.letterboxd.unlock.unlockAppIcons
-
-import app.revanced.patcher.patch.bytecodePatch
-import app.revanced.util.returnEarly
-
-@Suppress("unused")
-val unlockAppIconsPatch = bytecodePatch(
-    name = "Unlock app icons",
-) {
-    compatibleWith("com.letterboxd.letterboxd")
-
-    execute {
-        getCanChangeAppIconFingerprint.method.returnEarly(true)
-    }
-}

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

@@ -1,12 +0,0 @@
-package app.revanced.patches.music.layout.hide.general
-
-import app.revanced.patches.music.misc.litho.filter.lithoFilterPatch
-import app.revanced.patches.music.misc.settings.settingsPatch
-import app.revanced.patches.shared.layout.hide.general.hideLayoutComponentsPatch
-
-val hideLayoutComponentsPatch = hideLayoutComponentsPatch(
-    lithoFilterPatch = lithoFilterPatch,
-    settingsPatch = settingsPatch,
-    filterClasses = setOf("Lapp/revanced/extension/shared/patches/components/CustomFilter;"),
-    compatibleWithPackages = arrayOf("com.google.android.apps.youtube.music" to setOf("7.29.52", "8.10.52"))
-)

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

@@ -5,11 +5,24 @@ import app.revanced.patches.music.misc.extension.sharedExtensionPatch
 import app.revanced.patches.music.misc.settings.settingsPatch
 import app.revanced.util.returnEarly
 
-@Deprecated("This patch is useless by itself and has been merged into another patch.", ReplaceWith("unlockAndroidAutoMediaBrowserPatch"))
-
 @Suppress("unused")
 val bypassCertificateChecksPatch = bytecodePatch(
+    name = "Bypass certificate checks",
     description = "Bypasses certificate checks which prevent YouTube Music from working on Android Auto.",
 ) {
-    dependsOn(unlockAndroidAutoMediaBrowserPatch)
+    dependsOn(
+        sharedExtensionPatch,
+        settingsPatch
+    )
+
+    compatibleWith(
+        "com.google.android.apps.youtube.music"(
+            "7.29.52",
+            "8.10.52"
+        )
+    )
+
+    execute {
+        checkCertificateFingerprint.method.returnEarly(true)
+    }
 }

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

@@ -1,5 +1,6 @@
 package app.revanced.patches.music.misc.androidauto
 
+import com.android.tools.smali.dexlib2.AccessFlags
 import app.revanced.patcher.fingerprint
 
 internal val checkCertificateFingerprint = fingerprint {
@@ -9,13 +10,4 @@ internal val checkCertificateFingerprint = fingerprint {
         "X509",
         "Failed to get certificate" // Partial String match.
     )
-}
-
-internal val searchMediaItemsConstructorFingerprint = fingerprint {
-    returns("V")
-    strings("ytm_media_browser/search_media_items")
-}
-
-internal val searchMediaItemsExecuteFingerprint = fingerprint {
-    parameters()
 }

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

@@ -1,38 +0,0 @@
-package app.revanced.patches.music.misc.androidauto
-
-import app.revanced.patcher.extensions.InstructionExtensions.instructions
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.patch.bytecodePatch
-import app.revanced.util.getReference
-import app.revanced.util.registersUsed
-import app.revanced.util.returnEarly
-import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.iface.reference.FieldReference
-
-@Suppress("unused")
-val unlockAndroidAutoMediaBrowserPatch = bytecodePatch(
-    name = "Unlock Android Auto Media Browser",
-    description = "Unlocks Android Auto Media Browser which enables the search function including speech to text.",
-) {
-    compatibleWith(
-        "com.google.android.apps.youtube.music"(
-            "7.29.52",
-            "8.10.52"
-        )
-    )
-
-    execute {
-        checkCertificateFingerprint.method.returnEarly(true)
-
-        searchMediaItemsExecuteFingerprint
-        .match(searchMediaItemsConstructorFingerprint.classDef)
-        .method.apply {
-            val targetIndex = instructions.indexOfFirst { 
-            	it.opcode == Opcode.IGET_OBJECT && it.getReference<FieldReference>()?.type == "Ljava/lang/String;"
-            }
-
-            val register = instructions[targetIndex].registersUsed.first()
-            replaceInstruction(targetIndex, "const-string v$register, \"com.google.android.apps.youtube.music\"")
-        }
-    }
-}

patches/src/main/kotlin/app/revanced/patches/music/misc/debugging/EnableDebuggingPatch.kt

@@ -7,15 +7,20 @@ import app.revanced.patches.shared.misc.debugging.enableDebuggingPatch
 
 @Suppress("unused")
 val enableDebuggingPatch = enableDebuggingPatch(
-    sharedExtensionPatch = sharedExtensionPatch,
+    block = {
-    settingsPatch = settingsPatch,
+        dependsOn(
-    compatibleWithPackages = arrayOf(
+            sharedExtensionPatch,
-        "com.google.android.apps.youtube.music" to setOf(
+            settingsPatch,
-            "7.29.52",
-            "8.10.52"
         )
-    ),
+
+        compatibleWith(
+            "com.google.android.apps.youtube.music"(
+                "7.29.52",
+                "8.10.52"
+            )
+        )
+    },
     // String feature flag does not appear to be present with YT Music.
     hookStringFeatureFlag = false,
-    preferenceScreen = PreferenceScreen.MISC,
+    preferenceScreen = PreferenceScreen.MISC
 )

patches/src/main/kotlin/app/revanced/patches/music/misc/litho/filter/LithoFilterPatch.kt

@@ -1,17 +0,0 @@
-package app.revanced.patches.music.misc.litho.filter
-
-import app.revanced.patches.music.misc.extension.sharedExtensionPatch
-import app.revanced.patches.music.shared.conversionContextFingerprintToString
-import app.revanced.patches.shared.misc.litho.filter.lithoFilterPatch
-import app.revanced.util.indexOfFirstInstructionOrThrow
-import com.android.tools.smali.dexlib2.Opcode
-
-val lithoFilterPatch = lithoFilterPatch(
-    componentCreateInsertionIndex = {
-        // No supported version clobbers p2 so we can just do our things before the return instruction.
-        indexOfFirstInstructionOrThrow(Opcode.RETURN_OBJECT)
-    },
-    conversionContextFingerprintToString = conversionContextFingerprintToString,
-) {
-    dependsOn(sharedExtensionPatch)
-}

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

@@ -11,19 +11,3 @@ internal val mainActivityOnCreateFingerprint = fingerprint {
         method.name == "onCreate" && classDef.type == YOUTUBE_MUSIC_MAIN_ACTIVITY_CLASS_TYPE
     }
 }
-
-internal val conversionContextFingerprintToString = fingerprint {
-    parameters()
-    strings(
-        "ConversionContext{containerInternal=",
-        ", gridColumnCount=",
-        ", gridColumnIndex=",
-        ", templateLoggerFactory=",
-        ", rootDisposableContainer=",
-        ", elementId=",
-        ", identifierProperty="
-    )
-    custom { method, _ ->
-        method.name == "toString"
-    }
-}

patches/src/main/kotlin/app/revanced/patches/reddit/customclients/boostforreddit/fix/downloads/FixAudioMissingInDownloadsPatch.kt

@@ -14,8 +14,8 @@ val fixAudioMissingInDownloadsPatch = bytecodePatch(
 
     execute {
         val endpointReplacements = mapOf(
-            "/DASH_audio.mp4" to "/CMAF_AUDIO_128.mp4",
+            "/DASH_audio.mp4" to "/DASH_AUDIO_128.mp4",
-            "/audio" to "/CMAF_AUDIO_64.mp4",
+            "/audio" to "/DASH_AUDIO_64.mp4",
         )
 
         downloadAudioFingerprint.method.apply {

patches/src/main/kotlin/app/revanced/patches/shared/layout/branding/BaseCustomBrandingPatch.kt

@@ -17,7 +17,7 @@ import app.revanced.patches.shared.misc.mapping.resourceMappingPatch
 import app.revanced.patches.shared.misc.settings.preference.BasePreferenceScreen
 import app.revanced.patches.shared.misc.settings.preference.ListPreference
 import app.revanced.util.ResourceGroup
-import app.revanced.util.Utils.trimIndentMultiline
+import app.revanced.util.trimIndentMultiline
 import app.revanced.util.addInstructionsAtControlFlowLabel
 import app.revanced.util.copyResources
 import app.revanced.util.findElementByAttributeValueOrThrow

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

@@ -1,55 +0,0 @@
-package app.revanced.patches.shared.layout.hide.general
-
-import app.revanced.patcher.patch.BytecodePatchContext
-import app.revanced.patcher.patch.Patch
-import app.revanced.patcher.patch.bytecodePatch
-import app.revanced.patches.all.misc.resources.addResources
-import app.revanced.patches.all.misc.resources.addResourcesPatch
-import app.revanced.patches.music.misc.settings.PreferenceScreen
-import app.revanced.patches.shared.misc.litho.filter.addLithoFilter
-import app.revanced.patches.shared.misc.settings.preference.InputType
-import app.revanced.patches.shared.misc.settings.preference.PreferenceScreenPreference
-import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
-import app.revanced.patches.shared.misc.settings.preference.TextPreference
-
-internal fun hideLayoutComponentsPatch(
-    lithoFilterPatch: Patch<*>,
-    settingsPatch: Patch<*>,
-    additionalDependencies: Set<Patch<*>> = emptySet(),
-    filterClasses: Set<String>,
-    vararg compatibleWithPackages: Pair<String, Set<String>?>,
-    executeBlock: BytecodePatchContext.() -> Unit = {},
-) = bytecodePatch(
-    name = "Hide layout components",
-    description = "Adds options to hide general layout components.",
-) {
-    dependsOn(
-        lithoFilterPatch,
-        settingsPatch,
-        *additionalDependencies.toTypedArray(),
-        addResourcesPatch,
-    )
-
-    compatibleWith(packages = compatibleWithPackages)
-
-    execute {
-        addResources("shared", "layout.hide.general.hideLayoutComponentsPatch")
-
-        PreferenceScreen.GENERAL.addPreferences(
-            PreferenceScreenPreference(
-                key = "revanced_custom_filter_screen",
-                sorting = PreferenceScreenPreference.Sorting.UNSORTED,
-                preferences = setOf(
-                    SwitchPreference("revanced_custom_filter"),
-                    TextPreference("revanced_custom_filter_strings", inputType = InputType.TEXT_MULTI_LINE),
-                ),
-            ),
-        )
-
-        filterClasses.forEach { className ->
-            addLithoFilter(className)
-        }
-
-        executeBlock()
-    }
-}

patches/src/main/kotlin/app/revanced/patches/shared/misc/debugging/EnableDebuggingPatch.kt

@@ -2,14 +2,23 @@ package app.revanced.patches.shared.misc.debugging
 
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.Patch
+import app.revanced.patcher.patch.BytecodePatchBuilder
+import app.revanced.patcher.patch.BytecodePatchContext
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.patch.resourcePatch
 import app.revanced.patches.all.misc.resources.addResources
 import app.revanced.patches.all.misc.resources.addResourcesPatch
-import app.revanced.patches.shared.misc.settings.preference.*
+import app.revanced.patches.shared.misc.settings.preference.BasePreference
+import app.revanced.patches.shared.misc.settings.preference.BasePreferenceScreen
+import app.revanced.patches.shared.misc.settings.preference.NonInteractivePreference
+import app.revanced.patches.shared.misc.settings.preference.PreferenceScreenPreference
 import app.revanced.patches.shared.misc.settings.preference.PreferenceScreenPreference.Sorting
-import app.revanced.util.*
+import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
+import app.revanced.util.ResourceGroup
+import app.revanced.util.copyResources
+import app.revanced.util.findInstructionIndicesReversedOrThrow
+import app.revanced.util.indexOfFirstInstructionOrThrow
+import app.revanced.util.indexOfFirstInstructionReversedOrThrow
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 
@@ -20,27 +29,23 @@ private const val EXTENSION_CLASS_DESCRIPTOR =
  * Patch shared with YouTube and YT Music.
  */
 internal fun enableDebuggingPatch(
-    sharedExtensionPatch: Patch<*>,
+    block: BytecodePatchBuilder.() -> Unit = {},
-    settingsPatch: Patch<*>,
+    executeBlock: BytecodePatchContext.() -> Unit = {},
-    vararg compatibleWithPackages: Pair<String, Set<String>>,
     hookStringFeatureFlag: Boolean,
     preferenceScreen: BasePreferenceScreen.Screen,
+    additionalDebugPreferences: List<BasePreference> = emptyList()
 ) = bytecodePatch(
     name = "Enable debugging",
     description = "Adds options for debugging and exporting ReVanced logs to the clipboard.",
 ) {
-    compatibleWith(packages = compatibleWithPackages)
 
     dependsOn(
-        sharedExtensionPatch,
-        settingsPatch,
         addResourcesPatch,
         resourcePatch {
             execute {
                 copyResources(
                     "settings",
-                    ResourceGroup(
+                    ResourceGroup("drawable",
-                        "drawable",
                         // Action buttons.
                         "revanced_settings_copy_all.xml",
                         "revanced_settings_deselect_all.xml",
@@ -56,29 +61,38 @@ internal fun enableDebuggingPatch(
         }
     )
 
+    block()
 
     execute {
+        executeBlock()
+
         addResources("shared", "misc.debugging.enableDebuggingPatch")
 
-        val preferences = setOf(
+        val preferences = mutableSetOf<BasePreference>(
             SwitchPreference("revanced_debug"),
-            SwitchPreference("revanced_debug_protobuffer"),
+        )
-            SwitchPreference("revanced_debug_stacktrace"),
+
-            SwitchPreference("revanced_debug_toast_on_error"),
+        preferences.addAll(additionalDebugPreferences)
-            NonInteractivePreference(
+
-                "revanced_debug_export_logs_to_clipboard",
+        preferences.addAll(
-                tag = "app.revanced.extension.shared.settings.preference.ExportLogToClipboardPreference",
+            listOf(
-                selectable = true
+                SwitchPreference("revanced_debug_stacktrace"),
-            ),
+                SwitchPreference("revanced_debug_toast_on_error"),
-            NonInteractivePreference(
+                NonInteractivePreference(
-                "revanced_debug_logs_clear_buffer",
+                    "revanced_debug_export_logs_to_clipboard",
-                tag = "app.revanced.extension.shared.settings.preference.ClearLogBufferPreference",
+                    tag = "app.revanced.extension.shared.settings.preference.ExportLogToClipboardPreference",
-                selectable = true
+                    selectable = true
-            ),
+                ),
-            NonInteractivePreference(
+                NonInteractivePreference(
-                "revanced_debug_feature_flags_manager",
+                    "revanced_debug_logs_clear_buffer",
-                tag = "app.revanced.extension.shared.settings.preference.FeatureFlagsManagerPreference",
+                    tag = "app.revanced.extension.shared.settings.preference.ClearLogBufferPreference",
-                selectable = true
+                    selectable = true
+                ),
+                NonInteractivePreference(
+                    "revanced_debug_feature_flags_manager",
+                    tag = "app.revanced.extension.shared.settings.preference.FeatureFlagsManagerPreference",
+                    selectable = true
+                )
             )
         )
 

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

@@ -1,58 +0,0 @@
-package app.revanced.patches.shared.misc.litho.filter
-
-import app.revanced.patcher.fingerprint
-import app.revanced.util.containsLiteralInstruction
-import app.revanced.util.literal
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-internal val lithoFilterFingerprint = fingerprint {
-    accessFlags(AccessFlags.STATIC, AccessFlags.CONSTRUCTOR)
-    custom { _, classDef ->
-        classDef.endsWith("/LithoFilterPatch;")
-    }
-}
-
-/**
- * Matches a method that use the protobuf of our component.
- */
-internal val protobufBufferReferenceFingerprint = fingerprint {
-    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
-    returns("V")
-    parameters("I", "Ljava/nio/ByteBuffer;")
-    opcodes(
-        Opcode.IPUT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.SUB_INT_2ADDR,
-    )
-}
-
-internal val componentContextParserFingerprint = fingerprint {
-    strings("Number of bits must be positive")
-}
-
-internal val emptyComponentFingerprint = fingerprint {
-    accessFlags(AccessFlags.PRIVATE, AccessFlags.CONSTRUCTOR)
-    parameters()
-    strings("EmptyComponent")
-    custom { _, classDef ->
-        classDef.methods.filter { AccessFlags.STATIC.isSet(it.accessFlags) }.size == 1
-    }
-}
-
-internal val componentCreateFingerprint = fingerprint {
-    strings(
-        "Element missing correct type extension",
-        "Element missing type"
-    )
-}
-
-internal val lithoThreadExecutorFingerprint = fingerprint {
-    accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR)
-    parameters("I", "I", "I")
-    custom { method, classDef ->
-        classDef.superclass == "Ljava/util/concurrent/ThreadPoolExecutor;" &&
-                method.containsLiteralInstruction(1L) // 1L = default thread timeout.
-    }
-}

patches/src/main/kotlin/app/revanced/patches/shared/misc/litho/filter/LithoFilterPatch.kt

@@ -1,211 +0,0 @@
-@file:Suppress("SpellCheckingInspection")
-
-package app.revanced.patches.shared.misc.litho.filter
-
-import app.revanced.patcher.Fingerprint
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.removeInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.patch.BytecodePatchBuilder
-import app.revanced.patcher.patch.BytecodePatchContext
-import app.revanced.patcher.patch.bytecodePatch
-import app.revanced.patches.shared.misc.extension.sharedExtensionPatch
-import app.revanced.util.addInstructionsAtControlFlowLabel
-import app.revanced.util.findFreeRegister
-import app.revanced.util.getReference
-import app.revanced.util.indexOfFirstInstructionReversedOrThrow
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.iface.Method
-import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
-import com.android.tools.smali.dexlib2.iface.reference.FieldReference
-
-/**
- * Used to add a hook point to the extension stub.
- */
-lateinit var addLithoFilter: (String) -> Unit
-    private set
-
-/**
- * Counts the number of filters added to the static field array.
- */
-private var filterCount = 0
-
-private const val EXTENSION_CLASS_DESCRIPTOR = "Lapp/revanced/extension/shared/patches/litho/LithoFilterPatch;"
-
-/**
- * A patch that allows to filter Litho components based on their identifier or path.
- *
- * @param componentCreateInsertionIndex The index to insert the filtering code in the component create method.
- * @param conversionContextFingerprintToString The fingerprint of the conversion context to string method.
- * @param executeBlock The additional execution block of the patch.
- * @param block The additional block to build the patch.
- */
-internal fun lithoFilterPatch(
-    componentCreateInsertionIndex: Method.() -> Int,
-    conversionContextFingerprintToString: Fingerprint,
-    executeBlock: BytecodePatchContext.() -> Unit = {},
-    block: BytecodePatchBuilder.() -> Unit = {},
-) = bytecodePatch(
-    description = "Hooks the method which parses the bytes into a ComponentContext to filter components.",
-) {
-    dependsOn(
-        sharedExtensionPatch(),
-    )
-
-    /**
-     * The following patch inserts a hook into the method that parses the bytes into a ComponentContext.
-     * This method contains a StringBuilder object that represents the pathBuilder of the component.
-     * The pathBuilder is used to filter components by their path.
-     *
-     * Additionally, the method contains a reference to the component's identifier.
-     * The identifier is used to filter components by their identifier.
-     *
-     * The protobuf buffer is passed along from a different injection point before the filtering occurs.
-     * The buffer is a large byte array that represents the component tree.
-     * This byte array is searched for strings that indicate the current component.
-     *
-     * All modifications done here must allow all the original code to still execute
-     * even when filtering, otherwise memory leaks or poor app performance may occur.
-     *
-     * The following pseudocode shows how this patch works:
-     *
-     * class SomeOtherClass {
-     *    // Called before ComponentContextParser.parseComponent() method.
-     *    public void someOtherMethod(ByteBuffer byteBuffer) {
-     *        ExtensionClass.setProtoBuffer(byteBuffer); // Inserted by this patch.
-     *        ...
-     *   }
-     * }
-     *
-     * class CreateComponentClass {
-     *    public Component createComponent() {
-     *        ...
-     *
-     *        if (extensionClass.shouldFilter(identifier, path)) {  // Inserted by this patch.
-     *            return emptyComponent;
-     *        }
-     *        return originalUnpatchedComponent; // Original code.
-     *    }
-     * }
-     */
-    execute {
-        // Remove dummy filter from extenion static field
-        // and add the filters included during patching.
-        lithoFilterFingerprint.method.apply {
-            removeInstructions(2, 4) // Remove dummy filter.
-
-            addLithoFilter = { classDescriptor ->
-                addInstructions(
-                    2,
-                    """
-                        new-instance v1, $classDescriptor
-                        invoke-direct { v1 }, $classDescriptor-><init>()V
-                        const/16 v2, ${filterCount++}
-                        aput-object v1, v0, v2
-                    """,
-                )
-            }
-        }
-
-        // Add an interceptor to steal the protobuf of our component.
-        protobufBufferReferenceFingerprint.method.addInstruction(
-            0,
-            "invoke-static { p2 }, $EXTENSION_CLASS_DESCRIPTOR->setProtoBuffer(Ljava/nio/ByteBuffer;)V",
-        )
-
-
-        // Hook the method that parses bytes into a ComponentContext.
-        // Allow the method to run to completion, and override the
-        // return value with an empty component if it should be filtered.
-        // It is important to allow the original code to always run to completion,
-        // otherwise high memory usage and poor app performance can occur.
-
-        // Find the identifier/path fields of the conversion context.
-        val conversionContextIdentifierField = componentContextParserFingerprint.let {
-            // Identifier field is loaded just before the string declaration.
-            val index = it.method.indexOfFirstInstructionReversedOrThrow(
-                it.stringMatches!!.first().index
-            ) {
-                // Our instruction reads a String from a field of the ConversionContext class.
-                val reference = getReference<FieldReference>()
-                reference?.definingClass == conversionContextFingerprintToString.originalClassDef.type
-                        && reference.type == "Ljava/lang/String;"
-            }
-
-            it.method.getInstruction<ReferenceInstruction>(index).getReference<FieldReference>()!!
-        }
-
-        val conversionContextPathBuilderField = conversionContextFingerprintToString.originalClassDef
-            .fields.single { field -> field.type == "Ljava/lang/StringBuilder;" }
-
-        // Find class and methods to create an empty component.
-        val builderMethodDescriptor = emptyComponentFingerprint.classDef.methods.single {
-            // The only static method in the class.
-                method ->
-            AccessFlags.STATIC.isSet(method.accessFlags)
-        }
-
-        val emptyComponentField = classBy {
-            // Only one field that matches.
-            it.type == builderMethodDescriptor.returnType
-        }!!.immutableClass.fields.single()
-
-        // Match all component creations methods
-        componentCreateFingerprint.method.apply {
-            val insertIndex = componentCreateInsertionIndex()
-            val freeRegister = findFreeRegister(insertIndex)
-            val identifierRegister = findFreeRegister(insertIndex, freeRegister)
-            val pathRegister = findFreeRegister(insertIndex, freeRegister, identifierRegister)
-
-            addInstructionsAtControlFlowLabel(
-                insertIndex,
-                """
-                    move-object/from16 v$freeRegister, p2 # ConversionContext parameter
-                    check-cast v$freeRegister, ${conversionContextFingerprintToString.originalClassDef.type} # Check we got the actual ConversionContext
-                    
-                    # Get identifier and path from ConversionContext
-                    iget-object v$identifierRegister, v$freeRegister, $conversionContextIdentifierField
-                    iget-object v$pathRegister, v$freeRegister, $conversionContextPathBuilderField
-                    
-                    # Check if the component should be filtered.
-                    invoke-static { v$identifierRegister, v$pathRegister }, $EXTENSION_CLASS_DESCRIPTOR->isFiltered(Ljava/lang/String;Ljava/lang/StringBuilder;)Z
-                    move-result v$freeRegister
-                    if-eqz v$freeRegister, :unfiltered
-                    
-                    # Return an empty component
-                    move-object/from16 v$freeRegister, p1
-                    invoke-static { v$freeRegister }, $builderMethodDescriptor
-                    move-result-object v$freeRegister
-                    iget-object v$freeRegister, v$freeRegister, $emptyComponentField
-                    return-object v$freeRegister
-        
-                    :unfiltered
-                    nop
-                """
-            )
-        }
-
-        // TODO: Check if needed in music
-        // Change Litho thread executor to 1 thread to fix layout issue in unpatched YouTube.
-        lithoThreadExecutorFingerprint.method.addInstructions(
-            0,
-            """
-                invoke-static { p1 }, $EXTENSION_CLASS_DESCRIPTOR->getExecutorCorePoolSize(I)I
-                move-result p1
-                invoke-static { p2 }, $EXTENSION_CLASS_DESCRIPTOR->getExecutorMaxThreads(I)I
-                move-result p2
-            """
-        )
-
-        executeBlock()
-    }
-
-    finalize {
-        // Save the number of filters added.
-        lithoFilterFingerprint.method.replaceInstruction(0, "const/16 v0, $filterCount")
-    }
-
-    block()
-}

patches/src/main/kotlin/app/revanced/patches/shared/misc/privacy/DisableSentryTelemetry.kt

@@ -1,36 +0,0 @@
-package app.revanced.patches.shared.misc.privacy
-
-import app.revanced.patcher.patch.resourcePatch
-import app.revanced.util.asSequence
-import app.revanced.util.getNode
-import org.w3c.dom.Element
-
-@Suppress("unused")
-val disableSentryTelemetryPatch = resourcePatch(
-    name = "Disable Sentry telemetry",
-    description = "Disables Sentry telemetry. See https://sentry.io/for/android/ for more information.",
-    use = false,
-) {
-    execute {
-        fun Element.replaceOrCreate(tagName: String, attributeName: String, attributeValue: String) {
-            val childElements = getElementsByTagName(tagName).asSequence().filterIsInstance<Element>()
-            val targetChild = childElements.find { childElement ->
-                childElement.getAttribute("android:name") == attributeName
-            }
-            if (targetChild != null) {
-                targetChild.setAttribute("android:value", attributeValue)
-            } else {
-                appendChild(ownerDocument.createElement(tagName).apply {
-                    setAttribute("android:name", attributeName)
-                    setAttribute("android:value", attributeValue)
-                })
-            }
-        }
-
-        document("AndroidManifest.xml").use { document ->
-            val application = document.getNode("application") as Element
-            application.replaceOrCreate("meta-data", "io.sentry.enabled", "false")
-            application.replaceOrCreate("meta-data", "io.sentry.dsn", "")
-        }
-    }
-}

patches/src/main/kotlin/app/revanced/patches/strava/groupkudos/AddGiveGroupKudosButtonToGroupActivity.kt

@@ -1,201 +0,0 @@
-package app.revanced.patches.strava.groupkudos
-
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.instructions
-import app.revanced.patcher.patch.bytecodePatch
-import app.revanced.patcher.patch.resourcePatch
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
-import app.revanced.util.childElementsSequence
-import app.revanced.util.findElementByAttributeValueOrThrow
-import app.revanced.util.getReference
-import com.android.tools.smali.dexlib2.AccessFlags.*
-import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.builder.MutableMethodImplementation
-import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction11x
-import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction21c
-import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction31i
-import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction35c
-import com.android.tools.smali.dexlib2.iface.instruction.NarrowLiteralInstruction
-import com.android.tools.smali.dexlib2.iface.reference.TypeReference
-import com.android.tools.smali.dexlib2.immutable.ImmutableClassDef
-import com.android.tools.smali.dexlib2.immutable.ImmutableField
-import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
-import com.android.tools.smali.dexlib2.immutable.ImmutableMethodParameter
-import org.w3c.dom.Element
-
-private const val VIEW_CLASS_DESCRIPTOR = "Landroid/view/View;"
-private const val ON_CLICK_LISTENER_CLASS_DESCRIPTOR = "Landroid/view/View\$OnClickListener;"
-
-private var shakeToKudosStringId = -1
-private var kudosIdId = -1
-private var leaveIdId = -1
-
-private val addGiveKudosButtonToLayoutPatch = resourcePatch {
-    fun String.toResourceId() = substring(2).toInt(16)
-
-    execute {
-        document("res/values/public.xml").use { public ->
-            fun Sequence<Element>.firstByName(name: String) = first {
-                it.getAttribute("name") == name
-            }
-
-            val publicElements = public.documentElement.childElementsSequence().filter {
-                it.tagName == "public"
-            }
-            val idElements = publicElements.filter {
-                it.getAttribute("type") == "id"
-            }
-            val stringElements = publicElements.filter {
-                it.getAttribute("type") == "string"
-            }
-
-            shakeToKudosStringId =
-                stringElements.firstByName("shake_to_kudos_dialog_title").getAttribute("id").toResourceId()
-
-            val kudosIdNode = idElements.firstByName("kudos").apply {
-                kudosIdId = getAttribute("id").toResourceId()
-            }
-
-            document("res/layout/grouped_activities_dialog_group_tab.xml").use { layout ->
-                layout.childNodes.findElementByAttributeValueOrThrow("android:id", "@id/leave_group_button_container")
-                    .apply {
-                        // Change from "FrameLayout".
-                        layout.renameNode(this, namespaceURI, "LinearLayout")
-
-                        val leaveButton = childElementsSequence().first()
-                        // Get "Leave Group" button ID for bytecode matching.
-                        val leaveButtonIdName = leaveButton.getAttribute("android:id").substringAfter('/')
-                        leaveIdId = idElements.firstByName(leaveButtonIdName).getAttribute("id").toResourceId()
-
-                        // Add surrounding padding to offset decrease on buttons.
-                        setAttribute("android:paddingHorizontal", "@dimen/space_2xs")
-
-                        // Place buttons next to each other with equal width.
-                        val kudosButton = leaveButton.apply {
-                            setAttribute("android:layout_width", "0dp")
-                            setAttribute("android:layout_weight", "1")
-                            // Decrease padding between buttons from "@dimen/button_large_padding" ...
-                            setAttribute("android:paddingHorizontal", "@dimen/space_xs")
-                        }.cloneNode(true) as Element
-                        kudosButton.apply {
-                            setAttribute("android:id", "@id/${kudosIdNode.getAttribute("name")}")
-                            setAttribute("android:text", "@string/kudos_button")
-                        }.let(::appendChild)
-
-                        // Downgrade emphasis of "Leave Group" button from "primary".
-                        leaveButton.setAttribute("app:emphasis", "secondary")
-                    }
-            }
-        }
-    }
-}
-
-@Suppress("unused")
-val addGiveGroupKudosButtonToGroupActivity = bytecodePatch(
-    name = "Add 'Give Kudos' button to 'Group Activity'",
-    description = "Adds a button that triggers the same action as shaking your phone would."
-) {
-    compatibleWith("com.strava")
-
-    dependsOn(addGiveKudosButtonToLayoutPatch)
-
-    execute {
-        val className = initFingerprint.originalClassDef.type
-        val onClickListenerClassName = "${className.substringBeforeLast(';')}\$GiveKudosOnClickListener;"
-
-        initFingerprint.method.apply {
-            val constLeaveIdInstruction = instructions.filterIsInstance<BuilderInstruction31i>().first {
-                it.narrowLiteral == leaveIdId
-            }
-            val findViewByIdInstruction =
-                getInstruction<BuilderInstruction35c>(constLeaveIdInstruction.location.index + 1)
-            val moveViewInstruction = getInstruction<BuilderInstruction11x>(constLeaveIdInstruction.location.index + 2)
-            val checkCastButtonInstruction =
-                getInstruction<BuilderInstruction21c>(constLeaveIdInstruction.location.index + 3)
-
-            val buttonClassName = checkCastButtonInstruction.getReference<TypeReference>()!!.type
-
-            addInstructions(
-                constLeaveIdInstruction.location.index,
-                """
-                    ${constLeaveIdInstruction.opcode.name} v${constLeaveIdInstruction.registerA}, $kudosIdId
-                    ${findViewByIdInstruction.opcode.name} { v${findViewByIdInstruction.registerC}, v${findViewByIdInstruction.registerD} }, ${findViewByIdInstruction.reference}
-                    ${moveViewInstruction.opcode.name} v${moveViewInstruction.registerA}
-                    ${checkCastButtonInstruction.opcode.name} v${checkCastButtonInstruction.registerA}, ${checkCastButtonInstruction.reference}
-                    new-instance v0, $onClickListenerClassName
-                    invoke-direct { v0, p0 }, $onClickListenerClassName-><init>($className)V
-                    invoke-virtual { p3, v0 }, $buttonClassName->setOnClickListener($ON_CLICK_LISTENER_CLASS_DESCRIPTOR)V
-                """
-            )
-        }
-
-        val actionHandlerMethod = actionHandlerFingerprint.match(initFingerprint.originalClassDef).method
-        val constShakeToKudosStringIndex = actionHandlerMethod.instructions.indexOfFirst {
-            it is NarrowLiteralInstruction && it.narrowLiteral == shakeToKudosStringId
-        }
-        val getSingletonInstruction = actionHandlerMethod.instructions.filterIsInstance<BuilderInstruction21c>().last {
-            it.opcode == Opcode.SGET_OBJECT && it.location.index < constShakeToKudosStringIndex
-        }
-
-        val outerThisField = ImmutableField(
-            onClickListenerClassName,
-            "outerThis",
-            className,
-            PUBLIC.value or FINAL.value or SYNTHETIC.value,
-            null,
-            listOf(),
-            setOf()
-        )
-
-        val initFieldMethod = ImmutableMethod(
-            onClickListenerClassName,
-            "<init>",
-            listOf(ImmutableMethodParameter(className, setOf(), "outerThis")),
-            "V",
-            PUBLIC.value or SYNTHETIC.value or CONSTRUCTOR.value,
-            setOf(),
-            setOf(),
-            MutableMethodImplementation(2)
-        ).toMutable().apply {
-            addInstructions(
-                """
-                    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-                    iput-object p1, p0, $outerThisField
-                    return-void
-                """
-            )
-        }
-
-        val onClickMethod = ImmutableMethod(
-            onClickListenerClassName,
-            "onClick",
-            listOf(ImmutableMethodParameter(VIEW_CLASS_DESCRIPTOR, setOf(), "v")),
-            "V",
-            PUBLIC.value or FINAL.value,
-            setOf(),
-            setOf(),
-            MutableMethodImplementation(2)
-        ).toMutable().apply {
-            addInstructions(
-                """
-                    sget-object p1, ${getSingletonInstruction.reference}
-                    iget-object p0, p0, $outerThisField
-                    invoke-virtual { p0, p1 }, ${actionHandlerFingerprint.method}
-                    return-void
-                """
-            )
-        }
-
-        ImmutableClassDef(
-            onClickListenerClassName,
-            PUBLIC.value or FINAL.value or SYNTHETIC.value,
-            "Ljava/lang/Object;",
-            listOf(ON_CLICK_LISTENER_CLASS_DESCRIPTOR),
-            "ProGuard", // Same as source file name of other classes.
-            listOf(),
-            setOf(outerThisField),
-            setOf(initFieldMethod, onClickMethod)
-        ).let(classes::add)
-    }
-}

patches/src/main/kotlin/app/revanced/patches/strava/groupkudos/Fingerprints.kt

@@ -1,14 +0,0 @@
-package app.revanced.patches.strava.groupkudos
-
-import app.revanced.patcher.fingerprint
-
-internal val initFingerprint = fingerprint {
-    parameters("Lcom/strava/feed/view/modal/GroupTabFragment;" , "Z" , "Landroidx/fragment/app/FragmentManager;")
-    custom { method, _ ->
-        method.name == "<init>"
-    }
-}
-
-internal val actionHandlerFingerprint = fingerprint {
-    strings("state")
-}

patches/src/main/kotlin/app/revanced/patches/strava/media/download/AddMediaDownloadPatch.kt

@@ -1,116 +0,0 @@
-package app.revanced.patches.strava.media.download
-
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.instructions
-import app.revanced.patcher.patch.bytecodePatch
-import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.shared.misc.mapping.get
-import app.revanced.patches.shared.misc.mapping.resourceMappingPatch
-import app.revanced.patches.shared.misc.mapping.resourceMappings
-import app.revanced.patches.strava.misc.extension.sharedExtensionPatch
-import app.revanced.util.getReference
-import app.revanced.util.writeRegister
-import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction22c
-import com.android.tools.smali.dexlib2.iface.reference.FieldReference
-import com.android.tools.smali.dexlib2.iface.reference.TypeReference
-
-private const val ACTION_CLASS_DESCRIPTOR = "Lcom/strava/bottomsheet/Action;"
-private const val MEDIA_CLASS_DESCRIPTOR = "Lcom/strava/photos/data/Media;"
-private const val MEDIA_DOWNLOAD_CLASS_DESCRIPTOR = "Lapp/revanced/extension/strava/AddMediaDownloadPatch;"
-
-@Suppress("unused")
-val addMediaDownloadPatch = bytecodePatch(
-    name = "Add media download",
-    description = "Extends the full-screen media viewer menu with items to copy or open their URLs or download them directly."
-) {
-    compatibleWith("com.strava")
-
-    dependsOn(
-        resourceMappingPatch,
-        sharedExtensionPatch
-    )
-
-    execute {
-        val fragmentClass = classBy { it.endsWith("/FullscreenMediaFragment;") }!!.mutableClass
-
-        // region Extend menu of `FullscreenMediaFragment` with actions.
-
-        createAndShowFragmentFingerprint.match(fragmentClass).method.apply {
-            val setTrueIndex = instructions.indexOfFirst { instruction ->
-                instruction.opcode == Opcode.IPUT_BOOLEAN
-            }
-            val actionRegistrarRegister = getInstruction<BuilderInstruction22c>(setTrueIndex).registerB
-            val actionRegister = instructions.first { instruction ->
-                instruction.getReference<TypeReference>()?.type == ACTION_CLASS_DESCRIPTOR
-            }.writeRegister!!
-
-            fun addMenuItem(actionId: String, string: String, color: String, drawable: String) = addInstructions(
-                setTrueIndex + 1,
-                """
-                    new-instance v$actionRegister, $ACTION_CLASS_DESCRIPTOR
-                    sget v${actionRegister + 1}, $MEDIA_DOWNLOAD_CLASS_DESCRIPTOR->$actionId:I
-                    const v${actionRegister + 2}, 0x0
-                    const v${actionRegister + 3}, ${resourceMappings["string", string]}
-                    const v${actionRegister + 4}, ${resourceMappings["color", color]}
-                    const v${actionRegister + 5}, ${resourceMappings["drawable", drawable]}
-                    move/from16 v${actionRegister + 6}, v${actionRegister + 4}
-                    invoke-direct/range { v$actionRegister .. v${actionRegister + 7} }, $ACTION_CLASS_DESCRIPTOR-><init>(ILjava/lang/String;IIIILjava/io/Serializable;)V
-                    invoke-virtual { v$actionRegistrarRegister, v$actionRegister }, Lcom/strava/bottomsheet/a;->a(Lcom/strava/bottomsheet/BottomSheetItem;)V
-                """
-            )
-
-            addMenuItem("ACTION_COPY_LINK", "copy_link", "core_o3", "actions_link_normal_xsmall")
-            addMenuItem("ACTION_OPEN_LINK", "fallback_menu_item_open_in_browser", "core_o3", "actions_link_external_normal_xsmall")
-            addMenuItem("ACTION_DOWNLOAD", "download", "core_o3", "actions_download_normal_xsmall")
-
-            // Move media to last parameter of `Action` constructor.
-            val getMediaInstruction = instructions.first { instruction ->
-                instruction.getReference<FieldReference>()?.type == MEDIA_CLASS_DESCRIPTOR
-            }
-            addInstruction(
-                getMediaInstruction.location.index + 1,
-                "move-object/from16 v${actionRegister + 7}, v${getMediaInstruction.writeRegister}"
-            )
-        }
-
-        // endregion
-
-        // region Handle new actions.
-
-        val actionClass = classes.first { clazz ->
-            clazz.type == ACTION_CLASS_DESCRIPTOR
-        }
-        val actionSerializableField = actionClass.instanceFields.first { field ->
-            field.type == "Ljava/io/Serializable;"
-        }
-
-        // Handle "copy link" & "open link" & "download" actions.
-        handleMediaActionFingerprint.match(fragmentClass).method.apply {
-            // Call handler if action ID < 0 (= custom).
-            val moveInstruction = instructions.first { instruction ->
-                instruction.opcode == Opcode.MOVE_RESULT
-            }
-            val indexAfterMoveInstruction = moveInstruction.location.index + 1
-            val actionIdRegister = moveInstruction.writeRegister
-            addInstructionsWithLabels(
-                indexAfterMoveInstruction,
-                """
-                    if-gez v$actionIdRegister, :move
-                    check-cast p2, $ACTION_CLASS_DESCRIPTOR
-                    iget-object v0, p2, $actionSerializableField
-                    check-cast v0, $MEDIA_CLASS_DESCRIPTOR
-                    invoke-static { v$actionIdRegister, v0 }, $MEDIA_DOWNLOAD_CLASS_DESCRIPTOR->handleAction(I$MEDIA_CLASS_DESCRIPTOR)Z
-                    move-result v0
-                    return v0
-                """,
-                ExternalLabel("move", instructions[indexAfterMoveInstruction])
-            )
-        }
-
-        // endregion
-    }
-}

patches/src/main/kotlin/app/revanced/patches/strava/media/download/Fingerprints.kt

@@ -1,15 +0,0 @@
-package app.revanced.patches.strava.media.download
-
-import app.revanced.patcher.fingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-
-internal val createAndShowFragmentFingerprint = fingerprint {
-    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
-    returns("V")
-    parameters("L")
-    strings("mediaType")
-}
-
-internal val handleMediaActionFingerprint = fingerprint {
-    parameters("Landroid/view/View;", "Lcom/strava/bottomsheet/BottomSheetItem;")
-}

patches/src/main/kotlin/app/revanced/patches/strava/media/upload/Fingerprints.kt

@@ -1,21 +0,0 @@
-package app.revanced.patches.strava.media.upload
-
-import app.revanced.patcher.fingerprint
-
-internal val getCompressionQualityFingerprint = fingerprint {
-    custom { method, _ ->
-        method.name == "getCompressionQuality"
-    }
-}
-
-internal val getMaxDurationFingerprint = fingerprint {
-    custom { method, _ ->
-        method.name == "getMaxDuration"
-    }
-}
-
-internal val getMaxSizeFingerprint = fingerprint {
-    custom { method, _ ->
-        method.name == "getMaxSize"
-    }
-}

patches/src/main/kotlin/app/revanced/patches/strava/media/upload/OverwriteMediaUploadParametersPatch.kt

@@ -1,48 +0,0 @@
-package app.revanced.patches.strava.media.upload
-
-import app.revanced.patcher.patch.bytecodePatch
-import app.revanced.patcher.patch.intOption
-import app.revanced.patcher.patch.longOption
-import app.revanced.util.returnEarly
-
-@Suppress("unused")
-val overwriteMediaUploadParametersPatch = bytecodePatch(
-    name = "Overwrite media upload parameters",
-    description = "Overwrites the compression, resize and trim media (images and videos) parameters returned by Strava's server before upload.",
-) {
-    compatibleWith("com.strava")
-
-    val compressionQuality by intOption(
-        key = "compressionQuality",
-        title = "Compression quality (percent)",
-        description = "This is used as the JPEG quality setting (≤ 100).",
-    ) { it == null || it in 1..100 }
-
-    val maxDuration by longOption(
-        key = "maxDuration",
-        title = "Max duration (seconds)",
-        description = "The maximum length (≤ ${60 * 60}) of a video before it gets trimmed.",
-    ) { it == null || it in 1..60 * 60 }
-
-    val maxSize by intOption(
-        key = "maxSize",
-        title = "Max size (pixels)",
-        description = "The image gets resized so that the smaller dimension (width/height) does not exceed this value (≤ 10000).",
-    ) { it == null || it in 1..10000 }
-
-    execute {
-        val mediaUploadParametersClass = classes.single { it.endsWith("/MediaUploadParameters;") }
-
-        compressionQuality?.let { compressionQuality ->
-            getCompressionQualityFingerprint.match(mediaUploadParametersClass).method.returnEarly(compressionQuality / 100f)
-        }
-
-        maxDuration?.let { maxDuration ->
-            getMaxDurationFingerprint.match(mediaUploadParametersClass).method.returnEarly(maxDuration)
-        }
-
-        maxSize?.let {
-            getMaxSizeFingerprint.match(mediaUploadParametersClass).method.returnEarly(it)
-        }
-    }
-}

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

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