From df4b03fed5a0622b18bf4a8dca1940d26a590d8f Mon Sep 17 00:00:00 2001 From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com> Date: Thu, 27 Apr 2023 17:38:52 +0400 Subject: [PATCH] fix(youtube/minimized-playback): disable minimized playback for shorts (#371) --- .../integrations/patches/MinimizedPlaybackPatch.java | 11 ++++++----- .../revanced/integrations/settings/SettingsEnum.java | 1 - 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/app/revanced/integrations/patches/MinimizedPlaybackPatch.java b/app/src/main/java/app/revanced/integrations/patches/MinimizedPlaybackPatch.java index b4ec200f..60e6a642 100644 --- a/app/src/main/java/app/revanced/integrations/patches/MinimizedPlaybackPatch.java +++ b/app/src/main/java/app/revanced/integrations/patches/MinimizedPlaybackPatch.java @@ -1,16 +1,17 @@ package app.revanced.integrations.patches; -import app.revanced.integrations.settings.SettingsEnum; import app.revanced.integrations.shared.PlayerType; public class MinimizedPlaybackPatch { - public static boolean isNotPlayingShorts(boolean isPipEnabled) { - return !PlayerType.getCurrent().isNoneOrHidden() && isPipEnabled; + public static boolean playbackIsNotShort() { + return !PlayerType.getCurrent().isNoneOrHidden(); } - public static boolean isMinimizedPlaybackEnabled() { - return SettingsEnum.ENABLE_MINIMIZED_PLAYBACK.getBoolean(); + public static boolean overrideMinimizedPlaybackAvailable() { + // This could be done entirely in the patch, + // but having a unique method to search for makes manually inspecting the patched apk much easier. + return true; } } diff --git a/app/src/main/java/app/revanced/integrations/settings/SettingsEnum.java b/app/src/main/java/app/revanced/integrations/settings/SettingsEnum.java index 1b0de152..7a72ea7b 100644 --- a/app/src/main/java/app/revanced/integrations/settings/SettingsEnum.java +++ b/app/src/main/java/app/revanced/integrations/settings/SettingsEnum.java @@ -111,7 +111,6 @@ public enum SettingsEnum { CAPTIONS_ENABLED("revanced_autocaptions_enabled", BOOLEAN, FALSE), DISABLE_ZOOM_HAPTICS("revanced_disable_zoom_haptics", BOOLEAN, TRUE), ENABLE_EXTERNAL_BROWSER("revanced_enable_external_browser", BOOLEAN, TRUE, true), - ENABLE_MINIMIZED_PLAYBACK("revanced_enable_minimized_playback", BOOLEAN, TRUE), PREFERRED_AUTO_REPEAT("revanced_pref_auto_repeat", BOOLEAN, FALSE), TAP_SEEKING_ENABLED("revanced_enable_tap_seeking", BOOLEAN, TRUE), USE_HDR_AUTO_BRIGHTNESS("revanced_pref_hdr_autobrightness", BOOLEAN, TRUE),