fix(YouTube - Shorts components): Autoplay option of Change Shorts repeat state not working (20.09+)

This commit is contained in:
inotia00
2025-03-22 11:37:46 +09:00
parent fec13ad15b
commit c85816bbe9
8 changed files with 223 additions and 79 deletions

View File

@ -2,6 +2,8 @@ package app.revanced.extension.youtube.patches.shorts;
import android.app.Activity;
import androidx.annotation.Nullable;
import java.lang.ref.WeakReference;
import java.util.Objects;
@ -28,11 +30,16 @@ public class ShortsRepeatStatePatch {
END_SCREEN;
static void setYTEnumValue(Enum<?> ytBehavior) {
String ytName = ytBehavior.name();
for (ShortsLoopBehavior rvBehavior : values()) {
if (ytBehavior.name().endsWith(rvBehavior.name())) {
rvBehavior.ytEnumValue = ytBehavior;
Logger.printDebug(() -> rvBehavior + " set to YT enum: " + ytBehavior.name());
if (ytName.endsWith(rvBehavior.name())) {
if (rvBehavior.ytEnumValue != null) {
Logger.printException(() -> "Conflicting behavior names: " + rvBehavior
+ " ytBehavior: " + ytName);
} else {
rvBehavior.ytEnumValue = ytBehavior;
Logger.printDebug(() -> rvBehavior + " set to YT enum: " + ytName);
}
return;
}
}
@ -77,25 +84,39 @@ public class ShortsRepeatStatePatch {
/**
* Injection point.
*/
public static Enum<?> changeShortsRepeatBehavior(Enum<?> original) {
@Nullable
public static Enum<?> changeShortsRepeatBehavior(@Nullable Enum<?> original) {
try {
final ShortsLoopBehavior behavior = ExtendedUtils.IS_19_34_OR_GREATER &&
if (original == null) {
Logger.printDebug(() -> "Original is null, returning null");
return null;
}
ShortsLoopBehavior behavior = ExtendedUtils.IS_19_34_OR_GREATER &&
isAppInBackgroundPiPMode()
? Settings.CHANGE_SHORTS_BACKGROUND_REPEAT_STATE.get()
: Settings.CHANGE_SHORTS_REPEAT_STATE.get();
Enum<?> overrideBehavior = behavior.ytEnumValue;
if (behavior != ShortsLoopBehavior.UNKNOWN && behavior.ytEnumValue != null) {
Logger.printDebug(() -> behavior.ytEnumValue == original
? "Changing Shorts repeat behavior from: " + original.name() + " to: " + behavior.ytEnumValue
: "Behavior setting is same as original. Using original: " + original.name()
if (overrideBehavior != null) {
Logger.printDebug(() -> overrideBehavior == original
? "Behavior setting is same as original. Using original: " + original.name()
: "Changing Shorts repeat behavior from: " + original.name() + " to: " + overrideBehavior.name()
);
return behavior.ytEnumValue;
return overrideBehavior;
}
} catch (Exception ex) {
Logger.printException(() -> "changeShortsRepeatState failure", ex);
Logger.printException(() -> "changeShortsRepeatBehavior failure", ex);
}
return original;
}
/**
* Injection point.
*/
public static boolean isAutoPlay(@Nullable Enum<?> original) {
return original != null && ShortsLoopBehavior.SINGLE_PLAY.ytEnumValue == original;
}
}