chore(release): 4.12.0-dev.16 [skip ci]

# [4.12.0-dev.16](https://github.com/ReVanced/revanced-patches/compare/v4.12.0-dev.15...v4.12.0-dev.16) (2024-08-04)

### Bug Fixes

* **YouTube - Spoof client:** Restore livestream audio only playback with iOS spoofing ([#3504](https://github.com/ReVanced/revanced-patches/issues/3504)) ([eadbf5f](eadbf5f459))

CHANGELOG.md

@@ -1,3 +1,10 @@
+# [4.12.0-dev.16](https://github.com/ReVanced/revanced-patches/compare/v4.12.0-dev.15...v4.12.0-dev.16) (2024-08-04)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof client:** Restore livestream audio only playback with iOS spoofing ([#3504](https://github.com/ReVanced/revanced-patches/issues/3504)) ([90d3288](https://github.com/ReVanced/revanced-patches/commit/90d32880906787d82c4b9a7a1099b46dff3a0870))
+
 # [4.12.0-dev.15](https://github.com/ReVanced/revanced-patches/compare/v4.12.0-dev.14...v4.12.0-dev.15) (2024-08-02)
 
 

api/revanced-patches.api

@@ -423,6 +423,12 @@ public final class app/revanced/patches/music/ad/video/HideMusicVideoAds : app/r
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public final class app/revanced/patches/music/ad/video/HideVideoAds : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/music/ad/video/HideVideoAds;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/music/ad/video/MusicVideoAdsPatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/music/ad/video/MusicVideoAdsPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 4.12.0-dev.15
+version = 4.12.0-dev.16

src/main/kotlin/app/revanced/patches/music/ad/video/HideVideoAds.kt

@@ -6,11 +6,12 @@ import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.music.ad.video.fingerprints.ShowMusicVideoAdsParentFingerprint
+import app.revanced.patches.music.ad.video.fingerprints.ShowVideoAdsParentFingerprint
 import app.revanced.util.exception
 
 @Patch(
-    name = "Hide music video ads",
+    name = "Hide video ads",
+    description = "Hides ads that appear while listening to or streaming music videos, podcasts, or songs.",
     compatiblePackages = [
         CompatiblePackage(
             "com.google.android.apps.youtube.music",
@@ -25,24 +26,32 @@ import app.revanced.util.exception
     ],
 )
 @Suppress("unused")
-object HideMusicVideoAds : BytecodePatch(
+object HideVideoAds : BytecodePatch(
-    setOf(ShowMusicVideoAdsParentFingerprint),
+    setOf(ShowVideoAdsParentFingerprint),
 ) {
     override fun execute(context: BytecodeContext) {
-        ShowMusicVideoAdsParentFingerprint.result?.let {
+        ShowVideoAdsParentFingerprint.result?.let {
-            val showMusicVideoAdsMethod = context
+            val showVideoAdsMethod = context
                 .toMethodWalker(it.mutableMethod)
                 .nextMethod(it.scanResult.patternScanResult!!.startIndex + 1, true).getMethod() as MutableMethod
 
-            showMusicVideoAdsMethod.addInstruction(0, "const/4 p1, 0x0")
+            showVideoAdsMethod.addInstruction(0, "const/4 p1, 0x0")
-        } ?: throw ShowMusicVideoAdsParentFingerprint.exception
+        } ?: throw ShowVideoAdsParentFingerprint.exception
     }
 }
 
-@Deprecated("This patch class has been renamed to HideMusicVideoAds.")
+@Deprecated("This patch class has been renamed to HideVideoAds.")
+object HideMusicVideoAds : BytecodePatch(
+    dependencies = setOf(HideVideoAds::class)
+) {
+    override fun execute(context: BytecodeContext) {
+    }
+}
+
+@Deprecated("This patch class has been renamed to HideVideoAds.")
 object MusicVideoAdsPatch : BytecodePatch(
     dependencies = setOf(HideMusicVideoAds::class),
 ) {
     override fun execute(context: BytecodeContext) {
     }
-}
+}

src/main/kotlin/app/revanced/patches/music/ad/video/fingerprints/ShowVideoAdsParentFingerprint.kt

@@ -3,7 +3,7 @@ package app.revanced.patches.music.ad.video.fingerprints
 import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.Opcode
 
-internal object ShowMusicVideoAdsParentFingerprint : MethodFingerprint(
+internal object ShowVideoAdsParentFingerprint : MethodFingerprint(
     opcodes = listOf(
         Opcode.MOVE_RESULT_OBJECT,
         Opcode.INVOKE_VIRTUAL,

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/SpoofClientPatch.kt

@@ -16,7 +16,9 @@ import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMu
 import app.revanced.patches.all.misc.resources.AddResourcesPatch
 import app.revanced.patches.shared.misc.settings.preference.PreferenceScreen
 import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
+import app.revanced.patches.youtube.misc.backgroundplayback.BackgroundPlaybackPatch
 import app.revanced.patches.youtube.misc.fix.playback.fingerprints.*
+import app.revanced.patches.youtube.misc.playertype.PlayerTypeHookPatch
 import app.revanced.patches.youtube.misc.settings.SettingsPatch
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionOrThrow
@@ -38,16 +40,21 @@ import com.android.tools.smali.dexlib2.immutable.ImmutableMethodParameter
         SettingsPatch::class,
         AddResourcesPatch::class,
         UserAgentClientSpoofPatch::class,
+        // Required since iOS livestream fix partially enables background playback.
+        BackgroundPlaybackPatch::class,
+        PlayerTypeHookPatch::class,
     ],
     compatiblePackages = [
         CompatiblePackage(
             "com.google.android.youtube",
             [
-                "18.37.36",
+                // This patch works with these versions,
-                "18.38.44",
+                // but the dependent background playback patch does not.
-                "18.43.45",
+                // "18.37.36",
-                "18.44.41",
+                // "18.38.44",
-                "18.45.43",
+                // "18.43.45",
+                // "18.44.41",
+                // "18.45.43",
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",
@@ -89,9 +96,9 @@ object SpoofClientPatch : BytecodePatch(
         // Video qualities missing.
         BuildRequestFingerprint,
 
-        // Watch history.
+        // Livestream audio only background playback.
-        GetTrackingUriFingerprint,
+        PlayerResponseModelBackgroundAudioPlaybackFingerprint,
-    ),
+    )
 ) {
     private const val INTEGRATIONS_CLASS_DESCRIPTOR =
         "Lapp/revanced/integrations/youtube/patches/spoof/SpoofClientPatch;"
@@ -316,6 +323,23 @@ object SpoofClientPatch : BytecodePatch(
 
         // endregion
 
+        // region Fix livestream audio only background play if spoofing to iOS.
+        // This force enables audio background playback.
+
+        PlayerResponseModelBackgroundAudioPlaybackFingerprint.resultOrThrow().mutableMethod.addInstructions(
+            0,
+            """
+                invoke-static { }, $INTEGRATIONS_CLASS_DESCRIPTOR->overrideBackgroundAudioPlayback()Z
+                move-result v0
+                if-eqz v0, :do_not_override
+                return v0
+                :do_not_override
+                nop
+            """
+        )
+
+        // endregion
+
         // Fix playback speed menu item if spoofing to iOS.
 
         CreatePlaybackSpeedMenuItemFingerprint.resultOrThrow().let {
@@ -340,25 +364,6 @@ object SpoofClientPatch : BytecodePatch(
 
         // endregion
 
-        // Fix watch history if spoofing to iOS.
-
-        GetTrackingUriFingerprint.resultOrThrow().let {
-            it.mutableMethod.apply {
-                val returnUrlIndex = it.scanResult.patternScanResult!!.endIndex
-                val urlRegister = getInstruction<OneRegisterInstruction>(returnUrlIndex).registerA
-
-                addInstructions(
-                    returnUrlIndex,
-                    """
-                        invoke-static { v$urlRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->overrideTrackingUrl(Landroid/net/Uri;)Landroid/net/Uri;
-                        move-result-object v$urlRegister
-                    """
-                )
-            }
-        }
-
-        // endregion
-
         // region Fix video qualities missing, if spoofing to iOS by overriding the user agent.
 
         BuildRequestFingerprint.resultOrThrow().let { result ->

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/GetTrackingUriFingerprint.kt

@@ -1,21 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-internal object GetTrackingUriFingerprint : MethodFingerprint(
-    returnType = "Landroid/net/Uri;",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters = emptyList(),
-    opcodes = listOf(
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.RETURN_OBJECT
-    ),
-    customFingerprint = { _, classDef ->
-        classDef.endsWith("TrackingUrlModel;")
-    }
-)

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/PlayerResponseModelBackgroundAudioPlaybackFingerprint.kt

@@ -0,0 +1,25 @@
+package app.revanced.patches.youtube.misc.fix.playback.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+
+internal object PlayerResponseModelBackgroundAudioPlaybackFingerprint : MethodFingerprint(
+    returnType = "Z",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
+    parameters = listOf("Lcom/google/android/libraries/youtube/innertube/model/player/PlayerResponseModel;"),
+    opcodes = listOf(
+        Opcode.CONST_4,
+        Opcode.IF_EQZ,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT,
+        Opcode.IF_NEZ,
+        Opcode.GOTO,
+        Opcode.RETURN,
+        null,   // Opcode.CONST_4 or Opcode.MOVE
+        Opcode.RETURN,
+    )
+)

src/main/kotlin/app/revanced/patches/youtube/misc/gms/GmsCoreSupportPatch.kt

@@ -32,11 +32,12 @@ object GmsCoreSupportPatch : BaseGmsCoreSupportPatch(
         CompatiblePackage(
             "com.google.android.youtube",
             setOf(
-                "18.37.36",
+                // Patch supports these versions but ClientSpoof does not.
-                "18.38.44",
+                // "18.37.36",
-                "18.43.45",
+                // "18.38.44",
-                "18.44.41",
+                // "18.43.45",
-                "18.45.43",
+                // "18.44.41",
+                // "18.45.43",
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",

src/main/resources/addresources/values/strings.xml

@@ -1135,7 +1135,7 @@ This is because Crowdin requires temporarily flattening this file and removing t
             <string name="revanced_spoof_client_summary_off">Client is not spoofed\n\nVideo playback may not work</string>
             <string name="revanced_spoof_client_user_dialog_message">Turning off this setting may cause video playback issues.</string>
             <string name="revanced_spoof_client_use_ios_title">Spoof client to iOS</string>
-            <string name="revanced_spoof_client_use_ios_summary_on">Client is currently spoofed to iOS\n\nSide effects include:\n• No HDR video\n• Higher video qualities may be missing\n• Live streams cannot play as audio only</string>
+            <string name="revanced_spoof_client_use_ios_summary_on">Client is currently spoofed to iOS\n\nSide effects include:\n• HDR video may not be available\n• Watch history may not work</string>
             <string name="revanced_spoof_client_use_ios_summary_off">Client is currently spoofed to Android VR\n\nSide effects include:\n• No HDR video\n• Kids videos do not playback\n• Paused videos can randomly resume\n• Low quality Shorts seekbar thumbnails\n• Download action button is hidden\n• End screen cards are hidden</string>
             <string name="revanced_spoof_client_storyboard_timeout">Spoof client thumbnails not available (API timed out)</string>
             <string name="revanced_spoof_client_storyboard_io_exception">Spoof client thumbnails temporarily not available: %s</string>