fix(YouTube - Spoof video streams): Fix error toast that is sometimes shown (#4090)

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

@@ -6,7 +6,6 @@ import androidx.annotation.Nullable;
 
 import java.nio.ByteBuffer;
 import java.util.Map;
-import java.util.Objects;
 
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
@@ -87,14 +86,22 @@ public class SpoofVideoStreamsPatch {
             try {
                 Uri uri = Uri.parse(url);
                 String path = uri.getPath();
+
                 // 'heartbeat' has no video id and appears to be only after playback has started.
-                if (path != null && path.contains("player") && !path.contains("heartbeat")) {
+                // 'refresh' has no video id and appears to happen when waiting for a livestream to start.
-                    String videoId = Objects.requireNonNull(uri.getQueryParameter("id"));
+                if (path != null && path.contains("player") && !path.contains("heartbeat")
-                    StreamingDataRequest.fetchRequest(videoId, requestHeaders);
+                        && !path.contains("refresh")) {
+                    String id = uri.getQueryParameter("id");
+                    if (id == null) {
+                        Logger.printException(() -> "Ignoring request that has no video id." +
+                                " Url: " + url + " headers: " + requestHeaders);
+                        return;
+                    }
+
+                    StreamingDataRequest.fetchRequest(id, requestHeaders);
                 }
             } catch (Exception ex) {
-                Logger.printException(() -> "buildRequest failure. Url: " + url
+                Logger.printException(() -> "buildRequest failure", ex);
-                        + " headers: " + requestHeaders, ex);
             }
         }
     }

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

@@ -0,0 +1,85 @@
+package app.revanced.extension.youtube.settings.preference;
+
+import static app.revanced.extension.shared.StringRef.str;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.Preference;
+import android.preference.PreferenceManager;
+import android.util.AttributeSet;
+
+import androidx.annotation.Nullable;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.BaseSettings;
+import app.revanced.extension.shared.settings.Setting;
+import app.revanced.extension.shared.spoof.ClientType;
+
+@SuppressWarnings({"deprecation", "unused"})
+public class SpoofStreamingDataSideEffectsPreference extends Preference {
+
+    @Nullable
+    private ClientType currentClientType;
+
+    private final SharedPreferences.OnSharedPreferenceChangeListener listener = (sharedPreferences, str) -> {
+        // Because this listener may run before the ReVanced settings fragment updates Settings,
+        // this could show the prior config and not the current.
+        //
+        // Push this call to the end of the main run queue,
+        // so all other listeners are done and Settings is up to date.
+        Utils.runOnMainThread(this::updateUI);
+    };
+
+    public SpoofStreamingDataSideEffectsPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    public SpoofStreamingDataSideEffectsPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public SpoofStreamingDataSideEffectsPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public SpoofStreamingDataSideEffectsPreference(Context context) {
+        super(context);
+    }
+
+    private void addChangeListener() {
+        Setting.preferences.preferences.registerOnSharedPreferenceChangeListener(listener);
+    }
+
+    private void removeChangeListener() {
+        Setting.preferences.preferences.unregisterOnSharedPreferenceChangeListener(listener);
+    }
+
+    @Override
+    protected void onAttachedToHierarchy(PreferenceManager preferenceManager) {
+        super.onAttachedToHierarchy(preferenceManager);
+        updateUI();
+        addChangeListener();
+    }
+
+    @Override
+    protected void onPrepareForRemoval() {
+        super.onPrepareForRemoval();
+        removeChangeListener();
+    }
+
+    private void updateUI() {
+        ClientType clientType = BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get();
+        if (currentClientType == clientType) {
+            return;
+        }
+
+        Logger.printDebug(() -> "Updating spoof stream side effects preference");
+        setEnabled(BaseSettings.SPOOF_VIDEO_STREAMS.get());
+
+        String key = "revanced_spoof_video_streams_about_"
+                + clientType.name().toLowerCase();
+        setTitle(str(key + "_title"));
+        setSummary(str(key + "_summary"));
+    }
+}

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

@@ -45,8 +45,11 @@ val spoofVideoStreamsPatch = spoofVideoStreamsPatch({
                     summaryKey = null
                 ),
                 SwitchPreference("revanced_spoof_video_streams_ios_force_avc"),
-                NonInteractivePreference("revanced_spoof_video_streams_about_android_vr"),
+                // Preference requires a title but the actual text is chosen at runtime.
-                NonInteractivePreference("revanced_spoof_video_streams_about_ios"),
+                NonInteractivePreference(
+                    key = "revanced_spoof_video_streams_about_android_vr",
+                    tag = "app.revanced.extension.youtube.settings.preference.SpoofStreamingDataSideEffectsPreference"
+                ),
             ),
         ),
     )

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

@@ -1229,11 +1229,10 @@ This is because Crowdin requires temporarily flattening this file and removing t
             <string name="revanced_spoof_video_streams_ios_force_avc_summary_off">Video codec is determined automatically</string>
             <string name="revanced_spoof_video_streams_ios_force_avc_user_dialog_message">Enabling this might improve battery life and fix playback stuttering.\n\nAVC 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\n• Livestreams start from the beginning\n• Videos may end 1 second early</string>
+            <string name="revanced_spoof_video_streams_about_ios_summary">• Private kids videos may not play\n• Age restricted videos may not play\n• Livestreams start from the beginning\n• 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\n• Audio track menu is missing\n• Stable volume is not available</string>
+            <string name="revanced_spoof_video_streams_about_android_vr_summary">• Kids videos may not play\n• Age restricted videos may not play\n• Livestreams start from the beginning\n• Videos end 1 second early</string>
-            <string name="revanced_spoof_video_streams_language_">Video streams are spoofed</string>
+            <string name="revanced_spoof_video_streams_language_title">Default audio stream language</string>
-            <string name="revanced_spoof_video_streams_language_title">Preferred 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>
             <string name="revanced_spoof_video_streams_language_AZ">Azerbaijani</string>