Merge remote-tracking branch 'upstream/dev' into feat/patcher_instruction_filters

# Conflicts:
#	patches/api/patches.api
#	patches/src/main/kotlin/app/revanced/patches/shared/misc/spoof/Fingerprints.kt
#	patches/src/main/kotlin/app/revanced/patches/shared/misc/spoof/SpoofVideoStreamsPatch.kt

extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/EnableDebuggingPatch.java

@@ -0,0 +1,79 @@
+package app.revanced.extension.shared.patches;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.settings.BaseSettings;
+
+@SuppressWarnings("unused")
+public final class EnableDebuggingPatch {
+
+    /**
+     * Only log if debugging is enabled on startup.
+     * This prevents enabling debugging
+     * while the app is running then failing to restart
+     * resulting in an incomplete log.
+     */
+    private static final boolean LOG_FEATURE_FLAGS = BaseSettings.DEBUG.get();
+
+    private static final ConcurrentMap<Long, Boolean> featureFlags = LOG_FEATURE_FLAGS
+            ? new ConcurrentHashMap<>(800, 0.5f, 1)
+            : null;
+
+    /**
+     * Injection point.
+     */
+    public static boolean isBooleanFeatureFlagEnabled(boolean value, Long flag) {
+        if (LOG_FEATURE_FLAGS && value) {
+            if (featureFlags.putIfAbsent(flag, true) == null) {
+                Logger.printDebug(() -> "boolean feature is enabled: " + flag);
+            }
+        }
+
+        return value;
+    }
+
+    /**
+     * Injection point.
+     */
+    public static double isDoubleFeatureFlagEnabled(double value, long flag, double defaultValue) {
+        if (LOG_FEATURE_FLAGS && defaultValue != value) {
+            if (featureFlags.putIfAbsent(flag, true) == null) {
+                // Align the log outputs to make post processing easier.
+                Logger.printDebug(() -> " double feature is enabled: " + flag
+                        + " value: " + value + (defaultValue == 0 ? "" : " default: " + defaultValue));
+            }
+        }
+
+        return value;
+    }
+
+    /**
+     * Injection point.
+     */
+    public static long isLongFeatureFlagEnabled(long value, long flag, long defaultValue) {
+        if (LOG_FEATURE_FLAGS && defaultValue != value) {
+            if (featureFlags.putIfAbsent(flag, true) == null) {
+                Logger.printDebug(() -> "   long feature is enabled: " + flag
+                        + " value: " + value + (defaultValue == 0 ? "" : " default: " + defaultValue));
+            }
+        }
+
+        return value;
+    }
+
+    /**
+     * Injection point.
+     */
+    public static String isStringFeatureFlagEnabled(String value, long flag, String defaultValue) {
+        if (LOG_FEATURE_FLAGS && !defaultValue.equals(value)) {
+            if (featureFlags.putIfAbsent(flag, true) == null) {
+                Logger.printDebug(() -> " string feature is enabled: " + flag
+                        + " value: " + value +  (defaultValue.isEmpty() ? "" : " default: " + defaultValue));
+            }
+        }
+
+        return value;
+    }
+}

extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/SpoofVideoStreamsPatch.java

@@ -97,6 +97,35 @@ public class SpoofVideoStreamsPatch {
         return playerRequestUri;
     }
 
+    /**
+     * Injection point.
+     *
+     * Blocks /get_watch requests by returning an unreachable URI.
+     * /att/get requests are used to obtain a PoToken challenge.
+     * See: <a href="https://github.com/FreeTubeApp/FreeTube/blob/4b7208430bc1032019a35a35eb7c8a84987ddbd7/src/botGuardScript.js#L15">botGuardScript.js#L15</a>
+     * <p>
+     * Since the Spoof streaming data patch was implemented because a valid PoToken cannot be obtained,
+     * Blocking /att/get requests are not a problem.
+     */
+    public static String blockGetAttRequest(String originalUrlString) {
+        if (SPOOF_STREAMING_DATA) {
+            try {
+                var originalUri = Uri.parse(originalUrlString);
+                String path = originalUri.getPath();
+
+                if (path != null && path.contains("att/get")) {
+                    Logger.printDebug(() -> "Blocking 'att/get' by returning internet connection check uri");
+
+                    return INTERNET_CONNECTION_CHECK_URI_STRING;
+                }
+            } catch (Exception ex) {
+                Logger.printException(() -> "blockGetAttRequest failure", ex);
+            }
+        }
+
+        return originalUrlString;
+    }
+
     /**
      * Injection point.
      * <p>
@@ -130,7 +159,7 @@ public class SpoofVideoStreamsPatch {
 
     /**
      * Injection point.
-     * Only invoked when playing a livestream on an iOS client.
+     * Only invoked when playing a livestream on an Apple client.
      */
     public static boolean fixHLSCurrentTime(boolean original) {
         if (!SPOOF_STREAMING_DATA) {
@@ -139,6 +168,14 @@ public class SpoofVideoStreamsPatch {
         return false;
     }
 
+    /*
+     * Injection point.
+     * Fix audio stuttering in YouTube Music.
+     */
+    public static boolean disableSABR() {
+        return SPOOF_STREAMING_DATA;
+    }
+
     /**
      * Injection point.
      * Turns off a feature flag that interferes with spoofing.