From 6e947e24c2ac36e1bddcd25412870a36aa6c85c8 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Tue, 26 Mar 2024 22:29:06 +0100 Subject: [PATCH] fix(YouTube): Fix video playback by switching to ReVanced GmsCore vendor (#589) --- .../youtube/patches/GmsCoreSupport.java | 11 ++++------- .../patches/spoof/SpoofSignaturePatch.java | 17 ++++++++--------- .../patches/spoof/StoryboardRenderer.java | 1 + .../patches/spoof/requests/PlayerRoutes.java | 1 + .../requests/StoryboardRendererRequester.java | 1 + 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/GmsCoreSupport.java b/app/src/main/java/app/revanced/integrations/youtube/patches/GmsCoreSupport.java index ea1273fe..ddf4786e 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/GmsCoreSupport.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/GmsCoreSupport.java @@ -1,20 +1,18 @@ package app.revanced.integrations.youtube.patches; -import static app.revanced.integrations.shared.StringRef.str; - import android.app.SearchManager; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.net.Uri; import android.os.Build; - import androidx.annotation.RequiresApi; +import app.revanced.integrations.shared.Logger; +import app.revanced.integrations.shared.Utils; import java.util.Objects; -import app.revanced.integrations.shared.Logger; -import app.revanced.integrations.shared.Utils; +import static app.revanced.integrations.shared.StringRef.str; /** * @noinspection unused @@ -61,9 +59,8 @@ public class GmsCoreSupport { private static String getGmsCoreDownloadLink() { final var vendor = getGmsCoreVendor(); + //noinspection SwitchStatementWithTooFewBranches switch (vendor) { - case "com.mgoogle": - return "https://github.com/TeamVanced/VancedMicroG/releases/latest"; case "app.revanced": return "https://github.com/revanced/gmscore/releases/latest"; default: diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/spoof/SpoofSignaturePatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/spoof/SpoofSignaturePatch.java index 531d2b81..6573467a 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/spoof/SpoofSignaturePatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/spoof/SpoofSignaturePatch.java @@ -1,26 +1,25 @@ package app.revanced.integrations.youtube.patches.spoof; -import static app.revanced.integrations.youtube.patches.spoof.requests.StoryboardRendererRequester.getStoryboardRenderer; -import static app.revanced.integrations.shared.Utils.containsAny; - import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; - import androidx.annotation.Nullable; +import app.revanced.integrations.shared.Logger; +import app.revanced.integrations.shared.Utils; +import app.revanced.integrations.youtube.patches.VideoInformation; +import app.revanced.integrations.youtube.settings.Settings; +import app.revanced.integrations.youtube.shared.PlayerType; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import app.revanced.integrations.youtube.patches.VideoInformation; -import app.revanced.integrations.youtube.settings.Settings; -import app.revanced.integrations.youtube.shared.PlayerType; -import app.revanced.integrations.shared.Logger; -import app.revanced.integrations.shared.Utils; +import static app.revanced.integrations.shared.Utils.containsAny; +import static app.revanced.integrations.youtube.patches.spoof.requests.StoryboardRendererRequester.getStoryboardRenderer; /** @noinspection unused*/ +@Deprecated public class SpoofSignaturePatch { /** * Parameter (also used by diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/spoof/StoryboardRenderer.java b/app/src/main/java/app/revanced/integrations/youtube/patches/spoof/StoryboardRenderer.java index f2f69db7..8e337297 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/spoof/StoryboardRenderer.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/spoof/StoryboardRenderer.java @@ -4,6 +4,7 @@ import androidx.annotation.Nullable; import org.jetbrains.annotations.NotNull; +@Deprecated public final class StoryboardRenderer { @Nullable private final String spec; diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/spoof/requests/PlayerRoutes.java b/app/src/main/java/app/revanced/integrations/youtube/patches/spoof/requests/PlayerRoutes.java index c8f7741c..67e69502 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/spoof/requests/PlayerRoutes.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/spoof/requests/PlayerRoutes.java @@ -10,6 +10,7 @@ import org.json.JSONObject; import java.io.IOException; import java.net.HttpURLConnection; +@Deprecated final class PlayerRoutes { private static final String YT_API_URL = "https://www.youtube.com/youtubei/v1/"; static final Route.CompiledRoute GET_STORYBOARD_SPEC_RENDERER = new Route( diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/spoof/requests/StoryboardRendererRequester.java b/app/src/main/java/app/revanced/integrations/youtube/patches/spoof/requests/StoryboardRendererRequester.java index aeb7fe25..31d8c3ef 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/spoof/requests/StoryboardRendererRequester.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/spoof/requests/StoryboardRendererRequester.java @@ -19,6 +19,7 @@ import java.util.Objects; import static app.revanced.integrations.shared.StringRef.str; import static app.revanced.integrations.youtube.patches.spoof.requests.PlayerRoutes.*; +@Deprecated public class StoryboardRendererRequester { /**