fix(YouTube - Video Id): Fix video id not showing the currently playing video (#484)

Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>

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

@@ -1,16 +1,15 @@
 package app.revanced.integrations.patches;
 
 import androidx.annotation.NonNull;
-
-import java.lang.ref.WeakReference;
-import java.lang.reflect.Method;
-import java.util.Objects;
-
 import app.revanced.integrations.patches.playback.speed.RememberPlaybackSpeedPatch;
 import app.revanced.integrations.shared.VideoState;
 import app.revanced.integrations.utils.LogHelper;
 import app.revanced.integrations.utils.ReVancedUtils;
 
+import java.lang.ref.WeakReference;
+import java.lang.reflect.Method;
+import java.util.Objects;
+
 /**
  * Hooking class for the current playing video.
  */
@@ -25,6 +24,10 @@ public final class VideoInformation {
     private static String videoId = "";
     private static long videoLength = 0;
     private static long videoTime = -1;
+
+    @NonNull
+    private static volatile String playerResponseVideoId = "";
+
     /**
      * The current playback speed
      */
@@ -61,6 +64,18 @@ public final class VideoInformation {
         }
     }
 
+    /**
+     * Injection point.  Called off the main thread.
+     *
+     * @param videoId The id of the last video loaded.
+     */
+    public static void setPlayerResponseVideoId(@NonNull String videoId) {
+        if (!playerResponseVideoId.equals(videoId)) {
+            LogHelper.printDebug(() -> "New player response video id: " + videoId);
+            playerResponseVideoId = videoId;
+        }
+    }
+
     /**
      * Injection point.
      * Called when user selects a playback speed.
@@ -141,6 +156,22 @@ public final class VideoInformation {
         return videoId;
     }
 
+    /**
+     * Differs from {@link #videoId} as this is the video id for the
+     * last player response received, which may not be the current video playing.
+     *
+     * If Shorts are loading the background, this commonly will be
+     * different from the Short that is currently on screen.
+     *
+     * For most use cases, you should instead use {@link #getVideoId()}.
+     *
+     * @return The id of the last video loaded. Empty string if not set yet.
+     */
+    @NonNull
+    public static String getPlayerResponseVideoId() {
+        return playerResponseVideoId;
+    }
+
     /**
      * @return The current playback speed.
      */

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

@@ -1,19 +1,20 @@
 package app.revanced.integrations.patches.spoof;
 
+import static app.revanced.integrations.patches.spoof.requests.StoryboardRendererRequester.getStoryboardRenderer;
+import static app.revanced.integrations.utils.ReVancedUtils.containsAny;
+
 import androidx.annotation.Nullable;
-import app.revanced.integrations.patches.VideoInformation;
-import app.revanced.integrations.settings.SettingsEnum;
-import app.revanced.integrations.shared.PlayerType;
-import app.revanced.integrations.utils.LogHelper;
-import app.revanced.integrations.utils.ReVancedUtils;
 
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import static app.revanced.integrations.patches.spoof.requests.StoryboardRendererRequester.getStoryboardRenderer;
+import app.revanced.integrations.patches.VideoInformation;
-import static app.revanced.integrations.utils.ReVancedUtils.containsAny;
+import app.revanced.integrations.settings.SettingsEnum;
+import app.revanced.integrations.shared.PlayerType;
+import app.revanced.integrations.utils.LogHelper;
+import app.revanced.integrations.utils.ReVancedUtils;
 
 /** @noinspection unused*/
 public class SpoofSignaturePatch {
@@ -46,7 +47,7 @@ public class SpoofSignaturePatch {
     /**
      * Last video id loaded. Used to prevent reloading the same spec multiple times.
      */
-    private static volatile String currentVideoId;
+    private static volatile String lastPlayerResponseVideoId;
 
     private static volatile Future<StoryboardRenderer> rendererFuture;
 
@@ -83,7 +84,6 @@ public class SpoofSignaturePatch {
         var isClip = parameters.length() > 150;
         if (isClip) return parameters;
 
-
         // Shorts do not need to be spoofed.
         if (parameters.startsWith(SHORTS_PLAYER_PARAMETERS)) return parameters;
 
@@ -96,18 +96,23 @@ public class SpoofSignaturePatch {
                 // This will cause playback issues in the feed, but it's better than manipulating the history.
                 parameters;
 
-        String videoId = VideoInformation.getVideoId();
+        fetchStoryboardRenderer();
-        if (!videoId.equals(currentVideoId)) {
+
+        return INCOGNITO_PARAMETERS;
+    }
+
+    private static void fetchStoryboardRenderer() {
+        String videoId = VideoInformation.getPlayerResponseVideoId();
+        if (!videoId.equals(lastPlayerResponseVideoId)) {
             rendererFuture = ReVancedUtils.submitOnBackgroundThread(() -> getStoryboardRenderer(videoId));
-            currentVideoId = videoId;
+            lastPlayerResponseVideoId = videoId;
         }
-        // Occasionally when a new video is opened the video will be frozen a few seconds while the audio plays.
+        // Block until the fetch is completed.  Without this, occasionally when a new video is opened
+        // the video will be frozen a few seconds while the audio plays.
         // This is because the main thread is calling to get the storyboard but the fetch is not completed.
         // To prevent this, call get() here and block until the fetch is completed.
         // So later when the main thread calls to get the renderer it will never block as the future is done.
         getRenderer();
-
-        return INCOGNITO_PARAMETERS;
     }
 
     /**