chore(release): 4.3.0-dev.12 [skip ci]

# [4.3.0-dev.12](https://github.com/ReVanced/revanced-patches/compare/v4.3.0-dev.11...v4.3.0-dev.12) (2024-03-02) ### Features * **YouTube - Spoof app version:** Add target versions ([#2787](https://github.com/ReVanced/revanced-patches/issues/2787)) ([f9ae1a4](f9ae1a46d2))
feat(YouTube - Spoof app version): Add target versions (#2787 )
2025-12-15 21:52:27 +01:00 · 2024-03-02 07:12:52 +00:00 · 2024-03-02 08:10:07 +01:00 · 2024-03-02 07:05:33 +00:00 · 2024-03-02 08:03:07 +01:00 · 2024-02-29 00:18:20 +00:00
7 changed files with 115 additions and 29 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,24 @@
+# [4.3.0-dev.12](https://github.com/ReVanced/revanced-patches/compare/v4.3.0-dev.11...v4.3.0-dev.12) (2024-03-02)
+
+
+### Features
+
+* **YouTube - Spoof app version:** Add target versions ([#2787](https://github.com/ReVanced/revanced-patches/issues/2787)) ([83a7bd8](https://github.com/ReVanced/revanced-patches/commit/83a7bd8d69e62623fc4d2ba73d9fb49e92751d89))
+
+# [4.3.0-dev.11](https://github.com/ReVanced/revanced-patches/compare/v4.3.0-dev.10...v4.3.0-dev.11) (2024-03-02)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof signature:** Fix tracking such as history or watch time ([bcd8b48](https://github.com/ReVanced/revanced-patches/commit/bcd8b48e70693dac1bfcc0bf4971d6b526065b59))
+
+# [4.3.0-dev.10](https://github.com/ReVanced/revanced-patches/compare/v4.3.0-dev.9...v4.3.0-dev.10) (2024-02-29)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof app version:** Remove broken versions ([#2776](https://github.com/ReVanced/revanced-patches/issues/2776)) ([9466d97](https://github.com/ReVanced/revanced-patches/commit/9466d973c6d7a2891e3fa9f283107b64399152ea))
+
 # [4.3.0-dev.9](https://github.com/ReVanced/revanced-patches/compare/v4.3.0-dev.8...v4.3.0-dev.9) (2024-02-28)


--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 4.3.0-dev.9
+version = 4.3.0-dev.12
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/SpoofSignaturePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/SpoofSignaturePatch.kt
@@ -16,7 +16,8 @@ import app.revanced.patches.youtube.misc.playertype.PlayerTypeHookPatch
 import app.revanced.patches.youtube.misc.settings.SettingsPatch
 import app.revanced.patches.youtube.video.information.VideoInformationPatch
 import app.revanced.patches.youtube.video.playerresponse.PlayerResponseMethodHookPatch
-import app.revanced.util.exception
+import app.revanced.util.*
+import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction

@@ -28,8 +29,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
        PlayerResponseMethodHookPatch::class,
        VideoInformationPatch::class,
        SpoofSignatureResourcePatch::class,
-        AddResourcesPatch::class
-    ]
+        AddResourcesPatch::class,
+    ],
 )
 object SpoofSignaturePatch : BytecodePatch(
    setOf(
@@ -41,7 +42,9 @@ object SpoofSignaturePatch : BytecodePatch(
        StoryboardRendererDecoderRecommendedLevelFingerprint,
        StoryboardThumbnailParentFingerprint,
        ScrubbedPreviewLayoutFingerprint,
-    )
+        StatsQueryParameterFingerprint,
+        ParamsMapPutFingerprint,
+    ),
 ) {
    private const val INTEGRATIONS_CLASS_DESCRIPTOR =
        "Lapp/revanced/integrations/youtube/patches/spoof/SpoofSignaturePatch;"
@@ -55,14 +58,14 @@ object SpoofSignaturePatch : BytecodePatch(
                preferences = setOf(
                    SwitchPreference("revanced_spoof_signature_verification_enabled"),
                    SwitchPreference("revanced_spoof_signature_in_feed_enabled"),
-                    SwitchPreference("revanced_spoof_storyboard")
+                    SwitchPreference("revanced_spoof_storyboard"),
                ),
-            )
+            ),
        )

        // Hook the player parameters.
        PlayerResponseMethodHookPatch += PlayerResponseMethodHookPatch.Hook.ProtoBufferParameter(
-            "$INTEGRATIONS_CLASS_DESCRIPTOR->spoofParameter(Ljava/lang/String;Z)Ljava/lang/String;"
+            "$INTEGRATIONS_CLASS_DESCRIPTOR->spoofParameter(Ljava/lang/String;Z)Ljava/lang/String;",
        )

        // Force the seekbar time and chapters to always show up.
