fix(YouTube Music - Spoof client): Action bar not loading as of YouTube Music 7.17.51

2025-06-12 05:07:41 +02:00 · 2024-12-17 13:27:09 +09:00
parent a27a04d1f2
commit 50850a1fc6
15 changed files with 262 additions and 157 deletions
--- a/patches/src/main/kotlin/app/revanced/patches/music/utils/fix/client/SpoofClientPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/music/utils/fix/client/SpoofClientPatch.kt
@ -15,6 +15,7 @@ import app.revanced.patches.music.utils.settings.CategoryType
 import app.revanced.patches.music.utils.settings.ResourceUtils.updatePatchStatus
 import app.revanced.patches.music.utils.settings.addSwitchPreference
 import app.revanced.patches.music.utils.settings.settingsPatch
+import app.revanced.patches.shared.blockrequest.blockRequestPatch
 import app.revanced.patches.shared.createPlayerRequestBodyWithModelFingerprint
 import app.revanced.patches.shared.indexOfModelInstruction
 import app.revanced.util.fingerprint.matchOrThrow
@ -48,7 +49,10 @@ val spoofClientPatch = bytecodePatch(
    SPOOF_CLIENT.summary,
    false,
 ) {
-    dependsOn(settingsPatch)
+    dependsOn(
+        settingsPatch,
+        blockRequestPatch
+    )

    compatibleWith(COMPATIBLE_PACKAGE)

@ -211,6 +215,8 @@ val spoofClientPatch = bytecodePatch(

        // endregion

+        // region fix for playback speed menu is not available in Podcasts
+
        playbackSpeedBottomSheetFingerprint.mutableClassOrThrow().let {
            val onItemClickMethod =
                it.methods.find { method -> method.name == "onItemClick" }
@ -244,6 +250,8 @@ val spoofClientPatch = bytecodePatch(
            }
        }

+        // endregion
+
        addSwitchPreference(
            CategoryType.MISC,
            "revanced_spoof_client",
--- a/patches/src/main/kotlin/app/revanced/patches/music/utils/fix/streamingdata/SpoofStreamingDataPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/music/utils/fix/streamingdata/SpoofStreamingDataPatch.kt
@ -7,6 +7,7 @@ import app.revanced.patches.music.utils.compatibility.Constants.YOUTUBE_MUSIC_PA
 import app.revanced.patches.music.utils.patch.PatchList.SPOOF_STREAMING_DATA
 import app.revanced.patches.music.utils.settings.CategoryType
 import app.revanced.patches.music.utils.settings.ResourceUtils.updatePatchStatus
+import app.revanced.patches.music.utils.settings.addPreferenceWithIntent
 import app.revanced.patches.music.utils.settings.addSwitchPreference
 import app.revanced.patches.music.utils.settings.settingsPatch
 import app.revanced.patches.shared.extension.Constants.PATCHES_PATH
@ -19,6 +20,7 @@ import com.android.tools.smali.dexlib2.iface.reference.FieldReference

 private const val DEFAULT_CLIENT_TYPE = "ANDROID_VR"

+@Suppress("unused")
 val spoofStreamingDataPatch = baseSpoofStreamingDataPatch(
    {
        compatibleWith(COMPATIBLE_PACKAGE)
@ -45,6 +47,11 @@ val spoofStreamingDataPatch = baseSpoofStreamingDataPatch(
            "revanced_spoof_streaming_data",
            "true"
        )
+        addPreferenceWithIntent(
+            CategoryType.MISC,
+            "revanced_spoof_streaming_data_type",
+            "revanced_spoof_streaming_data"
+        )
        addSwitchPreference(
            CategoryType.MISC,
            "revanced_spoof_streaming_data_stats_for_nerds",
--- a/patches/src/main/kotlin/app/revanced/patches/shared/blockrequest/BlockRequestPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/shared/blockrequest/BlockRequestPatch.kt
@ -0,0 +1,57 @@
+package app.revanced.patches.shared.blockrequest
+
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patches.shared.extension.Constants.PATCHES_PATH
+import app.revanced.util.fingerprint.matchOrThrow
+import app.revanced.util.fingerprint.methodOrThrow
+import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+
+const val EXTENSION_CLASS_DESCRIPTOR =
+    "$PATCHES_PATH/BlockRequestPatch;"
+
+val blockRequestPatch = bytecodePatch(
+    description = "blockRequestPatch"
+) {
+    execute {
+        // region Block /initplayback requests to fall back to /get_watch requests.
+
+        buildInitPlaybackRequestFingerprint.matchOrThrow().let {
+            it.method.apply {
+                val moveUriStringIndex = it.patternMatch!!.startIndex
+                val targetRegister =
+                    getInstruction<OneRegisterInstruction>(moveUriStringIndex).registerA
+
+                addInstructions(
+                    moveUriStringIndex + 1,
+                    """
+                        invoke-static { v$targetRegister }, $EXTENSION_CLASS_DESCRIPTOR->blockInitPlaybackRequest(Ljava/lang/String;)Ljava/lang/String;
+                        move-result-object v$targetRegister
+                        """,
+                )
+            }
+        }
+
+        // endregion
+
+        // region Block /get_watch requests to fall back to /player requests.
+
+        buildPlayerRequestURIFingerprint.methodOrThrow().apply {
+            val invokeToStringIndex = indexOfToStringInstruction(this)
+            val uriRegister =
+                getInstruction<FiveRegisterInstruction>(invokeToStringIndex).registerC
+
+            addInstructions(
+                invokeToStringIndex,
+                """
+                    invoke-static { v$uriRegister }, $EXTENSION_CLASS_DESCRIPTOR->blockGetWatchRequest(Landroid/net/Uri;)Landroid/net/Uri;
+                    move-result-object v$uriRegister
+                    """,
+            )
+        }
+
+        // endregion
+    }
+}
--- a/patches/src/main/kotlin/app/revanced/patches/shared/blockrequest/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/shared/blockrequest/Fingerprints.kt
@ -0,0 +1,40 @@
+package app.revanced.patches.shared.blockrequest
+
+import app.revanced.util.fingerprint.legacyFingerprint
+import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstruction
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.Method
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+
+internal val buildInitPlaybackRequestFingerprint = legacyFingerprint(
+    name = "buildInitPlaybackRequestFingerprint",
+    returnType = "Lorg/chromium/net/UrlRequest\$Builder;",
+    opcodes = listOf(
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.IGET_OBJECT, // Moves the request URI string to a register to build the request with.
+    ),
+    strings = listOf(
+        "Content-Type",
+        "Range",
+    ),
+)
+
+internal val buildPlayerRequestURIFingerprint = legacyFingerprint(
+    name = "buildPlayerRequestURIFingerprint",
+    returnType = "Ljava/lang/String;",
+    strings = listOf(
+        "key",
+        "asig",
+    ),
+    customFingerprint = { method, _ ->
+        indexOfToStringInstruction(method) >= 0
+    },
+)
+
+internal fun indexOfToStringInstruction(method: Method) =
+    method.indexOfFirstInstruction {
+        opcode == Opcode.INVOKE_VIRTUAL &&
+                getReference<MethodReference>().toString() == "Landroid/net/Uri;->toString()Ljava/lang/String;"
+    }
+
--- a/patches/src/main/kotlin/app/revanced/patches/shared/spoof/streamingdata/BaseSpoofStreamingDataPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/shared/spoof/streamingdata/BaseSpoofStreamingDataPatch.kt
@ -9,6 +9,7 @@ import app.revanced.patcher.patch.BytecodePatchContext
 import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.util.smali.ExternalLabel
+import app.revanced.patches.shared.blockrequest.blockRequestPatch
 import app.revanced.patches.shared.extension.Constants.SPOOF_PATH
 import app.revanced.util.findInstructionIndicesReversedOrThrow
 import app.revanced.util.fingerprint.definingClassOrThrow
@ -32,47 +33,11 @@ fun baseSpoofStreamingDataPatch(
    name = "Spoof streaming data",
    description = "Adds options to spoof the streaming data to allow playback."
 ) {
+    dependsOn(blockRequestPatch)
+
    block()

    execute {
-        // region Block /initplayback requests to fall back to /get_watch requests.
-
-        buildInitPlaybackRequestFingerprint.matchOrThrow().let {
-            it.method.apply {
-                val moveUriStringIndex = it.patternMatch!!.startIndex
-                val targetRegister =
-                    getInstruction<OneRegisterInstruction>(moveUriStringIndex).registerA
-
-                addInstructions(
-                    moveUriStringIndex + 1,
-                    """
-                        invoke-static { v$targetRegister }, $EXTENSION_CLASS_DESCRIPTOR->blockInitPlaybackRequest(Ljava/lang/String;)Ljava/lang/String;
-                        move-result-object v$targetRegister
-                        """,
-                )
-            }
-        }
-
-        // endregion
-
-        // region Block /get_watch requests to fall back to /player requests.
-
-        buildPlayerRequestURIFingerprint.methodOrThrow().apply {
-            val invokeToStringIndex = indexOfToStringInstruction(this)
-            val uriRegister =
-                getInstruction<FiveRegisterInstruction>(invokeToStringIndex).registerC
-
-            addInstructions(
-                invokeToStringIndex,
-                """
-                    invoke-static { v$uriRegister }, $EXTENSION_CLASS_DESCRIPTOR->blockGetWatchRequest(Landroid/net/Uri;)Landroid/net/Uri;
-                    move-result-object v$uriRegister
-                    """,
-            )
-        }
-
-        // endregion
-
        // region Get replacement streams at player requests.

        buildRequestFingerprint.methodOrThrow().apply {
--- 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
@ -7,22 +7,8 @@ import app.revanced.util.or
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.Method
-import com.android.tools.smali.dexlib2.iface.reference.FieldReference
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference

-internal val buildInitPlaybackRequestFingerprint = legacyFingerprint(
-    name = "buildInitPlaybackRequestFingerprint",
-    returnType = "Lorg/chromium/net/UrlRequest\$Builder;",
-    opcodes = listOf(
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IGET_OBJECT, // Moves the request URI string to a register to build the request with.
-    ),
-    strings = listOf(
-        "Content-Type",
-        "Range",
-    ),
-)
-
 internal val buildMediaDataSourceFingerprint = legacyFingerprint(
    name = "buildMediaDataSourceFingerprint",
    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
@ -41,24 +27,6 @@ internal val buildMediaDataSourceFingerprint = legacyFingerprint(
    )
 )

-internal val buildPlayerRequestURIFingerprint = legacyFingerprint(
-    name = "buildPlayerRequestURIFingerprint",
-    returnType = "Ljava/lang/String;",
-    strings = listOf(
-        "key",
-        "asig",
-    ),
-    customFingerprint = { method, _ ->
-        indexOfToStringInstruction(method) >= 0
-    },
-)
-
-internal fun indexOfToStringInstruction(method: Method) =
-    method.indexOfFirstInstruction {
-        opcode == Opcode.INVOKE_VIRTUAL &&
-                getReference<MethodReference>().toString() == "Landroid/net/Uri;->toString()Ljava/lang/String;"
-    }
-
 internal val buildRequestFingerprint = legacyFingerprint(
    name = "buildRequestFingerprint",
    customFingerprint = { method, _ ->