refactor into DisableAutoAudioTracksPatch

ReVanced · Dec 15, 2024 · 735d1ca · 735d1ca
1 parent 185add7
commit 735d1ca
Show file tree

Hide file tree

Showing 13 changed files with 237 additions and 273 deletions.
diff --git a/...ons/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java b/...ons/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java
@@ -3,8 +3,9 @@
 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;
 
 /**
@@ -21,8 +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, 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));
 
 }
diff --git a/...shared/library/src/main/java/app/revanced/extension/shared/spoof/AudioStreamLanguage.java b/...shared/library/src/main/java/app/revanced/extension/shared/spoof/AudioStreamLanguage.java
@@ -8,11 +8,6 @@ public enum AudioStreamLanguage {
      */
     DEFAULT,
 
-    /**
-     * Original language of the video.
-     */
-    ORIGINAL,
-
     /**
      * Current language the app is set to.
      */

diff --git a/...red/library/src/main/java/app/revanced/extension/shared/spoof/SpoofVideoStreamsPatch.java b/...red/library/src/main/java/app/revanced/extension/shared/spoof/SpoofVideoStreamsPatch.java
@@ -165,10 +165,11 @@ public static byte[] removeVideoPlaybackPostBody(Uri uri, int method, byte[] pos
         return postData;
     }
 
-    public static final class ForceiOSAVCAvailability implements Setting.Availability {
+    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;
         }
     }
 }
diff --git a/...ared/library/src/main/java/app/revanced/extension/shared/spoof/requests/PlayerRoutes.java b/...ared/library/src/main/java/app/revanced/extension/shared/spoof/requests/PlayerRoutes.java
@@ -5,11 +5,11 @@
 
 import java.io.IOException;
 import java.net.HttpURLConnection;
-import java.util.Locale;
 
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.requests.Requester;
 import app.revanced.extension.shared.requests.Route;
