chore: Release v5.5.0-dev.5 [skip ci]

# [5.5.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v5.5.0-dev.4...v5.5.0-dev.5) (2024-12-16)

### Features

* **YouTube - Navigation buttons:** Add options to disable translucent status bar and navigation bar ([#4133](https://github.com/ReVanced/revanced-patches/issues/4133)) ([9e6669d](9e6669d962))

CHANGELOG.md

@@ -1,3 +1,38 @@
+# [5.5.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v5.5.0-dev.4...v5.5.0-dev.5) (2024-12-16)
+
+
+### Features
+
+* **YouTube - Navigation buttons:** Add options to disable translucent status bar and navigation bar ([#4133](https://github.com/ReVanced/revanced-patches/issues/4133)) ([a2d2141](https://github.com/ReVanced/revanced-patches/commit/a2d2141cec9b0b4929e07a8010889b21c324b229))
+
+# [5.5.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.5.0-dev.3...v5.5.0-dev.4) (2024-12-16)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof video streams:** Make livestreams start at the current time when using iOS client   ([#4137](https://github.com/ReVanced/revanced-patches/issues/4137)) ([140f484](https://github.com/ReVanced/revanced-patches/commit/140f484b4b251b0dfa94163a63f61f45f5302052))
+
+# [5.5.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.5.0-dev.2...v5.5.0-dev.3) (2024-12-16)
+
+
+### Features
+
+* **YouTube - Hide feed components:** Remove obsolete `Hide search result shelf header` option ([#4134](https://github.com/ReVanced/revanced-patches/issues/4134)) ([c71443a](https://github.com/ReVanced/revanced-patches/commit/c71443a08883ab10ef2553213c03b00e7c580a43))
+
+# [5.5.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.5.0-dev.1...v5.5.0-dev.2) (2024-12-16)
+
+
+### Bug Fixes
+
+* **YouTube Music:** Add `Spoof client patch` to fix playback ([#4132](https://github.com/ReVanced/revanced-patches/issues/4132)) ([b092508](https://github.com/ReVanced/revanced-patches/commit/b0925088e8b41636e285cb234593d545604ce461))
+
+# [5.5.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.4.1-dev.1...v5.5.0-dev.1) (2024-12-15)
+
+
+### Features
+
+* **YouTube:** Add `Force original audio` patch ([#4122](https://github.com/ReVanced/revanced-patches/issues/4122)) ([f4aa440](https://github.com/ReVanced/revanced-patches/commit/f4aa4406080b91f01d623e54b11b99ea849ddcdf))
+
 ## [5.4.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.4.0...v5.4.1-dev.1) (2024-12-14)
 
 

extensions/music/build.gradle.kts

@@ -0,0 +1 @@
+// Do not remove. Necessary for the extension plugin to be applied to the project.

extensions/music/src/main/AndroidManifest.xml

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

extensions/music/src/main/java/app/revanced/extension/music/spoof/SpoofClientPatch.java

@@ -0,0 +1,27 @@
+package app.revanced.extension.music.spoof;
+
+/**
+ * @noinspection unused
+ */
+public class SpoofClientPatch {
+    private static final int CLIENT_TYPE_ID = 26;
+    private static final String CLIENT_VERSION = "6.21";
+    private static final String DEVICE_MODEL = "iPhone16,2";
+    private static final String OS_VERSION = "17.7.2.21H221";
+
+    public static int getClientId() {
+        return CLIENT_TYPE_ID;
+    }
+
+    public static String getClientVersion() {
+        return CLIENT_VERSION;
+    }
+
+    public static String getClientModel() {
+        return DEVICE_MODEL;
+    }
+
+    public static String getOsVersion() {
+        return OS_VERSION;
+    }
+}

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

@@ -3,7 +3,7 @@ package app.revanced.extension.shared.settings;
 import static java.lang.Boolean.FALSE;
 import static java.lang.Boolean.TRUE;
 import static app.revanced.extension.shared.settings.Setting.parent;
-import static app.revanced.extension.shared.spoof.SpoofVideoStreamsPatch.ForceiOSAVCAvailability;
+import static app.revanced.extension.shared.spoof.SpoofVideoStreamsPatch.SpoofiOSAvailability;
 
 import app.revanced.extension.shared.spoof.AudioStreamLanguage;
 import app.revanced.extension.shared.spoof.ClientType;
@@ -22,9 +22,9 @@ public class BaseSettings {
     public static final IntegerSetting CHECK_ENVIRONMENT_WARNINGS_ISSUED = new IntegerSetting("revanced_check_environment_warnings_issued", 0, true, false);
 
     public static final BooleanSetting SPOOF_VIDEO_STREAMS = new BooleanSetting("revanced_spoof_video_streams", TRUE, true, "revanced_spoof_video_streams_user_dialog_message");
-    public static final EnumSetting<AudioStreamLanguage> SPOOF_VIDEO_STREAMS_LANGUAGE = new EnumSetting<>("revanced_spoof_video_streams_language", AudioStreamLanguage.DEFAULT, parent(SPOOF_VIDEO_STREAMS));
+    public static final EnumSetting<AudioStreamLanguage> SPOOF_VIDEO_STREAMS_LANGUAGE = new EnumSetting<>("revanced_spoof_video_streams_language", AudioStreamLanguage.DEFAULT, new SpoofiOSAvailability());
     public static final BooleanSetting SPOOF_VIDEO_STREAMS_IOS_FORCE_AVC = new BooleanSetting("revanced_spoof_video_streams_ios_force_avc", FALSE, true,
-            "revanced_spoof_video_streams_ios_force_avc_user_dialog_message", new ForceiOSAVCAvailability());
+            "revanced_spoof_video_streams_ios_force_avc_user_dialog_message", new SpoofiOSAvailability());
     public static final EnumSetting<ClientType> SPOOF_VIDEO_STREAMS_CLIENT_TYPE = new EnumSetting<>("revanced_spoof_video_streams_client", ClientType.ANDROID_VR, true, parent(SPOOF_VIDEO_STREAMS));
 
 }

extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/AudioStreamLanguage.java

@@ -3,6 +3,11 @@ package app.revanced.extension.shared.spoof;
 import java.util.Locale;
 
 public enum AudioStreamLanguage {
+    /**
+     * YouTube default.
+     * Can be the original language or can be app language,
+     * depending on what YouTube decides to pick as the default.
+     */
     DEFAULT,
 
     // Language codes found in locale_config.xml
@@ -86,15 +91,21 @@ public enum AudioStreamLanguage {
     private final String iso639_1;
 
     AudioStreamLanguage() {
-        iso639_1 = name().replace('_', '-');
+        String name = name();
+        final int regionSeparatorIndex = name.indexOf('_');
+        if (regionSeparatorIndex >= 0) {
+            iso639_1 = name.substring(0, regionSeparatorIndex).toLowerCase(Locale.US)
+                    + name.substring(regionSeparatorIndex);
+        } else {
+            iso639_1 = name().toLowerCase(Locale.US);
+        }
     }
 
     public String getIso639_1() {
         // Changing the app language does not force the app to completely restart,
         // so the default needs to be the current language and not a static field.
         if (this == DEFAULT) {
-            // Android VR requires uppercase language code.
-            return Locale.getDefault().toLanguageTag().toUpperCase(Locale.US);
+            return Locale.getDefault().toLanguageTag();
         }
 
         return iso639_1;

extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/ClientType.java

@@ -17,7 +17,7 @@ public enum ClientType {
             "32", // Android 12.1
             "1.56.21",
             true,
-            true),
+            false),
     // Specific for kids videos.
     IOS(5,
             "IOS",
@@ -40,21 +40,8 @@ public enum ClientType {
                     ? "17.40.5"
                     : "19.47.7",
             false,
-            true),
-    /**
-     * Android VR with no language code.
-     * Used for age restricted videos and YouTube Music to disable stable volume.
-     */
-    ANDROID_VR_NO_HL(
-            ANDROID_VR.id,
-            ANDROID_VR.clientName,
-            ANDROID_VR.deviceModel,
-            ANDROID_VR.osVersion,
-            ANDROID_VR.userAgent,
-            ANDROID_VR.androidSdkVersion,
-            ANDROID_VR.clientVersion,
-            ANDROID_VR.canLogin,
-            false);
+            true
+    );
 
     private static boolean forceAVC() {
         return BaseSettings.SPOOF_VIDEO_STREAMS_IOS_FORCE_AVC.get();

extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/SpoofVideoStreamsPatch.java

@@ -16,20 +16,16 @@ import app.revanced.extension.shared.spoof.requests.StreamingDataRequest;
 @SuppressWarnings("unused")
 public class SpoofVideoStreamsPatch {
     private static final boolean SPOOF_STREAMING_DATA = BaseSettings.SPOOF_VIDEO_STREAMS.get();
+
+    private static final boolean FIX_HLS_CURRENT_TIME = SPOOF_STREAMING_DATA
+            && BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get() == ClientType.IOS;
+
     /**
      * Any unreachable ip address.  Used to intentionally fail requests.
      */
     private static final String UNREACHABLE_HOST_URI_STRING = "https://127.0.0.0";
     private static final Uri UNREACHABLE_HOST_URI = Uri.parse(UNREACHABLE_HOST_URI_STRING);
 
-    /**
-     * Injection point. Used by YT Music to disable stable volume.
-     */
-    public static void setClientTypeToAndroidVrNoHl() {
-        Logger.printDebug(() -> "Setting stream spoofing to: " + ClientType.ANDROID_VR_NO_HL);
-        BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.save(ClientType.ANDROID_VR_NO_HL);
-    }
-
     /**
      * Injection point.
      * Blocks /get_watch requests by returning an unreachable URI.
@@ -173,10 +169,24 @@ public class SpoofVideoStreamsPatch {
         return postData;
     }
 
-    public static final class ForceiOSAVCAvailability implements Setting.Availability {
+    /**
+     * Injection point.
+     *
+     * Fixes iOS livestreams starting from the beginning.
+     */
+    public static boolean fixHLSCurrentTime(boolean original) {
+        if (FIX_HLS_CURRENT_TIME) {
+            return false;
+        }
+
+        return original;
+    }
+
+    public static final class SpoofiOSAvailability implements Setting.Availability {
         @Override
         public boolean isAvailable() {
-            return BaseSettings.SPOOF_VIDEO_STREAMS.get() && BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get() == ClientType.IOS;
+            return BaseSettings.SPOOF_VIDEO_STREAMS.get()
+                    && BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get() == ClientType.IOS;
         }
     }
 }

extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/requests/PlayerRoutes.java

@@ -19,7 +19,9 @@ final class PlayerRoutes {
                     "?fields=streamingData" +
                     "&alt=proto"
     ).compile();
+
     private static final String YT_API_URL = "https://youtubei.googleapis.com/youtubei/v1/";
+
     /**
      * TCP connection and HTTP read timeout
      */

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

@@ -0,0 +1,41 @@
+package app.revanced.extension.youtube.patches;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.youtube.settings.Settings;
+
+@SuppressWarnings("unused")
+public class ForceOriginalAudioPatch {
+
+    private static final String DEFAULT_AUDIO_TRACKS_IDENTIFIER = "original";
+
+    /**
+     * Injection point.
+     */
+    public static boolean isDefaultAudioStream(boolean isDefault, String audioTrackId, String audioTrackDisplayName) {
+        try {
+            if (!Settings.FORCE_ORIGINAL_AUDIO.get()) {
+                return isDefault;
+            }
+
+            if (audioTrackDisplayName.isEmpty()) {
+                // Older app targets can have empty audio tracks and these might be placeholders.
+                // The real audio tracks are called after these.
+                return isDefault;
+            }
+
+            Logger.printDebug(() -> "default: " + String.format("%-5s", isDefault) + " id: "
+                    + String.format("%-8s", audioTrackId) + " name:" + audioTrackDisplayName);
+
+            final boolean isOriginal = audioTrackDisplayName.contains(DEFAULT_AUDIO_TRACKS_IDENTIFIER);
+            if (isOriginal) {
+                Logger.printDebug(() -> "Using audio: " + audioTrackId);
+            }
+
+            return isOriginal;
+        } catch (Exception ex) {
+            Logger.printException(() -> "isDefaultAudioStream failure", ex);
+        }
+
+        return isDefault;
+    }
+}

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

@@ -3,12 +3,15 @@ package app.revanced.extension.youtube.patches;
 import static app.revanced.extension.shared.Utils.hideViewUnderCondition;
 import static app.revanced.extension.youtube.shared.NavigationBar.NavigationButton;
 
+import android.os.Build;
 import android.view.View;
 
 import java.util.EnumMap;
 import java.util.Map;
 
 import android.widget.TextView;
+
+import app.revanced.extension.shared.Utils;
 import app.revanced.extension.youtube.settings.Settings;
 
 @SuppressWarnings("unused")
@@ -26,6 +29,15 @@ public final class NavigationButtonsPatch {
     private static final boolean SWITCH_CREATE_WITH_NOTIFICATIONS_BUTTON
             = Settings.SWITCH_CREATE_WITH_NOTIFICATIONS_BUTTON.get();
 
+    private static final Boolean DISABLE_TRANSLUCENT_STATUS_BAR
+            = Settings.DISABLE_TRANSLUCENT_STATUS_BAR.get();
+
+    private static final Boolean DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT
+            = Settings.DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT.get();
+
+    private static final Boolean DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK
+            = Settings.DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK.get();
+
     /**
      * Injection point.
      */
@@ -48,4 +60,42 @@ public final class NavigationButtonsPatch {
     public static void hideNavigationButtonLabels(TextView navigationLabelsView) {
         hideViewUnderCondition(Settings.HIDE_NAVIGATION_BUTTON_LABELS, navigationLabelsView);
     }
+
+    /**
+     * Injection point.
+     */
+    public static boolean useTranslucentNavigationStatusBar(boolean original) {
+        // Must check Android version, as forcing this on Android 11 or lower causes app hang and crash.
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
+            return original;
+        }
+
+        if (DISABLE_TRANSLUCENT_STATUS_BAR) {
+            return false;
+        }
+
+        return original;
+    }
+
+    /**
+     * Injection point.
+     */
+    public static boolean useTranslucentNavigationButtons(boolean original) {
+        // Feature requires Android 13+
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+            return original;
+        }
+
+        if (!DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK && !DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT) {
+            return original;
+        }
+
+        if (DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK && DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT) {
+            return false;
+        }
+
+        return Utils.isDarkModeEnabled(Utils.getContext())
+                ? !DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK
+                : !DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT;
+    }
 }

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

@@ -36,7 +36,6 @@ public final class LayoutComponentsFilter extends Filter {
     );
 
     private final StringTrieSearch exceptions = new StringTrieSearch();
-    private final StringFilterGroup searchResultShelfHeader;
     private final StringFilterGroup inFeedSurvey;
     private final StringFilterGroup notifyMe;
     private final StringFilterGroup expandableMetadata;
@@ -194,11 +193,6 @@ public final class LayoutComponentsFilter extends Filter {
                 "timed_reaction"
         );
 
-        searchResultShelfHeader = new StringFilterGroup(
-                Settings.HIDE_SEARCH_RESULT_SHELF_HEADER,
-                "shelf_header.eml"
-        );
-
         notifyMe = new StringFilterGroup(
                 Settings.HIDE_NOTIFY_ME_BUTTON,
                 "set_reminder_button"
@@ -324,9 +318,6 @@ public final class LayoutComponentsFilter extends Filter {
             return false;
         }
 
-        // TODO: This also hides the feed Shorts shelf header
-        if (matchedGroup == searchResultShelfHeader && contentIndex != 0) return false;
-
         if (matchedGroup == horizontalShelves) {
             if (contentIndex == 0 && hideShelves()) {
                 return super.isFiltered(path, identifier, protobufBufferArray, matchedGroup, contentType, contentIndex);

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

@@ -16,7 +16,6 @@ import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerT
 import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerType.MODERN_2;
 import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerType.MODERN_3;
 import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerType.MODERN_4;
-import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerType.PHONE;
 import static app.revanced.extension.youtube.patches.SeekbarThumbnailsPatch.SeekbarThumbnailsHighQualityAvailability;
 import static app.revanced.extension.youtube.patches.VersionCheckPatch.IS_19_17_OR_GREATER;
 import static app.revanced.extension.youtube.sponsorblock.objects.CategoryBehaviour.IGNORE;
@@ -52,6 +51,8 @@ public class Settings extends BaseSettings {
     public static final FloatSetting PLAYBACK_SPEED_DEFAULT = new FloatSetting("revanced_playback_speed_default", -2.0f);
     public static final StringSetting CUSTOM_PLAYBACK_SPEEDS = new StringSetting("revanced_custom_playback_speeds",
             "0.25\n0.5\n0.75\n0.9\n0.95\n1.0\n1.05\n1.1\n1.25\n1.5\n1.75\n2.0\n3.0\n4.0\n5.0", true);
+    // Audio
+    public static final BooleanSetting FORCE_ORIGINAL_AUDIO = new BooleanSetting("revanced_force_original_audio", FALSE);
 
     // Ads
     public static final BooleanSetting HIDE_BUTTONED_ADS = new BooleanSetting("revanced_hide_buttoned_ads", TRUE);
@@ -91,7 +92,6 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting HIDE_NOTIFY_ME_BUTTON = new BooleanSetting("revanced_hide_notify_me_button", TRUE);
     public static final BooleanSetting HIDE_PLAYABLES = new BooleanSetting("revanced_hide_playables", TRUE);
     public static final BooleanSetting HIDE_SEARCH_RESULT_RECOMMENDATIONS = new BooleanSetting("revanced_hide_search_result_recommendations", TRUE);
-    public static final BooleanSetting HIDE_SEARCH_RESULT_SHELF_HEADER = new BooleanSetting("revanced_hide_search_result_shelf_header", FALSE);
     public static final BooleanSetting HIDE_SHOW_MORE_BUTTON = new BooleanSetting("revanced_hide_show_more_button", TRUE, true);
     // Alternative thumbnails
     public static final EnumSetting<ThumbnailOption> ALT_THUMBNAIL_HOME = new EnumSetting<>("revanced_alt_thumbnail_home", ThumbnailOption.ORIGINAL);
@@ -217,6 +217,9 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting HIDE_SUBSCRIPTIONS_BUTTON = new BooleanSetting("revanced_hide_subscriptions_button", FALSE, true);
     public static final BooleanSetting HIDE_NAVIGATION_BUTTON_LABELS = new BooleanSetting("revanced_hide_navigation_button_labels", FALSE, true);
     public static final BooleanSetting SWITCH_CREATE_WITH_NOTIFICATIONS_BUTTON = new BooleanSetting("revanced_switch_create_with_notifications_button", TRUE, true);
+    public static final BooleanSetting DISABLE_TRANSLUCENT_STATUS_BAR = new BooleanSetting("revanced_disable_translucent_status_bar", FALSE, true);
+    public static final BooleanSetting DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT = new BooleanSetting("revanced_disable_translucent_navigation_bar_light", FALSE, true);
+    public static final BooleanSetting DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK = new BooleanSetting("revanced_disable_translucent_navigation_bar_dark", FALSE, true);
 
     // Shorts
     public static final BooleanSetting DISABLE_RESUMING_SHORTS_PLAYER = new BooleanSetting("revanced_disable_resuming_shorts_player", FALSE);
@@ -388,7 +391,8 @@ public class Settings extends BaseSettings {
         }
 
         // Migrate renamed enum.
-        if (MINIPLAYER_TYPE.get() == PHONE) {
+        //noinspection deprecation
+        if (MINIPLAYER_TYPE.get() == MiniplayerType.PHONE) {
             MINIPLAYER_TYPE.save(MINIMAL);
         }
 

extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/ReVancedPreferenceFragment.java

@@ -48,35 +48,44 @@ public class ReVancedPreferenceFragment extends AbstractPreferenceFragment {
 
     /**
      * Sorts a preference list by menu entries, but preserves the first value as the first entry.
+     *
+     * @noinspection SameParameterValue
      */
-    private static void sortListPreferenceByValues(ListPreference listPreference) {
+    private static void sortListPreferenceByValues(ListPreference listPreference, int firstEntriesToPreserve) {
         CharSequence[] entries = listPreference.getEntries();
         CharSequence[] entryValues = listPreference.getEntryValues();
         final int entrySize = entries.length;
 
         if (entrySize != entryValues.length) {
+            // Xml array declaration has a missing/extra entry.
             throw new IllegalStateException();
         }
 
-        // Ensure the first entry remains the first after sorting.
-        CharSequence firstEntry = entries[0];
-        CharSequence firstEntryValue = entryValues[0];
+        List<Pair<String, String>> firstPairs = new ArrayList<>(firstEntriesToPreserve);
+        List<Pair<String, String>> pairsToSort = new ArrayList<>(entrySize);
 
-        List<Pair<String, String>> entryPairs = new ArrayList<>(entrySize);
-        for (int i = 1; i < entrySize; i++) {
-            entryPairs.add(new Pair<>(entries[i].toString(), entryValues[i].toString()));
+        for (int i = 0; i < entrySize; i++) {
+            Pair<String, String> pair = new Pair<>(entries[i].toString(), entryValues[i].toString());
+            if (i < firstEntriesToPreserve) {
+                firstPairs.add(pair);
+            } else {
+                pairsToSort.add(pair);
+            }
         }
 
-        Collections.sort(entryPairs, (pair1, pair2) -> pair1.first.compareToIgnoreCase(pair2.first));
+        Collections.sort(pairsToSort, (pair1, pair2) -> pair1.first.compareToIgnoreCase(pair2.first));
 
         CharSequence[] sortedEntries = new CharSequence[entrySize];
         CharSequence[] sortedEntryValues = new CharSequence[entrySize];
 
-        sortedEntries[0] = firstEntry;
-        sortedEntryValues[0] = firstEntryValue;
+        int i = 0;
+        for (Pair<String, String> pair : firstPairs) {
+            sortedEntries[i] = pair.first;
+            sortedEntryValues[i] = pair.second;
+            i++;
+        }
 
-        int i = 1;
-        for (Pair<String, String> pair : entryPairs) {
+        for (Pair<String, String> pair : pairsToSort) {
             sortedEntries[i] = pair.first;
             sortedEntryValues[i] = pair.second;
             i++;
@@ -102,7 +111,7 @@ public class ReVancedPreferenceFragment extends AbstractPreferenceFragment {
 
             preference = findPreference(Settings.SPOOF_VIDEO_STREAMS_LANGUAGE.key);
             if (preference instanceof ListPreference languagePreference) {
-                sortListPreferenceByValues(languagePreference);
+                sortListPreferenceByValues(languagePreference, 1);
             }
         } catch (Exception ex) {
             Logger.printException(() -> "initialize failure", ex);

gradle.properties

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

patches/api/patches.api

@@ -324,8 +324,12 @@ public final class app/revanced/patches/music/misc/gms/GmsCoreSupportPatchKt {
 	public static final fun getGmsCoreSupportPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
-public final class app/revanced/patches/music/misc/spoof/SpoofVideoStreamsPatchKt {
-	public static final fun getSpoofVideoStreamsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+public final class app/revanced/patches/music/misc/spoof/SpoofClientPatchKt {
+	public static final fun getSpoofClientPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
+public final class app/revanced/patches/music/misc/spoof/UserAgentClientSpoofPatchKt {
+	public static final fun getUserAgentClientSpoofPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
 public final class app/revanced/patches/myexpenses/misc/pro/UnlockProPatchKt {
@@ -766,6 +770,10 @@ public final class app/revanced/patches/shared/misc/spoof/SpoofVideoStreamsPatch
 	public static synthetic fun spoofVideoStreamsPatch$default (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/shared/misc/spoof/UserAgentClientSpoofPatchKt {
+	public static final fun userAgentClientSpoofPatch (Ljava/lang/String;)Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/solidexplorer2/functionality/filesize/RemoveFileSizeLimitPatchKt {
 	public static final fun getRemoveFileSizeLimitPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -1392,6 +1400,10 @@ public final class app/revanced/patches/youtube/shared/FingerprintsKt {
 	public static final fun getRollingNumberTextViewAnimationUpdateFingerprint ()Lapp/revanced/patcher/Fingerprint;
 }
 
+public final class app/revanced/patches/youtube/video/audio/ForceOriginalAudioPatchKt {
+	public static final fun getForceOriginalAudioPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/youtube/video/information/VideoInformationPatchKt {
 	public static final fun getVideoInformationPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 	public static final fun userSelectedPlaybackSpeedHook (Ljava/lang/String;Ljava/lang/String;)V

patches/src/main/kotlin/app/revanced/patches/music/misc/extension/SharedExtensionPatch.kt

@@ -4,5 +4,6 @@ import app.revanced.patches.music.misc.extension.hooks.applicationInitHook
 import app.revanced.patches.shared.misc.extension.sharedExtensionPatch
 
 val sharedExtensionPatch = sharedExtensionPatch(
+    "music",
     applicationInitHook,
 )

patches/src/main/kotlin/app/revanced/patches/music/misc/gms/GmsCoreSupportPatch.kt

@@ -4,7 +4,7 @@ import app.revanced.patcher.patch.Option
 import app.revanced.patches.music.misc.extension.sharedExtensionPatch
 import app.revanced.patches.music.misc.gms.Constants.MUSIC_PACKAGE_NAME
 import app.revanced.patches.music.misc.gms.Constants.REVANCED_MUSIC_PACKAGE_NAME
-import app.revanced.patches.music.misc.spoof.spoofVideoStreamsPatch
+import app.revanced.patches.music.misc.spoof.spoofClientPatch
 import app.revanced.patches.shared.castContextFetchFingerprint
 import app.revanced.patches.shared.misc.gms.gmsCoreSupportPatch
 import app.revanced.patches.shared.primeMethodFingerprint
@@ -21,7 +21,7 @@ val gmsCoreSupportPatch = gmsCoreSupportPatch(
     extensionPatch = sharedExtensionPatch,
     gmsCoreSupportResourcePatchFactory = ::gmsCoreSupportResourcePatch,
 ) {
-    dependsOn(spoofVideoStreamsPatch)
+    dependsOn(spoofClientPatch)
 
     compatibleWith(MUSIC_PACKAGE_NAME)
 }

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

@@ -0,0 +1,39 @@
+package app.revanced.patches.music.misc.spoof
+
+import app.revanced.patcher.fingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+
+internal val playerRequestConstructorFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR)
+    strings("player")
+}
+
+/**
+ * Matches using the class found in [playerRequestConstructorFingerprint].
+ */
+internal val createPlayerRequestBodyFingerprint = fingerprint {
+    parameters("L")
+    returns("V")
+    opcodes(
+        Opcode.CHECK_CAST,
+        Opcode.IGET,
+        Opcode.AND_INT_LIT16,
+    )
+    strings("ms")
+}
+
+/**
+ * Used to get a reference to other clientInfo fields.
+ */
+internal val setClientInfoFieldsFingerprint = fingerprint {
+    returns("L")
+    strings("Google Inc.")
+}
+
+/**
+ * Used to get a reference to the clientInfo and clientInfo.clientVersion field.
+ */
+internal val setClientInfoClientVersionFingerprint = fingerprint {
+    strings("10.29")
+}

patches/src/main/kotlin/app/revanced/patches/music/misc/spoof/SpoofClientPatch.kt

@@ -0,0 +1,105 @@
+package app.revanced.patches.music.misc.spoof
+
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.instructions
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
+import app.revanced.patches.music.misc.extension.sharedExtensionPatch
+import app.revanced.util.getReference
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.builder.MutableMethodImplementation
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.reference.FieldReference
+import com.android.tools.smali.dexlib2.iface.reference.TypeReference
+import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
+import com.android.tools.smali.dexlib2.immutable.ImmutableMethodParameter
+
+internal const val EXTENSION_CLASS_DESCRIPTOR =
+    "Lapp/revanced/extension/music/spoof/SpoofClientPatch;"
+
+// TODO: Replace this patch with spoofVideoStreamsPatch once possible.
+val spoofClientPatch = bytecodePatch(
+    name = "Spoof client",
+    description = "Spoofs the client to fix playback.",
+) {
+    compatibleWith("com.google.android.apps.youtube.music")
+
+    dependsOn(
+        sharedExtensionPatch,
+        // TODO: Add settingsPatch
+        userAgentClientSpoofPatch,
+    )
+
+    execute {
+        val playerRequestClass = playerRequestConstructorFingerprint.classDef
+
+        val createPlayerRequestBodyMatch = createPlayerRequestBodyFingerprint.match(playerRequestClass)
+
+        val clientInfoContainerClass = createPlayerRequestBodyMatch.method
+            .getInstruction(createPlayerRequestBodyMatch.patternMatch!!.startIndex)
+            .getReference<TypeReference>()!!.type
+
+        val clientInfoField = setClientInfoClientVersionFingerprint.method.instructions.first {
+            it.opcode == Opcode.IPUT_OBJECT && it.getReference<FieldReference>()!!.definingClass == clientInfoContainerClass
+        }.getReference<FieldReference>()!!
+
+        val setClientInfoFieldInstructions = setClientInfoFieldsFingerprint.method.instructions.filter {
+            (it.opcode == Opcode.IPUT_OBJECT || it.opcode == Opcode.IPUT) &&
+                it.getReference<FieldReference>()!!.definingClass == clientInfoField.type
+        }.map { it.getReference<FieldReference>()!! }
+
+        // Offsets are known for the fields in the clientInfo object.
+        val clientIdField = setClientInfoFieldInstructions[0]
+        val clientModelField = setClientInfoFieldInstructions[5]
+        val osVersionField = setClientInfoFieldInstructions[7]
+        val clientVersionField = setClientInfoClientVersionFingerprint.method
+            .getInstruction(setClientInfoClientVersionFingerprint.stringMatches!!.first().index + 1)
+            .getReference<FieldReference>()
+
+        // Helper method to spoof the client info.
+        val spoofClientInfoMethod = ImmutableMethod(
+            playerRequestClass.type,
+            "spoofClientInfo",
+            listOf(ImmutableMethodParameter(clientInfoContainerClass, null, null)),
+            "V",
+            AccessFlags.PRIVATE.value or AccessFlags.STATIC.value,
+            null,
+            null,
+            MutableMethodImplementation(3),
+        ).toMutable().also(playerRequestClass.methods::add).apply {
+            addInstructions(
+                """
+                    iget-object v0, p0, $clientInfoField
+                
+                    invoke-static { }, $EXTENSION_CLASS_DESCRIPTOR->getClientId()I
+                    move-result v1
+                    iput v1, v0, $clientIdField
+    
+                    invoke-static { }, $EXTENSION_CLASS_DESCRIPTOR->getClientModel()Ljava/lang/String;
+                    move-result-object v1
+                    iput-object v1, v0, $clientModelField
+                
+                    invoke-static { }, $EXTENSION_CLASS_DESCRIPTOR->getClientVersion()Ljava/lang/String;
+                    move-result-object v1
+                    iput-object v1, v0, $clientVersionField
+    
+                    invoke-static { }, $EXTENSION_CLASS_DESCRIPTOR->getOsVersion()Ljava/lang/String;
+                    move-result-object v1
+                    iput-object v1, v0, $osVersionField
+    
+                    return-void
+                """,
+            )
+        }
+
+        createPlayerRequestBodyMatch.method.apply {
+            val checkCastIndex = createPlayerRequestBodyMatch.patternMatch!!.startIndex
+            val clientInfoContainerRegister = getInstruction<OneRegisterInstruction>(checkCastIndex).registerA
+
+            addInstruction(checkCastIndex + 1, "invoke-static {v$clientInfoContainerRegister}, $spoofClientInfoMethod")
+        }
+    }
+}

patches/src/main/kotlin/app/revanced/patches/music/misc/spoof/SpoofVideoStreamsPatch.kt

@@ -1,15 +0,0 @@
-package app.revanced.patches.music.misc.spoof
-
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patches.music.misc.gms.musicActivityOnCreateFingerprint
-import app.revanced.patches.shared.misc.spoof.EXTENSION_CLASS_DESCRIPTOR
-import app.revanced.patches.shared.misc.spoof.spoofVideoStreamsPatch
-
-val spoofVideoStreamsPatch = spoofVideoStreamsPatch({
-    compatibleWith("com.google.android.apps.youtube.music")
-}, {
-    musicActivityOnCreateFingerprint.method.addInstruction(
-        0,
-        "invoke-static { }, $EXTENSION_CLASS_DESCRIPTOR->setClientTypeToAndroidVrNoHl()V"
-    )
-})

patches/src/main/kotlin/app/revanced/patches/music/misc/spoof/UserAgentClientSpoofPatch.kt

@@ -0,0 +1,5 @@
+package app.revanced.patches.music.misc.spoof
+
+import app.revanced.patches.shared.misc.spoof.userAgentClientSpoofPatch
+
+val userAgentClientSpoofPatch = userAgentClientSpoofPatch("com.google.android.apps.youtube.music")

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

@@ -1,6 +1,7 @@
 package app.revanced.patches.shared.misc.spoof
 
 import app.revanced.patcher.fingerprint
+import app.revanced.util.literal
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 
@@ -110,3 +111,13 @@ internal val buildMediaDataSourceFingerprint = fingerprint {
         "Ljava/lang/Object;",
     )
 }
+
+internal const val HLS_CURRENT_TIME_FEATURE_FLAG = 45355374L
+
+internal val hlsCurrentTimeFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+    parameters("Z", "L")
+    literal {
+        HLS_CURRENT_TIME_FEATURE_FLAG
+    }
+}

patches/src/main/kotlin/app/revanced/patches/shared/misc/spoof/SpoofVideoStreamsPatch.kt

@@ -12,6 +12,7 @@ import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMu
 import app.revanced.patches.all.misc.resources.addResourcesPatch
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionOrThrow
+import app.revanced.util.insertFeatureFlagBooleanOverride
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.builder.MutableMethodImplementation
@@ -201,6 +202,15 @@ fun spoofVideoStreamsPatch(
         }
         // endregion
 
+        // region Fix iOS livestream current time.
+
+        hlsCurrentTimeFingerprint.method.insertFeatureFlagBooleanOverride(
+            HLS_CURRENT_TIME_FEATURE_FLAG,
+            "$EXTENSION_CLASS_DESCRIPTOR->fixHLSCurrentTime(Z)Z"
+        )
+
+        // endregion
+
         executeBlock()
     }
 }

patches/src/main/kotlin/app/revanced/patches/shared/misc/spoof/UserAgentClientSpoofPatch.kt

@@ -0,0 +1,81 @@
+package app.revanced.patches.shared.misc.spoof
+
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patches.all.misc.transformation.IMethodCall
+import app.revanced.patches.all.misc.transformation.filterMapInstruction35c
+import app.revanced.patches.all.misc.transformation.transformInstructionsPatch
+import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstruction
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+import com.android.tools.smali.dexlib2.iface.reference.StringReference
+
+private const val USER_AGENT_STRING_BUILDER_APPEND_METHOD_REFERENCE =
+    "Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;"
+
+fun userAgentClientSpoofPatch(originalPackageName: String) = transformInstructionsPatch(
+    filterMap = { classDef, _, instruction, instructionIndex ->
+        filterMapInstruction35c<MethodCall>(
+            "Lapp/revanced/extension",
+            classDef,
+            instruction,
+            instructionIndex,
+        )
+    },
+    transform = transform@{ mutableMethod, entry ->
+        val (_, _, instructionIndex) = entry
+
+        // Replace the result of context.getPackageName(), if it is used in a user agent string.
+        mutableMethod.apply {
+            // After context.getPackageName() the result is moved to a register.
+            val targetRegister = (
+                getInstruction(instructionIndex + 1)
+                    as? OneRegisterInstruction ?: return@transform
+                ).registerA
+
+            // IndexOutOfBoundsException is technically possible here,
+            // but no such occurrences are present in the app.
+            val referee = getInstruction(instructionIndex + 2).getReference<MethodReference>()?.toString()
+
+            // Only replace string builder usage.
+            if (referee != USER_AGENT_STRING_BUILDER_APPEND_METHOD_REFERENCE) {
+                return@transform
+            }
+
+            // Do not change the package name in methods that use resources, or for methods that use GmsCore.
+            // Changing these package names will result in playback limitations,
+            // particularly Android VR background audio only playback.
+            val resourceOrGmsStringInstructionIndex = indexOfFirstInstruction {
+                val reference = getReference<StringReference>()
+                opcode == Opcode.CONST_STRING &&
+                    (reference?.string == "android.resource://" || reference?.string == "gcore_")
+            }
+            if (resourceOrGmsStringInstructionIndex >= 0) {
+                return@transform
+            }
+
+            // Overwrite the result of context.getPackageName() with the original package name.
+            replaceInstruction(
+                instructionIndex + 1,
+                "const-string v$targetRegister, \"$originalPackageName\"",
+            )
+        }
+    },
+)
+
+@Suppress("unused")
+private enum class MethodCall(
+    override val definedClassName: String,
+    override val methodName: String,
+    override val methodParams: Array<String>,
+    override val returnType: String,
+) : IMethodCall {
+    GetPackageName(
+        "Landroid/content/Context;",
+        "getPackageName",
+        emptyArray(),
+        "Ljava/lang/String;",
+    ),
+}

patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/Fingerprints.kt

@@ -3,6 +3,7 @@ package app.revanced.patches.youtube.layout.buttons.navigation
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.AccessFlags
 import app.revanced.patcher.fingerprint
+import app.revanced.util.literal
 
 internal const val ANDROID_AUTOMOTIVE_STRING = "Android Automotive"
 
@@ -22,4 +23,31 @@ internal val createPivotBarFingerprint = fingerprint {
         Opcode.INVOKE_VIRTUAL,
         Opcode.RETURN_VOID,
     )
+}
+
+internal const val TRANSLUCENT_NAVIGATION_STATUS_BAR_FEATURE_FLAG = 45400535L
+
+internal val translucentNavigationStatusBarFeatureFlagFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+    returns("Z")
+    literal { TRANSLUCENT_NAVIGATION_STATUS_BAR_FEATURE_FLAG }
+}
+
+internal const val TRANSLUCENT_NAVIGATION_BUTTONS_FEATURE_FLAG = 45630927L
+
+internal val translucentNavigationButtonsFeatureFlagFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+    returns("V")
+    literal { TRANSLUCENT_NAVIGATION_BUTTONS_FEATURE_FLAG }
+}
+
+/**
+ * The device on screen back/home/recent buttons.
+ */
+internal const val TRANSLUCENT_NAVIGATION_BUTTONS_SYSTEM_FEATURE_FLAG = 45632194L
+
+internal val translucentNavigationButtonsSystemFeatureFlagFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+    returns("Z")
+    literal { TRANSLUCENT_NAVIGATION_BUTTONS_SYSTEM_FEATURE_FLAG }
 }

patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/NavigationButtonsPatch.kt

@@ -12,10 +12,13 @@ import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
 import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
 import app.revanced.patches.youtube.misc.navigation.hookNavigationButtonCreated
 import app.revanced.patches.youtube.misc.navigation.navigationBarHookPatch
+import app.revanced.patches.youtube.misc.playservice.is_19_25_or_greater
+import app.revanced.patches.youtube.misc.playservice.versionCheckPatch
 import app.revanced.patches.youtube.misc.settings.PreferenceScreen
 import app.revanced.patches.youtube.misc.settings.settingsPatch
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionOrThrow
+import app.revanced.util.insertFeatureFlagBooleanOverride
 import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference
@@ -32,6 +35,7 @@ val navigationButtonsPatch = bytecodePatch(
         settingsPatch,
         addResourcesPatch,
         navigationBarHookPatch,
+        versionCheckPatch
     )
 
     compatibleWith(
@@ -50,19 +54,27 @@ val navigationButtonsPatch = bytecodePatch(
     execute {
         addResources("youtube", "layout.buttons.navigation.navigationButtonsPatch")
 
+        val preferences = mutableSetOf(
+            SwitchPreference("revanced_hide_home_button"),
+            SwitchPreference("revanced_hide_shorts_button"),
+            SwitchPreference("revanced_hide_create_button"),
+            SwitchPreference("revanced_hide_subscriptions_button"),
+            SwitchPreference("revanced_switch_create_with_notifications_button"),
+            SwitchPreference("revanced_hide_navigation_button_labels"),
+        )
+
+        if (is_19_25_or_greater) {
+            preferences += SwitchPreference("revanced_disable_translucent_status_bar")
+            preferences += SwitchPreference("revanced_disable_translucent_navigation_bar_light")
+            preferences += SwitchPreference("revanced_disable_translucent_navigation_bar_dark")
+        }
+
         PreferenceScreen.GENERAL_LAYOUT.addPreferences(
             PreferenceScreenPreference(
                 key = "revanced_navigation_buttons_screen",
                 sorting = Sorting.UNSORTED,
-                preferences = setOf(
-                    SwitchPreference("revanced_hide_home_button"),
-                    SwitchPreference("revanced_hide_shorts_button"),
-                    SwitchPreference("revanced_hide_create_button"),
-                    SwitchPreference("revanced_hide_subscriptions_button"),
-                    SwitchPreference("revanced_switch_create_with_notifications_button"),
-                    SwitchPreference("revanced_hide_navigation_button_labels"),
-                ),
-            ),
+                preferences = preferences
+            )
         )
 
         // Switch create with notifications button.
@@ -101,5 +113,24 @@ val navigationButtonsPatch = bytecodePatch(
 
         // Hook navigation button created, in order to hide them.
         hookNavigationButtonCreated(EXTENSION_CLASS_DESCRIPTOR)
+
+
+        // Force on/off translucent effect on status bar and navigation buttons.
+        if (is_19_25_or_greater) {
+            translucentNavigationStatusBarFeatureFlagFingerprint.method.insertFeatureFlagBooleanOverride(
+                TRANSLUCENT_NAVIGATION_STATUS_BAR_FEATURE_FLAG,
+                "$EXTENSION_CLASS_DESCRIPTOR->useTranslucentNavigationStatusBar(Z)Z",
+            )
+
+            translucentNavigationButtonsFeatureFlagFingerprint.method.insertFeatureFlagBooleanOverride(
+                TRANSLUCENT_NAVIGATION_BUTTONS_FEATURE_FLAG,
+                "$EXTENSION_CLASS_DESCRIPTOR->useTranslucentNavigationButtons(Z)Z",
+            )
+
+            translucentNavigationButtonsSystemFeatureFlagFingerprint.method.insertFeatureFlagBooleanOverride(
+                TRANSLUCENT_NAVIGATION_BUTTONS_SYSTEM_FEATURE_FLAG,
+                "$EXTENSION_CLASS_DESCRIPTOR->useTranslucentNavigationButtons(Z)Z",
+            )
+        }
     }
 }

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

@@ -222,7 +222,6 @@ val hideLayoutComponentsPatch = bytecodePatch(
             SwitchPreference("revanced_hide_notify_me_button"),
             SwitchPreference("revanced_hide_playables"),
             SwitchPreference("revanced_hide_search_result_recommendations"),
-            SwitchPreference("revanced_hide_search_result_shelf_header"),
             SwitchPreference("revanced_hide_show_more_button"),
             SwitchPreference("revanced_hide_doodles"),
         )

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

@@ -110,22 +110,22 @@ val enableDebuggingPatch = bytecodePatch(
                     """
                 )
             }
-        }
 
-        experimentalStringFeatureFlagFingerprint.match(
-            experimentalFeatureFlagParentFingerprint.originalClassDef
-        ).method.apply {
-            val insertIndex = indexOfFirstInstructionReversedOrThrow(Opcode.MOVE_RESULT_OBJECT)
+            experimentalStringFeatureFlagFingerprint.match(
+                experimentalFeatureFlagParentFingerprint.originalClassDef
+            ).method.apply {
+                val insertIndex = indexOfFirstInstructionReversedOrThrow(Opcode.MOVE_RESULT_OBJECT)
 
-            addInstructions(
-                insertIndex,
-                """
-                    move-result-object v0
-                    invoke-static { v0, p1, p2, p3 }, $EXTENSION_CLASS_DESCRIPTOR->isStringFeatureFlagEnabled(Ljava/lang/String;JLjava/lang/String;)Ljava/lang/String;
-                    move-result-object v0
-                    return-object v0
-                """
-            )
+                addInstructions(
+                    insertIndex,
+                    """
+                        move-result-object v0
+                        invoke-static { v0, p1, p2, p3 }, $EXTENSION_CLASS_DESCRIPTOR->isStringFeatureFlagEnabled(Ljava/lang/String;JLjava/lang/String;)Ljava/lang/String;
+                        move-result-object v0
+                        return-object v0
+                    """
+                )
+            }
         }
 
         // There exists other experimental accessor methods for byte[]

patches/src/main/kotlin/app/revanced/patches/youtube/misc/spoof/UserAgentClientSpoofPatch.kt

@@ -1,82 +1,5 @@
 package app.revanced.patches.youtube.misc.spoof
 
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patches.all.misc.transformation.IMethodCall
-import app.revanced.patches.all.misc.transformation.filterMapInstruction35c
-import app.revanced.patches.all.misc.transformation.transformInstructionsPatch
-import app.revanced.util.getReference
-import app.revanced.util.indexOfFirstInstruction
-import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
-import com.android.tools.smali.dexlib2.iface.reference.MethodReference
-import com.android.tools.smali.dexlib2.iface.reference.StringReference
+import app.revanced.patches.shared.misc.spoof.userAgentClientSpoofPatch
 
-private const val ORIGINAL_PACKAGE_NAME = "com.google.android.youtube"
-private const val USER_AGENT_STRING_BUILDER_APPEND_METHOD_REFERENCE =
-    "Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;"
-
-val userAgentClientSpoofPatch = transformInstructionsPatch(
-    filterMap = { classDef, _, instruction, instructionIndex ->
-        filterMapInstruction35c<MethodCall>(
-            "Lapp/revanced/extension",
-            classDef,
-            instruction,
-            instructionIndex,
-        )
-    },
-    transform = transform@{ mutableMethod, entry ->
-        val (_, _, instructionIndex) = entry
-
-        // Replace the result of context.getPackageName(), if it is used in a user agent string.
-        mutableMethod.apply {
-            // After context.getPackageName() the result is moved to a register.
-            val targetRegister = (
-                getInstruction(instructionIndex + 1)
-                    as? OneRegisterInstruction ?: return@transform
-                ).registerA
-
-            // IndexOutOfBoundsException is technically possible here,
-            // but no such occurrences are present in the app.
-            val referee = getInstruction(instructionIndex + 2).getReference<MethodReference>()?.toString()
-
-            // Only replace string builder usage.
-            if (referee != USER_AGENT_STRING_BUILDER_APPEND_METHOD_REFERENCE) {
-                return@transform
-            }
-
-            // Do not change the package name in methods that use resources, or for methods that use GmsCore.
-            // Changing these package names will result in playback limitations,
-            // particularly Android VR background audio only playback.
-            val resourceOrGmsStringInstructionIndex = indexOfFirstInstruction {
-                val reference = getReference<StringReference>()
-                opcode == Opcode.CONST_STRING &&
-                    (reference?.string == "android.resource://" || reference?.string == "gcore_")
-            }
-            if (resourceOrGmsStringInstructionIndex >= 0) {
-                return@transform
-            }
-
-            // Overwrite the result of context.getPackageName() with the original package name.
-            replaceInstruction(
-                instructionIndex + 1,
-                "const-string v$targetRegister, \"$ORIGINAL_PACKAGE_NAME\"",
-            )
-        }
-    },
-)
-
-@Suppress("unused")
-private enum class MethodCall(
-    override val definedClassName: String,
-    override val methodName: String,
-    override val methodParams: Array<String>,
-    override val returnType: String,
-) : IMethodCall {
-    GetPackageName(
-        "Landroid/content/Context;",
-        "getPackageName",
-        emptyArray(),
-        "Ljava/lang/String;",
-    ),
-}
+val userAgentClientSpoofPatch = userAgentClientSpoofPatch("com.google.android.youtube")

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

@@ -0,0 +1,23 @@
+package app.revanced.patches.youtube.video.audio
+
+import app.revanced.patcher.fingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+internal val streamingModelBuilderFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+    returns("L")
+    strings("vprng")
+}
+
+internal val menuItemAudioTrackFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+    parameters("L")
+    returns("V")
+    strings("menu_item_audio_track")
+}
+
+internal val audioStreamingTypeSelector = fingerprint {
+    accessFlags(AccessFlags.PRIVATE, AccessFlags.FINAL)
+    returns("L")
+    strings("raw") // String is not unique
+}

patches/src/main/kotlin/app/revanced/patches/youtube/video/audio/ForceOriginalAudioPatch.kt

@@ -0,0 +1,159 @@
+package app.revanced.patches.youtube.video.audio
+
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableField.Companion.toMutable
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+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.SwitchPreference
+import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
+import app.revanced.patches.youtube.misc.settings.PreferenceScreen
+import app.revanced.patches.youtube.misc.settings.settingsPatch
+import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstructionOrThrow
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.builder.MutableMethodImplementation
+import com.android.tools.smali.dexlib2.iface.Method
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+import com.android.tools.smali.dexlib2.immutable.ImmutableField
+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/ForceOriginalAudioPatch;"
+
+@Suppress("unused")
+val forceOriginalAudioPatch = bytecodePatch(
+    name = "Force original audio",
+    description = "Adds an option to always use the original audio track.",
+) {
+    dependsOn(
+        sharedExtensionPatch,
+        settingsPatch,
+        addResourcesPatch,
+    )
+
+    compatibleWith(
+        "com.google.android.youtube"(
+            "18.38.44",
+            "18.49.37",
+            "19.16.39",
+            "19.25.37",
+            "19.34.42",
+            "19.43.41",
+            "19.45.38",
+            "19.46.42",
+        ),
+    )
+
+    execute {
+        addResources("youtube", "video.audio.forceOriginalAudioPatch")
+
+        PreferenceScreen.VIDEO.addPreferences(
+            SwitchPreference("revanced_force_original_audio")
+        )
+
+        fun Method.firstFormatStreamingModelCall(
+            returnType: String = "Ljava/lang/String;"
+        ): MutableMethod {
+            val audioTrackIdIndex = indexOfFirstInstructionOrThrow {
+                val reference = getReference<MethodReference>()
+                reference?.definingClass == "Lcom/google/android/libraries/youtube/innertube/model/media/FormatStreamModel;"
+                        && reference.returnType == returnType
+            }
+
+            return navigate(this).to(audioTrackIdIndex).stop()
+        }
+
+        // Accessor methods of FormatStreamModel have no string constants and
+        // opcodes are identical to other methods in the same class,
+        // so must walk from another class that use the methods.
+        val isDefaultMethod = streamingModelBuilderFingerprint.originalMethod.firstFormatStreamingModelCall("Z")
+        val audioTrackIdMethod = menuItemAudioTrackFingerprint.originalMethod.firstFormatStreamingModelCall()
+        val audioTrackDisplayNameMethod = audioStreamingTypeSelector.originalMethod.firstFormatStreamingModelCall()
+        val formatStreamModelClass = proxy(classes.first {
+            it.type == audioTrackIdMethod.definingClass
+        }).mutableClass
+
+        formatStreamModelClass.apply {
+            // Add a new field to store the override.
+            val helperFieldName = "isDefaultAudioTrackOverride"
+            fields.add(
+                ImmutableField(
+                    type,
+                    helperFieldName,
+                    "Ljava/lang/Boolean;",
+                    // Boolean is a 100% immutable class (all fields are final)
+                    // and safe to write to a shared field without volatile/synchronization,
+                    // but without volatile the field can show stale data
+                    // and the same field is calculated more than once by different threads.
+                    AccessFlags.PRIVATE.value or AccessFlags.VOLATILE.value,
+                    null,
+                    null,
+                    null
+                ).toMutable()
+            )
+
+            // Add a helper method because the isDefaultAudioTrack() has only 2 registers and 3 are needed.
+            val helperMethodClass = type
+            val helperMethodName = "extension_isDefaultAudioTrack"
+            val helperMethod = ImmutableMethod(
+                helperMethodClass,
+                helperMethodName,
+                listOf(ImmutableMethodParameter("Z", null, null)),
+                "Z",
+                AccessFlags.PRIVATE.value,
+                null,
+                null,
+                MutableMethodImplementation(6),
+            ).toMutable().apply {
+                addInstructionsWithLabels(
+                    0,
+                    """
+                        iget-object v0, p0, $helperMethodClass->$helperFieldName:Ljava/lang/Boolean;
+                        if-eqz v0, :call_extension            
+                        invoke-virtual { v0 }, Ljava/lang/Boolean;->booleanValue()Z
+                        move-result v3
+                        return v3
+                        
+                        :call_extension
+                        invoke-virtual { p0 }, $audioTrackIdMethod
+                        move-result-object v1
+                        
+                        invoke-virtual { p0 }, $audioTrackDisplayNameMethod
+                        move-result-object v2
+    
+                        invoke-static { p1, v1, v2 }, $EXTENSION_CLASS_DESCRIPTOR->isDefaultAudioStream(ZLjava/lang/String;Ljava/lang/String;)Z
+                        move-result v3
+                        
+                        invoke-static { v3 }, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+                        move-result-object v0
+                        iput-object v0, p0, $helperMethodClass->$helperFieldName:Ljava/lang/Boolean;
+                        return v3
+                    """
+                )
+            }
+            methods.add(helperMethod)
+
+            // Modify isDefaultAudioTrack() to call extension helper method.
+            isDefaultMethod.apply {
+                val index = indexOfFirstInstructionOrThrow(Opcode.RETURN)
+                val register = getInstruction<OneRegisterInstruction>(index).registerA
+
+                addInstructions(
+                    index,
+                    """
+                        invoke-direct { p0, v$register }, $helperMethodClass->$helperMethodName(Z)Z
+                        move-result v$register
+                    """
+                )
+            }
+        }
+    }
+}

patches/src/main/resources/addresources/values/strings.xml

@@ -158,9 +158,6 @@ You will not be notified of any unexpected events."</string>
             <string name="revanced_hide_timed_reactions_title">Hide timed reactions</string>
             <string name="revanced_hide_timed_reactions_summary_on">Timed reactions are hidden</string>
             <string name="revanced_hide_timed_reactions_summary_off">Timed reactions are shown</string>
-            <string name="revanced_hide_search_result_shelf_header_title">Hide search result shelf header</string>
-            <string name="revanced_hide_search_result_shelf_header_summary_on">Shelf header is hidden</string>
-            <string name="revanced_hide_search_result_shelf_header_summary_off">Shelf header is shown</string>
             <string name="revanced_hide_channel_guidelines_title">Hide channel guidelines</string>
             <string name="revanced_hide_channel_guidelines_summary_on">Channel guidelines are hidden</string>
             <string name="revanced_hide_channel_guidelines_summary_off">Channel guidelines are shown</string>
@@ -522,6 +519,15 @@ Note: Enabling this also forcibly hides video ads"</string>
             <string name="revanced_hide_navigation_button_labels_title">Hide navigation button labels</string>
             <string name="revanced_hide_navigation_button_labels_summary_on">Labels are hidden</string>
             <string name="revanced_hide_navigation_button_labels_summary_off">Labels are shown</string>
+            <string name="revanced_disable_translucent_status_bar_title">Disable translucent status bar</string>
+            <string name="revanced_disable_translucent_status_bar_summary_on">Status bar is opaque</string>
+            <string name="revanced_disable_translucent_status_bar_summary_off">Status bar is opaque or translucent</string>
+            <string name="revanced_disable_translucent_navigation_bar_light_title">Disable light translucent bar</string>
+            <string name="revanced_disable_translucent_navigation_bar_light_summary_on">Light mode navigation bar is opaque</string>
+            <string name="revanced_disable_translucent_navigation_bar_light_summary_off">Light mode navigation bar is opaque or translucent</string>
+            <string name="revanced_disable_translucent_navigation_bar_dark_title">Disable dark translucent bar</string>
+            <string name="revanced_disable_translucent_navigation_bar_dark_summary_on">Dark mode navigation bar is opaque</string>
+            <string name="revanced_disable_translucent_navigation_bar_dark_summary_off">Dark mode navigation bar is opaque or translucent</string>
         </patch>
         <patch id="layout.hide.player.flyoutmenupanel.hidePlayerFlyoutMenuPatch">
             <string name="revanced_hide_player_flyout_title">Flyout menu</string>
@@ -1226,6 +1232,11 @@ Enabling this can unlock higher video qualities"</string>
             <string name="revanced_disable_zoom_haptics_summary_on">Haptics are disabled</string>
             <string name="revanced_disable_zoom_haptics_summary_off">Haptics are enabled</string>
         </patch>
+        <patch id="video.audio.forceOriginalAudioPatch">
+            <string name="revanced_force_original_audio_title">Force original audio</string>
+            <string name="revanced_force_original_audio_summary_on">Using original audio</string>
+            <string name="revanced_force_original_audio_summary_off">Using default audio</string>
+        </patch>
         <patch id="video.quality.rememberVideoQualityPatch">
             <!-- Translations should use the same text as revanced_custom_playback_speeds_auto -->
             <string name="revanced_video_quality_default_entry_1">Auto</string>
@@ -1288,12 +1299,11 @@ Video playback may not work"</string>
 AVC has a maximum resolution of 1080p, Opus audio codec is not available, and video playback will use more internet data than VP9 or AV1."</string>
             <string name="revanced_spoof_video_streams_about_ios_title">iOS spoofing side effects</string>
             <string name="revanced_spoof_video_streams_about_ios_summary">"• Private kids videos may not play
-• Livestreams start from the beginning
 • Videos end 1 second early"</string>
             <string name="revanced_spoof_video_streams_about_android_vr_title">Android VR spoofing side effects</string>
             <string name="revanced_spoof_video_streams_about_android_vr_summary">"• Kids videos may not play
-• Livestreams start from the beginning
-• Videos end 1 second early"</string>
+• Audio track menu is missing
+• Stable volume is not available"</string>
             <string name="revanced_spoof_video_streams_language_title">Default audio stream language</string>
             <string name="revanced_spoof_video_streams_language_DEFAULT">App language</string>
             <string name="revanced_spoof_video_streams_language_AR">Arabic</string>