chore(release): 0.122.1-dev.1 [skip ci]

## [0.122.1-dev.1](https://github.com/ReVanced/revanced-integrations/compare/v0.122.0...v0.122.1-dev.1) (2023-11-18)

### Bug Fixes

* **YouTube:** Check if `protobufBuffer` can be filtered ([b078f0c](b078f0ca37))

.github/workflows/pull_request.yml

@@ -1,4 +1,4 @@
-name: PR to main
+name: Open a PR to main
 
 on:
   push:
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 env:
-  MESSAGE: merge branch `${{ github.head_ref || github.ref_name }}` to `main`
+  MESSAGE: Merge branch `${{ github.head_ref || github.ref_name }}` to `main`
 
 jobs:
   pull-request:
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Open pull request
         uses: repo-sync/pull-request@v2
         with:

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           # Make sure the release step uses its own credentials:
           # https://github.com/cycjimmy/semantic-release-action#private-packages

app/src/main/java/app/revanced/all/screenshot/removerestriction/RemoveScreenshotRestrictionPatch.java

@@ -5,6 +5,10 @@ import android.view.WindowManager;
 
 public class RemoveScreenshotRestrictionPatch {
 
+    public static void addFlags(Window window, int flags) {
+        window.addFlags(flags & ~WindowManager.LayoutParams.FLAG_SECURE);
+    }
+
     public static void setFlags(Window window, int flags, int mask) {
         window.setFlags(flags & ~WindowManager.LayoutParams.FLAG_SECURE, mask & ~WindowManager.LayoutParams.FLAG_SECURE);
     }

app/src/main/java/app/revanced/integrations/patches/BrandingWaterMarkPatch.java

@@ -1,11 +0,0 @@
-package app.revanced.integrations.patches;
-
-import app.revanced.integrations.settings.SettingsEnum;
-
-public class BrandingWaterMarkPatch {
-
-    // Used by: app.revanced.patches.youtube.layout.watermark.patch.HideWatermarkPatch
-    public static boolean isBrandingWatermarkShown() {
-        return SettingsEnum.HIDE_VIDEO_WATERMARK.getBoolean() == false;
-    }
-}

app/src/main/java/app/revanced/integrations/patches/BypassURLRedirectsPatch.java

@@ -0,0 +1,29 @@
+package app.revanced.integrations.patches;
+
+import android.net.Uri;
+import app.revanced.integrations.settings.SettingsEnum;
+import app.revanced.integrations.utils.LogHelper;
+
+public class BypassURLRedirectsPatch {
+    private static final String YOUTUBE_REDIRECT_PATH = "/redirect";
+
+    /**
+     * Convert the YouTube redirect URI string to the redirect query URI.
+     *
+     * @param uri The YouTube redirect URI string.
+     * @return The redirect query URI.
+     */
+    public static Uri parseRedirectUri(String uri) {
+        final var parsed = Uri.parse(uri);
+
+        if (SettingsEnum.BYPASS_URL_REDIRECTS.getBoolean() && parsed.getPath().equals(YOUTUBE_REDIRECT_PATH)) {
+            var query = Uri.parse(Uri.decode(parsed.getQueryParameter("q")));
+
+            LogHelper.printDebug(() -> "Bypassing YouTube redirect URI: " + query);
+
+            return query;
+        }
+
+        return parsed;
+    }
+}

app/src/main/java/app/revanced/integrations/patches/DisableFullscreenAmbientModePatch.java

@@ -0,0 +1,10 @@
+package app.revanced.integrations.patches;
+
+import app.revanced.integrations.settings.SettingsEnum;
+
+/** @noinspection unused*/
+public final class DisableFullscreenAmbientModePatch {
+    public static boolean enableFullScreenAmbientMode() {
+        return !SettingsEnum.DISABLE_FULLSCREEN_AMBIENT_MODE.getBoolean();
+    }
+}

app/src/main/java/app/revanced/integrations/patches/DisablePreciseSeekingGesturePatch.java

@@ -0,0 +1,18 @@
+package app.revanced.integrations.patches;
+
+import android.view.MotionEvent;
+import android.view.VelocityTracker;
+import app.revanced.integrations.settings.SettingsEnum;
+
+public final class DisablePreciseSeekingGesturePatch {
+    /**
+     * Disables the gesture that is used to seek precisely.
+     * @param tracker The velocity tracker that is used to determine the gesture.
+     * @param event The motion event that is used to determine the gesture.
+     */
+    public static void disableGesture(VelocityTracker tracker, MotionEvent event) {
+        if (SettingsEnum.DISABLE_PRECISE_SEEKING_GESTURE.getBoolean()) return;
+
+        tracker.addMovement(event);
+    }
+}

app/src/main/java/app/revanced/integrations/patches/DisableResumingStartupShortsPlayerPatch.java

@@ -0,0 +1,14 @@
+package app.revanced.integrations.patches;
+
+import app.revanced.integrations.settings.SettingsEnum;
+
+/** @noinspection unused*/
+public class DisableResumingStartupShortsPlayerPatch {
+
+    /**
+     * Injection point.
+     */
+    public static boolean disableResumingStartupShortsPlayer() {
+        return SettingsEnum.DISABLE_RESUMING_SHORTS_PLAYER.getBoolean();
+    }
+}

app/src/main/java/app/revanced/integrations/patches/DisableStartupShortsPlayerPatch.java

@@ -1,10 +0,0 @@
-package app.revanced.integrations.patches;
-
-import app.revanced.integrations.settings.SettingsEnum;
-
-public class DisableStartupShortsPlayerPatch {
-    //Used by app.revanced.patches.youtube.layout.startupshortsreset.patch.DisableShortsOnStartupPatch
-    public static boolean disableStartupShortsPlayer() {
-        return SettingsEnum.DISABLE_RESUMING_SHORTS_PLAYER.getBoolean();
-    }
-}

app/src/main/java/app/revanced/integrations/patches/DisableSuggestedVideoEndScreenPatch.java

@@ -0,0 +1,30 @@
+package app.revanced.integrations.patches;
+
+import android.annotation.SuppressLint;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import app.revanced.integrations.settings.SettingsEnum;
+
+/** @noinspection unused*/
+public final class DisableSuggestedVideoEndScreenPatch {
+    @SuppressLint("StaticFieldLeak")
+    private static View lastView;
+
+    public static void closeEndScreen(final ImageView imageView) {
+        if (!SettingsEnum.DISABLE_SUGGESTED_VIDEO_END_SCREEN.getBoolean()) return;
+
+        // Get a parent view which can be listened to for layout changes.
+        final var parent = imageView.getParent().getParent();
+
+        // Prevent adding the listener multiple times.
+        if (lastView == parent) return;
+
+        lastView = (ViewGroup)parent;
+        lastView.addOnLayoutChangeListener((v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> {
+            // Disable sound effects to prevent the click sound.
+            imageView.setSoundEffectsEnabled(false);
+            imageView.performClick();
+        });
+    }
+}

app/src/main/java/app/revanced/integrations/patches/HideBreakingNewsPatch.java

@@ -2,28 +2,27 @@ package app.revanced.integrations.patches;
 
 import android.view.View;
 
+import app.revanced.integrations.patches.spoof.SpoofAppVersionPatch;
 import app.revanced.integrations.settings.SettingsEnum;
 import app.revanced.integrations.utils.ReVancedUtils;
 
 public class HideBreakingNewsPatch {
 
     /**
-     * When spoofing to app versions older than 17.30.35, the watch history preview bar uses
+     * When spoofing to app versions 17.31.00 and older, the watch history preview bar uses
      * the same layout components as the breaking news shelf.
      *
      * Breaking news does not appear to be present in these older versions anyways.
      */
-    private static boolean isSpoofingOldVersionWithHorizontalCardListWatchHistory() {
-        return SettingsEnum.SPOOF_APP_VERSION.getBoolean()
-                && SettingsEnum.SPOOF_APP_VERSION_TARGET.getString().compareTo("17.30.35") < 0;
-    }
+    private static final boolean isSpoofingOldVersionWithHorizontalCardListWatchHistory =
+            SpoofAppVersionPatch.isSpoofingToEqualOrLessThan("17.31.00");
 
     /**
      * Injection point.
      */
     public static void hideBreakingNews(View view) {
         if (!SettingsEnum.HIDE_BREAKING_NEWS.getBoolean()
-                || isSpoofingOldVersionWithHorizontalCardListWatchHistory()) return;
+                || isSpoofingOldVersionWithHorizontalCardListWatchHistory) return;
         ReVancedUtils.hideViewByLayoutParams(view);
     }
 }

app/src/main/java/app/revanced/integrations/patches/MinimizedPlaybackPatch.java

@@ -5,7 +5,7 @@ import app.revanced.integrations.shared.PlayerType;
 public class MinimizedPlaybackPatch {
 
     public static boolean isPlaybackNotShort() {
-        return !PlayerType.getCurrent().isNoneOrHidden();
+        return !PlayerType.getCurrent().isNoneHiddenOrSlidingMinimized();
     }
 
     public static boolean overrideMinimizedPlaybackAvailable() {

app/src/main/java/app/revanced/integrations/patches/RemoveTrackingQueryParameterPatch.java

@@ -0,0 +1,16 @@
+package app.revanced.integrations.patches;
+
+import app.revanced.integrations.settings.SettingsEnum;
+
+public final class RemoveTrackingQueryParameterPatch {
+    private static final String NEW_TRACKING_PARAMETER_REGEX = ".si=.+";
+    private static final String OLD_TRACKING_PARAMETER_REGEX = ".feature=.+";
+
+    public static String sanitize(String url) {
+        if (!SettingsEnum.REMOVE_TRACKING_QUERY_PARAMETER.getBoolean()) return url;
+
+        return url
+                .replaceAll(NEW_TRACKING_PARAMETER_REGEX, "")
+                .replaceAll(OLD_TRACKING_PARAMETER_REGEX, "");
+    }
+}

app/src/main/java/app/revanced/integrations/patches/RestoreOldSeekbarThumbnailsPatch.java

@@ -0,0 +1,10 @@
+package app.revanced.integrations.patches;
+
+import app.revanced.integrations.settings.SettingsEnum;
+
+@SuppressWarnings("unused")
+public final class RestoreOldSeekbarThumbnailsPatch {
+    public static boolean useFullscreenSeekbarThumbnails() {
+        return !SettingsEnum.RESTORE_OLD_SEEKBAR_THUMBNAILS.getBoolean();
+    }
+}

app/src/main/java/app/revanced/integrations/patches/SlideToSeekPatch.java

@@ -0,0 +1,9 @@
+package app.revanced.integrations.patches;
+
+import app.revanced.integrations.settings.SettingsEnum;
+
+public final class SlideToSeekPatch {
+    public static boolean isSlideToSeekDisabled() {
+        return !SettingsEnum.SLIDE_TO_SEEK.getBoolean();
+    }
+}

app/src/main/java/app/revanced/integrations/patches/SpoofAppVersionPatch.java

@@ -1,13 +0,0 @@
-package app.revanced.integrations.patches;
-
-import app.revanced.integrations.settings.SettingsEnum;
-
-public class SpoofAppVersionPatch {
-
-    public static String getYouTubeVersionOverride(String version) {
-        if (SettingsEnum.SPOOF_APP_VERSION.getBoolean()) {
-            return SettingsEnum.SPOOF_APP_VERSION_TARGET.getString();
-        }
-        return version;
-    }
-}

app/src/main/java/app/revanced/integrations/patches/SpoofSignatureVerificationPatch.java

@@ -1,95 +0,0 @@
-package app.revanced.integrations.patches;
-
-import static app.revanced.integrations.utils.ReVancedUtils.containsAny;
-
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-
-import app.revanced.integrations.settings.SettingsEnum;
-import app.revanced.integrations.shared.PlayerType;
-import app.revanced.integrations.utils.LogHelper;
-
-public class SpoofSignatureVerificationPatch {
-    /**
-     * Enable/disable all workarounds that are required due to signature spoofing.
-     */
-    private static final boolean WORKAROUND = true;
-
-    /**
-     * Protobuf parameters used for autoplay in scrim.
-     * Prepend this parameter to mute video playback (for autoplay in feed)
-     */
-    private static final String PROTOBUF_PARAMETER_SCRIM = "SAFgAXgB";
-
-    /**
-     * Protobuf parameter also used by
-     * <a href="https://github.com/yt-dlp/yt-dlp/blob/81ca451480051d7ce1a31c017e005358345a9149/yt_dlp/extractor/youtube.py#L3602">yt-dlp</a>
-     * <br>
-     * Known issue: captions are positioned on upper area in the player.
-     */
-    private static final String PROTOBUF_PLAYER_PARAMS = "CgIQBg==";
-
-    /**
-     * Target Protobuf parameters.
-     */
-    private static final String[] PROTOBUF_PARAMETER_TARGETS = {
-            "YAHI", // Autoplay in feed
-            "SAFg"  // Autoplay in scrim
-    };
-
-    /**
-     * Injection point.
-     *
-     * @param originalValue originalValue protobuf parameter
-     */
-    public static String overrideProtobufParameter(String originalValue) {
-        try {
-            if (!SettingsEnum.SPOOF_SIGNATURE_VERIFICATION.getBoolean()) {
-                return originalValue;
-            }
-
-            LogHelper.printDebug(() -> "Original protobuf parameter value: " + originalValue);
-
-            if (!WORKAROUND) return PROTOBUF_PLAYER_PARAMS;
-
-            var isPlayingVideo = originalValue.contains(PROTOBUF_PLAYER_PARAMS);
-            if (isPlayingVideo) return originalValue;
-
-            boolean isPlayingFeed = containsAny(originalValue, PROTOBUF_PARAMETER_TARGETS) && PlayerType.getCurrent() == PlayerType.INLINE_MINIMAL;
-            if (isPlayingFeed) {
-                // Videos in feed won't autoplay with sound.
-                return PROTOBUF_PARAMETER_SCRIM + PROTOBUF_PLAYER_PARAMS;
-            } else {
-                // Spoof the parameter to prevent playback issues.
-                return PROTOBUF_PLAYER_PARAMS;
-            }
-        } catch (Exception ex) {
-            LogHelper.printException(() -> "overrideProtobufParameter failure", ex);
-        }
-
-        return originalValue;
-    }
-
-    /**
-     * Injection point.
-     */
-    public static boolean getSeekbarThumbnailOverrideValue() {
-        return SettingsEnum.SPOOF_SIGNATURE_VERIFICATION.getBoolean();
-    }
-
-    /**
-     * Injection point.
-     *
-     * @param view seekbar thumbnail view.  Includes both shorts and regular videos.
-     */
-    public static void seekbarImageViewCreated(ImageView view) {
-        if (SettingsEnum.SPOOF_SIGNATURE_VERIFICATION.getBoolean()) {
-            view.setVisibility(View.GONE);
-            // Also hide the border around the thumbnail (otherwise a 1 pixel wide bordered frame is visible).
-            ViewGroup parentLayout = (ViewGroup) view.getParent();
-            parentLayout.setPadding(0, 0, 0, 0);
-        }
-    }
-
-}

app/src/main/java/app/revanced/integrations/patches/VideoInformation.java

@@ -1,16 +1,15 @@
 package app.revanced.integrations.patches;
 
 import androidx.annotation.NonNull;
-
-import java.lang.ref.WeakReference;
-import java.lang.reflect.Method;
-import java.util.Objects;
-
 import app.revanced.integrations.patches.playback.speed.RememberPlaybackSpeedPatch;
 import app.revanced.integrations.shared.VideoState;
 import app.revanced.integrations.utils.LogHelper;
 import app.revanced.integrations.utils.ReVancedUtils;
 
+import java.lang.ref.WeakReference;
+import java.lang.reflect.Method;
+import java.util.Objects;
+
 /**
  * Hooking class for the current playing video.
  */
@@ -25,6 +24,10 @@ public final class VideoInformation {
     private static String videoId = "";
     private static long videoLength = 0;
     private static long videoTime = -1;
+
+    @NonNull
+    private static volatile String playerResponseVideoId = "";
+
     /**
      * The current playback speed
      */
@@ -61,6 +64,18 @@ public final class VideoInformation {
         }
     }
 
+    /**
+     * Injection point.  Called off the main thread.
+     *
+     * @param videoId The id of the last video loaded.
+     */
+    public static void setPlayerResponseVideoId(@NonNull String videoId, boolean videoIsOpeningOrPlaying) {
+        if (!playerResponseVideoId.equals(videoId)) {
+            LogHelper.printDebug(() -> "New player response video id: " + videoId);
+            playerResponseVideoId = videoId;
+        }
+    }
+
     /**
      * Injection point.
      * Called when user selects a playback speed.
@@ -141,6 +156,22 @@ public final class VideoInformation {
         return videoId;
     }
 
+    /**
+     * Differs from {@link #videoId} as this is the video id for the
+     * last player response received, which may not be the current video playing.
+     *
+     * If Shorts are loading the background, this commonly will be
+     * different from the Short that is currently on screen.
+     *
+     * For most use cases, you should instead use {@link #getVideoId()}.
+     *
+     * @return The id of the last video loaded. Empty string if not set yet.
+     */
+    @NonNull
+    public static String getPlayerResponseVideoId() {
+        return playerResponseVideoId;
+    }
+
     /**
      * @return The current playback speed.
      */

app/src/main/java/app/revanced/integrations/patches/announcements/AnnouncementsPatch.java

@@ -0,0 +1,151 @@
+package app.revanced.integrations.patches.announcements;
+
+import android.app.Activity;
+import android.os.Build;
+import android.text.Html;
+import android.text.method.LinkMovementMethod;
+import android.widget.TextView;
+import androidx.annotation.RequiresApi;
+import app.revanced.integrations.patches.announcements.requests.AnnouncementsRoutes;
+import app.revanced.integrations.requests.Requester;
+import app.revanced.integrations.settings.SettingsEnum;
+import app.revanced.integrations.utils.LogHelper;
+import app.revanced.integrations.utils.ReVancedUtils;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.util.UUID;
+
+import static android.text.Html.FROM_HTML_MODE_COMPACT;
+import static app.revanced.integrations.patches.announcements.requests.AnnouncementsRoutes.GET_LATEST_ANNOUNCEMENT;
+
+public final class AnnouncementsPatch {
+    private final static String CONSUMER = getOrSetConsumer();
+
+    private AnnouncementsPatch() {
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.O)
+    public static void showAnnouncement(final Activity context) {
+        if (!SettingsEnum.ANNOUNCEMENTS.getBoolean()) return;
+
+        ReVancedUtils.runOnBackgroundThread(() -> {
+            try {
+                HttpURLConnection connection = AnnouncementsRoutes.getAnnouncementsConnectionFromRoute(GET_LATEST_ANNOUNCEMENT, CONSUMER);
+
+                LogHelper.printDebug(() -> "Get latest announcement route connection url: " + connection.getURL().toString());
+
+                try {
+                    // Do not show the announcement if the request failed.
+                    if (connection.getResponseCode() != 200) {
+                        if (SettingsEnum.ANNOUNCEMENT_LAST_HASH.getString().isEmpty()) return;
+
+                        SettingsEnum.ANNOUNCEMENT_LAST_HASH.saveValue("");
+                        ReVancedUtils.showToastLong("Failed to get announcement");
+
+                        return;
+                    }
+                } catch (IOException ex) {
+                    final var message = "Failed connecting to announcements provider";
+
+                    LogHelper.printException(() -> message, ex);
+                    return;
+                }
+
+                var jsonString = Requester.parseInputStreamAndClose(connection.getInputStream(), false);
+
+                // Do not show the announcement if it is older or the same as the last one.
+                final byte[] hashBytes = MessageDigest.getInstance("SHA-256").digest(jsonString.getBytes(StandardCharsets.UTF_8));
+                final var hash = java.util.Base64.getEncoder().encodeToString(hashBytes);
+                if (hash.equals(SettingsEnum.ANNOUNCEMENT_LAST_HASH.getString())) return;
+
+                // Parse the announcement. Fall-back to raw string if it fails.
+                String title;
+                String message;
+                Level level = Level.INFO;
+                try {
+                    final var announcement = new JSONObject(jsonString);
+
+                    title = announcement.getString("title");
+                    message = announcement.getJSONObject("content").getString("message");
+
+                    if (!announcement.isNull("level")) level = Level.fromInt(announcement.getInt("level"));
+                } catch (Throwable ex) {
+                    LogHelper.printException(() -> "Failed to parse announcement. Fall-backing to raw string", ex);
+
+                    title = "Announcement";
+                    message = jsonString;
+                }
+
+                final var finalTitle = title;
+                final var finalMessage = Html.fromHtml(message, FROM_HTML_MODE_COMPACT);
+                final Level finalLevel = level;
+
+                ReVancedUtils.runOnMainThread(() -> {
+                    // Show the announcement.
+                    var alertDialog = new android.app.AlertDialog.Builder(context)
+                            .setTitle(finalTitle)
+                            .setMessage(finalMessage)
+                            .setIcon(finalLevel.icon)
+                            .setPositiveButton("Ok", (dialog, which) -> {
+                                SettingsEnum.ANNOUNCEMENT_LAST_HASH.saveValue(hash);
+                                dialog.dismiss();
+                            }).setNegativeButton("Dismiss", (dialog, which) -> {
+                                dialog.dismiss();
+                            })
+                            .setCancelable(false)
+                            .show();
+
+                    // Make links clickable.
+                    ((TextView)alertDialog.findViewById(android.R.id.message))
+                            .setMovementMethod(LinkMovementMethod.getInstance());
+                });
+            } catch (Exception e) {
+                final var message = "Failed to get announcement";
+
+                LogHelper.printException(() -> message, e);
+            }
+        });
+    }
+
+    /**
+     * Clears the last announcement hash if it is not empty.
+     *
+     * @return true if the last announcement hash was empty.
+     */
+    private static boolean emptyLastAnnouncementHash() {
+        if (SettingsEnum.ANNOUNCEMENT_LAST_HASH.getString().isEmpty()) return true;
+        SettingsEnum.ANNOUNCEMENT_LAST_HASH.saveValue("");
+
+        return false;
+    }
+
+    private static String getOrSetConsumer() {
+        final var consumer = SettingsEnum.ANNOUNCEMENT_CONSUMER.getString();
+        if (!consumer.isEmpty()) return consumer;
+
+        final var uuid = UUID.randomUUID().toString();
+        SettingsEnum.ANNOUNCEMENT_CONSUMER.saveValue(uuid);
+        return uuid;
+    }
+
+    // TODO: Use better icons.
+    private enum Level {
+        INFO(android.R.drawable.ic_dialog_info),
+        WARNING(android.R.drawable.ic_dialog_alert),
+        SEVERE(android.R.drawable.ic_dialog_alert);
+
+        public final int icon;
+
+        Level(int icon) {
+            this.icon = icon;
+        }
+
+        public static Level fromInt(int value) {
+            return values()[Math.min(value, values().length - 1)];
+        }
+    }
+}

app/src/main/java/app/revanced/integrations/patches/announcements/requests/AnnouncementsRoutes.java

@@ -0,0 +1,23 @@
+package app.revanced.integrations.patches.announcements.requests;
+
+import app.revanced.integrations.requests.Requester;
+import app.revanced.integrations.requests.Route;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+
+import static app.revanced.integrations.requests.Route.Method.GET;
+
+public class AnnouncementsRoutes {
+    private static final String ANNOUNCEMENTS_PROVIDER = "https://api.revanced.app/v2";
+
+
+    public static final Route GET_LATEST_ANNOUNCEMENT = new Route(GET, "/announcements/youtube/latest?consumer={consumer}");
+
+    private AnnouncementsRoutes() {
+    }
+
+    public static HttpURLConnection getAnnouncementsConnectionFromRoute(Route route, String... params) throws IOException {
+        return Requester.getConnectionFromRoute(ANNOUNCEMENTS_PROVIDER, route, params);
+    }
+}

app/src/main/java/app/revanced/integrations/patches/components/DescriptionComponentsFilter.java

@@ -0,0 +1,69 @@
+package app.revanced.integrations.patches.components;
+
+import androidx.annotation.Nullable;
+import app.revanced.integrations.settings.SettingsEnum;
+import app.revanced.integrations.utils.StringTrieSearch;
+
+final class DescriptionComponentsFilter extends Filter {
+
+    private final StringTrieSearch exceptions = new StringTrieSearch();
+
+    public DescriptionComponentsFilter() {
+        exceptions.addPatterns(
+                "compact_channel",
+                "description",
+                "grid_video",
+                "inline_expander",
+                "metadata"
+        );
+
+        final StringFilterGroup chapterSection = new StringFilterGroup(
+                SettingsEnum.HIDE_CHAPTERS,
+                "macro_markers_carousel"
+        );
+
+        final StringFilterGroup infoCardsSection = new StringFilterGroup(
+                SettingsEnum.HIDE_INFO_CARDS_SECTION,
+                "infocards_section"
+        );
+
+        final StringFilterGroup gameSection = new StringFilterGroup(
+                SettingsEnum.HIDE_GAME_SECTION,
+                "gaming_section"
+        );
+
+        final StringFilterGroup musicSection = new StringFilterGroup(
+                SettingsEnum.HIDE_MUSIC_SECTION,
+                "music_section",
+                "video_attributes_section"
+        );
+
+        final StringFilterGroup podcastSection = new StringFilterGroup(
+                SettingsEnum.HIDE_PODCAST_SECTION,
+                "playlist_section"
+        );
+
+        final StringFilterGroup transcriptSection = new StringFilterGroup(
+                SettingsEnum.HIDE_TRANSCIPT_SECTION,
+                "transcript_section"
+        );
+
+        pathFilterGroupList.addAll(
+                chapterSection,
+                infoCardsSection,
+                gameSection,
+                musicSection,
+                podcastSection,
+                transcriptSection
+        );
+    }
+
+
+    @Override
+    boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
+                       FilterGroupList matchedList, FilterGroup matchedGroup, int matchedIndex) {
+        if (exceptions.matches(path)) return false;
+
+        return super.isFiltered(path, identifier, protobufBufferArray, matchedList, matchedGroup, matchedIndex);
+    }
+}

app/src/main/java/app/revanced/integrations/patches/components/HideInfoCardsFilterPatch.java

@@ -0,0 +1,15 @@
+package app.revanced.integrations.patches.components;
+
+import app.revanced.integrations.settings.SettingsEnum;
+
+public final class HideInfoCardsFilterPatch extends Filter {
+
+    public HideInfoCardsFilterPatch() {
+        identifierFilterGroupList.addAll(
+                new StringFilterGroup(
+                        SettingsEnum.HIDE_INFO_CARDS,
+                        "info_card_teaser_overlay.eml"
+                )
+        );
+    }
+}

app/src/main/java/app/revanced/integrations/patches/components/LayoutComponentsFilter.java

@@ -2,33 +2,49 @@ package app.revanced.integrations.patches.components;
 
 
 import android.os.Build;
-
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
-
 import app.revanced.integrations.settings.SettingsEnum;
+import app.revanced.integrations.utils.LogHelper;
 import app.revanced.integrations.utils.StringTrieSearch;
 
 @RequiresApi(api = Build.VERSION_CODES.N)
 public final class LayoutComponentsFilter extends Filter {
     private final StringTrieSearch exceptions = new StringTrieSearch();
+    private static final StringTrieSearch mixPlaylistsExceptions = new StringTrieSearch();
+    private static ByteArrayAsStringFilterGroup mixPlaylistsExceptions2;
+
     private final CustomFilterGroup custom;
 
     private static final ByteArrayAsStringFilterGroup mixPlaylists = new ByteArrayAsStringFilterGroup(
             SettingsEnum.HIDE_MIX_PLAYLISTS,
             "&list="
     );
+    private final StringFilterGroup searchResultShelfHeader;
+    private final StringFilterGroup inFeedSurvey;
+    private final StringFilterGroup notifyMe;
+    private final StringFilterGroup expandableMetadata;
 
     @RequiresApi(api = Build.VERSION_CODES.N)
     public LayoutComponentsFilter() {
         exceptions.addPatterns(
                 "home_video_with_context",
                 "related_video_with_context",
-                "comment_thread", // skip filtering anything in the comments
-                "|comment.", // skip filtering anything in the comments replies
+                "comment_thread", // Whitelist comments
+                "|comment.", // Whitelist comment replies
                 "library_recent_shelf"
         );
 
+        mixPlaylistsExceptions.addPatterns(
+                "V.ED", // Playlist browse id.
+                "java.lang.ref.WeakReference"
+        );
+
+        mixPlaylistsExceptions2 = new ByteArrayAsStringFilterGroup(
+                null,
+                "cell_description_body"
+        );
+
         custom = new CustomFilterGroup(
                 SettingsEnum.CUSTOM_FILTER,
                 SettingsEnum.CUSTOM_FILTER_STRINGS
@@ -60,7 +76,7 @@ public final class LayoutComponentsFilter extends Filter {
                 "compact_banner"
         );
 
-        final var inFeedSurvey = new StringFilterGroup(
+        inFeedSurvey = new StringFilterGroup(
                 SettingsEnum.HIDE_FEED_SURVEY,
                 "in_feed_survey",
                 "slimline_survey"
@@ -92,8 +108,16 @@ public final class LayoutComponentsFilter extends Filter {
                 "channel_guidelines_entry_banner"
         );
 
+        // The player audio track button does the exact same function as the audio track flyout menu option.
+        // But if the copy url button is shown, these button clashes and the the audio button does not work.
+        // Previously this was a setting to show/hide the player button.
+        // But it was decided it's simpler to always hide this button because:
+        // - it doesn't work with copy video url feature
+        // - the button is rare
+        // - always hiding makes the ReVanced settings simpler and easier to understand
+        // - nobody is going to notice the redundant button is always hidden
         final var audioTrackButton = new StringFilterGroup(
-                SettingsEnum.HIDE_AUDIO_TRACK_BUTTON,
+                null,
                 "multi_feed_icon_button"
         );
 
@@ -102,14 +126,14 @@ public final class LayoutComponentsFilter extends Filter {
                 "official_card"
         );
 
-        final var expandableMetadata = new StringFilterGroup(
+        expandableMetadata = new StringFilterGroup(
                 SettingsEnum.HIDE_EXPANDABLE_CHIP,
                 "inline_expander"
         );
 
-        final var chapters = new StringFilterGroup(
-                SettingsEnum.HIDE_CHAPTERS,
-                "macro_markers_carousel"
+        final var videoQualityMenuFooter = new StringFilterGroup(
+                SettingsEnum.HIDE_VIDEO_QUALITY_MENU_FOOTER,
+                "quality_sheet_footer"
         );
 
         final var channelBar = new StringFilterGroup(
@@ -137,30 +161,60 @@ public final class LayoutComponentsFilter extends Filter {
                 "cell_divider" // layout residue (gray line above the buttoned ad),
         );
 
+        final var timedReactions = new StringFilterGroup(
+                SettingsEnum.HIDE_TIMED_REACTIONS,
+                "emoji_control_panel",
+                "timed_reaction"
+        );
+
+        searchResultShelfHeader = new StringFilterGroup(
+                SettingsEnum.HIDE_SEARCH_RESULT_SHELF_HEADER,
+                "shelf_header.eml"
+        );
+
+        notifyMe = new StringFilterGroup(
+                SettingsEnum.HIDE_NOTIFY_ME_BUTTON,
+                "set_reminder_button"
+        );
+
+        final var joinMembership = new StringFilterGroup(
+                SettingsEnum.HIDE_JOIN_MEMBERSHIP_BUTTON,
+                "compact_sponsor_button"
+        );
+
         final var chipsShelf = new StringFilterGroup(
                 SettingsEnum.HIDE_CHIPS_SHELF,
                 "chips_shelf"
         );
 
+        final var channelWatermark = new StringFilterGroup(
+                SettingsEnum.HIDE_VIDEO_CHANNEL_WATERMARK,
+                "featured_channel_watermark_overlay"
+        );
+
         this.pathFilterGroupList.addAll(
                 channelBar,
                 communityPosts,
                 paidContent,
                 latestPosts,
-                chapters,
+                channelWatermark,
                 communityGuidelines,
                 quickActions,
                 expandableMetadata,
                 relatedVideos,
                 compactBanner,
                 inFeedSurvey,
+                joinMembership,
                 medicalPanel,
+                notifyMe,
+                videoQualityMenuFooter,
                 infoPanel,
+                subscribersCommunityGuidelines,
                 channelGuidelines,
                 audioTrackButton,
                 artistCard,
+                timedReactions,
                 imageShelf,
-                subscribersCommunityGuidelines,
                 channelMemberShelf,
                 custom
         );
@@ -174,19 +228,41 @@ public final class LayoutComponentsFilter extends Filter {
     @Override
     public boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
                               FilterGroupList matchedList, FilterGroup matchedGroup, int matchedIndex) {
+
+        // The groups are excluded from the filter due to the exceptions list below.
+        // Filter them separately here.
+        if (matchedGroup == notifyMe || matchedGroup == inFeedSurvey || matchedGroup == expandableMetadata) 
+            return super.isFiltered(identifier, path, protobufBufferArray, matchedList, matchedGroup, matchedIndex);
+
         if (matchedGroup != custom && exceptions.matches(path))
             return false; // Exceptions are not filtered.
 
+        // TODO: This also hides the feed Shorts shelf header
+        if (matchedGroup == searchResultShelfHeader && matchedIndex != 0) return false;
+
         return super.isFiltered(identifier, path, protobufBufferArray, matchedList, matchedGroup, matchedIndex);
     }
 
-
     /**
      * Injection point.
-     *
      * Called from a different place then the other filters.
      */
-    public static boolean filterMixPlaylists(final byte[] bytes) {
-        return mixPlaylists.check(bytes).isFiltered();
+    public static boolean filterMixPlaylists(final Object conversionContext, final byte[] bytes) {
+        // Prevent playlist items being hidden, if a mix playlist is present in it.
+        if (mixPlaylistsExceptions.matches(conversionContext.toString()))
+            return false;
+
+        if (!mixPlaylists.check(bytes).isFiltered()) return false;
+
+        // Prevent hiding the description of some videos accidentally.
+        if (mixPlaylistsExceptions2.check(bytes).isFiltered()) return false;
+
+        LogHelper.printDebug(() -> "Filtered mix playlist");
+        return true;
+
+    }
+
+    public static boolean showWatermark() {
+        return !SettingsEnum.HIDE_VIDEO_CHANNEL_WATERMARK.getBoolean();
     }
 }

app/src/main/java/app/revanced/integrations/patches/components/LithoFilterPatch.java

@@ -4,6 +4,7 @@ import android.os.Build;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
+
 import app.revanced.integrations.settings.SettingsEnum;
 import app.revanced.integrations.utils.*;
 
@@ -13,12 +14,24 @@ import java.util.function.Consumer;
 
 abstract class FilterGroup<T> {
     final static class FilterGroupResult {
-        SettingsEnum setting;
-        boolean filtered;
+        private SettingsEnum 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(SettingsEnum setting, boolean filtered) {
+        FilterGroupResult() {
+            this(null, -1, 0);
+        }
+
+        FilterGroupResult(SettingsEnum setting, int matchedIndex, int matchedLength) {
+            setValues(setting, matchedIndex, matchedLength);
+        }
+
+        public void setValues(SettingsEnum setting, int matchedIndex, int matchedLength) {
             this.setting = setting;
-            this.filtered = filtered;
+            this.matchedIndex = matchedIndex;
+            this.matchedLength = matchedLength;
         }
 
         /**
@@ -30,7 +43,21 @@ abstract class FilterGroup<T> {
         }
 
         public boolean isFiltered() {
-            return filtered;
+            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;
         }
     }
 
@@ -81,14 +108,40 @@ class StringFilterGroup extends FilterGroup<String> {
 
     @Override
     public FilterGroupResult check(final String string) {
-        return new FilterGroupResult(setting, isEnabled() && ReVancedUtils.containsAny(string, filters));
+        int matchedIndex = -1;
+        int matchedLength = 0;
+        if (isEnabled()) {
+            for (String pattern : filters) {
+                if (!string.isEmpty()) {
+                    final int indexOf = pattern.indexOf(string);
+                    if (indexOf >= 0) {
+                        matchedIndex = indexOf;
+                        matchedLength = pattern.length();
+                        break;
+                    }
+                }
+            }
+        }
+        return new FilterGroupResult(setting, matchedIndex, matchedLength);
     }
 }
 
 final class CustomFilterGroup extends StringFilterGroup {
 
-    public CustomFilterGroup(final SettingsEnum setting, final SettingsEnum filter) {
-        super(setting, filter.getString().split(","));
+    private static String[] getFilterPatterns(SettingsEnum setting) {
+        String[] patterns = setting.getString().split("\\s+");
+        for (String pattern : patterns) {
+            if (!StringTrieSearch.isValidPattern(pattern)) {
+                ReVancedUtils.showToastLong("Invalid custom filter, resetting to default");
+                setting.saveValue(setting.defaultValue);
+                return getFilterPatterns(setting);
+            }
+        }
+        return patterns;
+    }
+
+    public CustomFilterGroup(SettingsEnum setting, SettingsEnum filter) {
+        super(setting, getFilterPatterns(filter));
     }
 }
 
@@ -155,19 +208,22 @@ class ByteArrayFilterGroup extends FilterGroup<byte[]> {
 
     @Override
     public FilterGroupResult check(final byte[] bytes) {
-        var matched = false;
+        int matchedLength = 0;
+        int matchedIndex = -1;
         if (isEnabled()) {
             if (failurePatterns == null) {
                 buildFailurePatterns(); // Lazy load.
             }
             for (int i = 0, length = filters.length; i < length; i++) {
-                if (indexOf(bytes, filters[i], failurePatterns[i]) >= 0) {
-                    matched = true;
+                byte[] filter = filters[i];
+                matchedIndex = indexOf(bytes, filter, failurePatterns[i]);
+                if (matchedIndex >= 0) {
+                    matchedLength = filter.length;
                     break;
                 }
             }
         }
-        return new FilterGroupResult(setting, matched);
+        return new FilterGroupResult(setting, matchedIndex, matchedLength);
     }
 }
 
@@ -204,11 +260,10 @@ abstract class FilterGroupList<V, T extends FilterGroup<V>> implements Iterable<
                 continue;
             }
             for (V pattern : group.filters) {
-                search.addPattern(pattern, (textSearched, matchedStartIndex, callbackParameter) -> {
+                search.addPattern(pattern, (textSearched, matchedStartIndex, matchedLength, callbackParameter) -> {
                     if (group.isEnabled()) {
                         FilterGroup.FilterGroupResult result = (FilterGroup.FilterGroupResult) callbackParameter;
-                        result.setting = group.setting;
-                        result.filtered = true;
+                        result.setValues(group.setting, matchedStartIndex, matchedLength);
                         return true;
                     }
                     return false;
@@ -241,9 +296,10 @@ abstract class FilterGroupList<V, T extends FilterGroup<V>> implements Iterable<
         if (search == null) {
             buildSearch(); // Lazy load.
         }
-        FilterGroup.FilterGroupResult result = new FilterGroup.FilterGroupResult(null, false);
+        FilterGroup.FilterGroupResult result = new FilterGroup.FilterGroupResult();
         search.matches(stack, result);
         return result;
+
     }
 
     protected abstract TrieSearch<V> createSearchGraph();
@@ -292,10 +348,10 @@ abstract class Filter {
     boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
                        FilterGroupList matchedList, FilterGroup matchedGroup, int matchedIndex) {
         if (SettingsEnum.DEBUG.getBoolean()) {
-            if (pathFilterGroupList == matchedList) {
-                LogHelper.printDebug(() -> getClass().getSimpleName() + " Filtered path: " + path);
-            } else if (identifierFilterGroupList == matchedList) {
+            if (matchedList == identifierFilterGroupList) {
                 LogHelper.printDebug(() -> getClass().getSimpleName() + " Filtered identifier: " + identifier);
+            } else {
+                LogHelper.printDebug(() -> getClass().getSimpleName() + " Filtered path: " + path);
             }
         }
         return true;
@@ -381,15 +437,15 @@ public final class LithoFilterPatch {
 
     static {
         for (Filter filter : filters) {
-            filterGroupLists(pathSearchTree, filter, filter.pathFilterGroupList);
             filterGroupLists(identifierSearchTree, filter, filter.identifierFilterGroupList);
+            filterGroupLists(pathSearchTree, filter, filter.pathFilterGroupList);
         }
 
         LogHelper.printDebug(() -> "Using: "
-                + pathSearchTree.numberOfPatterns() + " path filters"
-                + " (" + pathSearchTree.getEstimatedMemorySize() + " KB), "
                 + identifierSearchTree.numberOfPatterns() + " identifier filters"
-                + " (" + identifierSearchTree.getEstimatedMemorySize() + " KB)");
+                + " (" + identifierSearchTree.getEstimatedMemorySize() + " KB), "
+                + pathSearchTree.numberOfPatterns() + " path filters"
+                + " (" + pathSearchTree.getEstimatedMemorySize() + " KB)");
     }
 
     private static <T> void filterGroupLists(TrieSearch<T> pathSearchTree,
@@ -399,7 +455,7 @@ public final class LithoFilterPatch {
                 continue;
             }
             for (T pattern : group.filters) {
-                pathSearchTree.addPattern(pattern, (textSearched, matchedStartIndex, callbackParameter) -> {
+                pathSearchTree.addPattern(pattern, (textSearched, matchedStartIndex, matchedLength, callbackParameter) -> {
                             if (!group.isEnabled()) return false;
                             LithoFilterParameters parameters = (LithoFilterParameters) callbackParameter;
                             return filter.isFiltered(parameters.identifier, parameters.path, parameters.protoBuffer,
@@ -433,10 +489,11 @@ public final class LithoFilterPatch {
                 return false;
 
             ByteBuffer protobufBuffer = bufferThreadLocal.get();
-            if (protobufBuffer == null) {
-                LogHelper.printException(() -> "Proto buffer is null"); // Should never happen
+            if (protobufBuffer == null || !protobufBuffer.hasArray()) {
+                LogHelper.printException(() -> "Proto buffer is null or has no array"); // Should never happen.
                 return false;
             }
+
             LithoFilterParameters parameter = new LithoFilterParameters(lithoIdentifier, pathBuilder, protobufBuffer);
             LogHelper.printDebug(() -> "Searching " + parameter);
 

app/src/main/java/app/revanced/integrations/patches/components/PlaybackSpeedMenuFilterPatch.java

@@ -2,7 +2,11 @@ package app.revanced.integrations.patches.components;
 
 import androidx.annotation.Nullable;
 
-// Abuse LithoFilter for CustomPlaybackSpeedPatch.
+import app.revanced.integrations.patches.playback.speed.CustomPlaybackSpeedPatch;
+
+/**
+ * Abuse LithoFilter for {@link CustomPlaybackSpeedPatch}.
+ */
 public final class PlaybackSpeedMenuFilterPatch extends Filter {
     // Must be volatile or synchronized, as litho filtering runs off main thread and this field is then access from the main thread.
     public static volatile boolean isPlaybackSpeedMenuVisible;

app/src/main/java/app/revanced/integrations/patches/components/PlayerFlyoutMenuItemsFilter.java

@@ -6,26 +6,38 @@ import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 
 import app.revanced.integrations.settings.SettingsEnum;
+import app.revanced.integrations.shared.PlayerType;
 
 public class PlayerFlyoutMenuItemsFilter extends Filter {
 
-    // Search the buffer only if the flyout menu identifier is found.
+    // Search the buffer only if the flyout menu path is found.
     // Handle the searching in this class instead of adding to the global filter group (which searches all the time)
     private final ByteArrayFilterGroupList flyoutFilterGroupList = new ByteArrayFilterGroupList();
 
+    private final ByteArrayFilterGroup exception;
+
     @RequiresApi(api = Build.VERSION_CODES.N)
     public PlayerFlyoutMenuItemsFilter() {
-        identifierFilterGroupList.addAll(new StringFilterGroup(null, "overflow_menu_item.eml|"));
+        exception = new ByteArrayAsStringFilterGroup(
+                // Whitelist Quality menu item when "Hide Additional settings menu" is enabled
+                SettingsEnum.HIDE_ADDITIONAL_SETTINGS_MENU,
+                "quality_sheet"
+        );
+
+        // Using pathFilterGroupList due to new flyout panel(A/B)
+        pathFilterGroupList.addAll(
+                new StringFilterGroup(null, "overflow_menu_item.eml|")
+        );
 
         flyoutFilterGroupList.addAll(
-                new ByteArrayAsStringFilterGroup(
-                        SettingsEnum.HIDE_QUALITY_MENU,
-                        "yt_outline_gear"
-                ),
                 new ByteArrayAsStringFilterGroup(
                         SettingsEnum.HIDE_CAPTIONS_MENU,
                         "closed_caption"
                 ),
+                new ByteArrayAsStringFilterGroup(
+                        SettingsEnum.HIDE_ADDITIONAL_SETTINGS_MENU,
+                        "yt_outline_gear"
+                ),
                 new ByteArrayAsStringFilterGroup(
                         SettingsEnum.HIDE_LOOP_VIDEO_MENU,
                         "yt_outline_arrow_repeat_1_"
@@ -64,6 +76,10 @@ public class PlayerFlyoutMenuItemsFilter extends Filter {
     @Override
     boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
                        FilterGroupList matchedList, FilterGroup matchedGroup, int matchedIndex) {
+        // Shorts also use this player flyout panel
+        if (PlayerType.getCurrent().isNoneOrHidden() || exception.check(protobufBufferArray).isFiltered())
+            return false;
+
         // Only 1 group is added to the parent class, so the matched group must be the overflow menu.
         if (matchedIndex == 0 && flyoutFilterGroupList.check(protobufBufferArray).isFiltered()) {
             // Super class handles logging.

app/src/main/java/app/revanced/integrations/patches/components/ReturnYouTubeDislikeFilterPatch.java

@@ -0,0 +1,133 @@
+package app.revanced.integrations.patches.components;
+
+import android.os.Build;
+
+import androidx.annotation.GuardedBy;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+
+import app.revanced.integrations.patches.ReturnYouTubeDislikePatch;
+import app.revanced.integrations.patches.VideoInformation;
+import app.revanced.integrations.settings.SettingsEnum;
+import app.revanced.integrations.utils.LogHelper;
+import app.revanced.integrations.utils.TrieSearch;
+
+/**
+ * Searches for video id's in the proto buffer of Shorts dislike.
+ *
+ * Because multiple litho dislike spans are created in the background
+ * (and also anytime litho refreshes the components, which is somewhat arbitrary),
+ * that makes the value of {@link VideoInformation#getVideoId()} and {@link VideoInformation#getPlayerResponseVideoId()}
+ * unreliable to determine which video id a Shorts litho span belongs to.
+ *
+ * But the correct video id does appear in the protobuffer just before a Shorts litho span is created.
+ *
+ * Once a way to asynchronously update litho text is found, this strategy will no longer be needed.
+ */
+@RequiresApi(api = Build.VERSION_CODES.N)
+public final class ReturnYouTubeDislikeFilterPatch extends Filter {
+
+    /**
+     * Last unique video id's loaded.  Value is ignored and Map is treated as a Set.
+     * Cannot use {@link LinkedHashSet} because it's missing #removeEldestEntry().
+     */
+    @GuardedBy("itself")
+    private static final Map<String, Boolean> lastVideoIds = new LinkedHashMap<>() {
+        /**
+         * Number of video id's to keep track of for searching thru the buffer.
+         * A minimum value of 3 should be sufficient, but check a few more just in case.
+         */
+        private static final int NUMBER_OF_LAST_VIDEO_IDS_TO_TRACK = 5;
+
+        @Override
+        protected boolean removeEldestEntry(Map.Entry eldest) {
+            return size() > NUMBER_OF_LAST_VIDEO_IDS_TO_TRACK;
+        }
+    };
+
+    /**
+     * Injection point.
+     */
+    public static void newPlayerResponseVideoId(String videoId, boolean videoIsOpeningOrPlaying) {
+        try {
+            if (!videoIsOpeningOrPlaying || !SettingsEnum.RYD_SHORTS.getBoolean()) {
+                return;
+            }
+            synchronized (lastVideoIds) {
+                if (lastVideoIds.put(videoId, Boolean.TRUE) == null) {
+                    LogHelper.printDebug(() -> "New video id: " + videoId);
+                }
+            }
+        } catch (Exception ex) {
+            LogHelper.printException(() -> "newPlayerResponseVideoId failure", ex);
+        }
+    }
+
+    private final ByteArrayFilterGroupList videoIdFilterGroup = new ByteArrayFilterGroupList();
+
+    public ReturnYouTubeDislikeFilterPatch() {
+        pathFilterGroupList.addAll(
+                new StringFilterGroup(SettingsEnum.RYD_SHORTS, "|shorts_dislike_button.eml|")
+        );
+        // After the dislikes icon name is some binary data and then the video id for that specific short.
+        videoIdFilterGroup.addAll(
+                // Video was previously disliked before video was opened.
+                new ByteArrayAsStringFilterGroup(null, "ic_right_dislike_on_shadowed"),
+                // Video was not already disliked.
+                new ByteArrayAsStringFilterGroup(null, "ic_right_dislike_off_shadowed")
+        );
+    }
+
+    @Override
+    public boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
+                              FilterGroupList matchedList, FilterGroup matchedGroup, int matchedIndex) {
+        FilterGroup.FilterGroupResult result = videoIdFilterGroup.check(protobufBufferArray);
+        if (result.isFiltered()) {
+            String matchedVideoId = findVideoId(protobufBufferArray);
+            // Matched video will be null if in incognito mode.
+            // Must pass a null id to correctly clear out the current video data.
+            // Otherwise if a Short is opened in non-incognito, then incognito is enabled and another Short is opened,
+            // the new incognito Short will show the old prior data.
+            ReturnYouTubeDislikePatch.setLastLithoShortsVideoId(matchedVideoId);
+        }
+
+        return false;
+    }
+
+    @Nullable
+    private String findVideoId(byte[] protobufBufferArray) {
+        synchronized (lastVideoIds) {
+            for (String videoId : lastVideoIds.keySet()) {
+                if (byteArrayContainsString(protobufBufferArray, videoId)) {
+                    return videoId;
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
+     * This could use {@link TrieSearch}, but since the video ids are constantly changing
+     * the overhead of updating the Trie might negate the search performance gain.
+     */
+    private static boolean byteArrayContainsString(@NonNull byte[] array, @NonNull String text) {
+        for (int i = 0, lastArrayStartIndex = array.length - text.length(); i <= lastArrayStartIndex; i++) {
+            boolean found = true;
+            for (int j = 0, textLength = text.length(); j < textLength; j++) {
+                if (array[i + j] != (byte) text.charAt(j)) {
+                    found = false;
+                    break;
+                }
+            }
+            if (found) {
+                return true;
+            }
+        }
+        return false;
+    }
+}

app/src/main/java/app/revanced/integrations/patches/components/ShortsFilter.java

@@ -1,31 +1,32 @@
 package app.revanced.integrations.patches.components;
 
+import android.os.Build;
+import android.view.View;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import app.revanced.integrations.settings.SettingsEnum;
+import com.google.android.libraries.youtube.rendering.ui.pivotbar.PivotBar;
+
 import static app.revanced.integrations.utils.ReVancedUtils.hideViewBy1dpUnderCondition;
 import static app.revanced.integrations.utils.ReVancedUtils.hideViewUnderCondition;
 
-import android.view.View;
-
-import androidx.annotation.Nullable;
-
-import com.google.android.libraries.youtube.rendering.ui.pivotbar.PivotBar;
-
-import app.revanced.integrations.settings.SettingsEnum;
-
+/** @noinspection unused*/
+@RequiresApi(api = Build.VERSION_CODES.N)
 public final class ShortsFilter extends Filter {
-    private static final String REEL_CHANNEL_BAR_PATH = "reel_channel_bar.eml";
     public static PivotBar pivotBar; // Set by patch.
+    private final String REEL_CHANNEL_BAR_PATH = "reel_channel_bar.eml";
 
     private final StringFilterGroup channelBar;
+    private final StringFilterGroup subscribeButton;
+    private final StringFilterGroup subscribeButtonPaused;
     private final StringFilterGroup soundButton;
     private final StringFilterGroup infoPanel;
-    private final StringFilterGroup shortsShelfHeader;
+    private final StringFilterGroup shelfHeader;
+
+    private final StringFilterGroup videoActionButton;
+    private final ByteArrayFilterGroupList videoActionButtonGroupList = new ByteArrayFilterGroupList();
 
     public ShortsFilter() {
-        // Home / subscription feed components.
-        var thanksButton = new StringFilterGroup(
-                SettingsEnum.HIDE_SHORTS_THANKS_BUTTON,
-                "suggested_action"
-        );
         var shorts = new StringFilterGroup(
                 SettingsEnum.HIDE_SHORTS,
                 "shorts_shelf",
@@ -33,37 +34,80 @@ public final class ShortsFilter extends Filter {
                 "shorts_grid",
                 "shorts_video_cell",
                 "shorts_pivot_item"
+
         );
+        // Feed Shorts shelf header.
         // Use a different filter group for this pattern, as it requires an additional check after matching.
-        shortsShelfHeader = new StringFilterGroup(
+        shelfHeader = new StringFilterGroup(
                 SettingsEnum.HIDE_SHORTS,
                 "shelf_header.eml"
         );
-        identifierFilterGroupList.addAll(shorts, shortsShelfHeader, thanksButton);
 
+        // Home / subscription feed components.
+        var thanksButton = new StringFilterGroup(
+                SettingsEnum.HIDE_SHORTS_THANKS_BUTTON,
+                "suggested_action"
+        );
+
+        identifierFilterGroupList.addAll(shorts, shelfHeader, thanksButton);
 
         // Shorts player components.
         var joinButton = new StringFilterGroup(
                 SettingsEnum.HIDE_SHORTS_JOIN_BUTTON,
                 "sponsor_button"
         );
-        var subscribeButton = new StringFilterGroup(
+
+        subscribeButton = new StringFilterGroup(
                 SettingsEnum.HIDE_SHORTS_SUBSCRIBE_BUTTON,
                 "subscribe_button"
         );
+
+        subscribeButtonPaused = new StringFilterGroup(
+                SettingsEnum.HIDE_SHORTS_SUBSCRIBE_BUTTON_PAUSED,
+                "shorts_paused_state"
+        );
+
         channelBar = new StringFilterGroup(
                 SettingsEnum.HIDE_SHORTS_CHANNEL_BAR,
                 REEL_CHANNEL_BAR_PATH
         );
+
         soundButton = new StringFilterGroup(
                 SettingsEnum.HIDE_SHORTS_SOUND_BUTTON,
                 "reel_pivot_button"
         );
+
         infoPanel = new StringFilterGroup(
                 SettingsEnum.HIDE_SHORTS_INFO_PANEL,
                 "shorts_info_panel_overview"
         );
-        pathFilterGroupList.addAll(joinButton, subscribeButton, channelBar, soundButton, infoPanel);
+
+        videoActionButton = new StringFilterGroup(
+                null,
+                "ContainerType|shorts_video_action_button"
+        );
+
+        pathFilterGroupList.addAll(
+                joinButton, subscribeButton, subscribeButtonPaused,
+                channelBar, soundButton, infoPanel, videoActionButton
+        );
+
+        var shortsCommentButton = new ByteArrayAsStringFilterGroup(
+                SettingsEnum.HIDE_SHORTS_COMMENTS_BUTTON,
+                "reel_comment_button"
+        );
+
+        var shortsShareButton = new ByteArrayAsStringFilterGroup(
+                SettingsEnum.HIDE_SHORTS_SHARE_BUTTON,
+                "reel_share_button"
+        );
+
+        var shortsRemixButton = new ByteArrayAsStringFilterGroup(
+                SettingsEnum.HIDE_SHORTS_REMIX_BUTTON,
+                "reel_remix_button"
+        );
+
+        videoActionButtonGroupList.addAll(shortsCommentButton, shortsShareButton, shortsRemixButton);
     }
 
     @Override
@@ -71,28 +115,43 @@ public final class ShortsFilter extends Filter {
                        FilterGroupList matchedList, FilterGroup matchedGroup, int matchedIndex) {
         if (matchedList == pathFilterGroupList) {
             // Always filter if matched.
-            if (matchedGroup == soundButton || matchedGroup == infoPanel || matchedGroup == channelBar)
-                return super.isFiltered(path, identifier, protobufBufferArray, matchedList, matchedGroup, matchedIndex);
+            if (matchedGroup == soundButton ||
+                    matchedGroup == infoPanel ||
+                    matchedGroup == channelBar ||
+                    matchedGroup == subscribeButtonPaused
+            ) return super.isFiltered(identifier, path, protobufBufferArray, matchedList, matchedGroup, matchedIndex);
+
+            // Video action buttons (comment, share, remix) have the same path.
+            if (matchedGroup == videoActionButton) {
+                if (videoActionButtonGroupList.check(protobufBufferArray).isFiltered()) return super.isFiltered(
+                        identifier, path, protobufBufferArray, matchedList, matchedGroup, matchedIndex
+                );
+                return false;
+            }
 
             // Filter other path groups from pathFilterGroupList, only when reelChannelBar is visible
             // to avoid false positives.
-            if (!path.startsWith(REEL_CHANNEL_BAR_PATH))
-                return false;
-        } else if (matchedGroup == shortsShelfHeader) {
+            if (path.startsWith(REEL_CHANNEL_BAR_PATH))
+                if (matchedGroup == subscribeButton) return super.isFiltered(
+                        identifier, path, protobufBufferArray, matchedList, matchedGroup, matchedIndex
+                );
+
+            return false;
+        } else if (matchedGroup == shelfHeader) {
             // Because the header is used in watch history and possibly other places, check for the index,
             // which is 0 when the shelf header is used for Shorts.
             if (matchedIndex != 0) return false;
         }
 
         // Super class handles logging.
-        return super.isFiltered(path, identifier, protobufBufferArray, matchedList, matchedGroup, matchedIndex);
+        return super.isFiltered(identifier, path, protobufBufferArray, matchedList, matchedGroup, matchedIndex);
     }
 
     public static void hideShortsShelf(final View shortsShelfView) {
         hideViewBy1dpUnderCondition(SettingsEnum.HIDE_SHORTS, shortsShelfView);
     }
 
-    // Additional components that have to be hidden by setting their visibility
+    // region Hide the buttons in older versions of YouTube. New versions use Litho.
 
     public static void hideShortsCommentsButton(final View commentsButtonView) {
         hideViewUnderCondition(SettingsEnum.HIDE_SHORTS_COMMENTS_BUTTON, commentsButtonView);
@@ -106,6 +165,8 @@ public final class ShortsFilter extends Filter {
         hideViewUnderCondition(SettingsEnum.HIDE_SHORTS_SHARE_BUTTON, shareButtonView);
     }
 
+    // endregion
+
     public static void hideNavigationBar() {
         if (!SettingsEnum.HIDE_SHORTS_NAVIGATION_BAR.getBoolean()) return;
         if (pivotBar == null) return;

app/src/main/java/app/revanced/integrations/patches/components/VideoQualityMenuFilterPatch.java

@@ -2,16 +2,19 @@ package app.revanced.integrations.patches.components;
 
 import androidx.annotation.Nullable;
 
+import app.revanced.integrations.patches.playback.quality.RestoreOldVideoQualityMenuPatch;
 import app.revanced.integrations.settings.SettingsEnum;
 
-// Abuse LithoFilter for OldVideoQualityMenuPatch.
+/**
+ * Abuse LithoFilter for {@link RestoreOldVideoQualityMenuPatch}.
+ */
 public final class VideoQualityMenuFilterPatch extends Filter {
     // Must be volatile or synchronized, as litho filtering runs off main thread and this field is then access from the main thread.
     public static volatile boolean isVideoQualityMenuVisible;
 
     public VideoQualityMenuFilterPatch() {
         pathFilterGroupList.addAll(new StringFilterGroup(
-                SettingsEnum.SHOW_OLD_VIDEO_QUALITY_MENU,
+                SettingsEnum.RESTORE_OLD_VIDEO_QUALITY_MENU,
                 "quick_quality_sheet_content.eml-js"
         ));
     }

app/src/main/java/app/revanced/integrations/patches/playback/quality/OldVideoQualityMenuPatch.java

@@ -1,95 +0,0 @@
-package app.revanced.integrations.patches.playback.quality;
-
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
-import android.widget.LinearLayout;
-import android.widget.ListView;
-
-import androidx.annotation.NonNull;
-
-import app.revanced.integrations.patches.components.VideoQualityMenuFilterPatch;
-import app.revanced.integrations.settings.SettingsEnum;
-import app.revanced.integrations.utils.LogHelper;
-import com.facebook.litho.ComponentHost;
-import kotlin.Deprecated;
-
-// This patch contains the logic to show the old video quality menu.
-// Two methods are required, because the quality menu is a RecyclerView in the new YouTube version
-// and a ListView in the old one.
-public final class OldVideoQualityMenuPatch {
-
-    public static void onFlyoutMenuCreate(final LinearLayout linearLayout) {
-        if (!SettingsEnum.SHOW_OLD_VIDEO_QUALITY_MENU.getBoolean()) return;
-
-        // The quality menu is a RecyclerView with 3 children. The third child is the "Advanced" quality menu.
-        addRecyclerListener(linearLayout, 3, 2, recyclerView -> {
-            // Check if the current view is the quality menu.
-            if (VideoQualityMenuFilterPatch.isVideoQualityMenuVisible) {
-                VideoQualityMenuFilterPatch.isVideoQualityMenuVisible = false;
-                linearLayout.setVisibility(View.GONE);
-
-                // Click the "Advanced" quality menu to show the "old" quality menu.
-                ((ComponentHost) recyclerView.getChildAt(0)).getChildAt(3).performClick();
-                LogHelper.printDebug(() -> "Advanced quality menu in new type of quality menu clicked");
-            }
-        });
-    }
-
-    public static void addRecyclerListener(@NonNull LinearLayout linearLayout,
-                                           int expectedLayoutChildCount, int recyclerViewIndex,
-                                           @NonNull RecyclerViewGlobalLayoutListener listener) {
-        if (linearLayout.getChildCount() != expectedLayoutChildCount) return;
-
-        var layoutChild = linearLayout.getChildAt(recyclerViewIndex);
-        if (!(layoutChild instanceof RecyclerView)) return;
-        final var recyclerView = (RecyclerView) layoutChild;
-
-        recyclerView.getViewTreeObserver().addOnGlobalLayoutListener(
-                new ViewTreeObserver.OnGlobalLayoutListener() {
-                    @Override
-                    public void onGlobalLayout() {
-                        try {
-                            listener.recyclerOnGlobalLayout(recyclerView);
-                        } catch (Exception ex) {
-                            LogHelper.printException(() -> "addRecyclerListener failure", ex);
-                        } finally {
-                            // Remove the listener because it will be added again.
-                            recyclerView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-                        }
-                    }
-                }
-        );
-    }
-
-    public interface RecyclerViewGlobalLayoutListener {
-        void recyclerOnGlobalLayout(@NonNull RecyclerView recyclerView);
-    }
-
-    @Deprecated(message = "This patch is deprecated because the quality menu is not a ListView anymore")
-    public static void showOldVideoQualityMenu(final ListView listView) {
-        if (!SettingsEnum.SHOW_OLD_VIDEO_QUALITY_MENU.getBoolean()) return;
-
-        listView.setOnHierarchyChangeListener(new ViewGroup.OnHierarchyChangeListener() {
-            @Override
-            public void onChildViewAdded(View parent, View child) {
-                LogHelper.printDebug(() -> "Added listener to old type of quality menu");
-
-                parent.setVisibility(View.GONE);
-
-                final var indexOfAdvancedQualityMenuItem = 4;
-                if (listView.indexOfChild(child) != indexOfAdvancedQualityMenuItem) return;
-
-                LogHelper.printDebug(() -> "Found advanced menu item in old type of quality menu");
-
-                final var qualityItemMenuPosition = 4;
-                listView.performItemClick(null, qualityItemMenuPosition, 0);
-            }
-
-            @Override
-            public void onChildViewRemoved(View parent, View child) {
-            }
-        });
-    }
-}