+import app.revanced.extension.shared.settings.BaseSettings;
 import app.revanced.extension.shared.spoof.ClientType;
 
 final class PlayerRoutes {
@@ -37,9 +37,7 @@ static String createInnertubeBody(ClientType clientType) {
             JSONObject context = new JSONObject();
 
             JSONObject client = new JSONObject();
-            // 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.
-            client.put("hl", Locale.getDefault().toLanguageTag());
+            client.put("hl", BaseSettings.SPOOF_VIDEO_STREAMS_LANGUAGE.get().getIso639_1());
             client.put("clientName", clientType.clientName);
             client.put("clientVersion", clientType.clientVersion);
             client.put("deviceModel", clientType.deviceModel);

diff --git a/...src/main/java/app/revanced/extension/youtube/patches/ChangeDefaultAudioLanguagePatch.java b/...src/main/java/app/revanced/extension/youtube/patches/ChangeDefaultAudioLanguagePatch.java
diff --git a/...ube/src/main/java/app/revanced/extension/youtube/patches/DisableAutoAudioTracksPatch.java b/...ube/src/main/java/app/revanced/extension/youtube/patches/DisableAutoAudioTracksPatch.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 DisableAutoAudioTracksPatch {
+
+    private static final String DEFAULT_AUDIO_TRACKS_IDENTIFIER = "original";
+
+    /**
+     * Injection point.
+     */
+    public static boolean isDefaultAudioStream(boolean isDefault, String audioTrackId, String audioTrackDisplayName) {
+        try {
+            if (!Settings.DISABLE_AUTO_AUDIO_TRACKS.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;
+    }
+}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/Settings.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/Settings.java
@@ -34,7 +34,6 @@
 import app.revanced.extension.shared.settings.Setting;
 import app.revanced.extension.shared.settings.StringSetting;
 import app.revanced.extension.shared.settings.preference.SharedPrefCategory;
-import app.revanced.extension.shared.spoof.AudioStreamLanguage;
 import app.revanced.extension.youtube.patches.AlternativeThumbnailsPatch.DeArrowAvailability;
 import app.revanced.extension.youtube.patches.AlternativeThumbnailsPatch.StillImagesAvailability;
 import app.revanced.extension.youtube.patches.AlternativeThumbnailsPatch.ThumbnailOption;
@@ -54,7 +53,7 @@ public class Settings extends BaseSettings {
     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 EnumSetting<AudioStreamLanguage> AUDIO_DEFAULT_LANGUAGE = new EnumSetting<>("revanced_audio_default_language", AudioStreamLanguage.DEFAULT);
+    public static final BooleanSetting DISABLE_AUTO_AUDIO_TRACKS = new BooleanSetting("revanced_disable_auto_audio_tracks", TRUE);
 
     // Ads
     public static final BooleanSetting HIDE_BUTTONED_ADS = new BooleanSetting("revanced_hide_buttoned_ads", TRUE);

diff --git a/...n/java/app/revanced/extension/youtube/settings/preference/ReVancedPreferenceFragment.java b/...n/java/app/revanced/extension/youtube/settings/preference/ReVancedPreferenceFragment.java
@@ -109,9 +109,9 @@ protected void initialize() {
                 CustomPlaybackSpeedPatch.initializeListPreference(playbackPreference);
             }
 
-            preference = findPreference(Settings.AUDIO_DEFAULT_LANGUAGE.key);
+            preference = findPreference(Settings.SPOOF_VIDEO_STREAMS_LANGUAGE.key);
             if (preference instanceof ListPreference languagePreference) {
-                sortListPreferenceByValues(languagePreference, 3);
+                sortListPreferenceByValues(languagePreference, 2);
             }
         } catch (Exception ex) {
             Logger.printException(() -> "initialize failure", ex);

diff --git a/patches/api/patches.api b/patches/api/patches.api
@@ -1392,8 +1392,8 @@ 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/ChangeDefaultAudioLanguagePatchKt {
-	public static final fun getChangeDefaultAudioLanguagePatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+public final class app/revanced/patches/youtube/video/audio/DisableAutoAudioTracksPatchKt {
+	public static final fun getDisableAutoAudioTracksPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
 public final class app/revanced/patches/youtube/video/information/VideoInformationPatchKt {

diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/spoof/SpoofVideoStreamsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/spoof/SpoofVideoStreamsPatch.kt
@@ -40,6 +40,10 @@ val spoofVideoStreamsPatch = spoofVideoStreamsPatch({
                     "revanced_spoof_video_streams_client",
                     summaryKey = null,
                 ),
+                ListPreference(
+                    "revanced_spoof_video_streams_language",
+                    summaryKey = null
+                ),
                 SwitchPreference("revanced_spoof_video_streams_ios_force_avc"),
                 // Preference requires a title but the actual text is chosen at runtime.
                 NonInteractivePreference(

diff --git a/.../audio/ChangeDefaultAudioLanguagePatch.kt → ...ideo/audio/DisableAutoAudioTracksPatch.kt b/.../audio/ChangeDefaultAudioLanguagePatch.kt → ...ideo/audio/DisableAutoAudioTracksPatch.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.patches.all.misc.resources.addResources
 import app.revanced.patches.all.misc.resources.addResourcesPatch
-import app.revanced.patches.shared.misc.settings.preference.ListPreference
+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
@@ -26,12 +26,12 @@ 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/ChangeDefaultAudioLanguagePatch;"
+    "Lapp/revanced/extension/youtube/patches/DisableAutoAudioTracksPatch;"
 
 @Suppress("unused")
-val changeDefaultAudioLanguagePatch = bytecodePatch(
-    name = "Change default audio language",
-    description = "Adds an option to set a default audio language.",
+val disableAutoAudioTracksPatch = bytecodePatch(
+    name = "Disable auto audio tracks",
+    description = "Adds an option to disable audio tracks from being automatically enabled.",
 ) {
     dependsOn(
         sharedExtensionPatch,
@@ -53,13 +53,10 @@ val changeDefaultAudioLanguagePatch = bytecodePatch(
     )
 
     execute {
-        addResources("youtube", "video.audio.changeDefaultAudioTrackPatch")
+        addResources("youtube", "video.audio.disableAutoAudioTracksPatch")
 
         PreferenceScreen.VIDEO.addPreferences(
-            ListPreference(
-                "revanced_audio_default_language",
-                summaryKey = null
-            )
+            SwitchPreference("revanced_disable_auto_audio_tracks")
         )
 
         fun Method.firstFormatStreamingModelCall(