fix(YouTube - Spoof streaming data): On iOS clients, livestreams al…

…ways start from the beginning
anddea · Dec 17, 2024 · 4e60bf5 · 4e60bf5
1 parent a58ed6b
commit 4e60bf5
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 7 deletions.
diff --git a/...ed/src/main/java/app/revanced/extension/shared/patches/spoof/SpoofStreamingDataPatch.java b/...ed/src/main/java/app/revanced/extension/shared/patches/spoof/SpoofStreamingDataPatch.java
@@ -78,6 +78,16 @@ public static boolean isSpoofingEnabled() {
         return SPOOF_STREAMING_DATA;
     }
 
+    /**
+     * Injection point.
+     */
+    public static boolean fixHLSCurrentTime(boolean original) {
+        if (!SPOOF_STREAMING_DATA) {
+            return original;
+        }
+        return false;
+    }
+
     /**
      * Injection point.
      */

diff --git a/...vanced/extension/youtube/settings/preference/SpoofStreamingDataSideEffectsPreference.java b/...vanced/extension/youtube/settings/preference/SpoofStreamingDataSideEffectsPreference.java
@@ -64,13 +64,7 @@ protected void onPrepareForRemoval() {
 
     private void updateUI() {
         final ClientType clientType = Settings.SPOOF_STREAMING_DATA_TYPE.get();
-
-        final String summaryTextKey;
-        if (clientType == ClientType.IOS && Settings.SPOOF_STREAMING_DATA_IOS_SKIP_LIVESTREAM_PLAYBACK.get()) {
-            summaryTextKey = "revanced_spoof_streaming_data_side_effects_ios_skip_livestream_playback";
-        } else {
-            summaryTextKey = "revanced_spoof_streaming_data_side_effects_" + clientType.name().toLowerCase();
-        }
+        final String summaryTextKey = "revanced_spoof_streaming_data_side_effects_" + clientType.name().toLowerCase();
 
         setSummary(str(summaryTextKey));
         setEnabled(Settings.SPOOF_STREAMING_DATA.get());

diff --git a/...ain/kotlin/app/revanced/patches/shared/spoof/streamingdata/BaseSpoofStreamingDataPatch.kt b/...ain/kotlin/app/revanced/patches/shared/spoof/streamingdata/BaseSpoofStreamingDataPatch.kt
@@ -12,6 +12,7 @@ import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patches.shared.extension.Constants.SPOOF_PATH
 import app.revanced.util.findInstructionIndicesReversedOrThrow
 import app.revanced.util.fingerprint.definingClassOrThrow
+import app.revanced.util.fingerprint.injectLiteralInstructionBooleanCall
 import app.revanced.util.fingerprint.matchOrThrow
 import app.revanced.util.fingerprint.methodOrThrow
 import app.revanced.util.getReference
@@ -209,6 +210,15 @@ fun baseSpoofStreamingDataPatch(
 
         // endregion
 
+        // region Fix iOS livestream current time.
+
+        hlsCurrentTimeFingerprint.injectLiteralInstructionBooleanCall(
+            HLS_CURRENT_TIME_FEATURE_FLAG,
+            "$EXTENSION_CLASS_DESCRIPTOR->fixHLSCurrentTime(Z)Z"
+        )
+
+        // endregion
+
         executeBlock()
 
     }

diff --git a/patches/src/main/kotlin/app/revanced/patches/shared/spoof/streamingdata/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/shared/spoof/streamingdata/Fingerprints.kt
@@ -134,3 +134,12 @@ internal val protobufClassParseByteBufferFingerprint = legacyFingerprint(
     ),
     customFingerprint = { method, _ -> method.name == "parseFrom" },
 )
+
+internal const val HLS_CURRENT_TIME_FEATURE_FLAG = 45355374L
+
+internal val hlsCurrentTimeFingerprint = legacyFingerprint(
+    name = "hlsCurrentTimeFingerprint",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    parameters = listOf("Z", "L"),
+    literals = listOf(HLS_CURRENT_TIME_FEATURE_FLAG),
+)