@@ -72,7 +75,7 @@ object SpoofSignaturePatch : BytecodePatch(
            StoryboardThumbnailFingerprint.also {
                it.resolve(
                    context,
-                    classDef
+                    classDef,
                )
            }.result?.let {
                val endIndex = it.scanResult.patternScanResult!!.endIndex
@@ -84,7 +87,7 @@ object SpoofSignaturePatch : BytecodePatch(
                    endIndex,
                    """
                        invoke-static {}, $INTEGRATIONS_CLASS_DESCRIPTOR->getSeekbarThumbnailOverrideValue()Z
-                    """
+                    """,
                )
                // Since this is end of the method must replace one line then add the rest.
                it.mutableMethod.addInstructions(
@@ -92,7 +95,7 @@ object SpoofSignaturePatch : BytecodePatch(
                    """
                    move-result v0
                    return v0
-                """
+                """,
                )
            } ?: throw StoryboardThumbnailFingerprint.exception
        }
@@ -107,7 +110,7 @@ object SpoofSignaturePatch : BytecodePatch(
                    """
                        iget-object v0, p0, $imageViewFieldName   # copy imageview field to a register
                        invoke-static {v0}, $INTEGRATIONS_CLASS_DESCRIPTOR->seekbarImageViewCreated(Landroid/widget/ImageView;)V
-                    """
+                    """,
                )
            }
        } ?: throw ScrubbedPreviewLayoutFingerprint.exception
@@ -117,7 +120,7 @@ object SpoofSignaturePatch : BytecodePatch(
         */
        arrayOf(
            PlayerResponseModelImplGeneralFingerprint,
-            PlayerResponseModelImplLiveStreamFingerprint
+            PlayerResponseModelImplLiveStreamFingerprint,
        ).forEach { fingerprint ->
            fingerprint.result?.let {
                it.mutableMethod.apply {
@@ -130,7 +133,7 @@ object SpoofSignaturePatch : BytecodePatch(
                        """
                        invoke-static { v$getStoryBoardRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->getStoryboardRendererSpec(Ljava/lang/String;)Ljava/lang/String;
                        move-result-object v$getStoryBoardRegister
-                    """
+                    """,
                    )
                }
            } ?: throw fingerprint.exception
