fix(YouTube - Client spoof): Fix toast shown for live streams (#489)

ReVanced · Sep 28, 2023 · 27f49df · 27f49df
1 parent da923a3
commit 27f49df
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 15 deletions.
diff --git a/app/src/main/java/app/revanced/integrations/patches/spoof/SpoofSignaturePatch.java b/app/src/main/java/app/revanced/integrations/patches/spoof/SpoofSignaturePatch.java
@@ -128,23 +128,26 @@ public static boolean getSeekbarThumbnailOverrideValue() {
      */
     @Nullable
     public static String getStoryboardRendererSpec(String originalStoryboardRendererSpec) {
-        if (!SettingsEnum.SPOOF_SIGNATURE.getBoolean()) return originalStoryboardRendererSpec;
-
-        StoryboardRenderer renderer = getRenderer();
-        if (renderer == null) return originalStoryboardRendererSpec;
+        if (SettingsEnum.SPOOF_SIGNATURE.getBoolean()) {
+            StoryboardRenderer renderer = getRenderer();
+            if (renderer != null) return renderer.getSpec();
+        }
 
-        return renderer.getSpec();
+        return originalStoryboardRendererSpec;
     }
 
     /**
      * Injection point.
      */
     public static int getRecommendedLevel(int originalLevel) {
-        if (!SettingsEnum.SPOOF_SIGNATURE.getBoolean()) return originalLevel;
-
-        StoryboardRenderer renderer = getRenderer();
-        if (renderer == null) return originalLevel;
+        if (SettingsEnum.SPOOF_SIGNATURE.getBoolean()) {
+            StoryboardRenderer renderer = getRenderer();
+            if (renderer != null) {
+                Integer recommendedLevel = renderer.getRecommendedLevel();
+                if (recommendedLevel != null) return recommendedLevel;
+            }
+        }
 
-        return renderer.getRecommendedLevel();
+        return originalLevel;
     }
 }
diff --git a/app/src/main/java/app/revanced/integrations/patches/spoof/StoryboardRenderer.java b/app/src/main/java/app/revanced/integrations/patches/spoof/StoryboardRenderer.java
@@ -1,13 +1,16 @@
 package app.revanced.integrations.patches.spoof;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import org.jetbrains.annotations.NotNull;
 
 public final class StoryboardRenderer {
     private final String spec;
-    private final int recommendedLevel;
+    @Nullable
+    private final Integer recommendedLevel;
 
-    public StoryboardRenderer(String spec, int recommendedLevel) {
+    public StoryboardRenderer(String spec, @Nullable Integer recommendedLevel) {
         this.spec = spec;
         this.recommendedLevel = recommendedLevel;
     }
@@ -17,7 +20,11 @@ public String getSpec() {
         return spec;
     }
 
-    public int getRecommendedLevel() {
+    /**
+     * @return Recommended image quality level, or NULL if no recommendation exists.
+     */
+    @Nullable
+    public Integer getRecommendedLevel() {
         return recommendedLevel;
     }
 

diff --git a/...in/java/app/revanced/integrations/patches/spoof/requests/StoryboardRendererRequester.java b/...in/java/app/revanced/integrations/patches/spoof/requests/StoryboardRendererRequester.java
@@ -49,7 +49,7 @@ private static boolean isPlayabilityStatusOk(@NonNull JSONObject playerResponse)
         try {
             return playerResponse.getJSONObject("playabilityStatus").getString("status").equals("OK");
         } catch (JSONException e) {
-            LogHelper.printException(() -> "Failed to get playabilityStatus", e);
+            LogHelper.printDebug(() -> "Failed to get playabilityStatus for response: " + playerResponse);
         }
 
         return false;
@@ -80,7 +80,9 @@ private static StoryboardRenderer getStoryboardRendererUsingResponse(@NonNull JS
             final var rendererElement = storyboards.getJSONObject(storyboardsRendererTag);
             StoryboardRenderer renderer = new StoryboardRenderer(
                     rendererElement.getString("spec"),
-                    rendererElement.getInt("recommendedLevel")
+                    rendererElement.has("recommendedLevel")
+                            ? rendererElement.getInt("recommendedLevel")
+                            : null
             );
 
             LogHelper.printDebug(() -> "Fetched: " + renderer);