feat(YouTube Music): Support version 8.05.50 (#4439)

2025-04-29 22:24:27 +02:00 · 2025-02-11 18:37:58 +00:00 · 2025-02-11 18:37:58 +00:00 · b31fed9890
commit b31fed9890
parent c631ce91a5
11 changed files with 64 additions and 27 deletions
--- a/patches/src/main/kotlin/app/revanced/patches/music/ad/video/HideVideoAds.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/music/ad/video/HideVideoAds.kt
@ -8,7 +8,12 @@ val hideVideoAdsPatch = bytecodePatch(
    name = "Hide music video ads",
    description = "Hides ads that appear while listening to or streaming music videos, podcasts, or songs.",
 ) {
-    compatibleWith("com.google.android.apps.youtube.music")
+    compatibleWith(
+        "com.google.android.apps.youtube.music"(
+            "7.16.53",
+            "8.05.50"
+        )
+    )

    execute {
        navigate(showVideoAdsParentFingerprint.originalMethod)
--- a/patches/src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/EnableExclusiveAudioPlayback.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/EnableExclusiveAudioPlayback.kt
@ -1,24 +1,21 @@
 package app.revanced.patches.music.audio.exclusiveaudio

-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.util.returnEarly

@Suppress("unused")
 val enableExclusiveAudioPlaybackPatch = bytecodePatch(
    name = "Enable exclusive audio playback",
    description = "Enables the option to play audio without video.",
 ) {
-    compatibleWith("com.google.android.apps.youtube.music")
+    compatibleWith(
+        "com.google.android.apps.youtube.music"(
+            "7.16.53",
+            "8.05.50"
+        )
+    )

    execute {
-        allowExclusiveAudioPlaybackFingerprint.method.apply {
-            addInstructions(
-                0,
-                """
-                    const/4 v0, 0x1
-                    return v0
-                """,
-            )
-        }
+        allowExclusiveAudioPlaybackFingerprint.method.returnEarly(true)
    }
 }
--- a/patches/src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/Fingerprints.kt
@ -9,16 +9,15 @@ internal val allowExclusiveAudioPlaybackFingerprint = fingerprint {
    returns("Z")
    parameters()
    opcodes(
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.IGET_OBJECT,
        Opcode.INVOKE_VIRTUAL,
        Opcode.MOVE_RESULT_OBJECT,
        Opcode.CHECK_CAST,
        Opcode.IF_NEZ,
        Opcode.IGET_OBJECT,
        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.GOTO,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.RETURN
+        Opcode.MOVE_RESULT
    )
 }
--- a/patches/src/main/kotlin/app/revanced/patches/music/interaction/permanentrepeat/PermanentRepeatPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/music/interaction/permanentrepeat/PermanentRepeatPatch.kt
@ -11,10 +11,14 @@ val permanentRepeatPatch = bytecodePatch(
    description = "Permanently remember your repeating preference even if the playlist ends or another track is played.",
    use = false,
 ) {
-    compatibleWith("com.google.android.apps.youtube.music")
+    compatibleWith(
+        "com.google.android.apps.youtube.music"(
+            "7.16.53",
+            "8.05.50"
+        )
+    )

    execute {
-
        val startIndex = repeatTrackFingerprint.patternMatch!!.endIndex
        val repeatIndex = startIndex + 1

--- a/patches/src/main/kotlin/app/revanced/patches/music/layout/compactheader/HideCategoryBar.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/music/layout/compactheader/HideCategoryBar.kt
@ -11,7 +11,12 @@ val hideCategoryBar = bytecodePatch(
    description = "Hides the category bar at the top of the homepage.",
    use = false,
 ) {
-    compatibleWith("com.google.android.apps.youtube.music")
+    compatibleWith(
+        "com.google.android.apps.youtube.music"(
+            "7.16.53",
+            "8.05.50"
+        )
+    )

    execute {
        constructCategoryBarFingerprint.method.apply {
--- a/patches/src/main/kotlin/app/revanced/patches/music/layout/premium/HideGetPremiumPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/music/layout/premium/HideGetPremiumPatch.kt
@ -11,7 +11,12 @@ val hideGetPremiumPatch = bytecodePatch(
    name = "Hide 'Get Music Premium' label",
    description = "Hides the \"Get Music Premium\" label from the account menu and settings.",
 ) {
-    compatibleWith("com.google.android.apps.youtube.music")
+    compatibleWith(
+        "com.google.android.apps.youtube.music"(
+            "7.16.53",
+            "8.05.50"
+        )
+    )

    execute {
        hideGetPremiumFingerprint.method.apply {
--- a/patches/src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/RemoveUpgradeButtonPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/RemoveUpgradeButtonPatch.kt
@ -18,7 +18,12 @@ val removeUpgradeButtonPatch = bytecodePatch(
    name = "Remove upgrade button",
    description = "Removes the upgrade tab from the pivot bar.",
 ) {
-    compatibleWith("com.google.android.apps.youtube.music")
+    compatibleWith(
+        "com.google.android.apps.youtube.music"(
+            "7.16.53",
+            "8.05.50"
+        )
+    )

    execute {
        pivotBarConstructorFingerprint.method.apply {
--- a/patches/src/main/kotlin/app/revanced/patches/music/misc/androidauto/BypassCertificateChecksPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/music/misc/androidauto/BypassCertificateChecksPatch.kt
@ -8,7 +8,12 @@ val bypassCertificateChecksPatch = bytecodePatch(
    name = "Bypass certificate checks",
    description = "Bypasses certificate checks which prevent YouTube Music from working on Android Auto.",
 ) {
-    compatibleWith("com.google.android.apps.youtube.music"("7.29.52"))
+    compatibleWith(
+        "com.google.android.apps.youtube.music"(
+            "7.16.53",
+            "8.05.50"
+        )
+    )

    execute {
        checkCertificateFingerprint.method.returnEarly(true)
--- a/patches/src/main/kotlin/app/revanced/patches/music/misc/androidauto/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/music/misc/androidauto/Fingerprints.kt
@ -4,8 +4,10 @@ import com.android.tools.smali.dexlib2.AccessFlags
 import app.revanced.patcher.fingerprint

 internal val checkCertificateFingerprint = fingerprint {
-    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
    returns("Z")
    parameters("Ljava/lang/String;")
-    strings("X509", "Failed to get certificate.")
+    strings(
+        "X509",
+        "Failed to get certificate" // Partial String match.
+    )
 }
--- a/patches/src/main/kotlin/app/revanced/patches/music/misc/backgroundplayback/BackgroundPlaybackPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/music/misc/backgroundplayback/BackgroundPlaybackPatch.kt
@ -8,7 +8,12 @@ val backgroundPlaybackPatch = bytecodePatch(
    name = "Remove background playback restrictions",
    description = "Removes restrictions on background playback, including playing kids videos in the background.",
 ) {
-    compatibleWith("com.google.android.apps.youtube.music")
+    compatibleWith(
+        "com.google.android.apps.youtube.music"(
+            "7.16.53",
+            "8.05.50"
+        )
+    )

    execute {
        kidsBackgroundPlaybackPolicyControllerFingerprint.method.addInstruction(
--- a/patches/src/main/kotlin/app/revanced/patches/music/misc/spoof/SpoofClientPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/music/misc/spoof/SpoofClientPatch.kt
@ -25,7 +25,12 @@ val spoofClientPatch = bytecodePatch(
    name = "Spoof client",
    description = "Spoofs the client to fix playback.",
 ) {
-    compatibleWith("com.google.android.apps.youtube.music")
+    compatibleWith(
+        "com.google.android.apps.youtube.music"(
+            "7.16.53",
+            "8.05.50"
+        )
+    )

    dependsOn(
        sharedExtensionPatch,