@@ -143,10 +146,11 @@ object SpoofSignaturePatch : BytecodePatch(
                .getInstruction<OneRegisterInstruction>(moveOriginalRecommendedValueIndex).registerA

            it.mutableMethod.addInstructions(
-                moveOriginalRecommendedValueIndex + 1, """
+                moveOriginalRecommendedValueIndex + 1,
+                """
                        invoke-static { v$originalValueRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->getRecommendedLevel(I)I
                        move-result v$originalValueRegister
-                """
+                """,
            )
        } ?: throw StoryboardRendererDecoderRecommendedLevelFingerprint.exception

@@ -158,10 +162,11 @@ object SpoofSignaturePatch : BytecodePatch(
                    getInstruction<OneRegisterInstruction>(moveOriginalRecommendedValueIndex).registerA

                addInstructions(
-                    moveOriginalRecommendedValueIndex, """
+                    moveOriginalRecommendedValueIndex,
+                    """
                        invoke-static { v$originalValueRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->getRecommendedLevel(I)I
                        move-result v$originalValueRegister
-                        """
+                        """,
                )
            }
        } ?: throw PlayerResponseModelImplRecommendedLevelFingerprint.exception
@@ -177,7 +182,7 @@ object SpoofSignaturePatch : BytecodePatch(
                        invoke-static { p$storyBoardUrlParams }, $INTEGRATIONS_CLASS_DESCRIPTOR->getStoryboardRendererSpec(Ljava/lang/String;)Ljava/lang/String;
                        move-result-object p$storyBoardUrlParams
                    """,
-                    ExternalLabel("ignore", getInstruction(0))
+                    ExternalLabel("ignore", getInstruction(0)),
                )
            }
        } ?: throw StoryboardRendererSpecFingerprint.exception
@@ -189,11 +194,43 @@ object SpoofSignaturePatch : BytecodePatch(
                it.mutableMethod.getInstruction<OneRegisterInstruction>(storyBoardUrlIndex).registerA

            it.mutableMethod.addInstructions(
-                storyBoardUrlIndex + 1, """
+                storyBoardUrlIndex + 1,
+                """
                        invoke-static { v$storyboardUrlRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->getStoryboardDecoderRendererSpec(Ljava/lang/String;)Ljava/lang/String;
                        move-result-object v$storyboardUrlRegister
-                """
+                """,
            )
        } ?: throw StoryboardRendererDecoderSpecFingerprint.exception
+
+        // Fix stats not being tracked.
+        // Due to signature spoofing "adformat" is present in query parameters made for /stats requests,
+        // even though, for regular videos, it should not be.
+        // This breaks stats tracking.
+        // Replace the ad parameter with the video parameter in the query parameters.
+        StatsQueryParameterFingerprint.result?.let {
+            val putMethod = ParamsMapPutFingerprint.result?.method?.toString()
+                ?: throw ParamsMapPutFingerprint.exception
+
+            it.mutableMethod.apply {
+                val adParamIndex = it.scanResult.stringsScanResult!!.matches.first().index
+                val videoParamIndex = adParamIndex + 3
+
+                // Replace the ad parameter with the video parameter.
+                replaceInstruction(adParamIndex, getInstruction(videoParamIndex))
+
+                // Call paramsMap.put instead of paramsMap.putIfNotExist
+                // because the key is already present in the map.
+                val putAdParamIndex = adParamIndex + 1
+                val putIfKeyNotExistsInstruction = getInstruction<FiveRegisterInstruction>(putAdParamIndex)
+                replaceInstruction(
+                    putAdParamIndex,
+                    "invoke-virtual { " +
+                        "v${putIfKeyNotExistsInstruction.registerC}, " +
+                        "v${putIfKeyNotExistsInstruction.registerD}, " +
+                        "v${putIfKeyNotExistsInstruction.registerE} }, " +
+                        putMethod,
+                )
+            }
+        } ?: throw StatsQueryParameterFingerprint.exception
    }
 }
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/ParamsMapPutFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/ParamsMapPutFingerprint.kt
@@ -0,0 +1,24 @@
+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 ParamsMapPutFingerprint : MethodFingerprint(
+    returnType = "V",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    parameters = listOf(
+        "Ljava/lang/String;",
+        "Ljava/lang/String;",
+    ),
+    opcodes = listOf(
+        Opcode.CONST_4,
+        Opcode.CONST_4,
+        Opcode.CONST_4,
+        Opcode.MOVE_OBJECT,
+        Opcode.MOVE_OBJECT,
+        Opcode.MOVE_OBJECT,
+        Opcode.INVOKE_DIRECT_RANGE,
+    ),
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/StatsQueryParameterFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/StatsQueryParameterFingerprint.kt
@@ -0,0 +1,7 @@
+package app.revanced.patches.youtube.misc.fix.playback.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+
+internal object StatsQueryParameterFingerprint : MethodFingerprint(
+    strings = listOf("adunit"),
+)
--- a/src/main/resources/addresources/values/arrays.xml
+++ b/src/main/resources/addresources/values/arrays.xml
@@ -7,15 +7,13 @@
                <item>@string/revanced_spoof_app_version_target_entry_3</item>
                <item>@string/revanced_spoof_app_version_target_entry_4</item>
                <item>@string/revanced_spoof_app_version_target_entry_5</item>
-                <item>@string/revanced_spoof_app_version_target_entry_6</item>
            </string-array>
            <string-array name="revanced_spoof_app_version_target_entry_values">
                <item>18.33.40</item>
                <item>18.20.39</item>
                <item>18.09.39</item>
-                <item>17.08.35</item>
-                <item>16.08.35</item>
-                <item>16.01.35</item>
+                <item>17.41.37</item>
+                <item>17.33.42</item>
            </string-array>
        </patch>
        <patch id="layout.startpage.ChangeStartPagePatch">
--- a/src/main/resources/addresources/values/strings.xml
+++ b/src/main/resources/addresources/values/strings.xml
@@ -783,12 +783,11 @@
            <string name="revanced_spoof_app_version_summary_off">Version not spoofed</string>
            <string name="revanced_spoof_app_version_user_dialog_message">App version will be spoofed to an older version of YouTube.\n\nThis will change the appearance and features of the app, but unknown side effects may occur.\n\nIf later turned off, it is recommended to clear the app data to prevent UI bugs.</string>
            <string name="revanced_spoof_app_version_target_title">Spoof app version target</string>
-            <string name="revanced_spoof_app_version_target_entry_1">18.33.40 - Restore RYD Shorts incognito mode</string>
+            <string name="revanced_spoof_app_version_target_entry_1">18.33.40 - Restore RYD on Shorts incognito mode</string>
            <string name="revanced_spoof_app_version_target_entry_2">18.20.39 - Restore wide video speed &amp; quality menu</string>
            <string name="revanced_spoof_app_version_target_entry_3">18.09.39 - Restore library tab</string>
-            <string name="revanced_spoof_app_version_target_entry_4">17.08.35 - Restore old UI layout</string>
-            <string name="revanced_spoof_app_version_target_entry_5">16.08.35 - Restore explore tab</string>
-            <string name="revanced_spoof_app_version_target_entry_6">16.01.35 - Restore fewer video player action buttons</string>
+            <string name="revanced_spoof_app_version_target_entry_4">17.41.37 - Restore old playlist shelf</string>
+            <string name="revanced_spoof_app_version_target_entry_5">17.33.42 - Restore old UI layout</string>
        </patch>
        <patch id="layout.startpage.ChangeStartPagePatch">
            <string name="revanced_start_page_title">Set start page</string>
Author	SHA1	Message	Date
semantic-release-bot	2f2ad3e584	chore(release): 4.3.0-dev.12 [skip ci] # [4.3.0-dev.12](https://github.com/ReVanced/revanced-patches/compare/v4.3.0-dev.11...v4.3.0-dev.12) (2024-03-02) ### Features * YouTube - Spoof app version: Add target versions ([#2787](https://github.com/ReVanced/revanced-patches/issues/2787)) ([`f9ae1a4`](`f9ae1a46d2`))	2024-03-02 07:12:52 +00:00
kitadai31	f9ae1a46d2	feat(YouTube - Spoof app version): Add target versions (#2787 )	2024-03-02 08:10:07 +01:00
semantic-release-bot	e386313deb	chore(release): 4.3.0-dev.11 [skip ci] # [4.3.0-dev.11](https://github.com/ReVanced/revanced-patches/compare/v4.3.0-dev.10...v4.3.0-dev.11) (2024-03-02) ### Bug Fixes * YouTube - Spoof signature: Fix tracking such as history or watch time ([`f2edae2`](`f2edae2ac1`))	2024-03-02 07:05:33 +00:00
oSumAtrIX	f2edae2ac1	fix(YouTube - Spoof signature): Fix tracking such as history or watch time	2024-03-02 08:03:07 +01:00
semantic-release-bot	c153979981	chore(release): 4.3.0-dev.10 [skip ci] # [4.3.0-dev.10](https://github.com/ReVanced/revanced-patches/compare/v4.3.0-dev.9...v4.3.0-dev.10) (2024-02-29) ### Bug Fixes * YouTube - Spoof app version: Remove broken versions ([#2776](https://github.com/ReVanced/revanced-patches/issues/2776)) ([`2fe9060`](`2fe9060944`))	2024-02-29 00:18:20 +00:00
oSumAtrIX	2fe9060944	fix(YouTube - Spoof app version): Remove broken versions (#2776 )	2024-02-29 01:16:06 +01:00