chore(release): 0.119.1 [skip ci]

## [0.119.1](https://github.com/ReVanced/revanced-integrations/compare/v0.119.0...v0.119.1) (2023-10-09)

### Bug Fixes

* **YouTube - Hide shorts components:** Do not hide subscribe button outside of Shorts ([1479d6b](1479d6bc26))

.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/build.gradle.kts

@@ -5,7 +5,6 @@ plugins {
 
 android {
     compileSdk = 33
-    buildToolsVersion = "33.0.1"
     namespace = "app.revanced.integrations"
 
     defaultConfig {
@@ -44,7 +43,7 @@ android {
 dependencies {
     compileOnly(project(mapOf("path" to ":dummy")))
     compileOnly("androidx.annotation:annotation:1.6.0")
-    compileOnly("androidx.appcompat:appcompat:1.7.0-alpha02")
+    compileOnly("androidx.appcompat:appcompat:1.7.0-alpha03")
     compileOnly("com.squareup.okhttp3:okhttp:5.0.0-alpha.11")
     compileOnly("com.squareup.retrofit2:retrofit:2.9.0")
 }

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/CustomPlayerOverlayOpacityPatch.java

@@ -0,0 +1,22 @@
+package app.revanced.integrations.patches;
+
+import android.widget.ImageView;
+
+import app.revanced.integrations.settings.SettingsEnum;
+import app.revanced.integrations.utils.ReVancedUtils;
+
+public class CustomPlayerOverlayOpacityPatch {
+    private static final int DEFAULT_OPACITY = (int) SettingsEnum.PLAYER_OVERLAY_OPACITY.defaultValue;
+
+    public static void changeOpacity(ImageView imageView) {
+        int opacity = SettingsEnum.PLAYER_OVERLAY_OPACITY.getInt();
+
+        if (opacity < 0 || opacity > 100) {
+            ReVancedUtils.showToastLong("Player overlay opacity must be between 0-100");
+            SettingsEnum.PLAYER_OVERLAY_OPACITY.saveValue(DEFAULT_OPACITY);
+            opacity = DEFAULT_OPACITY;
+        }
+
+        imageView.setImageAlpha((opacity * 255) / 100);
+    }
+}

app/src/main/java/app/revanced/integrations/patches/DisableFineScrubbingGesturePatch.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 DisableFineScrubbingGesturePatch {
+    /**
+     * Disables the fine scrubbing gesture.
+     * @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_FINE_SCRUBBING_GESTURE.getBoolean()) return;
+
+        tracker.addMovement(event);
+    }
+}

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

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

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

@@ -1,12 +0,0 @@
-package app.revanced.integrations.patches;
-
-import android.widget.ImageView;
-
-import app.revanced.integrations.settings.SettingsEnum;
-
-public class HidePlayerOverlayPatch {
-    public static void hidePlayerOverlay(ImageView view) {
-        if (!SettingsEnum.HIDE_PLAYER_OVERLAY.getBoolean()) return;
-        view.setImageResource(android.R.color.transparent);
-    }
-}

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

@@ -4,16 +4,14 @@ import app.revanced.integrations.settings.SettingsEnum;
 
 public class OpenLinksExternallyPatch {
     /**
-     * Override 'android.support.customtabs.action.CustomTabsService',
-     * in order to open links in the default browser. This is done by returning an empty string,
-     * for the service that handles custom tabs in the Android support library
-     * which opens links in the default service instead.
+     * Return the intent to open links with. If empty, the link will be opened with the default browser.
      *
-     * @param original The original custom tabs service.
-     * @return The new, default service to open links with or the original service.
+     * @param originalIntent The original intent to open links with.
+     * @return The intent to open links with. Empty means the link will be opened with the default browser.
      */
-    public static String enableExternalBrowser(String original) {
-        if (SettingsEnum.EXTERNAL_BROWSER.getBoolean()) original = "";
-        return original;
+    public static String getIntent(String originalIntent) {
+        if (SettingsEnum.EXTERNAL_BROWSER.getBoolean()) return "";
+
+        return originalIntent;
     }
 }

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) {
+        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/components/AdsFilter.java

@@ -86,7 +86,7 @@ public final class AdsFilter extends Filter {
                 "cta_shelf_card"
         );
 
-        this.pathFilterGroups.addAll(
+        this.pathFilterGroupList.addAll(
                 generalAds,
                 buttonedAd,
                 merchandise,
@@ -95,7 +95,7 @@ public final class AdsFilter extends Filter {
                 webLinkPanel,
                 movieAds
         );
-        this.identifierFilterGroups.addAll(carouselAd);
+        this.identifierFilterGroupList.addAll(carouselAd);
     }
 
     @Override

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

@@ -9,26 +9,25 @@ import app.revanced.integrations.settings.SettingsEnum;
 
 @RequiresApi(api = Build.VERSION_CODES.N)
 final class ButtonsFilter extends Filter {
-
     private static final String VIDEO_ACTION_BAR_PATH = "video_action_bar.eml";
 
-    private final StringFilterGroup actionBarRule;
-    private final StringFilterGroup bufferFilterPathRule;
+    private final StringFilterGroup actionBarGroup;
+    private final StringFilterGroup bufferFilterPathGroup;
     private final ByteArrayFilterGroupList bufferButtonsGroupList = new ByteArrayFilterGroupList();
 
     public ButtonsFilter() {
-        actionBarRule = new StringFilterGroup(
+        actionBarGroup = new StringFilterGroup(
                 null,
                 VIDEO_ACTION_BAR_PATH
         );
-        identifierFilterGroups.addAll(actionBarRule);
+        identifierFilterGroupList.addAll(actionBarGroup);
 
 
-        bufferFilterPathRule = new StringFilterGroup(
+        bufferFilterPathGroup = new StringFilterGroup(
                 null,
                 "|CellType|CollectionType|CellType|ContainerType|button.eml|"
         );
-        pathFilterGroups.addAll(
+        pathFilterGroupList.addAll(
                 new StringFilterGroup(
                         SettingsEnum.HIDE_LIKE_DISLIKE_BUTTON,
                         "|segmented_like_dislike_button"
@@ -45,7 +44,7 @@ final class ButtonsFilter extends Filter {
                         SettingsEnum.HIDE_CLIP_BUTTON,
                         "|clip_button.eml|"
                 ),
-                bufferFilterPathRule
+                bufferFilterPathGroup
         );
 
         bufferButtonsGroupList.addAll(
@@ -83,11 +82,11 @@ final class ButtonsFilter extends Filter {
     }
 
     private boolean isEveryFilterGroupEnabled() {
-        for (FilterGroup rule : pathFilterGroups)
-            if (!rule.isEnabled()) return false;
+        for (var group : pathFilterGroupList)
+            if (!group.isEnabled()) return false;
 
-        for (FilterGroup rule : bufferButtonsGroupList)
-            if (!rule.isEnabled()) return false;
+        for (var group : bufferButtonsGroupList)
+            if (!group.isEnabled()) return false;
 
         return true;
     }
@@ -95,17 +94,19 @@ final class ButtonsFilter extends Filter {
     @Override
     public boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
                               FilterGroupList matchedList, FilterGroup matchedGroup, int matchedIndex) {
-        if (matchedGroup == actionBarRule) {
+        // If the current matched group is the action bar group,
+        // in case every filter group is enabled, hide the action bar.
+        if (matchedGroup == actionBarGroup) {
             if (!isEveryFilterGroupEnabled()) {
                 return false;
             }
-        } else if (matchedGroup == bufferFilterPathRule) {
-            if (!path.startsWith(VIDEO_ACTION_BAR_PATH)) {
-                return false; // Some other unknown button and not part of the player action buttons.
-            }
-            if (!bufferButtonsGroupList.check(protobufBufferArray).isFiltered()) {
-                return false; // Action button is not set to hide.
-            }
+        } else if (matchedGroup == bufferFilterPathGroup) {
+            // Make sure the current path is the right one
+            //  to avoid false positives.
+            if (!path.startsWith(VIDEO_ACTION_BAR_PATH)) return false;
+
+            // In case the group list has no match, return false.
+            if (!bufferButtonsGroupList.check(protobufBufferArray).isFiltered()) return false;
         }
 
         return super.isFiltered(identifier, path, protobufBufferArray, matchedList, matchedGroup, matchedIndex);

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

@@ -18,7 +18,7 @@ final class CommentsFilter extends Filter {
                 "comments_entry_point_simplebox"
         );
 
-        this.pathFilterGroups.addAll(
+        this.pathFilterGroupList.addAll(
                 comments,
                 previewComment
         );

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

@@ -7,6 +7,7 @@ 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)
@@ -18,14 +19,17 @@ public final class LayoutComponentsFilter extends Filter {
             SettingsEnum.HIDE_MIX_PLAYLISTS,
             "&list="
     );
+    private final StringFilterGroup searchResultShelfHeader;
+    private final StringFilterGroup inFeedSurvey;
+    private final StringFilterGroup notifyMe;
 
     @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"
         );
 
@@ -60,7 +64,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 +96,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"
         );
 
@@ -137,46 +149,76 @@ 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"
         );
 
-        this.pathFilterGroups.addAll(
+        this.pathFilterGroupList.addAll(
                 channelBar,
                 communityPosts,
                 paidContent,
                 latestPosts,
-                chapters,
                 communityGuidelines,
                 quickActions,
                 expandableMetadata,
                 relatedVideos,
                 compactBanner,
                 inFeedSurvey,
+                joinMembership,
                 medicalPanel,
+                notifyMe,
                 infoPanel,
+                subscribersCommunityGuidelines,
                 channelGuidelines,
                 audioTrackButton,
                 artistCard,
+                timedReactions,
                 imageShelf,
-                subscribersCommunityGuidelines,
                 channelMemberShelf,
                 custom
         );
 
-        this.identifierFilterGroups.addAll(
+        this.identifierFilterGroupList.addAll(
                 graySeparator,
-                chipsShelf
+                chipsShelf,
+                chapters
         );
     }
 
     @Override
     public boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
                               FilterGroupList matchedList, FilterGroup matchedGroup, int matchedIndex) {
+
+        if (matchedGroup == notifyMe || matchedGroup == inFeedSurvey) return true;
+
         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);
     }
 
@@ -187,6 +229,11 @@ public final class LayoutComponentsFilter extends Filter {
      * Called from a different place then the other filters.
      */
     public static boolean filterMixPlaylists(final byte[] bytes) {
-        return mixPlaylists.check(bytes).isFiltered();
+        final boolean isMixPlaylistFiltered = mixPlaylists.check(bytes).isFiltered();
+
+        if (isMixPlaylistFiltered)
+            LogHelper.printDebug(() -> "Filtered mix playlist");
+
+        return isMixPlaylistFiltered;
     }
 }

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

@@ -1,34 +1,37 @@
 package app.revanced.integrations.patches.components;
 
 import android.os.Build;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Spliterator;
-import java.util.function.Consumer;
-
 import app.revanced.integrations.settings.SettingsEnum;
-import app.revanced.integrations.utils.ByteTrieSearch;
-import app.revanced.integrations.utils.LogHelper;
-import app.revanced.integrations.utils.ReVancedUtils;
-import app.revanced.integrations.utils.StringTrieSearch;
-import app.revanced.integrations.utils.TrieSearch;
+import app.revanced.integrations.utils.*;
+
+import java.nio.ByteBuffer;
+import java.util.*;
+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;
         }
 
         /**
@@ -40,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;
         }
     }
 
@@ -91,14 +108,28 @@ 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(","));
+        super(setting, filter.getString().split("\\s+"));
     }
 }
 
@@ -165,19 +196,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);
     }
 }
 
@@ -214,11 +248,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;
@@ -251,9 +284,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();
@@ -283,8 +317,8 @@ abstract class Filter {
      * will never be called for any matches.
      */
 
-    protected final StringFilterGroupList pathFilterGroups = new StringFilterGroupList();
-    protected final StringFilterGroupList identifierFilterGroups = new StringFilterGroupList();
+    protected final StringFilterGroupList pathFilterGroupList = new StringFilterGroupList();
+    protected final StringFilterGroupList identifierFilterGroupList = new StringFilterGroupList();
 
     /**
      * Called after an enabled filter has been matched.
@@ -302,10 +336,10 @@ abstract class Filter {
     boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
                        FilterGroupList matchedList, FilterGroup matchedGroup, int matchedIndex) {
         if (SettingsEnum.DEBUG.getBoolean()) {
-            if (pathFilterGroups == matchedList) {
-                LogHelper.printDebug(() -> getClass().getSimpleName() + " Filtered path: " + path);
-            } else if (identifierFilterGroups == matchedList) {
+            if (matchedList == identifierFilterGroupList) {
                 LogHelper.printDebug(() -> getClass().getSimpleName() + " Filtered identifier: " + identifier);
+            } else {
+                LogHelper.printDebug(() -> getClass().getSimpleName() + " Filtered path: " + path);
             }
         }
         return true;
@@ -391,8 +425,8 @@ public final class LithoFilterPatch {
 
     static {
         for (Filter filter : filters) {
-            filterGroupLists(pathSearchTree, filter, filter.pathFilterGroups);
-            filterGroupLists(identifierSearchTree, filter, filter.identifierFilterGroups);
+            filterGroupLists(pathSearchTree, filter, filter.pathFilterGroupList);
+            filterGroupLists(identifierSearchTree, filter, filter.identifierFilterGroupList);
         }
 
         LogHelper.printDebug(() -> "Using: "
@@ -409,7 +443,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,
@@ -425,6 +459,10 @@ public final class LithoFilterPatch {
      */
     @SuppressWarnings("unused")
     public static void setProtoBuffer(@NonNull ByteBuffer protobufBuffer) {
+        // Set the buffer to a thread local.  The buffer will remain in memory, even after the call to #filter completes.
+        // This is intentional, as it appears the buffer can be set once and then filtered multiple times.
+        // The buffer will be cleared from memory after a new buffer is set by the same thread,
+        // or when the calling thread eventually dies.
         bufferThreadLocal.set(protobufBuffer);
     }
 
@@ -452,8 +490,6 @@ public final class LithoFilterPatch {
             if (pathSearchTree.matches(parameter.path, parameter)) return true;
         } catch (Exception ex) {
             LogHelper.printException(() -> "Litho filter failure", ex);
-        } finally {
-            bufferThreadLocal.remove(); // Cleanup and remove the buffer.
         }
 
         return false;

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

@@ -8,7 +8,7 @@ public final class PlaybackSpeedMenuFilterPatch extends Filter {
     public static volatile boolean isPlaybackSpeedMenuVisible;
 
     public PlaybackSpeedMenuFilterPatch() {
-        pathFilterGroups.addAll(new StringFilterGroup(
+        pathFilterGroupList.addAll(new StringFilterGroup(
                 null,
                 "playback_speed_sheet_content.eml-js"
         ));

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

@@ -15,7 +15,7 @@ public class PlayerFlyoutMenuItemsFilter extends Filter {
 
     @RequiresApi(api = Build.VERSION_CODES.N)
     public PlayerFlyoutMenuItemsFilter() {
-        identifierFilterGroups.addAll(new StringFilterGroup(null, "overflow_menu_item.eml|"));
+        identifierFilterGroupList.addAll(new StringFilterGroup(null, "overflow_menu_item.eml|"));
 
         flyoutFilterGroupList.addAll(
                 new ByteArrayAsStringFilterGroup(

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

@@ -0,0 +1,76 @@
+package app.revanced.integrations.patches.components;
+
+import android.os.Build;
+
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+
+import java.nio.charset.StandardCharsets;
+
+import app.revanced.integrations.patches.ReturnYouTubeDislikePatch;
+import app.revanced.integrations.settings.SettingsEnum;
+
+@RequiresApi(api = Build.VERSION_CODES.N)
+public final class ReturnYouTubeDislikeFilterPatch extends Filter {
+
+    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()) {
+            // The video length must be hard coded to 11, as there is additional ASCII text that
+            // appears immediately after the id if the dislike button is already selected.
+            final int videoIdLength = 11;
+            final int subStringSearchStartIndex = result.getMatchedIndex() + result.getMatchedLength();
+            String videoId = findSubString(protobufBufferArray, subStringSearchStartIndex, videoIdLength);
+            if (videoId != null) {
+                ReturnYouTubeDislikePatch.newVideoLoaded(videoId, true);
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Find an exact length ASCII substring starting from a given index.
+     *
+     * Similar to the String finding code in {@link LithoFilterPatch},
+     * but refactoring it to also handle this use case became messy and overly complicated.
+     */
+    @Nullable
+    private static String findSubString(byte[] buffer, int bufferStartIndex, int subStringLength) {
+        // Valid ASCII values (ignore control characters).
+        final int minimumAscii = 32;  // 32 = space character
+        final int maximumAscii = 126; // 127 = delete character
+
+        final int bufferLength = buffer.length;
+        int start = bufferStartIndex;
+        int end = bufferStartIndex;
+        do {
+            final int value = buffer[end];
+            if (value < minimumAscii || value > maximumAscii) {
+                start = end + 1;
+            } else if (end - start == subStringLength) {
+                return new String(buffer, start, subStringLength, StandardCharsets.US_ASCII);
+            }
+            end++;
+        } while (end < bufferLength);
+
+        return null;
+    }
+}

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

@@ -1,25 +1,72 @@
 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";
     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 shelfHeader;
+
+    private final StringFilterGroup videoActionButton;
+    private final ByteArrayFilterGroupList videoActionButtonGroupList = new ByteArrayFilterGroupList();
 
     public ShortsFilter() {
+        var shorts = new StringFilterGroup(
+                SettingsEnum.HIDE_SHORTS,
+                "shorts_shelf",
+                "inline_shorts",
+                "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.
+        shelfHeader = new StringFilterGroup(
+                SettingsEnum.HIDE_SHORTS,
+                "shelf_header.eml"
+        );
+
+        // 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"
+        );
+
+        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
@@ -35,52 +82,76 @@ public final class ShortsFilter extends Filter {
                 "shorts_info_panel_overview"
         );
 
-        final var thanksButton = new StringFilterGroup(
-                SettingsEnum.HIDE_SHORTS_THANKS_BUTTON,
-                "suggested_action"
+        videoActionButton = new StringFilterGroup(
+                null,
+                "ContainerType|shorts_video_action_button"
         );
 
-        final var subscribeButton = new StringFilterGroup(
-                SettingsEnum.HIDE_SHORTS_SUBSCRIBE_BUTTON,
-                "subscribe_button"
+        pathFilterGroupList.addAll(
+                joinButton, subscribeButton, subscribeButtonPaused,
+                channelBar, soundButton, infoPanel, videoActionButton
         );
 
-        final var joinButton = new StringFilterGroup(
-                SettingsEnum.HIDE_SHORTS_JOIN_BUTTON,
-                "sponsor_button"
+        var shortsCommentButton = new ByteArrayAsStringFilterGroup(
+                SettingsEnum.HIDE_SHORTS_COMMENTS_BUTTON,
+                "reel_comment_button"
         );
 
-        final var shorts = new StringFilterGroup(
-                SettingsEnum.HIDE_SHORTS,
-                "shorts_shelf",
-                "inline_shorts",
-                "shorts_grid",
-                "shorts_video_cell",
-                "shorts_pivot_item"
+        var shortsShareButton = new ByteArrayAsStringFilterGroup(
+                SettingsEnum.HIDE_SHORTS_SHARE_BUTTON,
+                "reel_share_button"
         );
 
-        pathFilterGroups.addAll(joinButton, subscribeButton, channelBar, soundButton, infoPanel);
-        identifierFilterGroups.addAll(shorts, thanksButton);
+        var shortsRemixButton = new ByteArrayAsStringFilterGroup(
+                SettingsEnum.HIDE_SHORTS_REMIX_BUTTON,
+                "reel_remix_button"
+        );
+
+        videoActionButtonGroupList.addAll(shortsCommentButton, shortsShareButton, shortsRemixButton);
     }
 
     @Override
     boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
                        FilterGroupList matchedList, FilterGroup matchedGroup, int matchedIndex) {
-        if (matchedGroup == soundButton || matchedGroup == infoPanel || matchedGroup == channelBar) return true;
+        if (matchedList == pathFilterGroupList) {
+            // Always filter if matched.
+            if (matchedGroup == soundButton ||
+                    matchedGroup == infoPanel ||
+                    matchedGroup == channelBar ||
+                    matchedGroup == subscribeButtonPaused
+            ) return super.isFiltered(identifier, path, protobufBufferArray, matchedList, matchedGroup, matchedIndex);
 
-        // Filter the path only when reelChannelBar is visible.
-        if (pathFilterGroups == matchedList) {
-            return path.contains(REEL_CHANNEL_BAR_PATH);
+            // 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))
+                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;
         }
 
-        return identifierFilterGroups == matchedList;
+        // Super class handles logging.
+        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);
@@ -94,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

@@ -10,7 +10,7 @@ public final class VideoQualityMenuFilterPatch extends Filter {
     public static volatile boolean isVideoQualityMenuVisible;
 
     public VideoQualityMenuFilterPatch() {
-        pathFilterGroups.addAll(new StringFilterGroup(
+        pathFilterGroupList.addAll(new StringFilterGroup(
                 SettingsEnum.SHOW_OLD_VIDEO_QUALITY_MENU,
                 "quick_quality_sheet_content.eml-js"
         ));

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

@@ -3,71 +3,44 @@ 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.
+/**
+ * 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) {
+    /**
+     * Injection point.
+     */
+    public static void onFlyoutMenuCreate(RecyclerView recyclerView) {
         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);
+        recyclerView.getViewTreeObserver().addOnDrawListener(() -> {
+            try {
+                // Check if the current view is the quality menu.
+                if (VideoQualityMenuFilterPatch.isVideoQualityMenuVisible) {
+                    VideoQualityMenuFilterPatch.isVideoQualityMenuVisible = false;
+                    ((ViewGroup) recyclerView.getParent().getParent().getParent()).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");
+                    // Click the "Advanced" quality menu to show the "old" quality menu.
+                    ((ViewGroup) recyclerView.getChildAt(0)).getChildAt(3).performClick();
+                }
+            } catch (Exception ex) {
+                LogHelper.printException(() -> "onFlyoutMenuCreate failure", ex);
             }
         });
     }
 
-    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")
+    /**
+     * Injection point.  Only used if spoofing to an old app version.
+     */
     public static void showOldVideoQualityMenu(final ListView listView) {
         if (!SettingsEnum.SHOW_OLD_VIDEO_QUALITY_MENU.getBoolean()) return;
 

app/src/main/java/app/revanced/integrations/patches/playback/speed/CustomPlaybackSpeedPatch.java

@@ -1,23 +1,23 @@
 package app.revanced.integrations.patches.playback.speed;
 
 import android.preference.ListPreference;
+import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.LinearLayout;
+
 import androidx.annotation.NonNull;
+
+import java.util.Arrays;
+
 import app.revanced.integrations.patches.components.PlaybackSpeedMenuFilterPatch;
 import app.revanced.integrations.settings.SettingsEnum;
 import app.revanced.integrations.utils.LogHelper;
 import app.revanced.integrations.utils.ReVancedUtils;
-import com.facebook.litho.ComponentHost;
-
-import java.util.Arrays;
-
-import static app.revanced.integrations.patches.playback.quality.OldVideoQualityMenuPatch.addRecyclerListener;
 
 public class CustomPlaybackSpeedPatch {
     /**
      * Maximum playback speed, exclusive value.  Custom speeds must be less than this value.
+     * Limit is required otherwise double digit speeds show up out of order in the UI selector.
      */
     public static final float MAXIMUM_PLAYBACK_SPEED = 10;
 
@@ -26,16 +26,6 @@ public class CustomPlaybackSpeedPatch {
      */
     public static float[] customPlaybackSpeeds;
 
-    /**
-     * Minimum value of {@link #customPlaybackSpeeds}
-     */
-    public static float minPlaybackSpeed;
-
-    /**
-     * Maxium value of {@link #customPlaybackSpeeds}
-     */
-    public static float maxPlaybackSpeed;
-
     /**
      * PreferenceList entries and values, of all available playback speeds.
      */
@@ -69,8 +59,6 @@ public class CustomPlaybackSpeedPatch {
                     loadCustomSpeeds();
                     return;
                 }
-                minPlaybackSpeed = Math.min(minPlaybackSpeed, speed);
-                maxPlaybackSpeed = Math.max(maxPlaybackSpeed, speed);
                 customPlaybackSpeeds[i] = speed;
             }
         } catch (Exception ex) {
@@ -106,25 +94,37 @@ public class CustomPlaybackSpeedPatch {
         preference.setEntryValues(preferenceListEntryValues);
     }
 
-    /*
-     * To reduce copy and paste between two similar code paths.
+    /**
+     * Injection point.
      */
-    public static void onFlyoutMenuCreate(final LinearLayout linearLayout) {
-        // The playback rate menu is a RecyclerView with 2 children. The third child is the "Advanced" quality menu.
-        addRecyclerListener(linearLayout, 2, 1, recyclerView -> {
-            if (PlaybackSpeedMenuFilterPatch.isPlaybackSpeedMenuVisible) {
-                PlaybackSpeedMenuFilterPatch.isPlaybackSpeedMenuVisible = false;
+    public static void onFlyoutMenuCreate(RecyclerView recyclerView) {
+        recyclerView.getViewTreeObserver().addOnDrawListener(() -> {
+            try {
+                // For some reason, the custom playback speed flyout panel is activated when the user opens the share panel. (A/B tests)
+                // Check the child count of playback speed flyout panel to prevent this issue.
+                // Child count of playback speed flyout panel is always 8.
+                if (PlaybackSpeedMenuFilterPatch.isPlaybackSpeedMenuVisible
+                        && ((ViewGroup) recyclerView.getChildAt(0)).getChildCount() == 8) {
+                    PlaybackSpeedMenuFilterPatch.isPlaybackSpeedMenuVisible = false;
+                    ViewGroup parentView3rd = (ViewGroup) recyclerView.getParent().getParent().getParent();
+                    ViewGroup parentView4th = (ViewGroup) parentView3rd.getParent();
 
-                if (recyclerView.getChildCount() == 1 && recyclerView.getChildAt(0) instanceof ComponentHost) {
-                    linearLayout.setVisibility(View.GONE);
+                    // Dismiss View [R.id.touch_outside] is the 1st ChildView of the 4th ParentView.
+                    // This only shows in phone layout.
+                    parentView4th.getChildAt(0).performClick();
 
-                    // Close the new Playback speed menu and instead show the old one.
+                    // In tablet layout there is no Dismiss View, instead we just hide all two parent views.
+                    parentView3rd.setVisibility(View.GONE);
+                    parentView4th.setVisibility(View.GONE);
+
+                    // This works without issues for both tablet and phone layouts,
+                    // So no code is needed to check whether the current device is a tablet or phone.
+
+                    // Close the new Playback speed menu and show the old one.
                     showOldPlaybackSpeedMenu();
-
-                    // DismissView [R.id.touch_outside] is the 1st ChildView of the 3rd ParentView.
-                    ((ViewGroup) linearLayout.getParent().getParent().getParent())
-                            .getChildAt(0).performClick();
                 }
+            } catch (Exception ex) {
+                LogHelper.printException(() -> "onFlyoutMenuCreate failure", ex);
             }
         });
     }

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

@@ -1,4 +1,4 @@
-package app.revanced.integrations.patches;
+package app.revanced.integrations.patches.spoof;
 
 import app.revanced.integrations.settings.SettingsEnum;
 

app/src/main/java/app/revanced/integrations/patches/spoof/SpoofSignaturePatch.java

@@ -0,0 +1,153 @@
+package app.revanced.integrations.patches.spoof;
+
+import static app.revanced.integrations.patches.spoof.requests.StoryboardRendererRequester.getStoryboardRenderer;
+import static app.revanced.integrations.utils.ReVancedUtils.containsAny;
+
+import androidx.annotation.Nullable;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import app.revanced.integrations.patches.VideoInformation;
+import app.revanced.integrations.settings.SettingsEnum;
+import app.revanced.integrations.shared.PlayerType;
+import app.revanced.integrations.utils.LogHelper;
+import app.revanced.integrations.utils.ReVancedUtils;
+
+/** @noinspection unused*/
+public class SpoofSignaturePatch {
+    /**
+     * Parameter (also used by
+     * <a href="https://github.com/yt-dlp/yt-dlp/blob/81ca451480051d7ce1a31c017e005358345a9149/yt_dlp/extractor/youtube.py#L3602">yt-dlp</a>)
+     * to fix playback issues.
+     */
+    private static final String INCOGNITO_PARAMETERS = "CgIQBg==";
+
+    /**
+     * Parameters causing playback issues.
+     */
+    private static final String[] AUTOPLAY_PARAMETERS = {
+            "YAHI", // Autoplay in feed.
+            "SAFg"  // Autoplay in scrim.
+    };
+
+    /**
+     * Parameter used for autoplay in scrim.
+     * Prepend this parameter to mute video playback (for autoplay in feed).
+     */
+    private static final String SCRIM_PARAMETER = "SAFgAXgB";
+
+    /**
+     * Parameters used in YouTube Shorts.
+     */
+    private static final String SHORTS_PLAYER_PARAMETERS = "8AEB";
+
+    /**
+     * Last video id loaded. Used to prevent reloading the same spec multiple times.
+     */
+    private static volatile String lastPlayerResponseVideoId;
+
+    private static volatile Future<StoryboardRenderer> rendererFuture;
+
+    @Nullable
+    private static StoryboardRenderer getRenderer() {
+        if (rendererFuture != null) {
+            try {
+                return rendererFuture.get(5000, TimeUnit.MILLISECONDS);
+            } catch (TimeoutException ex) {
+                LogHelper.printDebug(() -> "Could not get renderer (get timed out)");
+            } catch (ExecutionException | InterruptedException ex) {
+                // Should never happen.
+                LogHelper.printException(() -> "Could not get renderer", ex);
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Injection point.
+     *
+     * Called off the main thread, and called multiple times for each video.
+     *
+     * @param parameters Original protobuf parameter value.
+     */
+    public static String spoofParameter(String parameters) {
+        LogHelper.printDebug(() -> "Original protobuf parameter value: " + parameters);
+
+        if (!SettingsEnum.SPOOF_SIGNATURE.getBoolean()) return parameters;
+
+        // Clip's player parameters contain a lot of information (e.g. video start and end time or whether it loops)
+        // For this reason, the player parameters of a clip are usually very long (150~300 characters).
+        // Clips are 60 seconds or less in length, so no spoofing.
+        var isClip = parameters.length() > 150;
+        if (isClip) return parameters;
+
+        // Shorts do not need to be spoofed.
+        if (parameters.startsWith(SHORTS_PLAYER_PARAMETERS)) return parameters;
+
+        boolean isPlayingFeed = PlayerType.getCurrent() == PlayerType.INLINE_MINIMAL && containsAny(parameters, AUTOPLAY_PARAMETERS);
+        if (isPlayingFeed) return SettingsEnum.SPOOF_SIGNATURE_IN_FEED.getBoolean() ?
+                // Prepend the scrim parameter to mute videos in feed.
+                SCRIM_PARAMETER + INCOGNITO_PARAMETERS :
+                // In order to prevent videos that are auto-played in feed to be added to history,
+                // only spoof the parameter if the video is not playing in the feed.
+                // This will cause playback issues in the feed, but it's better than manipulating the history.
+                parameters;
+
+        fetchStoryboardRenderer();
+
+        return INCOGNITO_PARAMETERS;
+    }
+
+    private static void fetchStoryboardRenderer() {
+        String videoId = VideoInformation.getPlayerResponseVideoId();
+        if (!videoId.equals(lastPlayerResponseVideoId)) {
+            rendererFuture = ReVancedUtils.submitOnBackgroundThread(() -> getStoryboardRenderer(videoId));
+            lastPlayerResponseVideoId = videoId;
+        }
+        // Block until the fetch is completed.  Without this, occasionally when a new video is opened
+        // the video will be frozen a few seconds while the audio plays.
+        // This is because the main thread is calling to get the storyboard but the fetch is not completed.
+        // To prevent this, call get() here and block until the fetch is completed.
+        // So later when the main thread calls to get the renderer it will never block as the future is done.
+        getRenderer();
+    }
+
+    /**
+     * Injection point.
+     */
+    public static boolean getSeekbarThumbnailOverrideValue() {
+        return SettingsEnum.SPOOF_SIGNATURE.getBoolean();
+    }
+
+    /**
+     * Injection point.
+     * Called from background threads and from the main thread.
+     */
+    @Nullable
+    public static String getStoryboardRendererSpec(String originalStoryboardRendererSpec) {
+        if (SettingsEnum.SPOOF_SIGNATURE.getBoolean()) {
+            StoryboardRenderer renderer = getRenderer();
+            if (renderer != null) return renderer.getSpec();
+        }
+
+        return originalStoryboardRendererSpec;
+    }
+
+    /**
+     * Injection point.
+     */
+    public static int getRecommendedLevel(int originalLevel) {
+        if (SettingsEnum.SPOOF_SIGNATURE.getBoolean()) {
+            StoryboardRenderer renderer = getRenderer();
+            if (renderer != null) {
+                Integer recommendedLevel = renderer.getRecommendedLevel();
+                if (recommendedLevel != null) return recommendedLevel;
+            }
+        }
+
+        return originalLevel;
+    }
+}

app/src/main/java/app/revanced/integrations/patches/spoof/StoryboardRenderer.java

@@ -0,0 +1,39 @@
+package app.revanced.integrations.patches.spoof;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.jetbrains.annotations.NotNull;
+
+public final class StoryboardRenderer {
+    private final String spec;
+    @Nullable
+    private final Integer recommendedLevel;
+
+    public StoryboardRenderer(String spec, @Nullable Integer recommendedLevel) {
+        this.spec = spec;
+        this.recommendedLevel = recommendedLevel;
+    }
+
+    @NonNull
+    public String getSpec() {
+        return spec;
+    }
+
+    /**
+     * @return Recommended image quality level, or NULL if no recommendation exists.
+     */
+    @Nullable
+    public Integer getRecommendedLevel() {
+        return recommendedLevel;
+    }
+
+    @NotNull
+    @Override
+    public String toString() {
+        return "StoryboardRenderer{" +
+                "spec='" + spec + '\'' +
+                ", recommendedLevel=" + recommendedLevel +
+                '}';
+    }
+}

app/src/main/java/app/revanced/integrations/patches/spoof/requests/PlayerRoutes.java

@@ -0,0 +1,89 @@
+package app.revanced.integrations.patches.spoof.requests;
+
+import app.revanced.integrations.requests.Requester;
+import app.revanced.integrations.requests.Route;
+import app.revanced.integrations.utils.LogHelper;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+
+final class PlayerRoutes {
+    private static final String YT_API_URL = "https://www.youtube.com/youtubei/v1/";
+    static final Route.CompiledRoute GET_STORYBOARD_SPEC_RENDERER = new Route(
+            Route.Method.POST,
+            "player" +
+                    "?fields=storyboards.playerStoryboardSpecRenderer," +
+                    "storyboards.playerLiveStoryboardSpecRenderer," +
+                    "playabilityStatus.status"
+    ).compile();
+
+    static final String ANDROID_INNER_TUBE_BODY;
+    static final String TV_EMBED_INNER_TUBE_BODY;
+
+    static {
+        JSONObject innerTubeBody = new JSONObject();
+
+        try {
+            JSONObject context = new JSONObject();
+
+            JSONObject client = new JSONObject();
+            client.put("clientName", "ANDROID");
+            client.put("clientVersion", "18.37.36");
+            client.put("androidSdkVersion", 34);
+
+            context.put("client", client);
+
+            innerTubeBody.put("context", context);
+            innerTubeBody.put("videoId", "%s");
+        } catch (JSONException e) {
+            LogHelper.printException(() -> "Failed to create innerTubeBody", e);
+        }
+
+        ANDROID_INNER_TUBE_BODY = innerTubeBody.toString();
+
+        JSONObject tvEmbedInnerTubeBody = new JSONObject();
+
+        try {
+            JSONObject context = new JSONObject();
+
+            JSONObject client = new JSONObject();
+            client.put("clientName", "TVHTML5_SIMPLY_EMBEDDED_PLAYER");
+            client.put("clientVersion", "2.0");
+            client.put("platform", "TV");
+            client.put("clientScreen", "EMBED");
+
+            JSONObject thirdParty = new JSONObject();
+            thirdParty.put("embedUrl", "https://www.youtube.com/watch?v=%s");
+
+            context.put("thirdParty", thirdParty);
+            context.put("client", client);
+
+            tvEmbedInnerTubeBody.put("context", context);
+            tvEmbedInnerTubeBody.put("videoId", "%s");
+        } catch (JSONException e) {
+            LogHelper.printException(() -> "Failed to create tvEmbedInnerTubeBody", e);
+        }
+
+        TV_EMBED_INNER_TUBE_BODY = tvEmbedInnerTubeBody.toString();
+    }
+
+    private PlayerRoutes() {
+    }
+
+    /** @noinspection SameParameterValue*/
+    static HttpURLConnection getPlayerResponseConnectionFromRoute(Route.CompiledRoute route) throws IOException {
+        var connection = Requester.getConnectionFromCompiledRoute(YT_API_URL, route);
+        connection.setRequestProperty("User-Agent", "com.google.android.youtube/18.37.36 (Linux; U; Android 12; GB) gzip");
+        connection.setRequestProperty("X-Goog-Api-Format-Version", "2");
+        connection.setRequestProperty("Content-Type", "application/json");
+
+        connection.setUseCaches(false);
+        connection.setDoOutput(true);
+
+        connection.setConnectTimeout(5000);
+        connection.setReadTimeout(5000);
+        return connection;
+    }
+}

app/src/main/java/app/revanced/integrations/patches/spoof/requests/StoryboardRendererRequester.java

@@ -0,0 +1,119 @@
+package app.revanced.integrations.patches.spoof.requests;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import app.revanced.integrations.patches.spoof.StoryboardRenderer;
+import app.revanced.integrations.requests.Requester;
+import app.revanced.integrations.utils.LogHelper;
+import app.revanced.integrations.utils.ReVancedUtils;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.net.HttpURLConnection;
+import java.net.SocketTimeoutException;
+import java.nio.charset.StandardCharsets;
+import java.util.Objects;
+
+import static app.revanced.integrations.patches.spoof.requests.PlayerRoutes.*;
+
+public class StoryboardRendererRequester {
+    private StoryboardRendererRequester() {
+    }
+
+    @Nullable
+    private static JSONObject fetchPlayerResponse(@NonNull String requestBody) {
+        try {
+            ReVancedUtils.verifyOffMainThread();
+            Objects.requireNonNull(requestBody);
+
+            final byte[] innerTubeBody = requestBody.getBytes(StandardCharsets.UTF_8);
+
+            HttpURLConnection connection = PlayerRoutes.getPlayerResponseConnectionFromRoute(GET_STORYBOARD_SPEC_RENDERER);
+            connection.getOutputStream().write(innerTubeBody, 0, innerTubeBody.length);
+
+            final int responseCode = connection.getResponseCode();
+            if (responseCode == 200) return Requester.parseJSONObject(connection);
+
+            LogHelper.printException(() -> "API not available: " + responseCode);
+            connection.disconnect();
+        } catch (SocketTimeoutException ex) {
+            LogHelper.printException(() -> "API timed out", ex);
+        } catch (Exception ex) {
+            LogHelper.printException(() -> "Failed to fetch storyboard URL", ex);
+        }
+
+        return null;
+    }
+
+    private static boolean isPlayabilityStatusOk(@NonNull JSONObject playerResponse) {
+        try {
+            return playerResponse.getJSONObject("playabilityStatus").getString("status").equals("OK");
+        } catch (JSONException e) {
+            LogHelper.printDebug(() -> "Failed to get playabilityStatus for response: " + playerResponse);
+        }
+
+        return false;
+    }
+
+    /**
+     * Fetches the storyboardRenderer from the innerTubeBody.
+     * @param innerTubeBody The innerTubeBody to use to fetch the storyboardRenderer.
+     * @return StoryboardRenderer or null if playabilityStatus is not OK.
+     */
+    @Nullable
+    private static StoryboardRenderer getStoryboardRendererUsingBody(@NonNull String innerTubeBody) {
+        final JSONObject playerResponse = fetchPlayerResponse(innerTubeBody);
+        if (playerResponse != null && isPlayabilityStatusOk(playerResponse))
+            return getStoryboardRendererUsingResponse(playerResponse);
+
+        return null;
+    }
+
+    @Nullable
+    private static StoryboardRenderer getStoryboardRendererUsingResponse(@NonNull JSONObject playerResponse) {
+        try {
+            final JSONObject storyboards = playerResponse.getJSONObject("storyboards");
+            final String storyboardsRendererTag = storyboards.has("playerLiveStoryboardSpecRenderer")
+                    ? "playerLiveStoryboardSpecRenderer"
+                    : "playerStoryboardSpecRenderer";
+
+            final var rendererElement = storyboards.getJSONObject(storyboardsRendererTag);
+            StoryboardRenderer renderer = new StoryboardRenderer(
+                    rendererElement.getString("spec"),
+                    rendererElement.has("recommendedLevel")
+                            ? rendererElement.getInt("recommendedLevel")
+                            : null
+            );
+
+            LogHelper.printDebug(() -> "Fetched: " + renderer);
+
+            return renderer;
+        } catch (JSONException e) {
+            LogHelper.printException(() -> "Failed to get storyboardRenderer", e);
+        }
+
+        return null;
+    }
+
+    @Nullable
+    public static StoryboardRenderer getStoryboardRenderer(@NonNull String videoId) {
+        try {
+            Objects.requireNonNull(videoId);
+
+            var renderer = getStoryboardRendererUsingBody(String.format(ANDROID_INNER_TUBE_BODY, videoId));
+            if (renderer == null) {
+                LogHelper.printDebug(() -> videoId + " not available using Android client");
+                renderer = getStoryboardRendererUsingBody(String.format(TV_EMBED_INNER_TUBE_BODY, videoId, videoId));
+                if (renderer == null) {
+                    LogHelper.printDebug(() -> videoId + " not available using TV embedded client");
+                }
+            }
+
+            return renderer;
+        } catch (Exception ex) {
+            LogHelper.printException(() -> "Failed to fetch storyboard URL", ex);
+        }
+
+        return null;
+    }
+}