diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/HDRAutoBrightnessPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/HDRAutoBrightnessPatch.java
deleted file mode 100644
index 3c644308..00000000
--- a/app/src/main/java/app/revanced/integrations/youtube/patches/HDRAutoBrightnessPatch.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package app.revanced.integrations.youtube.patches;
-
-import android.view.WindowManager;
-
-import app.revanced.integrations.youtube.settings.Settings;
-import app.revanced.integrations.youtube.swipecontrols.SwipeControlsHostActivity;
-
-/**
- * Patch class for 'hdr-auto-brightness' patch.
- *
- * Edit: This patch no longer does anything, as YT already uses BRIGHTNESS_OVERRIDE_NONE
- * as the default brightness level. The hooked code was also removed from YT 19.09+ as well.
- */
-@Deprecated
-@SuppressWarnings("unused")
-public class HDRAutoBrightnessPatch {
- /**
- * get brightness override for HDR brightness
- *
- * @param original brightness youtube would normally set
- * @return brightness to set on HRD video
- */
- public static float getHDRBrightness(float original) {
- // do nothing if disabled
- if (!Settings.HDR_AUTO_BRIGHTNESS.get()) {
- return original;
- }
-
- // override with brightness set by swipe-controls
- // only when swipe-controls is active and has overridden the brightness
- final SwipeControlsHostActivity swipeControlsHost = SwipeControlsHostActivity.getCurrentHost().get();
- if (swipeControlsHost != null
- && swipeControlsHost.getScreen() != null
- && swipeControlsHost.getConfig().getEnableBrightnessControl()
- && !swipeControlsHost.getScreen().isDefaultBrightness()) {
- return swipeControlsHost.getScreen().getRawScreenBrightness();
- }
-
- // otherwise, set the brightness to auto
- return WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_NONE;
- }
-}
diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/HideEmailAddressPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/HideEmailAddressPatch.java
deleted file mode 100644
index 3cbd5b19..00000000
--- a/app/src/main/java/app/revanced/integrations/youtube/patches/HideEmailAddressPatch.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package app.revanced.integrations.youtube.patches;
-
-import app.revanced.integrations.youtube.settings.Settings;
-
-/**
- * Patch is obsolete and will be deleted in a future release
- */
-@SuppressWarnings("unused")
-@Deprecated()
-public class HideEmailAddressPatch {
- //Used by app.revanced.patches.youtube.layout.personalinformation.patch.HideEmailAddressPatch
- public static int hideEmailAddress(int originalValue) {
- if (Settings.HIDE_EMAIL_ADDRESS.get())
- return 8;
- return originalValue;
- }
-}
diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/announcements/AnnouncementsPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/announcements/AnnouncementsPatch.java
index eec599ec..5afba471 100644
--- a/app/src/main/java/app/revanced/integrations/youtube/patches/announcements/AnnouncementsPatch.java
+++ b/app/src/main/java/app/revanced/integrations/youtube/patches/announcements/AnnouncementsPatch.java
@@ -84,27 +84,10 @@ public final class AnnouncementsPatch {
message = jsonString;
}
- // TODO: Remove this migration code after a few months.
- if (!Settings.DEPRECATED_ANNOUNCEMENT_LAST_HASH.isSetToDefault()){
- final byte[] hashBytes = MessageDigest
- .getInstance("SHA-256")
- .digest(jsonString.getBytes(StandardCharsets.UTF_8));
-
- final var hash = java.util.Base64.getEncoder().encodeToString(hashBytes);
-
- // Migrate to saving the id instead of the hash.
- if (hash.equals(Settings.DEPRECATED_ANNOUNCEMENT_LAST_HASH.get())) {
- Settings.ANNOUNCEMENT_LAST_ID.save(id);
- }
-
- Settings.DEPRECATED_ANNOUNCEMENT_LAST_HASH.resetToDefault();
- }
-
// Do not show the announcement, if the last announcement id is the same as the current one.
if (Settings.ANNOUNCEMENT_LAST_ID.get() == id) return;
-
int finalId = id;
final var finalTitle = title;
final var finalMessage = Html.fromHtml(message, FROM_HTML_MODE_COMPACT);
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
deleted file mode 100644
index 6573467a..00000000
--- a/app/src/main/java/app/revanced/integrations/youtube/patches/spoof/SpoofSignaturePatch.java
+++ /dev/null
@@ -1,241 +0,0 @@
-package app.revanced.integrations.youtube.patches.spoof;
-
-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 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
- * yt-dlp)
- * to fix playback issues.
- */
- private static final String INCOGNITO_PARAMETERS = "CgIQBg==";
-
- /**
- * Parameters used when playing clips.
- */
- private static final String CLIPS_PARAMETERS = "kAIB";
-
- /**
- * Parameters causing playback issues.
- */
- private static final String[] AUTOPLAY_PARAMETERS = {
- "YAHI", // Autoplay in feed.
- "SAFg" // Autoplay in scrim.
- };
-
- /**
- * Parameter used for autoplay in scrim.
- * Prepend this parameter to mute video playback (for autoplay in feed).
- */
- private static final String SCRIM_PARAMETER = "SAFgAXgB";
-
- /**
- * Last video id loaded. Used to prevent reloading the same spec multiple times.
- */
- @Nullable
- private static volatile String lastPlayerResponseVideoId;
-
- @Nullable
- private static volatile Future rendererFuture;
-
- private static volatile boolean useOriginalStoryboardRenderer;
-
- private static volatile boolean isPlayingShorts;
-
- @Nullable
- private static StoryboardRenderer getRenderer(boolean waitForCompletion) {
- Future future = rendererFuture;
- if (future != null) {
- try {
- if (waitForCompletion || future.isDone()) {
- return future.get(20000, TimeUnit.MILLISECONDS); // Any arbitrarily large timeout.
- } // else, return null.
- } catch (TimeoutException ex) {
- Logger.printDebug(() -> "Could not get renderer (get timed out)");
- } catch (ExecutionException | InterruptedException ex) {
- // Should never happen.
- Logger.printException(() -> "Could not get renderer", ex);
- }
- }
- return null;
- }
-
- /**
- * Injection point.
- *
- * Called off the main thread, and called multiple times for each video.
- *
- * @param parameters Original protobuf parameter value.
- */
- public static String spoofParameter(String parameters, boolean isShortAndOpeningOrPlaying) {
- try {
- Logger.printDebug(() -> "Original protobuf parameter value: " + parameters);
-
- if (parameters == null || !Settings.SPOOF_SIGNATURE.get()) {
- return parameters;
- }
-
- // Clip's player parameters contain a lot of information (e.g. video start and end time or whether it loops)
- // For this reason, the player parameters of a clip are usually very long (150~300 characters).
- // Clips are 60 seconds or less in length, so no spoofing.
- //noinspection AssignmentUsedAsCondition
- if (useOriginalStoryboardRenderer = parameters.length() > 150 || parameters.startsWith(CLIPS_PARAMETERS)) {
- return parameters;
- }
-
- // Shorts do not need to be spoofed.
- //noinspection AssignmentUsedAsCondition
- if (useOriginalStoryboardRenderer = VideoInformation.playerParametersAreShort(parameters)) {
- isPlayingShorts = true;
- return parameters;
- }
- isPlayingShorts = false;
-
- boolean isPlayingFeed = PlayerType.getCurrent() == PlayerType.INLINE_MINIMAL
- && containsAny(parameters, AUTOPLAY_PARAMETERS);
- if (isPlayingFeed) {
- //noinspection AssignmentUsedAsCondition
- if (useOriginalStoryboardRenderer = !Settings.SPOOF_SIGNATURE_IN_FEED.get()) {
- // Don't spoof the feed video playback. This will cause video playback issues,
- // but only if user continues watching for more than 1 minute.
- return parameters;
- }
- // Spoof the feed video. Video will show up in watch history and video subtitles are missing.
- fetchStoryboardRenderer();
- return SCRIM_PARAMETER + INCOGNITO_PARAMETERS;
- }
-
- fetchStoryboardRenderer();
- } catch (Exception ex) {
- Logger.printException(() -> "spoofParameter failure", ex);
- }
- return INCOGNITO_PARAMETERS;
- }
-
- private static void fetchStoryboardRenderer() {
- if (!Settings.SPOOF_STORYBOARD_RENDERER.get()) {
- lastPlayerResponseVideoId = null;
- rendererFuture = null;
- return;
- }
- String videoId = VideoInformation.getPlayerResponseVideoId();
- if (!videoId.equals(lastPlayerResponseVideoId)) {
- rendererFuture = Utils.submitOnBackgroundThread(() -> getStoryboardRenderer(videoId));
- lastPlayerResponseVideoId = videoId;
- }
- // Block until the renderer fetch completes.
- // This is desired because if this returns without finishing the fetch
- // then video will start playback but the storyboard is not ready yet.
- getRenderer(true);
- }
-
- private static String getStoryboardRendererSpec(String originalStoryboardRendererSpec,
- boolean returnNullIfLiveStream) {
- if (Settings.SPOOF_SIGNATURE.get() && !useOriginalStoryboardRenderer) {
- StoryboardRenderer renderer = getRenderer(false);
- if (renderer != null) {
- if (returnNullIfLiveStream && renderer.isLiveStream()) {
- return null;
- }
- String spec = renderer.getSpec();
- if (spec != null) {
- return spec;
- }
- }
- }
-
- return originalStoryboardRendererSpec;
- }
-
- /**
- * Injection point.
- * Called from background threads and from the main thread.
- */
- @Nullable
- public static String getStoryboardRendererSpec(String originalStoryboardRendererSpec) {
- return getStoryboardRendererSpec(originalStoryboardRendererSpec, false);
- }
-
- /**
- * Injection point.
- * Uses additional check to handle live streams.
- * Called from background threads and from the main thread.
- */
- @Nullable
- public static String getStoryboardDecoderRendererSpec(String originalStoryboardRendererSpec) {
- return getStoryboardRendererSpec(originalStoryboardRendererSpec, true);
- }
-
- /**
- * Injection point.
- */
- public static int getRecommendedLevel(int originalLevel) {
- if (Settings.SPOOF_SIGNATURE.get() && !useOriginalStoryboardRenderer) {
- StoryboardRenderer renderer = getRenderer(false);
- if (renderer != null) {
- Integer recommendedLevel = renderer.getRecommendedLevel();
- if (recommendedLevel != null) return recommendedLevel;
- }
- }
-
- return originalLevel;
- }
-
- /**
- * Injection point. Forces seekbar to be shown for paid videos or
- * if {@link Settings#SPOOF_STORYBOARD_RENDERER} is not enabled.
- */
- public static boolean getSeekbarThumbnailOverrideValue() {
- if (!Settings.SPOOF_SIGNATURE.get()) {
- return false;
- }
- StoryboardRenderer renderer = getRenderer(false);
- if (renderer == null) {
- // Spoof storyboard renderer is turned off,
- // video is paid, or the storyboard fetch timed out.
- // Show empty thumbnails so the seek time and chapters still show up.
- return true;
- }
- return renderer.getSpec() != null;
- }
-
- /**
- * Injection point.
- *
- * @param view seekbar thumbnail view. Includes both shorts and regular videos.
- */
- public static void seekbarImageViewCreated(ImageView view) {
- try {
- if (!Settings.SPOOF_SIGNATURE.get()
- || Settings.SPOOF_STORYBOARD_RENDERER.get()) {
- return;
- }
- if (isPlayingShorts) return;
-
- view.setVisibility(View.GONE);
- // Also hide the border around the thumbnail (otherwise a 1 pixel wide bordered frame is visible).
- ViewGroup parentLayout = (ViewGroup) view.getParent();
- parentLayout.setPadding(0, 0, 0, 0);
- } catch (Exception ex) {
- Logger.printException(() -> "seekbarImageViewCreated failure", ex);
- }
- }
-}
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
deleted file mode 100644
index 8e337297..00000000
--- a/app/src/main/java/app/revanced/integrations/youtube/patches/spoof/StoryboardRenderer.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package app.revanced.integrations.youtube.patches.spoof;
-
-import androidx.annotation.Nullable;
-
-import org.jetbrains.annotations.NotNull;
-
-@Deprecated
-public final class StoryboardRenderer {
- @Nullable
- private final String spec;
- private final boolean isLiveStream;
- @Nullable
- private final Integer recommendedLevel;
-
- public StoryboardRenderer(@Nullable String spec, boolean isLiveStream, @Nullable Integer recommendedLevel) {
- this.spec = spec;
- this.isLiveStream = isLiveStream;
- this.recommendedLevel = recommendedLevel;
- }
-
- @Nullable
- public String getSpec() {
- return spec;
- }
-
- public boolean isLiveStream() {
- return isLiveStream;
- }
-
- /**
- * @return Recommended image quality level, or NULL if no recommendation exists.
- */
- @Nullable
- public Integer getRecommendedLevel() {
- return recommendedLevel;
- }
-
- @NotNull
- @Override
- public String toString() {
- return "StoryboardRenderer{" +
- "isLiveStream=" + isLiveStream +
- ", spec='" + spec + '\'' +
- ", recommendedLevel=" + recommendedLevel +
- '}';
- }
-}
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
deleted file mode 100644
index 7909387f..00000000
--- a/app/src/main/java/app/revanced/integrations/youtube/patches/spoof/requests/PlayerRoutes.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package app.revanced.integrations.youtube.patches.spoof.requests;
-
-import app.revanced.integrations.youtube.requests.Requester;
-import app.revanced.integrations.youtube.requests.Route;
-import app.revanced.integrations.shared.Logger;
-import app.revanced.integrations.shared.Utils;
-import org.json.JSONException;
-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(
- Route.Method.POST,
- "player" +
- "?fields=storyboards.playerStoryboardSpecRenderer," +
- "storyboards.playerLiveStoryboardSpecRenderer," +
- "playabilityStatus.status"
- ).compile();
-
- static final String ANDROID_INNER_TUBE_BODY;
- static final String TV_EMBED_INNER_TUBE_BODY;
-
- /**
- * TCP connection and HTTP read timeout
- */
- private static final int CONNECTION_TIMEOUT_MILLISECONDS = 4 * 1000; // 4 Seconds.
-
- static {
- JSONObject innerTubeBody = new JSONObject();
-
- try {
- JSONObject context = new JSONObject();
-
- JSONObject client = new JSONObject();
- client.put("clientName", "ANDROID");
- client.put("clientVersion", Utils.getAppVersionName());
- client.put("androidSdkVersion", 34);
-
- context.put("client", client);
-
- innerTubeBody.put("context", context);
- innerTubeBody.put("videoId", "%s");
- } catch (JSONException e) {
- Logger.printException(() -> "Failed to create innerTubeBody", e);
- }
-
- ANDROID_INNER_TUBE_BODY = innerTubeBody.toString();
-
- JSONObject tvEmbedInnerTubeBody = new JSONObject();
-
- try {
- JSONObject context = new JSONObject();
-
- JSONObject client = new JSONObject();
- client.put("clientName", "TVHTML5_SIMPLY_EMBEDDED_PLAYER");
- client.put("clientVersion", "2.0");
- client.put("platform", "TV");
- client.put("clientScreen", "EMBED");
-
- JSONObject thirdParty = new JSONObject();
- thirdParty.put("embedUrl", "https://www.youtube.com/watch?v=%s");
-
- context.put("thirdParty", thirdParty);
- context.put("client", client);
-
- tvEmbedInnerTubeBody.put("context", context);
- tvEmbedInnerTubeBody.put("videoId", "%s");
- } catch (JSONException e) {
- Logger.printException(() -> "Failed to create tvEmbedInnerTubeBody", e);
- }
-
- TV_EMBED_INNER_TUBE_BODY = tvEmbedInnerTubeBody.toString();
- }
-
- private PlayerRoutes() {
- }
-
- /** @noinspection SameParameterValue*/
- static HttpURLConnection getPlayerResponseConnectionFromRoute(Route.CompiledRoute route) throws IOException {
- var connection = Requester.getConnectionFromCompiledRoute(YT_API_URL, route);
-
- connection.setRequestProperty(
- "User-Agent", "com.google.android.youtube/" +
- Utils.getAppVersionName() +
- " (Linux; U; Android 12; GB) gzip"
- );
- connection.setRequestProperty("X-Goog-Api-Format-Version", "2");
- connection.setRequestProperty("Content-Type", "application/json");
-
- connection.setUseCaches(false);
- connection.setDoOutput(true);
-
- connection.setConnectTimeout(CONNECTION_TIMEOUT_MILLISECONDS);
- connection.setReadTimeout(CONNECTION_TIMEOUT_MILLISECONDS);
- return connection;
- }
-}
\ No newline at end of file
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
deleted file mode 100644
index 31d8c3ef..00000000
--- a/app/src/main/java/app/revanced/integrations/youtube/patches/spoof/requests/StoryboardRendererRequester.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package app.revanced.integrations.youtube.patches.spoof.requests;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import app.revanced.integrations.shared.settings.BaseSettings;
-import app.revanced.integrations.youtube.patches.spoof.StoryboardRenderer;
-import app.revanced.integrations.youtube.requests.Requester;
-import app.revanced.integrations.shared.Logger;
-import app.revanced.integrations.shared.Utils;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.SocketTimeoutException;
-import java.nio.charset.StandardCharsets;
-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 {
-
- /**
- * For videos that have no storyboard.
- * Usually for low resolution videos as old as YouTube itself.
- * Does not include paid videos where the renderer fetch fails.
- */
- private static final StoryboardRenderer emptyStoryboard
- = new StoryboardRenderer(null, false, null);
-
- private StoryboardRendererRequester() {
- }
-
- private static void randomlyWaitIfLocallyDebugging() {
- final boolean randomlyWait = false; // Enable to simulate slow connection responses.
- if (randomlyWait) {
- final long maximumTimeToRandomlyWait = 10000;
- Utils.doNothingForDuration(maximumTimeToRandomlyWait);
- }
- }
-
- private static void handleConnectionError(@NonNull String toastMessage, @Nullable Exception ex,
- boolean showToastOnIOException) {
- if (showToastOnIOException) Utils.showToastShort(toastMessage);
- Logger.printInfo(() -> toastMessage, ex);
- }
-
- @Nullable
- private static JSONObject fetchPlayerResponse(@NonNull String requestBody, boolean showToastOnIOException) {
- final long startTime = System.currentTimeMillis();
- try {
- Utils.verifyOffMainThread();
- Objects.requireNonNull(requestBody);
-
- final byte[] innerTubeBody = requestBody.getBytes(StandardCharsets.UTF_8);
-
- HttpURLConnection connection = PlayerRoutes.getPlayerResponseConnectionFromRoute(GET_STORYBOARD_SPEC_RENDERER);
- connection.getOutputStream().write(innerTubeBody, 0, innerTubeBody.length);
-
- final int responseCode = connection.getResponseCode();
- randomlyWaitIfLocallyDebugging();
- if (responseCode == 200) return Requester.parseJSONObject(connection);
-
- // Always show a toast for this, as a non 200 response means something is broken.
- // Not a normal code path and should not be reached, so no translations are needed.
- handleConnectionError("Spoof storyboard not available: " + responseCode,
- null, showToastOnIOException || BaseSettings.DEBUG_TOAST_ON_ERROR.get());
- connection.disconnect();
- } catch (SocketTimeoutException ex) {
- handleConnectionError(str("revanced_spoof_storyboard_timeout"), ex, showToastOnIOException);
- } catch (IOException ex) {
- handleConnectionError(str("revanced_spoof_storyboard_io_exception", ex.getMessage()),
- ex, showToastOnIOException);
- } catch (Exception ex) {
- Logger.printException(() -> "Spoof storyboard fetch failed", ex); // Should never happen.
- } finally {
- Logger.printDebug(() -> "Request took: " + (System.currentTimeMillis() - startTime) + "ms");
- }
-
- return null;
- }
-
- private static boolean isPlayabilityStatusOk(@NonNull JSONObject playerResponse) {
- try {
- return playerResponse.getJSONObject("playabilityStatus").getString("status").equals("OK");
- } catch (JSONException e) {
- Logger.printDebug(() -> "Failed to get playabilityStatus for response: " + playerResponse);
- }
-
- return false;
- }
-
- /**
- * Fetches the storyboardRenderer from the innerTubeBody.
- * @param innerTubeBody The innerTubeBody to use to fetch the storyboardRenderer.
- * @return StoryboardRenderer or null if playabilityStatus is not OK.
- */
- @Nullable
- private static StoryboardRenderer getStoryboardRendererUsingBody(@NonNull String innerTubeBody,
- boolean showToastOnIOException) {
- final JSONObject playerResponse = fetchPlayerResponse(innerTubeBody, showToastOnIOException);
- if (playerResponse != null && isPlayabilityStatusOk(playerResponse))
- return getStoryboardRendererUsingResponse(playerResponse);
-
- return null;
- }
-
- @Nullable
- private static StoryboardRenderer getStoryboardRendererUsingResponse(@NonNull JSONObject playerResponse) {
- try {
- Logger.printDebug(() -> "Parsing response: " + playerResponse);
- if (!playerResponse.has("storyboards")) {
- Logger.printDebug(() -> "Using empty storyboard");
- return emptyStoryboard;
- }
- final JSONObject storyboards = playerResponse.getJSONObject("storyboards");
- final boolean isLiveStream = storyboards.has("playerLiveStoryboardSpecRenderer");
- final String storyboardsRendererTag = isLiveStream
- ? "playerLiveStoryboardSpecRenderer"
- : "playerStoryboardSpecRenderer";
-
- final var rendererElement = storyboards.getJSONObject(storyboardsRendererTag);
- StoryboardRenderer renderer = new StoryboardRenderer(
- rendererElement.getString("spec"),
- isLiveStream,
- rendererElement.has("recommendedLevel")
- ? rendererElement.getInt("recommendedLevel")
- : null
- );
-
- Logger.printDebug(() -> "Fetched: " + renderer);
-
- return renderer;
- } catch (JSONException e) {
- Logger.printException(() -> "Failed to get storyboardRenderer", e);
- }
-
- return null;
- }
-
- @Nullable
- public static StoryboardRenderer getStoryboardRenderer(@NonNull String videoId) {
- Objects.requireNonNull(videoId);
-
- var renderer = getStoryboardRendererUsingBody(
- String.format(ANDROID_INNER_TUBE_BODY, videoId), false);
- if (renderer == null) {
- Logger.printDebug(() -> videoId + " not available using Android client");
- renderer = getStoryboardRendererUsingBody(
- String.format(TV_EMBED_INNER_TUBE_BODY, videoId, videoId), true);
- if (renderer == null) {
- Logger.printDebug(() -> videoId + " not available using TV embedded client");
- }
- }
-
- return renderer;
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/app/revanced/integrations/youtube/settings/Settings.java b/app/src/main/java/app/revanced/integrations/youtube/settings/Settings.java
index c2556984..adcebc64 100644
--- a/app/src/main/java/app/revanced/integrations/youtube/settings/Settings.java
+++ b/app/src/main/java/app/revanced/integrations/youtube/settings/Settings.java
@@ -30,8 +30,6 @@ public class Settings extends BaseSettings {
public static final FloatSetting PLAYBACK_SPEED_DEFAULT = new FloatSetting("revanced_playback_speed_default", 1.0f);
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);
- @Deprecated // Patch is obsolete and no longer works with 19.09+
- public static final BooleanSetting HDR_AUTO_BRIGHTNESS = new BooleanSetting("revanced_hdr_auto_brightness", TRUE);
// Ads
public static final BooleanSetting HIDE_FULLSCREEN_ADS = new BooleanSetting("revanced_hide_fullscreen_ads", TRUE);
@@ -83,7 +81,6 @@ public class Settings extends BaseSettings {
public static final BooleanSetting HIDE_COMMUNITY_POSTS = new BooleanSetting("revanced_hide_community_posts", FALSE);
public static final BooleanSetting HIDE_COMPACT_BANNER = new BooleanSetting("revanced_hide_compact_banner", TRUE);
public static final BooleanSetting HIDE_CROWDFUNDING_BOX = new BooleanSetting("revanced_hide_crowdfunding_box", FALSE, true);
- @Deprecated public static final BooleanSetting HIDE_EMAIL_ADDRESS = new BooleanSetting("revanced_hide_email_address", FALSE);
public static final BooleanSetting HIDE_EMERGENCY_BOX = new BooleanSetting("revanced_hide_emergency_box", TRUE);
public static final BooleanSetting HIDE_ENDSCREEN_CARDS = new BooleanSetting("revanced_hide_endscreen_cards", TRUE);
public static final BooleanSetting HIDE_EXPANDABLE_CHIP = new BooleanSetting("revanced_hide_expandable_chip", TRUE);
@@ -99,7 +96,6 @@ public class Settings extends BaseSettings {
public static final BooleanSetting HIDE_IMAGE_SHELF = new BooleanSetting("revanced_hide_image_shelf", TRUE);
public static final BooleanSetting HIDE_INFO_CARDS = new BooleanSetting("revanced_hide_info_cards", TRUE);
public static final BooleanSetting HIDE_JOIN_MEMBERSHIP_BUTTON = new BooleanSetting("revanced_hide_join_membership_button", TRUE);
- @Deprecated public static final BooleanSetting HIDE_LOAD_MORE_BUTTON = new BooleanSetting("revanced_hide_load_more_button", TRUE);
public static final BooleanSetting HIDE_SHOW_MORE_BUTTON = new BooleanSetting("revanced_hide_show_more_button", TRUE, true);
public static final BooleanSetting HIDE_MEDICAL_PANELS = new BooleanSetting("revanced_hide_medical_panels", TRUE);
public static final BooleanSetting HIDE_MIX_PLAYLISTS = new BooleanSetting("revanced_hide_mix_playlists", TRUE);
@@ -235,8 +231,6 @@ public class Settings extends BaseSettings {
"revanced_spoof_device_dimensions_user_dialog_message");
public static final BooleanSetting BYPASS_URL_REDIRECTS = new BooleanSetting("revanced_bypass_url_redirects", TRUE);
public static final BooleanSetting ANNOUNCEMENTS = new BooleanSetting("revanced_announcements", TRUE);
- @Deprecated
- public static final StringSetting DEPRECATED_ANNOUNCEMENT_LAST_HASH = new StringSetting("revanced_announcement_last_hash", "");
public static final IntegerSetting ANNOUNCEMENT_LAST_ID = new IntegerSetting("revanced_announcement_last_id", -1);
public static final BooleanSetting REMOVE_TRACKING_QUERY_PARAMETER = new BooleanSetting("revanced_remove_tracking_query_parameter", TRUE);
@@ -247,14 +241,6 @@ public class Settings extends BaseSettings {
*/
public static final BooleanSetting DEBUG_PROTOBUFFER = new BooleanSetting("revanced_debug_protobuffer", FALSE, parent(BaseSettings.DEBUG));
- // Old deprecated signature spoofing
- @Deprecated public static final BooleanSetting SPOOF_SIGNATURE = new BooleanSetting("revanced_spoof_signature_verification_enabled", TRUE, true, false,
- "revanced_spoof_signature_verification_enabled_user_dialog_message", null);
- @Deprecated public static final BooleanSetting SPOOF_SIGNATURE_IN_FEED = new BooleanSetting("revanced_spoof_signature_in_feed_enabled", FALSE, false, false, null,
- parent(SPOOF_SIGNATURE));
- @Deprecated public static final BooleanSetting SPOOF_STORYBOARD_RENDERER = new BooleanSetting("revanced_spoof_storyboard", TRUE, true, false, null,
- parent(SPOOF_SIGNATURE));
-
// Swipe controls
public static final BooleanSetting SWIPE_BRIGHTNESS = new BooleanSetting("revanced_swipe_brightness", TRUE);
public static final BooleanSetting SWIPE_VOLUME = new BooleanSetting("revanced_swipe_volume", TRUE);
@@ -396,8 +382,6 @@ public class Settings extends BaseSettings {
// Remove any previously saved announcement consumer (a random generated string).
Setting.preferences.removeKey("revanced_announcement_consumer");
- migrateOldSettingToNew(HIDE_LOAD_MORE_BUTTON, HIDE_SHOW_MORE_BUTTON);
-
// endregion
}
}