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

# [5.33.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v5.33.0-dev.5...v5.33.0-dev.6) (2025-07-31)

### Bug Fixes

* **YouTube - Video quality:** Use 1080p enhanced bitrate for Premium users ([#5565](https://github.com/ReVanced/revanced-patches/issues/5565)) ([1adbd56](1adbd563b2))

CHANGELOG.md

@@ -1,3 +1,24 @@
+# [5.33.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v5.33.0-dev.5...v5.33.0-dev.6) (2025-07-31)
+
+
+### Bug Fixes
+
+* **YouTube - Video quality:** Use 1080p enhanced bitrate for Premium users ([#5565](https://github.com/ReVanced/revanced-patches/issues/5565)) ([bd3ace0](https://github.com/ReVanced/revanced-patches/commit/bd3ace0bd04ccd0369adb49d63aa0cf986402346))
+
+# [5.33.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v5.33.0-dev.4...v5.33.0-dev.5) (2025-07-31)
+
+
+### Bug Fixes
+
+* **YouTube - Litho filter:** Correctly filter identifier of older YouTube targets ([bf29d69](https://github.com/ReVanced/revanced-patches/commit/bf29d6909e389819bad878ad3b94bbc90d823cc9))
+
+# [5.33.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.33.0-dev.3...v5.33.0-dev.4) (2025-07-30)
+
+
+### Performance Improvements
+
+* **YouTube:** Filter identifier callback only on root component creation ([#5558](https://github.com/ReVanced/revanced-patches/issues/5558)) ([ccac46e](https://github.com/ReVanced/revanced-patches/commit/ccac46eebc2e14b094454e37ef4461d48a62c53f))
+
 # [5.33.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.33.0-dev.2...v5.33.0-dev.3) (2025-07-30)
 
 

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

@@ -6,8 +6,6 @@ import android.app.Instrumentation;
 import android.view.KeyEvent;
 import android.view.View;
 
-import androidx.annotation.Nullable;
-
 import java.util.List;
 
 import app.revanced.extension.shared.Logger;
@@ -155,10 +153,10 @@ public final class AdsFilter extends Filter {
     }
 
     @Override
-    boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
+    boolean isFiltered(String identifier, String path, byte[] buffer,
                        StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
         if (matchedGroup == playerShoppingShelf) {
-            return contentIndex == 0 && playerShoppingShelfBuffer.check(protobufBufferArray).isFiltered();
+            return contentIndex == 0 && playerShoppingShelfBuffer.check(buffer).isFiltered();
         }
 
         if (exceptions.matches(path)) {

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

@@ -1,7 +1,5 @@
 package app.revanced.extension.youtube.patches.components;
 
-import androidx.annotation.Nullable;
-
 import app.revanced.extension.youtube.patches.playback.quality.AdvancedVideoQualityMenuPatch;
 import app.revanced.extension.youtube.settings.Settings;
 
@@ -21,7 +19,7 @@ public final class AdvancedVideoQualityMenuFilter extends Filter {
     }
 
     @Override
-    boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
+    boolean isFiltered(String identifier, String path, byte[] buffer,
                        StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
         isVideoQualityMenuVisible = true;
 

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

@@ -1,7 +1,5 @@
 package app.revanced.extension.youtube.patches.components;
 
-import androidx.annotation.Nullable;
-
 import app.revanced.extension.youtube.settings.Settings;
 
 @SuppressWarnings("unused")
@@ -100,7 +98,7 @@ final class ButtonsFilter extends Filter {
     }
 
     @Override
-    boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
+    boolean isFiltered(String identifier, String path, byte[] buffer,
                        StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
         if (matchedGroup == likeSubscribeGlow) {
             return (path.startsWith(VIDEO_ACTION_BAR_PATH_PREFIX) || path.startsWith(COMPACT_CHANNEL_BAR_PATH_PREFIX))
@@ -117,7 +115,7 @@ final class ButtonsFilter extends Filter {
             // Make sure the current path is the right one
             //  to avoid false positives.
             return path.startsWith(VIDEO_ACTION_BAR_PATH)
-                    && bufferButtonsGroupList.check(protobufBufferArray).isFiltered();
+                    && bufferButtonsGroupList.check(buffer).isFiltered();
         }
 
         return true;

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

@@ -1,7 +1,5 @@
 package app.revanced.extension.youtube.patches.components;
 
-import androidx.annotation.Nullable;
-
 import app.revanced.extension.youtube.settings.Settings;
 import app.revanced.extension.youtube.shared.PlayerType;
 
@@ -87,12 +85,12 @@ final class CommentsFilter extends Filter {
     }
 
     @Override
-    boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
+    boolean isFiltered(String identifier, String path, byte[] buffer,
                        StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
         if (matchedGroup == chipBar) {
             // Playlist sort button uses same components and must only filter if the player is opened.
             return PlayerType.getCurrent().isMaximizedOrFullscreen()
-                    && aiCommentsSummary.check(protobufBufferArray).isFiltered();
+                    && aiCommentsSummary.check(buffer).isFiltered();
         }
 
         return true;

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

@@ -3,7 +3,6 @@ package app.revanced.extension.youtube.patches.components;
 import static app.revanced.extension.shared.StringRef.str;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -146,7 +145,7 @@ final class CustomFilter extends Filter {
     }
 
     @Override
-    boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
+    boolean isFiltered(String identifier, String path, byte[] buffer,
                        StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
         // All callbacks are custom filter groups.
         CustomFilterGroup custom = (CustomFilterGroup) matchedGroup;
@@ -158,6 +157,6 @@ final class CustomFilter extends Filter {
             return true; // No buffer filter, only path filtering.
         }
 
-        return custom.bufferSearch.matches(protobufBufferArray);
+        return custom.bufferSearch.matches(buffer);
     }
 }

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

@@ -1,7 +1,5 @@
 package app.revanced.extension.youtube.patches.components;
 
-import androidx.annotation.Nullable;
-
 import app.revanced.extension.youtube.StringTrieSearch;
 import app.revanced.extension.youtube.settings.Settings;
 import app.revanced.extension.youtube.shared.PlayerType;
@@ -105,7 +103,7 @@ final class DescriptionComponentsFilter extends Filter {
     }
 
     @Override
-    boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
+    boolean isFiltered(String identifier, String path, byte[] buffer,
                        StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
 
         if (matchedGroup == aiGeneratedVideoSummarySection) {
@@ -116,11 +114,11 @@ final class DescriptionComponentsFilter extends Filter {
         if (exceptions.matches(path)) return false;
 
         if (matchedGroup == macroMarkersCarousel) {
-            return contentIndex == 0 && macroMarkersCarouselGroupList.check(protobufBufferArray).isFiltered();
+            return contentIndex == 0 && macroMarkersCarouselGroupList.check(buffer).isFiltered();
         }
 
         if (matchedGroup == horizontalShelf) {
-            return cellVideoAttribute.check(protobufBufferArray).isFiltered();
+            return cellVideoAttribute.check(buffer).isFiltered();
         }
 
         return true;

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

@@ -1,7 +1,5 @@
 package app.revanced.extension.youtube.patches.components;
 
-import androidx.annotation.Nullable;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -42,6 +40,7 @@ abstract class Filter {
     /**
      * Adds callbacks to {@link #isFiltered(String, String, byte[], StringFilterGroup, FilterContentType, int)}
      * if any of the groups are found.
+     * <p>
      */
     protected final void addIdentifierCallbacks(StringFilterGroup... groups) {
         identifierCallbacks.addAll(Arrays.asList(groups));
@@ -68,7 +67,7 @@ abstract class Filter {
      * @param contentIndex Matched index of the identifier or path.
      * @return True if the litho component should be filtered out.
      */
-    boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
+    boolean isFiltered(String identifier, String path, byte[] buffer,
                        StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
         return true;
     }

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

@@ -554,7 +554,7 @@ final class KeywordContentFilter extends Filter {
     }
 
     @Override
-    boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
+    boolean isFiltered(String identifier, String path, byte[] buffer,
                        StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
         if (contentIndex != 0 && matchedGroup == startsWithFilter) {
             return false;
@@ -574,7 +574,7 @@ final class KeywordContentFilter extends Filter {
         }
 
         MutableReference<String> matchRef = new MutableReference<>();
-        if (bufferSearch.matches(protobufBufferArray, matchRef)) {
+        if (bufferSearch.matches(buffer, matchRef)) {
             updateStats(true, matchRef.value);
             return true;
         }

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

@@ -304,7 +304,7 @@ public final class LayoutComponentsFilter extends Filter {
     }
 
     @Override
-    boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
+    boolean isFiltered(String identifier, String path, byte[] buffer,
                        StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
         // This identifier is used not only in players but also in search results:
         // https://github.com/ReVanced/revanced-patches/issues/3245
@@ -322,7 +322,7 @@ public final class LayoutComponentsFilter extends Filter {
         }
 
         if (matchedGroup == channelProfile) {
-            return channelProfileBuffer.check(protobufBufferArray).isFiltered();
+            return channelProfileBuffer.check(buffer).isFiltered();
         }
 
         if (exceptions.matches(path)) return false; // Exceptions are not filtered.
@@ -331,11 +331,11 @@ public final class LayoutComponentsFilter extends Filter {
             return compactChannelBarInnerButton.check(path).isFiltered()
                     // The filter may be broad, but in the context of a compactChannelBarInnerButton,
                     // it's safe to assume that the button is the only thing that should be hidden.
-                    && joinMembershipButton.check(protobufBufferArray).isFiltered();
+                    && joinMembershipButton.check(buffer).isFiltered();
         }
 
         if (matchedGroup == horizontalShelves) {
-            return contentIndex == 0 && (hideShelves() || ticketShelf.check(protobufBufferArray).isFiltered());
+            return contentIndex == 0 && (hideShelves() || ticketShelf.check(buffer).isFiltered());
         }
 
         if (matchedGroup == chipBar) {

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

@@ -17,29 +17,28 @@ public final class LithoFilterPatch {
      * Simple wrapper to pass the litho parameters through the prefix search.
      */
     private static final class LithoFilterParameters {
-        @Nullable
         final String identifier;
         final String path;
-        final byte[] protoBuffer;
+        final byte[] buffer;
 
-        LithoFilterParameters(@Nullable String lithoIdentifier, String lithoPath, byte[] protoBuffer) {
+        LithoFilterParameters(String lithoIdentifier, String lithoPath, byte[] buffer) {
             this.identifier = lithoIdentifier;
             this.path = lithoPath;
-            this.protoBuffer = protoBuffer;
+            this.buffer = buffer;
         }
 
         @NonNull
         @Override
         public String toString() {
             // Estimate the percentage of the buffer that are Strings.
-            StringBuilder builder = new StringBuilder(Math.max(100, protoBuffer.length / 2));
+            StringBuilder builder = new StringBuilder(Math.max(100, buffer.length / 2));
             builder.append( "ID: ");
             builder.append(identifier);
             builder.append(" Path: ");
             builder.append(path);
             if (Settings.DEBUG_PROTOBUFFER.get()) {
                 builder.append(" BufferStrings: ");
-                findAsciiStrings(builder, protoBuffer);
+                findAsciiStrings(builder, buffer);
             }
 
             return builder.toString();
@@ -128,21 +127,21 @@ public final class LithoFilterPatch {
     private static void filterUsingCallbacks(StringTrieSearch pathSearchTree,
                                              Filter filter, List<StringFilterGroup> groups,
                                              Filter.FilterContentType type) {
+        String filterSimpleName = filter.getClass().getSimpleName();
+
         for (StringFilterGroup group : groups) {
             if (!group.includeInSearch()) {
                 continue;
             }
 
             for (String pattern : group.filters) {
-                String filterSimpleName = filter.getClass().getSimpleName();
-
                 pathSearchTree.addPattern(pattern, (textSearched, matchedStartIndex,
                                                     matchedLength, callbackParameter) -> {
                             if (!group.isEnabled()) return false;
 
                             LithoFilterParameters parameters = (LithoFilterParameters) callbackParameter;
                             final boolean isFiltered = filter.isFiltered(parameters.identifier,
-                                    parameters.path, parameters.protoBuffer, group, type, matchedStartIndex);
+                                    parameters.path, parameters.buffer, group, type, matchedStartIndex);
 
                             if (isFiltered && BaseSettings.DEBUG.get()) {
                                 if (type == Filter.FilterContentType.IDENTIFIER) {
@@ -163,6 +162,7 @@ public final class LithoFilterPatch {
 
     /**
      * Injection point.  Called off the main thread.
+     * Targets 20.22+
      */
     public static void setProtoBuffer(byte[] buffer) {
         // Set the buffer to a thread local.  The buffer will remain in memory, even after the call to #filter completes.
@@ -193,9 +193,9 @@ public final class LithoFilterPatch {
     /**
      * Injection point.
      */
-    public static boolean shouldFilter(@Nullable String lithoIdentifier, StringBuilder pathBuilder) {
+    public static boolean isFiltered(String lithoIdentifier, StringBuilder pathBuilder) {
         try {
-            if (pathBuilder.length() == 0) {
+            if (lithoIdentifier.isEmpty() && pathBuilder.length() == 0) {
                 return false;
             }
 
@@ -210,7 +210,7 @@ public final class LithoFilterPatch {
                     lithoIdentifier, pathBuilder.toString(), buffer);
             Logger.printDebug(() -> "Searching " + parameter);
 
-            if (parameter.identifier != null && identifierSearchTree.matches(parameter.identifier, parameter)) {
+            if (identifierSearchTree.matches(parameter.identifier, parameter)) {
                 return true;
             }
 
@@ -218,7 +218,7 @@ public final class LithoFilterPatch {
                 return true;
             }
         } catch (Exception ex) {
-            Logger.printException(() -> "Litho filter failure", ex);
+            Logger.printException(() -> "isFiltered failure", ex);
         }
 
         return false;

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

@@ -1,7 +1,5 @@
 package app.revanced.extension.youtube.patches.components;
 
-import androidx.annotation.Nullable;
-
 import app.revanced.extension.youtube.patches.playback.speed.CustomPlaybackSpeedPatch;
 import app.revanced.extension.youtube.settings.Settings;
 
@@ -38,7 +36,7 @@ public final class PlaybackSpeedMenuFilter extends Filter {
     }
 
     @Override
-    boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
+    boolean isFiltered(String identifier, String path, byte[] buffer,
                        StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
         if (matchedGroup == oldPlaybackMenuGroup) {
             isOldPlaybackSpeedMenuVisible = true;

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

@@ -1,7 +1,5 @@
 package app.revanced.extension.youtube.patches.components;
 
-import androidx.annotation.Nullable;
-
 import app.revanced.extension.shared.settings.Setting;
 import app.revanced.extension.shared.spoof.SpoofVideoStreamsPatch;
 import app.revanced.extension.youtube.settings.Settings;
@@ -96,7 +94,7 @@ public class PlayerFlyoutMenuItemsFilter extends Filter {
     }
 
     @Override
-    boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
+    boolean isFiltered(String identifier, String path, byte[] buffer,
                        StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
         if (matchedGroup == videoQualityMenuFooter) {
             return true;
@@ -107,10 +105,10 @@ public class PlayerFlyoutMenuItemsFilter extends Filter {
         }
 
         // Shorts also use this player flyout panel
-        if (PlayerType.getCurrent().isNoneOrHidden() || exception.check(protobufBufferArray).isFiltered()) {
+        if (PlayerType.getCurrent().isNoneOrHidden() || exception.check(buffer).isFiltered()) {
             return false;
         }
 
-        return flyoutFilterGroupList.check(protobufBufferArray).isFiltered();
+        return flyoutFilterGroupList.check(buffer).isFiltered();
     }
 }

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

@@ -84,15 +84,15 @@ public final class ReturnYouTubeDislikeFilter extends Filter {
     }
 
     @Override
-    boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
+    boolean isFiltered(String identifier, String path, byte[] buffer,
                        StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
         if (!Settings.RYD_ENABLED.get() || !Settings.RYD_SHORTS.get()) {
             return false;
         }
 
-        FilterGroup.FilterGroupResult result = videoIdFilterGroup.check(protobufBufferArray);
+        FilterGroup.FilterGroupResult result = videoIdFilterGroup.check(buffer);
         if (result.isFiltered()) {
-            String matchedVideoId = findVideoId(protobufBufferArray);
+            String matchedVideoId = findVideoId(buffer);
             // Matched video will be null if in incognito mode.
             // Must pass a null id to correctly clear out the current video data.
             // Otherwise if a Short is opened in non-incognito, then incognito is enabled and another Short is opened,

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

@@ -4,8 +4,6 @@ import static app.revanced.extension.youtube.shared.NavigationBar.NavigationButt
 
 import android.view.View;
 
-import androidx.annotation.Nullable;
-
 import com.google.android.libraries.youtube.rendering.ui.pivotbar.PivotBar;
 
 import java.lang.ref.WeakReference;
@@ -13,7 +11,6 @@ import java.util.Arrays;
 import java.util.List;
 
 import app.revanced.extension.shared.Logger;
-import app.revanced.extension.shared.Utils;
 import app.revanced.extension.youtube.settings.Settings;
 import app.revanced.extension.youtube.shared.NavigationBar;
 import app.revanced.extension.youtube.shared.PlayerType;
@@ -321,7 +318,7 @@ public final class ShortsFilter extends Filter {
     }
 
     @Override
-    boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
+    boolean isFiltered(String identifier, String path, byte[] buffer,
                        StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
         if (contentType == FilterContentType.PATH) {
             if (matchedGroup == subscribeButton || matchedGroup == joinButton || matchedGroup == paidPromotionButton) {
@@ -330,22 +327,22 @@ public final class ShortsFilter extends Filter {
             }
 
             if (matchedGroup == useSoundButton) {
-                return useSoundButtonBuffer.check(protobufBufferArray).isFiltered();
+                return useSoundButtonBuffer.check(buffer).isFiltered();
             }
 
             if (matchedGroup == useTemplateButton) {
-                return useTemplateButtonBuffer.check(protobufBufferArray).isFiltered();
+                return useTemplateButtonBuffer.check(buffer).isFiltered();
             }
 
             if (matchedGroup == shortsCompactFeedVideo) {
-                return shouldHideShortsFeedItems() && shortsCompactFeedVideoBuffer.check(protobufBufferArray).isFiltered();
+                return shouldHideShortsFeedItems() && shortsCompactFeedVideoBuffer.check(buffer).isFiltered();
             }
 
             // Video action buttons (comment, share, remix) have the same path.
             // Like and dislike are separate path filters and don't require buffer searching.
             if (matchedGroup == shortsActionBar) {
                 return videoActionButton.check(path).isFiltered()
-                        && videoActionButtonBuffer.check(protobufBufferArray).isFiltered();
+                        && videoActionButtonBuffer.check(buffer).isFiltered();
             }
 
             if (matchedGroup == suggestedAction) {
@@ -356,7 +353,7 @@ public final class ShortsFilter extends Filter {
                     return true;
                 }
 
-                return suggestedActionsBuffer.check(protobufBufferArray).isFiltered();
+                return suggestedActionsBuffer.check(buffer).isFiltered();
             }
 
             return true;

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/playback/quality/RememberVideoQualityPatch.java

@@ -5,9 +5,9 @@ import static app.revanced.extension.shared.Utils.NetworkType;
 
 import androidx.annotation.Nullable;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
+import com.google.android.libraries.youtube.innertube.model.media.VideoQuality;
+
+import java.util.Arrays;
 import java.util.List;
 
 import app.revanced.extension.shared.Logger;
@@ -20,6 +20,14 @@ import app.revanced.extension.youtube.shared.ShortsPlayerState;
 
 @SuppressWarnings("unused")
 public class RememberVideoQualityPatch {
+
+    /**
+     * Interface to use obfuscated methods.
+     */
+    public interface VideoQualityMenuInterface {
+        void patch_setMenuIndexFromQuality(VideoQuality quality);
+    }
+
     private static final int AUTOMATIC_VIDEO_QUALITY_VALUE = -2;
     private static final IntegerSetting videoQualityWifi = Settings.VIDEO_QUALITY_DEFAULT_WIFI;
     private static final IntegerSetting videoQualityMobile = Settings.VIDEO_QUALITY_DEFAULT_MOBILE;
@@ -30,7 +38,8 @@ public class RememberVideoQualityPatch {
 
     /**
      * If the user selected a new quality from the flyout menu,
-     * and {@link Settings#REMEMBER_VIDEO_QUALITY_LAST_SELECTED} is enabled.
+     * and {@link Settings#REMEMBER_VIDEO_QUALITY_LAST_SELECTED}
+     * or {@link Settings#REMEMBER_SHORTS_QUALITY_LAST_SELECTED} is enabled.
      */
     private static boolean userChangedDefaultQuality;
 
@@ -40,10 +49,10 @@ public class RememberVideoQualityPatch {
     private static int userSelectedQualityIndex;
 
     /**
-     * The available qualities of the current video in human readable form: [1080, 720, 480]
+     * The available qualities of the current video.
      */
     @Nullable
-    private static List<Integer> videoQualities;
+    private static List<VideoQuality> videoQualities;
 
     private static boolean shouldRememberVideoQuality() {
         BooleanSetting preference = ShortsPlayerState.isOpen() ?
@@ -52,23 +61,27 @@ public class RememberVideoQualityPatch {
         return preference.get();
     }
 
-    private static void changeDefaultQuality(int defaultQuality) {
+    private static void changeDefaultQuality(int qualityResolution) {
+        final boolean shortPlayerOpen = ShortsPlayerState.isOpen();
         String networkTypeMessage;
-        boolean useShortsPreference = ShortsPlayerState.isOpen();
+        IntegerSetting qualitySetting;
         if (Utils.getNetworkType() == NetworkType.MOBILE) {
-            if (useShortsPreference) shortsQualityMobile.save(defaultQuality);
-            else videoQualityMobile.save(defaultQuality);
             networkTypeMessage = str("revanced_remember_video_quality_mobile");
+            qualitySetting = shortPlayerOpen ? shortsQualityMobile : videoQualityMobile;
         } else {
-            if (useShortsPreference) shortsQualityWifi.save(defaultQuality);
-            else videoQualityWifi.save(defaultQuality);
             networkTypeMessage = str("revanced_remember_video_quality_wifi");
+            qualitySetting = shortPlayerOpen ? shortsQualityWifi : videoQualityWifi;
         }
+        qualitySetting.save(qualityResolution);
+
         if (Settings.REMEMBER_VIDEO_QUALITY_LAST_SELECTED_TOAST.get())
             Utils.showToastShort(str(
-                    useShortsPreference ? "revanced_remember_video_quality_toast_shorts" : "revanced_remember_video_quality_toast",
-                    networkTypeMessage, (defaultQuality + "p")
-            ));
+                    shortPlayerOpen
+                            ? "revanced_remember_video_quality_toast_shorts"
+                            : "revanced_remember_video_quality_toast",
+                    networkTypeMessage,
+                    (qualityResolution + "p"))
+            );
     }
 
     /**
@@ -77,9 +90,11 @@ public class RememberVideoQualityPatch {
      * @param qualities Video qualities available, ordered from largest to smallest, with index 0 being the 'automatic' value of -2
      * @param originalQualityIndex quality index to use, as chosen by YouTube
      */
-    public static int setVideoQuality(Object[] qualities, final int originalQualityIndex, Object qInterface, String qIndexMethod) {
+    public static int setVideoQuality(VideoQuality[] qualities, VideoQualityMenuInterface menu, int originalQualityIndex) {
         try {
-            boolean useShortsPreference = ShortsPlayerState.isOpen();
+            Utils.verifyOnMainThread();
+
+            final boolean useShortsPreference = ShortsPlayerState.isOpen();
             final int preferredQuality = Utils.getNetworkType() == NetworkType.MOBILE
                     ? (useShortsPreference ? shortsQualityMobile : videoQualityMobile).get()
                     : (useShortsPreference ? shortsQualityWifi : videoQualityWifi).get();
@@ -89,16 +104,8 @@ public class RememberVideoQualityPatch {
             }
 
             if (videoQualities == null || videoQualities.size() != qualities.length) {
-                videoQualities = new ArrayList<>(qualities.length);
-                for (Object streamQuality : qualities) {
-                    for (Field field : streamQuality.getClass().getFields()) {
-                        if (field.getType().isAssignableFrom(Integer.TYPE)
-                                && field.getName().length() <= 2) {
-                            videoQualities.add(field.getInt(streamQuality));
-                        }
-                    }
-                }
-                
+                videoQualities = Arrays.asList(qualities);
+
                 // After changing videos the qualities can initially be for the prior video.
                 // So if the qualities have changed an update is needed.
                 qualityNeedsUpdating = true;
@@ -107,9 +114,9 @@ public class RememberVideoQualityPatch {
 
             if (userChangedDefaultQuality) {
                 userChangedDefaultQuality = false;
-                final int quality = videoQualities.get(userSelectedQualityIndex);
+                VideoQuality quality = videoQualities.get(userSelectedQualityIndex);
                 Logger.printDebug(() -> "User changed default quality to: " + quality);
-                changeDefaultQuality(quality);
+                changeDefaultQuality(quality.patch_getResolution());
                 return userSelectedQualityIndex;
             }
 
@@ -119,65 +126,86 @@ public class RememberVideoQualityPatch {
             qualityNeedsUpdating = false;
 
             // Find the highest quality that is equal to or less than the preferred.
-            int qualityToUse = videoQualities.get(0); // first element is automatic mode
+            VideoQuality qualityToUse = videoQualities.get(0); // First element is automatic mode.
             int qualityIndexToUse = 0;
             int i = 0;
-            for (Integer quality : videoQualities) {
-                if (quality <= preferredQuality && qualityToUse < quality)  {
+            for (VideoQuality quality : videoQualities) {
+                final int qualityResolution = quality.patch_getResolution();
+                if (qualityResolution > qualityToUse.patch_getResolution() && qualityResolution <= preferredQuality) {
                     qualityToUse = quality;
                     qualityIndexToUse = i;
+                    break;
                 }
                 i++;
             }
 
             // If the desired quality index is equal to the original index,
             // then the video is already set to the desired default quality.
-            final int qualityToUseFinal = qualityToUse;
+            String qualityToUseName = qualityToUse.patch_getQualityName();
             if (qualityIndexToUse == originalQualityIndex) {
-                // On first load of a new video, if the UI video quality flyout menu
-                // is not updated then it will still show 'Auto' (ie: Auto (480p)),
-                // even though it's already set to the desired resolution.
-                //
-                // To prevent confusion, set the video index anyways (even if it matches the existing index)
-                // as that will force the UI picker to not display "Auto".
-                Logger.printDebug(() -> "Video is already preferred quality: " + qualityToUseFinal);
+                Logger.printDebug(() -> "Video is already preferred quality: " + qualityToUseName);
             } else {
                 Logger.printDebug(() -> "Changing video quality from: "
-                        + videoQualities.get(originalQualityIndex) + " to: " + qualityToUseFinal);
+                        + videoQualities.get(originalQualityIndex).patch_getQualityName()
+                        + " to: " + qualityToUseName);
             }
 
-            Method m = qInterface.getClass().getMethod(qIndexMethod, Integer.TYPE);
-            m.invoke(qInterface, qualityToUse);
+            // On first load of a new video, if the video is already the desired quality
+            // then the quality flyout will show 'Auto' (ie: Auto (720p)).
+            //
+            // To prevent user confusion, set the video index even if the
+            // quality is already correct so the UI picker will not display "Auto".
+            menu.patch_setMenuIndexFromQuality(qualities[qualityIndexToUse]);
+
             return qualityIndexToUse;
         } catch (Exception ex) {
-            Logger.printException(() -> "Failed to set quality", ex);
+            Logger.printException(() -> "setVideoQuality failure", ex);
             return originalQualityIndex;
         }
     }
 
     /**
-     * Injection point.  Old quality menu.
+     * Injection point. Fixes bad data used by YouTube.
      */
-    public static void userChangedQuality(int selectedQualityIndex) {
+    public static int fixVideoQualityResolution(String name, int quality) {
+        final int correctQuality = 480;
+        if (name.equals("480p") && quality != correctQuality) {
+            Logger.printDebug(() -> "Fixing bad data of " + name + " from: " + quality
+                    + " to: " + correctQuality);
+            return correctQuality;
+        }
+
+        return quality;
+    }
+
+    /**
+     * Injection point.
+     * @param qualityIndex Element index of {@link #videoQualities}.
+     */
+    public static void userChangedQuality(int qualityIndex) {
         if (shouldRememberVideoQuality()) {
-            userSelectedQualityIndex = selectedQualityIndex;
+            userSelectedQualityIndex = qualityIndex;
             userChangedDefaultQuality = true;
         }
     }
 
     /**
-     * Injection point.  New quality menu.
+     * Injection point.
+     * @param videoResolution Human readable resolution: 480, 720, 1080.
      */
-    public static void userChangedQualityInNewFlyout(int selectedQuality) {
+    public static void userChangedQualityInFlyout(int videoResolution) {
+        Utils.verifyOnMainThread();
         if (!shouldRememberVideoQuality()) return;
 
-        changeDefaultQuality(selectedQuality); // Quality is human readable resolution (ie: 1080).
+        changeDefaultQuality(videoResolution);
     }
 
     /**
      * Injection point.
      */
     public static void newVideoStarted(VideoInformation.PlaybackController ignoredPlayerController) {
+        Utils.verifyOnMainThread();
+
         Logger.printDebug(() -> "newVideoStarted");
         qualityNeedsUpdating = true;
         videoQualities = null;

extensions/youtube/stub/src/main/java/com/google/android/libraries/youtube/innertube/model/media/VideoQuality.java

@@ -0,0 +1,12 @@
+package com.google.android.libraries.youtube.innertube.model.media;
+
+public class VideoQuality {
+    public final String patch_getQualityName() {
+        throw new UnsupportedOperationException("Stub");
+    }
+
+    public final int patch_getResolution() {
+        throw new UnsupportedOperationException("Stub");
+    }
+}
+

gradle.properties

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

package-lock.json

@@ -9,7 +9,7 @@
         "@semantic-release/changelog": "^6.0.3",
         "@semantic-release/git": "^10.0.1",
         "gradle-semantic-release-plugin": "^1.10.1",
-        "semantic-release": "^24.2.6"
+        "semantic-release": "^24.2.7"
       }
     },
     "node_modules/@babel/code-frame": {
@@ -6889,10 +6889,11 @@
       "license": "MIT"
     },
     "node_modules/semantic-release": {
-      "version": "24.2.6",
-      "resolved": "https://registry.npmjs.org/semantic-release/-/semantic-release-24.2.6.tgz",
-      "integrity": "sha512-D0cwjlO5RZzHHxAcsoF1HxiRLfC3ehw+ay+zntzFs6PNX6aV0JzKNG15mpxPipBYa/l4fHly88dHvgDyqwb1Ww==",
+      "version": "24.2.7",
+      "resolved": "https://registry.npmjs.org/semantic-release/-/semantic-release-24.2.7.tgz",
+      "integrity": "sha512-g7RssbTAbir1k/S7uSwSVZFfFXwpomUB9Oas0+xi9KStSCmeDXcA7rNhiskjLqvUe/Evhx8fVCT16OSa34eM5g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@semantic-release/commit-analyzer": "^13.0.0-beta.1",
         "@semantic-release/error": "^4.0.0",

package.json

@@ -4,6 +4,6 @@
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
     "gradle-semantic-release-plugin": "^1.10.1",
-    "semantic-release": "^24.2.6"
+    "semantic-release": "^24.2.7"
   }
 }

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

@@ -156,7 +156,7 @@ val lithoFilterPatch = bytecodePatch(
                     move-object/from16 v$freeRegister, p2
                     iget-object v$identifierRegister, v$freeRegister, $conversionContextIdentifierField
                     iget-object v$pathRegister, v$freeRegister, $conversionContextPathBuilderField
-                    invoke-static { v$identifierRegister, v$pathRegister }, $EXTENSION_CLASS_DESCRIPTOR->shouldFilter(Ljava/lang/String;Ljava/lang/StringBuilder;)Z
+                    invoke-static { v$identifierRegister, v$pathRegister }, $EXTENSION_CLASS_DESCRIPTOR->isFiltered(Ljava/lang/String;Ljava/lang/StringBuilder;)Z
                     move-result v$freeRegister
                     if-eqz v$freeRegister, :unfiltered
                     

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

@@ -121,7 +121,7 @@ internal val subtitleButtonControllerFingerprint = fingerprint {
     )
 }
 
-internal val newVideoQualityChangedFingerprint = fingerprint {
+internal val videoQualityChangedFingerprint = fingerprint {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
     returns("L")
     parameters("L")

patches/src/main/kotlin/app/revanced/patches/youtube/video/information/Fingerprints.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.video.information
 
 import app.revanced.patcher.fingerprint
-import app.revanced.patches.youtube.shared.newVideoQualityChangedFingerprint
+import app.revanced.patches.youtube.shared.videoQualityChangedFingerprint
 import app.revanced.util.getReference
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
@@ -110,7 +110,7 @@ internal val seekRelativeFingerprint = fingerprint {
 }
 
 /**
- * Resolves with the class found in [newVideoQualityChangedFingerprint].
+ * Resolves with the class found in [videoQualityChangedFingerprint].
  */
 internal val playbackSpeedMenuSpeedChangedFingerprint = fingerprint {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)

patches/src/main/kotlin/app/revanced/patches/youtube/video/information/VideoInformationPatch.kt

@@ -9,7 +9,7 @@ import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
 import app.revanced.patcher.util.smali.toInstructions
 import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
-import app.revanced.patches.youtube.shared.newVideoQualityChangedFingerprint
+import app.revanced.patches.youtube.shared.videoQualityChangedFingerprint
 import app.revanced.patches.youtube.video.playerresponse.Hook
 import app.revanced.patches.youtube.video.playerresponse.addPlayerResponseMethodHook
 import app.revanced.patches.youtube.video.playerresponse.playerResponseMethodHookPatch
@@ -263,7 +263,7 @@ val videoInformationPatch = bytecodePatch(
 
         // Handle new playback speed menu.
         playbackSpeedMenuSpeedChangedFingerprint.match(
-            newVideoQualityChangedFingerprint.originalClassDef,
+            videoQualityChangedFingerprint.originalClassDef,
         ).method.apply {
             val index = indexOfFirstInstructionOrThrow(Opcode.IGET)
 

patches/src/main/kotlin/app/revanced/patches/youtube/video/quality/Fingerprints.kt

@@ -5,6 +5,21 @@ import app.revanced.util.literal
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 
+internal const val YOUTUBE_VIDEO_QUALITY_CLASS_TYPE = "Lcom/google/android/libraries/youtube/innertube/model/media/VideoQuality;"
+
+internal val videoQualityFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR)
+    parameters(
+        "I", // Resolution.
+        "Ljava/lang/String;", // Human readable resolution: "480p", "1080p Premium", etc
+        "Z",
+        "L"
+    )
+    custom { _, classDef ->
+        classDef.type == YOUTUBE_VIDEO_QUALITY_CLASS_TYPE
+    }
+}
+
 /**
  * Matches with the class found in [videoQualitySetterFingerprint].
  */
@@ -23,6 +38,22 @@ internal val videoQualityItemOnClickParentFingerprint = fingerprint {
     strings("VIDEO_QUALITIES_MENU_BOTTOM_SHEET_FRAGMENT")
 }
 
+/**
+ * Resolves to class found in [videoQualityItemOnClickFingerprint].
+ */
+internal val videoQualityItemOnClickFingerprint = fingerprint {
+    returns("V")
+    parameters(
+        "Landroid/widget/AdapterView;",
+        "Landroid/view/View;",
+        "I",
+        "J"
+    )
+    custom { method, _ ->
+        method.name == "onItemClick"
+    }
+}
+
 internal val videoQualitySetterFingerprint = fingerprint {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
     returns("V")
@@ -37,7 +68,6 @@ internal val videoQualitySetterFingerprint = fingerprint {
     strings("menu_item_video_quality")
 }
 
-
 internal val videoQualityMenuOptionsFingerprint = fingerprint {
     accessFlags(AccessFlags.STATIC)
     returns("[L")

patches/src/main/kotlin/app/revanced/patches/youtube/video/quality/RememberVideoQualityPatch.kt

@@ -3,8 +3,8 @@ package app.revanced.patches.youtube.video.quality
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
 import app.revanced.patches.all.misc.resources.addResources
 import app.revanced.patches.all.misc.resources.addResourcesPatch
 import app.revanced.patches.shared.misc.settings.preference.ListPreference
@@ -12,15 +12,21 @@ import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
 import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
 import app.revanced.patches.youtube.misc.playertype.playerTypeHookPatch
 import app.revanced.patches.youtube.misc.settings.settingsPatch
-import app.revanced.patches.youtube.shared.newVideoQualityChangedFingerprint
+import app.revanced.patches.youtube.shared.videoQualityChangedFingerprint
 import app.revanced.patches.youtube.video.information.onCreateHook
 import app.revanced.patches.youtube.video.information.videoInformationPatch
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.builder.MutableMethodImplementation
 import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.reference.FieldReference
+import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
+import com.android.tools.smali.dexlib2.immutable.ImmutableMethodParameter
 
 private const val EXTENSION_CLASS_DESCRIPTOR =
     "Lapp/revanced/extension/youtube/patches/playback/quality/RememberVideoQualityPatch;"
+private const val EXTENSION_VIDEO_QUALITY_MENU_INTERFACE =
+    "Lapp/revanced/extension/youtube/patches/playback/quality/RememberVideoQualityPatch\$VideoQualityMenuInterface;"
 
 val rememberVideoQualityPatch = bytecodePatch {
     dependsOn(
@@ -70,72 +76,151 @@ val rememberVideoQualityPatch = bytecodePatch {
          */
         onCreateHook(EXTENSION_CLASS_DESCRIPTOR, "newVideoStarted")
 
+        videoQualityFingerprint.let {
+            // Fix bad data used by YouTube.
+            it.method.addInstructions(
+                0,
+                """
+                    invoke-static { p2, p1 }, $EXTENSION_CLASS_DESCRIPTOR->fixVideoQualityResolution(Ljava/lang/String;I)I    
+                    move-result p1       
+                """
+            )
+
+            // Add methods to access obfuscated quality fields.
+            it.classDef.apply {
+                methods.add(
+                    ImmutableMethod(
+                        type,
+                        "patch_getQualityName",
+                        listOf(),
+                        "Ljava/lang/String;",
+                        AccessFlags.PUBLIC.value or AccessFlags.FINAL.value,
+                        null,
+                        null,
+                        MutableMethodImplementation(2),
+                    ).toMutable().apply {
+                        // Only one string field.
+                        val qualityNameField = fields.single { field ->
+                            field.type == "Ljava/lang/String;"
+                        }
+
+                        addInstructions(
+                            0,
+                            """
+                                iget-object v0, p0, $qualityNameField
+                                return-object v0
+                            """
+                        )
+                    }
+                )
+
+                methods.add(
+                    ImmutableMethod(
+                        type,
+                        "patch_getResolution",
+                        listOf(),
+                        "I",
+                        AccessFlags.PUBLIC.value or AccessFlags.FINAL.value,
+                        null,
+                        null,
+                        MutableMethodImplementation(2),
+                    ).toMutable().apply {
+                        val resolutionField = fields.single { field ->
+                            field.type == "I"
+                        }
+
+                        addInstructions(
+                            0,
+                            """
+                                iget v0, p0, $resolutionField
+                                return v0
+                            """
+                        )
+                    }
+                )
+            }
+        }
+
         // Inject a call to set the remembered quality once a video loads.
         setQualityByIndexMethodClassFieldReferenceFingerprint.match(
-            videoQualitySetterFingerprint.originalClassDef,
+            videoQualitySetterFingerprint.originalClassDef
         ).let { match ->
             // This instruction refers to the field with the type that contains the setQualityByIndex method.
             val instructions = match.method.implementation!!.instructions
-
-            val getOnItemClickListenerClassReference =
+            val onItemClickListenerClassReference =
                 (instructions.elementAt(0) as ReferenceInstruction).reference
-            val getSetQualityByIndexMethodClassFieldReference =
-                (instructions.elementAt(1) as ReferenceInstruction).reference
+            val setQualityFieldReference =
+                ((instructions.elementAt(1) as ReferenceInstruction).reference) as FieldReference
 
-            val setQualityByIndexMethodClassFieldReference =
-                getSetQualityByIndexMethodClassFieldReference as FieldReference
+            proxy(
+                classes.find { classDef ->
+                    classDef.type == setQualityFieldReference.type
+                }!!
+            ).mutableClass.apply {
+                // Add interface and helper methods to allow extension code to call obfuscated methods.
+                interfaces.add(EXTENSION_VIDEO_QUALITY_MENU_INTERFACE)
 
-            val setQualityByIndexMethodClass = classes
-                .find { classDef -> classDef.type == setQualityByIndexMethodClassFieldReference.type }!!
+                // Get the name of the setQualityByIndex method.
+                val setQualityMenuIndexMethod = methods.single {
+                    method -> method.parameterTypes.firstOrNull() == YOUTUBE_VIDEO_QUALITY_CLASS_TYPE
+                }
 
-            // Get the name of the setQualityByIndex method.
-            val setQualityByIndexMethod = setQualityByIndexMethodClass.methods
-                .find { method -> method.parameterTypes.first() == "I" }
-                ?: throw PatchException("Could not find setQualityByIndex method")
+                methods.add(
+                    ImmutableMethod(
+                        type,
+                        "patch_setMenuIndexFromQuality",
+                        listOf(
+                            ImmutableMethodParameter(YOUTUBE_VIDEO_QUALITY_CLASS_TYPE, null, null)
+                        ),
+                        "V",
+                        AccessFlags.PUBLIC.value or AccessFlags.FINAL.value,
+                        null,
+                        null,
+                        MutableMethodImplementation(2),
+                    ).toMutable().apply {
+                        addInstructions(
+                            0,
+                            """
+                                invoke-virtual { p0, p1 }, $setQualityMenuIndexMethod
+                                return-void
+                            """
+                        )
+                    }
+                )
+            }
 
             videoQualitySetterFingerprint.method.addInstructions(
                 0,
                 """
                     # Get the object instance to invoke the setQualityByIndex method on.
-                    iget-object v0, p0, $getOnItemClickListenerClassReference
-                    iget-object v0, v0, $getSetQualityByIndexMethodClassFieldReference
+                    iget-object v0, p0, $onItemClickListenerClassReference
+                    iget-object v0, v0, $setQualityFieldReference
                     
-                    # Get the method name.
-                    const-string v1, "${setQualityByIndexMethod.name}"
-                    
-                    # Set the quality.
-                    # The first parameter is the array list of video qualities.
-                    # The second parameter is the index of the selected quality.
-                    # The register v0 stores the object instance to invoke the setQualityByIndex method on.
-                    # The register v1 stores the name of the setQualityByIndex method.
-                    invoke-static { p1, p2, v0, v1 }, $EXTENSION_CLASS_DESCRIPTOR->setVideoQuality([Ljava/lang/Object;ILjava/lang/Object;Ljava/lang/String;)I
+                    invoke-static { p1, v0, p2 }, $EXTENSION_CLASS_DESCRIPTOR->setVideoQuality([$YOUTUBE_VIDEO_QUALITY_CLASS_TYPE${EXTENSION_VIDEO_QUALITY_MENU_INTERFACE}I)I
                     move-result p2
-                """,
+                """
             )
         }
 
         // Inject a call to remember the selected quality.
-        videoQualityItemOnClickParentFingerprint.classDef.methods.find { it.name == "onItemClick" }
-            ?.apply {
-                val listItemIndexParameter = 3
+        videoQualityItemOnClickFingerprint.match(
+            videoQualityItemOnClickParentFingerprint.classDef
+        ).method.addInstruction(
+            0,
+            "invoke-static { p3 }, $EXTENSION_CLASS_DESCRIPTOR->userChangedQuality(I)V"
+        )
+
+        // Inject a call to remember the user selected quality.
+        videoQualityChangedFingerprint.let {
+            it.method.apply {
+                val index = it.patternMatch!!.startIndex
+                val register = getInstruction<TwoRegisterInstruction>(index).registerA
 
                 addInstruction(
-                    0,
-                    "invoke-static { p$listItemIndexParameter }, " +
-                        "$EXTENSION_CLASS_DESCRIPTOR->userChangedQuality(I)V",
+                    index + 1,
+                    "invoke-static { v$register }, $EXTENSION_CLASS_DESCRIPTOR->userChangedQualityInFlyout(I)V",
                 )
-            } ?: throw PatchException("Failed to find onItemClick method")
-
-        // Remember video quality if not using old layout menu.
-        newVideoQualityChangedFingerprint.method.apply {
-            val index = newVideoQualityChangedFingerprint.patternMatch!!.startIndex
-            val qualityRegister = getInstruction<TwoRegisterInstruction>(index).registerA
-
-            addInstruction(
-                index + 1,
-                "invoke-static { v$qualityRegister }, " +
-                    "$EXTENSION_CLASS_DESCRIPTOR->userChangedQualityInNewFlyout(I)V",
-            )
+            }
         }
     }
 }

patches/src/main/resources/addresources/values-az-rAZ/strings.xml

@@ -1468,6 +1468,9 @@ Bunu aktivləşdirmə daha yüksək video keyfiyyətləri əngəlin silə bilər
   <string name="revanced_custom_speed_menu_title">Fərdi oynatma sürəti siyahısı</string>
   <string name="revanced_custom_speed_menu_summary_on">Fərdi sürət siyahısı göstərilir</string>
   <string name="revanced_custom_speed_menu_summary_off">Fərdi sürət siyahısı göstərilmir</string>
+  <string name="revanced_restore_old_speed_menu_title">Köhnə oynatma sürəti menyusunu bərpa et</string>
+  <string name="revanced_restore_old_speed_menu_summary_on">Köhnə sürət menyusu göstərilir</string>
+  <string name="revanced_restore_old_speed_menu_summary_off">Müasir sürət menyusu göstərilir</string>
   <string name="revanced_custom_playback_speeds_title">Fərdi oynatma sürəti</string>
   <string name="revanced_custom_playback_speeds_summary">Fərdi oynatma sürətlərini əlavə et və ya dəyiş</string>
   <string name="revanced_custom_playback_speeds_invalid">Fərdi sürətlər %s dəyərindən az olmalıdır</string>

patches/src/main/resources/addresources/values-fi-rFI/strings.xml

@@ -1469,6 +1469,9 @@ Tämä voi avata korkealaatuisemmat videot"</string>
   <string name="revanced_custom_speed_menu_title">Mukautettu toistonopeusvalikko</string>
   <string name="revanced_custom_speed_menu_summary_on">Mukautettu nopeusvalikko näytetään</string>
   <string name="revanced_custom_speed_menu_summary_off">Mukautettua nopeusvalikkoa ei näytetä</string>
+  <string name="revanced_restore_old_speed_menu_title">Palauta vanha toistonopeusvalikko</string>
+  <string name="revanced_restore_old_speed_menu_summary_on">Vanha nopeusvalikko näytetään</string>
+  <string name="revanced_restore_old_speed_menu_summary_off">Moderni nopeusvalikko näytetään</string>
   <string name="revanced_custom_playback_speeds_title">Mukautetut toistonopeudet</string>
   <string name="revanced_custom_playback_speeds_summary">Lisää tai muuta mukautettuja toistonopeuksia</string>
   <string name="revanced_custom_playback_speeds_invalid">Mukautettujen nopeuksien tulee olla alle %s</string>

patches/src/main/resources/addresources/values-ja-rJP/strings.xml

@@ -965,7 +965,7 @@ GmsCore の電池の最適化を無効にしても、バッテリーの使用に
 シークバー サムネイルは、動画の再生中の画質と同じ画質になります。
 
 この機能は、非常に高速なインターネット接続を使用して 720P 以下の画質で動画を視聴する場合に最適です。"</string>
-  <string name="revanced_restore_old_seekbar_thumbnails_title">シーク中のサムネイルを旧バージョンに戻す</string>
+  <string name="revanced_restore_old_seekbar_thumbnails_title">古いシークバー サムネイルを復元</string>
   <string name="revanced_restore_old_seekbar_thumbnails_summary_on">シーク中のサムネイルはシークバーの上に表示されます</string>
   <string name="revanced_restore_old_seekbar_thumbnails_summary_off">シーク中のサムネイルはプレーヤー画面全体に表示されます</string>
   </patch>
@@ -1199,8 +1199,8 @@ Automotive レイアウト
 
 再び無効にする場合には、UI のバグを防ぐためにアプリデータを消去することをお勧めします。"</string>
   <string name="revanced_spoof_app_version_target_title">アプリバージョン</string>
-  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - ショート動画プレーヤーのアイコンが旧バージョン</string>
-  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - ナビゲーション アイコンが旧バージョン</string>
+  <string name="revanced_spoof_app_version_target_entry_1">19.35.36 - 古いショート プレーヤーのアイコンを復元</string>
+  <string name="revanced_spoof_app_version_target_entry_2">19.01.34 - 古いナビゲーション アイコンを復元</string>
   </patch>
   <patch id="layout.startpage.changeStartPagePatch">
   <string name="revanced_change_start_page_title">スタート画面を変更</string>
@@ -1466,16 +1466,16 @@ Automotive レイアウト
   <string name="revanced_playback_speed_dialog_button_summary_off">ボタンはオーバーレイに表示されません</string>
   </patch>
   <patch id="video.speed.custom.customPlaybackSpeedPatch">
-  <string name="revanced_custom_speed_menu_title">カスタムした再生速度リストを使用する</string>
-  <string name="revanced_custom_speed_menu_summary_on">カスタムした再生速度リストが表示されます</string>
-  <string name="revanced_custom_speed_menu_summary_off">デフォルトの再生速度リストが表示されます</string>
+  <string name="revanced_custom_speed_menu_title">カスタム再生速度メニュー</string>
+  <string name="revanced_custom_speed_menu_summary_on">カスタム再生速度リストが再生速度メニューに表示されます</string>
+  <string name="revanced_custom_speed_menu_summary_off">デフォルトの再生速度リストが再生速度メニューに表示されます</string>
   <string name="revanced_restore_old_speed_menu_title">古い再生速度メニューを復元</string>
-  <string name="revanced_restore_old_speed_menu_summary_on">古い速度メニューが表示されます</string>
-  <string name="revanced_restore_old_speed_menu_summary_off">最新の速度メニューが表示されます</string>
+  <string name="revanced_restore_old_speed_menu_summary_on">古いスタイルの再生速度メニューが表示されます</string>
+  <string name="revanced_restore_old_speed_menu_summary_off">新しいスタイルの再生速度メニューが表示されます</string>
   <string name="revanced_custom_playback_speeds_title">カスタム再生速度リスト</string>
-  <string name="revanced_custom_playback_speeds_summary">カスタム再生速度リストを編集します</string>
+  <string name="revanced_custom_playback_speeds_summary">カスタム再生速度を追加または変更します</string>
   <string name="revanced_custom_playback_speeds_invalid">再生速度は %s 未満である必要があります</string>
-  <string name="revanced_custom_playback_speeds_parse_exception">カスタム再生速度リストが無効です</string>
+  <string name="revanced_custom_playback_speeds_parse_exception">カスタム再生速度が無効です</string>
   <string name="revanced_custom_playback_speeds_auto">自動</string>
   <string name="revanced_speed_tap_and_hold_title">長押し倍速再生の速度</string>
   <string name="revanced_speed_tap_and_hold_summary">再生速度の範囲は 0-8 で、0 および 8 は含まれません</string>
@@ -1496,9 +1496,9 @@ Automotive レイアウト
   <string name="revanced_disable_hdr_video_summary_off">HDR 動画は有効です</string>
   </patch>
   <patch id="video.quality.advancedVideoQualityMenuPatch">
-  <string name="revanced_advanced_video_quality_menu_title">画質の詳細設定メニューを使用する</string>
-  <string name="revanced_advanced_video_quality_menu_summary_on">画質設定メニューとして詳細設定メニューが表示されます</string>
-  <string name="revanced_advanced_video_quality_menu_summary_off">通常の画質設定メニューが表示されます</string>
+  <string name="revanced_advanced_video_quality_menu_title">画質の詳細設定メニューを表示</string>
+  <string name="revanced_advanced_video_quality_menu_summary_on">画質メニューとして詳細設定メニューが表示されます</string>
+  <string name="revanced_advanced_video_quality_menu_summary_off">通常の画質メニューが表示されます</string>
   </patch>
   <patch id="interaction.seekbar.enableSlideToSeekPatch">
   <string name="revanced_slide_to_seek_title">スライドしてシークする機能を有効にする</string>

patches/src/main/resources/addresources/values-tr-rTR/strings.xml

@@ -299,28 +299,28 @@ Bir Doodle şu anda bölgenizde gösteriliyorsa ve bu gizleme ayarı açıksa, a
   <string name="revanced_hide_for_you_shelf_title">\'Sizin için\' rafını gizle</string>
   <string name="revanced_hide_for_you_shelf_summary_on">Sizin İçin rafı gizli</string>
   <string name="revanced_hide_for_you_shelf_summary_off">Sizin İçin rafı görünür</string>
-  <string name="revanced_hide_links_preview_title">Bağlantı önizlemesini gizle</string>
-  <string name="revanced_hide_links_preview_summary_on">Bağlantı önizlemesi gizli</string>
-  <string name="revanced_hide_links_preview_summary_off">Bağlantı önizlemesi görünür</string>
+  <string name="revanced_hide_links_preview_title">Bağlantı ön izlemesini gizle</string>
+  <string name="revanced_hide_links_preview_summary_on">Bağlantı ön izlemesi gizli</string>
+  <string name="revanced_hide_links_preview_summary_off">Bağlantı ön izlemesi görünür</string>
   <string name="revanced_hide_members_shelf_title">Üyeler rafını gizle</string>
   <string name="revanced_hide_members_shelf_summary_on">Üyeler rafı gizli</string>
-  <string name="revanced_hide_members_shelf_summary_off">Üyeler rafı gösteriliyor</string>
+  <string name="revanced_hide_members_shelf_summary_off">Üyeler rafı görünür</string>
   <!-- 'Visit Community' should be translated with the same localized wording that YouTube displays. -->
   <string name="revanced_hide_visit_community_button_title">\'Topluluğu Ziyaret Et\' düğmesini gizle</string>
   <string name="revanced_hide_visit_community_button_summary_on">Topluluğu Ziyaret Et düğmesi gizli</string>
   <string name="revanced_hide_visit_community_button_summary_off">Topluluğu Ziyaret Et düğmesi görünür</string>
   <!-- 'Visit store' should be translated with the same localized wording that YouTube displays. -->
-  <string name="revanced_hide_visit_store_button_title">Kanal sayfalarındaki \'Mağazayı ziyaret et\' düğmesini gizle</string>
-  <string name="revanced_hide_visit_store_button_summary_on">Mağazayı Ziyaret Et düğmesi gizli</string>
-  <string name="revanced_hide_visit_store_button_summary_off">Mağazayı Ziyaret Et düğmesi görünür</string>
+  <string name="revanced_hide_visit_store_button_title">\'Mağazayı ziyaret et\' düğmesini gizle</string>
+  <string name="revanced_hide_visit_store_button_summary_on">Mağazayı ziyaret et düğmesi gizli</string>
+  <string name="revanced_hide_visit_store_button_summary_off">Mağazayı ziyaret et düğmesi görünür</string>
   <string name="revanced_comments_screen_title">Yorumlar</string>
   <string name="revanced_comments_screen_summary">Yorumlar kısmı bileşenlerini gizle veya göster</string>
   <string name="revanced_hide_comments_ai_chat_summary_title">Yapay zeka sohbet özetini gizle</string>
   <string name="revanced_hide_comments_ai_chat_summary_summary_on">Yapay zeka sohbet özeti gizli</string>
-  <string name="revanced_hide_comments_ai_chat_summary_summary_off">Yapay zeka sohbet özeti gösteriliyor</string>
-  <string name="revanced_hide_comments_ai_summary_title">Yapay zeka yorumlar özetini gizle</string>
-  <string name="revanced_hide_comments_ai_summary_summary_on">Yapay zeka yorum özeti gizli</string>
-  <string name="revanced_hide_comments_ai_summary_summary_off">Yapay zeka yorum özeti gösteriliyor</string>
+  <string name="revanced_hide_comments_ai_chat_summary_summary_off">Yapay zeka sohbet özeti görünür</string>
+  <string name="revanced_hide_comments_ai_summary_title">Yapay zeka yorumların özetini gizle</string>
+  <string name="revanced_hide_comments_ai_summary_summary_on">Yapay zeka yorumların özeti gizli</string>
+  <string name="revanced_hide_comments_ai_summary_summary_off">Yapay zeka yorumların özeti görünür</string>
   <string name="revanced_hide_comments_channel_guidelines_title">Kanal yönergelerini gizle</string>
   <string name="revanced_hide_comments_channel_guidelines_summary_on">Kanal yönergeleri gizli</string>
   <string name="revanced_hide_comments_channel_guidelines_summary_off">Kanal yönergeleri görünür</string>
@@ -342,7 +342,7 @@ Bir Doodle şu anda bölgenizde gösteriliyorsa ve bu gizleme ayarı açıksa, a
   <string name="revanced_hide_comments_thanks_button_title">Teşekkürler düğmesini gizle</string>
   <string name="revanced_hide_comments_thanks_button_summary_on">Teşekkürler düğmesi gizli</string>
   <string name="revanced_hide_comments_thanks_button_summary_off">Teşekkürler düğmesi görünür</string>
-  <string name="revanced_hide_comments_timestamp_button_title">Zaman Damgası düğmesini gizle</string>
+  <string name="revanced_hide_comments_timestamp_button_title">Zaman damgası düğmesini gizle</string>
   <string name="revanced_hide_comments_timestamp_button_summary_on">Zaman damgası düğmesi gizli</string>
   <string name="revanced_hide_comments_timestamp_button_summary_off">Zaman damgası düğmesi görünür</string>
   <string name="revanced_custom_filter_screen_title">Özel filtre</string>
@@ -555,43 +555,43 @@ Ekranın sağ tarafında dikey olarak kaydırarak sesi ayarlayın"</string>
   <string name="revanced_hide_like_dislike_button_summary_on">Beğenme ve Beğenmeme düğmeleri gizli</string>
   <string name="revanced_hide_like_dislike_button_summary_off">Beğenme ve Beğenmeme düğmeleri görünür</string>
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
-  <string name="revanced_hide_share_button_title">Paylaşmayı gizle</string>
-  <string name="revanced_hide_share_button_summary_on">Paylaşma düğmesi gizli</string>
-  <string name="revanced_hide_share_button_summary_off">Paylaşma düğmesi görünür</string>
+  <string name="revanced_hide_share_button_title">Paylaş\'ı gizle</string>
+  <string name="revanced_hide_share_button_summary_on">Paylaş düğmesi gizli</string>
+  <string name="revanced_hide_share_button_summary_off">Paylaş düğmesi görünür</string>
   <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
-  <string name="revanced_hide_stop_ads_button_title">Reklamları Durdur\'u Gizle</string>
-  <string name="revanced_hide_stop_ads_button_summary_on">Reklamları durdur düğmesi gizlendi</string>
-  <string name="revanced_hide_stop_ads_button_summary_off">Reklamları durdur düğmesi gösterildi</string>
+  <string name="revanced_hide_stop_ads_button_title">Reklamları durdur\'u Gizle</string>
+  <string name="revanced_hide_stop_ads_button_summary_on">Reklamları durdur düğmesi gizli</string>
+  <string name="revanced_hide_stop_ads_button_summary_off">Reklamları durdur düğmesi görünür</string>
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                   This button usually appears only on live streams. -->
-  <string name="revanced_hide_report_button_title">Bildirmeyi gizle</string>
-  <string name="revanced_hide_report_button_summary_on">Bildirme düğmesi gizli</string>
-  <string name="revanced_hide_report_button_summary_off">Bildirme düğmesi görünür</string>
+  <string name="revanced_hide_report_button_title">Bildir\'i gizle</string>
+  <string name="revanced_hide_report_button_summary_on">Bildir düğmesi gizli</string>
+  <string name="revanced_hide_report_button_summary_off">Bildir düğmesi görünür</string>
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->
-  <string name="revanced_hide_remix_button_title">Remix düğmesini gizle</string>
+  <string name="revanced_hide_remix_button_title">Remix\'i gizle</string>
   <string name="revanced_hide_remix_button_summary_on">Remix düğmesi gizli</string>
   <string name="revanced_hide_remix_button_summary_off">Remix düğmesi görünür</string>
   <!-- 'Download' should be translated with the same localized wording that YouTube displays. -->
-  <string name="revanced_hide_download_button_title">İndirmeyi gizle</string>
-  <string name="revanced_hide_download_button_summary_on">İndirme düğmesi gizli</string>
-  <string name="revanced_hide_download_button_summary_off">İndirme düğmesi görünür</string>
+  <string name="revanced_hide_download_button_title">İndir\'i gizle</string>
+  <string name="revanced_hide_download_button_summary_on">İndir düğmesi gizli</string>
+  <string name="revanced_hide_download_button_summary_off">İndir düğmesi görünür</string>
   <!-- 'Thanks' should be translated with the same localized wording that YouTube displays. -->
-  <string name="revanced_hide_thanks_button_title">Teşekkürler düğmesini gizle</string>
+  <string name="revanced_hide_thanks_button_title">Teşekkürler\'i gizle</string>
   <string name="revanced_hide_thanks_button_summary_on">Teşekkürler düğmesi gizli</string>
   <string name="revanced_hide_thanks_button_summary_off">Teşekkürler düğmesi görünür</string>
   <!-- 'Ask' should be translated with the same localized wording that YouTube displays.
                   This button only shows up if the user ip is from specific region such as the USA or EU. -->
-  <string name="revanced_hide_ask_button_title">\'Sor\'u gizle</string>
+  <string name="revanced_hide_ask_button_title">Sor\'u gizle</string>
   <string name="revanced_hide_ask_button_summary_on">Sor düğmesi gizli</string>
   <string name="revanced_hide_ask_button_summary_off">Sor düğmesi görünür</string>
   <!-- 'Clip' should be translated with the same localized wording that YouTube displays. -->
-  <string name="revanced_hide_clip_button_title">Klip düğmesini gizle</string>
+  <string name="revanced_hide_clip_button_title">Klip\'i gizle</string>
   <string name="revanced_hide_clip_button_summary_on">Klip düğmesi gizli</string>
   <string name="revanced_hide_clip_button_summary_off">Klip düğmesi görünür</string>
   <!-- 'Save' should be translated with the same localized wording that YouTube displays. -->
   <string name="revanced_hide_save_button_title">Kaydet\'i Gizle</string>
-  <string name="revanced_hide_save_button_summary_on">Kaydet düğmesi gizlendi</string>
-  <string name="revanced_hide_save_button_summary_off">Kaydet düğmesi gösterildi</string>
+  <string name="revanced_hide_save_button_summary_on">Kaydet düğmesi gizli</string>
+  <string name="revanced_hide_save_button_summary_off">Kaydet düğmesi görünür</string>
   </patch>
   <patch id="layout.buttons.navigation.navigationButtonsPatch">
   <string name="revanced_navigation_buttons_screen_title">Gezinme düğmeleri</string>
@@ -722,8 +722,8 @@ Ses parçası menüsünü göstermek için 'Video akışlarını taklit et' ayar
   </patch>
   <patch id="layout.hide.fullscreenambientmode.disableFullscreenAmbientModePatch">
   <string name="revanced_disable_fullscreen_ambient_mode_title">Tam ekranda ambiyans modunu devre dışı bırak</string>
-  <string name="revanced_disable_fullscreen_ambient_mode_summary_on">Tam ekranda ambiyans modu devre dışı</string>
-  <string name="revanced_disable_fullscreen_ambient_mode_summary_off">Tam ekranda ambiyans modu etkin</string>
+  <string name="revanced_disable_fullscreen_ambient_mode_summary_on">Ambiyans modu devre dışı</string>
+  <string name="revanced_disable_fullscreen_ambient_mode_summary_off">Ambiyans modu etkin</string>
   </patch>
   <patch id="layout.hide.infocards.hideInfocardsResourcePatch">
   <string name="revanced_hide_info_cards_title">Bilgi kartlarını gizle</string>
@@ -736,13 +736,13 @@ Ses parçası menüsünü göstermek için 'Video akışlarını taklit et' ayar
   <string name="revanced_disable_rolling_number_animations_summary_off">Kayan sayı animasyonları etkin</string>
   </patch>
   <patch id="layout.hide.seekbar.hideSeekbarPatch">
-  <string name="revanced_hide_seekbar_title">Video oynatıcı kaydırma çubuğunu gizle</string>
-  <string name="revanced_hide_seekbar_summary_on">Video oynatıcısındaki zaman çubuğu gizli</string>
-  <string name="revanced_hide_seekbar_summary_off">Video oynatıcısındaki zaman çubuğu görünür</string>
+  <string name="revanced_hide_seekbar_title">Video oynatıcısı zaman çubuğunu gizle</string>
+  <string name="revanced_hide_seekbar_summary_on">Video oynatıcısı zaman çubuğu gizli</string>
+  <string name="revanced_hide_seekbar_summary_off">Video oynatıcısı zaman çubuğu görünür</string>
   <!-- Seekbar shown inside video thumbnails found the home/feed/search/history.  The seekbar shows the prior watch progress when the video was last open. -->
-  <string name="revanced_hide_seekbar_thumbnail_title">Video küçük resimleri kaydırma çubuğunu gizle</string>
-  <string name="revanced_hide_seekbar_thumbnail_summary_on">Video küçük resimleri kaydırma çubuğu gizli</string>
-  <string name="revanced_hide_seekbar_thumbnail_summary_off">Video küçük resimleri kaydırma çubuğu gösteriliyor</string>
+  <string name="revanced_hide_seekbar_thumbnail_title">Video kapak fotoğrafı zaman çubuğunu gizle</string>
+  <string name="revanced_hide_seekbar_thumbnail_summary_on">Video kapak fotoğrafı zaman çubuğu gizli</string>
+  <string name="revanced_hide_seekbar_thumbnail_summary_off">Video kapak fotoğrafı zaman çubuğu gösteriliyor</string>
   </patch>
   <patch id="layout.hide.shorts.hideShortsComponentsResourcePatch">
   <string name="revanced_shorts_player_screen_title">Shorts oynatıcı</string>
@@ -751,22 +751,22 @@ Ses parçası menüsünü göstermek için 'Video akışlarını taklit et' ayar
   <string name="revanced_hide_shorts_home_title">Ana Sayfa akışında Shorts\'u gizle</string>
   <string name="revanced_hide_shorts_home_summary_on">Ana Sayfa akışında ve ilgili videolarda gizli</string>
   <string name="revanced_hide_shorts_home_summary_off">Ana Sayfa akışında ve ilgili videolarda görünür</string>
-  <string name="revanced_hide_shorts_search_title">Arama sonuçlarında Shorts videolarını gizle</string>
+  <string name="revanced_hide_shorts_search_title">Arama sonuçlarında Shorts\'u gizle</string>
   <string name="revanced_hide_shorts_search_summary_on">Arama sonuçlarında gizli</string>
   <string name="revanced_hide_shorts_search_summary_off">Arama sonuçlarında görünür</string>
   <!-- 'Subscriptions' should be translated using the same localized wording YouTube displays for the Subscriptions tab. -->
   <string name="revanced_hide_shorts_subscriptions_title">Abonelikler akışında Shorts\'u gizle</string>
   <string name="revanced_hide_shorts_subscriptions_summary_on">Abonelikler akışında gizli</string>
   <string name="revanced_hide_shorts_subscriptions_summary_off">Abonelikler akışında görünür</string>
-  <string name="revanced_hide_shorts_history_title">Shorts\'u izleme geçmişinde gizle</string>
+  <string name="revanced_hide_shorts_history_title">İzleme geçmişinde Shorts\'u gizle</string>
   <string name="revanced_hide_shorts_history_summary_on">İzleme geçmişinde gizli</string>
   <string name="revanced_hide_shorts_history_summary_off">İzleme geçmişinde görünür</string>
   <string name="revanced_hide_shorts_super_thanks_button_title">Süper Teşekkürler düğmesini gizle</string>
-  <string name="revanced_hide_shorts_super_thanks_button_summary_on">Süper Teşekkürler satın al düğmesi gizli</string>
-  <string name="revanced_hide_shorts_super_thanks_button_summary_off">Süper Teşekkürler satın al düğmesi görünür</string>
+  <string name="revanced_hide_shorts_super_thanks_button_summary_on">Süper Teşekkürler düğmesi gizli</string>
+  <string name="revanced_hide_shorts_super_thanks_button_summary_off">Süper Teşekkürler düğmesi görünür</string>
   <string name="revanced_hide_shorts_effect_button_title">Efekt düğmesini gizle</string>
   <string name="revanced_hide_shorts_effect_button_summary_on">Efekt düğmesi gizli</string>
-  <string name="revanced_hide_shorts_effect_button_summary_off">Efekt düğmesi gösteriliyor</string>
+  <string name="revanced_hide_shorts_effect_button_summary_off">Efekt düğmesi görünür</string>
   <string name="revanced_hide_shorts_green_screen_button_title">Yeşil ekran düğmesini gizle</string>
   <string name="revanced_hide_shorts_green_screen_button_summary_on">Yeşil ekran düğmesi gizli</string>
   <string name="revanced_hide_shorts_green_screen_button_summary_off">Yeşil ekran düğmesi görünür</string>
@@ -849,9 +849,9 @@ Ses parçası menüsünü göstermek için 'Video akışlarını taklit et' ayar
   <string name="revanced_hide_shorts_video_title_summary_on">Video başlığı gizli</string>
   <string name="revanced_hide_shorts_video_title_summary_off">Video başlığı görünür</string>
   <string name="revanced_hide_shorts_sound_metadata_label_title">Ses bilgisi etiketini gizle</string>
-  <string name="revanced_hide_shorts_sound_metadata_label_summary_on">Ses meta veri etiketi gizli</string>
-  <string name="revanced_hide_shorts_sound_metadata_label_summary_off">Ses meta veri etiketi görünür</string>
-  <string name="revanced_hide_shorts_full_video_link_label_title">Video bağlantı etiketini gizle</string>
+  <string name="revanced_hide_shorts_sound_metadata_label_summary_on">Ses bilgisi etiketi gizli</string>
+  <string name="revanced_hide_shorts_sound_metadata_label_summary_off">Ses bilgisi etiketi görünür</string>
+  <string name="revanced_hide_shorts_full_video_link_label_title">Video bağlantısı etiketini gizle</string>
   <string name="revanced_hide_shorts_full_video_link_label_summary_on">Video bağlantısı etiketi gizli</string>
   <string name="revanced_hide_shorts_full_video_link_label_summary_off">Video bağlantısı etiketi görünür</string>
   <string name="revanced_hide_shorts_navigation_bar_title">Gezinme çubuğunu gizle</string>
@@ -864,12 +864,12 @@ Ses parçası menüsünü göstermek için 'Video akışlarını taklit et' ayar
 
 Otomatik oynatma YouTube ayarlarından değiştirilebilir:
 Ayarlar → Oynatma → Sonraki videoyu otomatik oynat"</string>
-  <string name="revanced_end_screen_suggested_video_summary_off">Bitiş ekranı önerilen videosu gösteriliyor</string>
+  <string name="revanced_end_screen_suggested_video_summary_off">Bitiş ekranı önerilen videosu görünür</string>
   </patch>
   <patch id="layout.hide.relatedvideooverlay.hideRelatedVideoOverlayPatch">
-  <string name="revanced_hide_related_videos_overlay_title">İlgili videolar bindirmesini gizle</string>
-  <string name="revanced_hide_related_videos_overlay_summary_on">Tam ekrandaki ilgili videolar bindirmesi gizli</string>
-  <string name="revanced_hide_related_videos_overlay_summary_off">Tam ekrandaki ilgili videolar bindirmesi görünür</string>
+  <string name="revanced_hide_related_videos_overlay_title">İlgili videolar katmanını gizle</string>
+  <string name="revanced_hide_related_videos_overlay_summary_on">Tam ekrandaki ilgili videolar katmanı gizli</string>
+  <string name="revanced_hide_related_videos_overlay_summary_off">Tam ekrandaki ilgili videolar katmanı görünür</string>
   </patch>
   <patch id="layout.hide.time.hideTimestampPatch">
   <string name="revanced_hide_timestamp_title">Video zaman damgasını gizle</string>
@@ -894,7 +894,7 @@ Ayarlar → Oynatma → Sonraki videoyu otomatik oynat"</string>
   <string name="revanced_open_videos_fullscreen_portrait_summary_off">Videolar tam ekranda açılmaz</string>
   </patch>
   <patch id="layout.player.overlay.customPlayerOverlayOpacityResourcePatch">
-  <string name="revanced_player_overlay_opacity_title">Oynatıcı paneli opaklığı</string>
+  <string name="revanced_player_overlay_opacity_title">Oynatıcı katmanı opaklığı</string>
   <string name="revanced_player_overlay_opacity_summary">0-100 arasında opaklık değeri, 0 şeffaftır</string>
   <string name="revanced_player_overlay_opacity_invalid_toast">Oynatıcı katmanı opaklığı 0-100 arasında olmalıdır</string>
   </patch>
@@ -984,13 +984,13 @@ Bu özellik, 720p veya daha düşük video kalitesi ve çok hızlı bir internet
   <string name="revanced_sb_enable_auto_hide_skip_segment_button">Atlama düğmesini otomatik olarak gizle</string>
   <string name="revanced_sb_enable_auto_hide_skip_segment_button_sum_on">Atlama düğmesi birkaç saniye sonra gizlenir</string>
   <string name="revanced_sb_enable_auto_hide_skip_segment_button_sum_off">Atlama düğmesi bütün kısım boyunca gösterilir</string>
-  <string name="revanced_sb_auto_hide_skip_button_duration">Atla düğmesi süresi</string>
-  <string name="revanced_sb_auto_hide_skip_button_duration_sum">Atla ve öne çıkanlara atla düğmelerini otomatik olarak gizlemeden önce ne kadar süreyle göster</string>
+  <string name="revanced_sb_auto_hide_skip_button_duration">Atlama düğmesi süresi</string>
+  <string name="revanced_sb_auto_hide_skip_button_duration_sum">Atla ve vurguya atla düğmelerinin otomatik olarak gizlenmeden önce ne kadar süre gösterileceği</string>
   <string name="revanced_sb_general_skiptoast">Atlamayı geri al bildirimini göster</string>
-  <string name="revanced_sb_general_skiptoast_sum_on">Bildirim, bir segment otomatik olarak atlandığında gösterilir. Atlamayı geri almak için bildirimine dokunun</string>
-  <string name="revanced_sb_general_skiptoast_sum_off">Toast gösterilmiyor</string>
-  <string name="revanced_sb_toast_on_skip_duration">Atlama toast süresi</string>
-  <string name="revanced_sb_toast_on_skip_duration_sum">Geri al atla bildirimini ne kadar süreyle göster</string>
+  <string name="revanced_sb_general_skiptoast_sum_on">Bir kısım otomatik olarak atlandığında bildirim gösterilir. Atlamayı geri almak için bildirime dokunun</string>
+  <string name="revanced_sb_general_skiptoast_sum_off">Bildirim gösterilmez</string>
+  <string name="revanced_sb_toast_on_skip_duration">Atlama bildirimi süresi</string>
+  <string name="revanced_sb_toast_on_skip_duration_sum">Atlamayı geri alma bildiriminin ne kadar süre gösterileceği</string>
   <string name="revanced_sb_duration_1s">1 saniye</string>
   <string name="revanced_sb_duration_2s">2 saniye</string>
   <string name="revanced_sb_duration_3s">3 saniye</string>
@@ -1001,14 +1001,14 @@ Bu özellik, 720p veya daha düşük video kalitesi ve çok hızlı bir internet
   <string name="revanced_sb_duration_8s">8 saniye</string>
   <string name="revanced_sb_duration_9s">9 saniye</string>
   <string name="revanced_sb_duration_10s">10 saniye</string>
-  <string name="revanced_sb_general_time_without">Kısımlar çıkarıldığında kalan video süresini göster</string>
-  <string name="revanced_sb_general_time_without_sum_on">Tüm segmentler çıkarıldıktan sonra video uzunluğu arama çubuğunda gösterilir</string>
-  <string name="revanced_sb_general_time_without_sum_off">Tam video uzunluğu gösterilir</string>
+  <string name="revanced_sb_general_time_without">Kısımlar olmadan video süresini göster</string>
+  <string name="revanced_sb_general_time_without_sum_on">Video süresi eksi bütün kısımların süresi zaman çubuğunda görünür</string>
+  <string name="revanced_sb_general_time_without_sum_off">Tam video süresi görünür</string>
   <string name="revanced_sb_create_segment_category">Yeni kısım oluşturma</string>
   <string name="revanced_sb_enable_create_segment">Yeni kısım oluşturma düğmesini göster</string>
   <string name="revanced_sb_enable_create_segment_sum_on">Yeni kısım oluşturma düğmesi gösterilir</string>
   <string name="revanced_sb_enable_create_segment_sum_off">Yeni kısım oluşturma düğmesi gösterilmez</string>
-  <string name="revanced_sb_general_adjusting">Yeni kısım oluştururken atlama süresi</string>
+  <string name="revanced_sb_general_adjusting">Yeni kısım oluştururkenki atlama süresi</string>
   <string name="revanced_sb_general_adjusting_sum">Yeni bölüm oluştururkenki atlama düğmelerinin atlayacağı milisaniye miktarı</string>
   <string name="revanced_sb_general_adjusting_invalid">Değer pozitif bir sayı olmalıdır</string>
   <string name="revanced_sb_guidelines_preference_title">Yönergeleri görüntüle</string>
@@ -1018,10 +1018,10 @@ Bu özellik, 720p veya daha düşük video kalitesi ve çok hızlı bir internet
   <string name="revanced_sb_guidelines_popup_already_read">Okudum</string>
   <string name="revanced_sb_guidelines_popup_open">Göster</string>
   <string name="revanced_sb_general">Genel</string>
-  <string name="revanced_sb_toast_on_connection_error_title">API kullanılamadığında bir tost bildirimi göster</string>
-  <string name="revanced_sb_toast_on_connection_error_summary_on">SponsorBlock kullanılamadığında tost bildirimi gösterilir</string>
-  <string name="revanced_sb_toast_on_connection_error_summary_off">SponsorBlock kullanılamadığında tost bildirimi gösterilmez</string>
-  <string name="revanced_sb_general_skipcount">Atlama sayısı izlemeyi etkinleştir</string>
+  <string name="revanced_sb_toast_on_connection_error_title">API kullanılamadığında bir bildirim göster</string>
+  <string name="revanced_sb_toast_on_connection_error_summary_on">SponsorBlock kullanılamadığında bir bildirim gösterilir</string>
+  <string name="revanced_sb_toast_on_connection_error_summary_off">SponsorBlock kullanılamadığında bildirim gösterilmez</string>
+  <string name="revanced_sb_general_skipcount">Atlama sayısı takibini etkinleştir</string>
   <string name="revanced_sb_general_skipcount_sum_on">SponsorBlock liderlik tablosunun ne kadar zaman kazanıldığını bilmesini sağlar. Her bir kısım atlandığında liderlik tablosuna bir mesaj gönderilir</string>
   <string name="revanced_sb_general_skipcount_sum_off">Atlama sayısı izleme etkin değil</string>
   <string name="revanced_sb_general_min_duration">En az kısım süresi</string>
@@ -1103,7 +1103,7 @@ Kullanıcı kimliğiniz bir parola gibidir ve asla paylaşılmamalıdır.
   <string name="revanced_sb_skip_seekbaronly">Zaman çubuğunda göster</string>
   <string name="revanced_sb_skip_ignore">Devre dışı bırak</string>
   <string name="revanced_sb_submit_failed_invalid">Kısım gönderilemedi: %s</string>
-  <string name="revanced_sb_submit_failed_timeout">SponsorBlock geçici olarak kullanılamıyor</string>
+  <string name="revanced_sb_submit_failed_timeout">SponsorBlock geçici olarak kapalı</string>
   <string name="revanced_sb_submit_failed_unknown_error">Kısım gönderilemedi (durum: %1$d %2$s)</string>
   <string name="revanced_sb_submit_failed_rate_limit">Kısım gönderilemiyor. Kullanıcı veya IP\'den çok fazla istek</string>
   <string name="revanced_sb_submit_failed_forbidden">Kısım gönderilemiyor: %s</string>
@@ -1120,7 +1120,7 @@ Aynısı mevcut"</string>
   <string name="revanced_sb_vote_upvote">Olumlu oy</string>
   <string name="revanced_sb_vote_downvote">Olumsuz oy</string>
   <string name="revanced_sb_vote_category">Kategori değiştir</string>
-  <string name="revanced_sb_vote_no_segments">Oylanılacak bir kısım yok</string>
+  <string name="revanced_sb_vote_no_segments">Oylanılacak kısım bulunmuyor</string>
   <!-- A segment start and end time, such as "02:10 to 03:40". -->
   <string name="revanced_sb_vote_segment_time_to_from">%1$s - %2$s</string>
   <string name="revanced_sb_new_segment_choose_category">Kısım kategorisini seçin</string>
@@ -1218,7 +1218,7 @@ Daha sonra kapatılırsa, arayüz hatalarını önlemek için uygulama verilerin
   <string name="revanced_change_start_page_entry_live">Canlı yayın</string>
   <string name="revanced_change_start_page_entry_movies">Filmler</string>
   <string name="revanced_change_start_page_entry_music">Müzik</string>
-  <string name="revanced_change_start_page_entry_news">Habercilik</string>
+  <string name="revanced_change_start_page_entry_news">Haberler</string>
   <string name="revanced_change_start_page_entry_notifications">Bildirimler</string>
   <string name="revanced_change_start_page_entry_playlists">Oynatma listeleri</string>
   <string name="revanced_change_start_page_entry_search">Arama</string>
@@ -1228,7 +1228,7 @@ Daha sonra kapatılırsa, arayüz hatalarını önlemek için uygulama verilerin
   <string name="revanced_change_start_page_entry_trending">Trendler</string>
   <string name="revanced_change_start_page_entry_virtual_reality">Sanal Gerçeklik</string>
   <string name="revanced_change_start_page_entry_watch_later">Daha sonra izle</string>
-  <string name="revanced_change_start_page_entry_your_clips">Sizin klipleriniz</string>
+  <string name="revanced_change_start_page_entry_your_clips">Klipleriniz</string>
   <string name="revanced_change_start_page_always_title">Başlangıç sayfasını her zaman değiştir</string>
   <string name="revanced_change_start_page_always_summary_on">"Başlangıç sayfası her zaman değiştirilir
 
@@ -1248,8 +1248,8 @@ Kısıtlama: Araç çubuğundaki geri düğmesini kullanmak işe yaramayabilir"<
   </patch>
   <patch id="layout.shortsautoplay.shortsAutoplayPatch">
   <string name="revanced_shorts_autoplay_title">Shorts\'u otomatik oynat</string>
-  <string name="revanced_shorts_autoplay_summary_on">Sıradaki Shorts videosu otomatik olarak oynatılacak</string>
-  <string name="revanced_shorts_autoplay_summary_off">Aynı Shorts videosu sürekli döngü yapacak</string>
+  <string name="revanced_shorts_autoplay_summary_on">Shorts otomatik oynatılacak</string>
+  <string name="revanced_shorts_autoplay_summary_off">Aynı Shorts videosu sürekli yeniden oynayacak</string>
   <string name="revanced_shorts_autoplay_background_title">Arka planda Shorts\'u otomatik oynat</string>
   <string name="revanced_shorts_autoplay_background_summary_on">Shorts arka planda otomatik oynatılacak</string>
   <string name="revanced_shorts_autoplay_background_summary_off">Shorts arka planda döngüde olacak</string>
@@ -1476,7 +1476,7 @@ Bunu etkinleştirmek daha yüksek video kalitelerini açabilir"</string>
   <string name="revanced_custom_speed_menu_title">Özel oynatma hızı menüsü</string>
   <string name="revanced_custom_speed_menu_summary_on">Özel oynatma hızı menüsü gösterilir</string>
   <string name="revanced_custom_speed_menu_summary_off">Özel oynatma hızı menüsü gösterilmez</string>
-  <string name="revanced_restore_old_speed_menu_title">Eski oynatma hızı menüsünü geri yükle</string>
+  <string name="revanced_restore_old_speed_menu_title">Eski oynatma hızı menüsünü geri getir</string>
   <string name="revanced_restore_old_speed_menu_summary_on">Eski hız menüsü gösterilir</string>
   <string name="revanced_restore_old_speed_menu_summary_off">Modern hız menüsü gösterilir</string>
   <string name="revanced_custom_playback_speeds_title">Özel oynatma hızları</string>
@@ -1490,10 +1490,10 @@ Bunu etkinleştirmek daha yüksek video kalitelerini açabilir"</string>
   <patch id="video.speed.remember.rememberPlaybackSpeedPatch">
   <string name="revanced_remember_playback_speed_last_selected_title">Oynatma hızı değişikliklerini hatırla</string>
   <string name="revanced_remember_playback_speed_last_selected_summary_on">Oynatma hızı değişiklikleri tüm videolara uygulanır</string>
-  <string name="revanced_remember_playback_speed_last_selected_summary_off">Oynatma hızı değişiklikleri yalnızca geçerli videoya uygulanır</string>
+  <string name="revanced_remember_playback_speed_last_selected_summary_off">Oynatma hızı değişiklikleri yalnızca mevcut videoya uygulanır</string>
   <string name="revanced_remember_playback_speed_last_selected_toast_title">Oynatma hızı değişikliklerinde bildirim göster</string>
   <string name="revanced_remember_playback_speed_last_selected_toast_summary_on">Varsayılan oynatma hızı değiştirildiğinde bir bildirim gösterilir</string>
-  <string name="revanced_remember_playback_speed_last_selected_toast_summary_off">Varsayılan oynatma hızı değiştirildiğinde bir bildirim gösterilmez.</string>
+  <string name="revanced_remember_playback_speed_last_selected_toast_summary_off">Varsayılan oynatma hızı değiştirildiğinde bir bildirim gösterilmez</string>
   <string name="revanced_playback_speed_default_title">Varsayılan oynatma hızı</string>
   <string name="revanced_remember_playback_speed_toast">Varsayılan hız %s olarak ayarlandı</string>
   </patch>