fix(YouTube): Adjusting patches to apply correctly to earlier versions.

rufusin · rufusin · commit e0a41cf1d3fa · 2024-03-21T15:00:24.000+03:00
diff --git a/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/player/ChangeTogglePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/player/ChangeTogglePatch.kt
@@ -70,7 +70,6 @@ object ChangeTogglePatch : BytecodePatch(
     )
 ) {
     override fun execute(context: BytecodeContext) {
-        if (SettingsPatch.upward1905) throw PatchException("This version is not supported. Please use YouTube 19.05.36 or earlier.")
 
         val additionalSettingsConfigResult = AdditionalSettingsConfigFingerprint.result
             ?: throw AdditionalSettingsConfigFingerprint.exception
@@ -108,6 +107,7 @@ object ChangeTogglePatch : BytecodePatch(
     }
 
     private fun MethodFingerprint.injectCall(descriptor: String) {
+
         result?.let {
             it.mutableMethod.apply {
                 val insertIndex = implementation!!.instructions.indexOfFirst { instruction ->
@@ -124,6 +124,7 @@ object ChangeTogglePatch : BytecodePatch(
                         """
                 )
             }
-        } ?: throw exception
+        } ?: throw PatchException("This version is not supported. Please use YouTube 19.05.36 or earlier.")
+
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/landscapemode/keep/KeepLandScapeModePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/landscapemode/keep/KeepLandScapeModePatch.kt
@@ -54,6 +54,7 @@ object KeepLandScapeModePatch : BytecodePatch(
     )
 ) {
     override fun execute(context: BytecodeContext) {
+
         LandScapeModeConfigFingerprint.result?.let {
             it.mutableMethod.apply {
                 val insertIndex = implementation!!.instructions.size - 1
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/rollingnumber/DisableRollingNumberAnimationPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/rollingnumber/DisableRollingNumberAnimationPatch.kt
@@ -12,6 +12,7 @@ import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patches.youtube.utils.fingerprints.RollingNumberTextViewAnimationUpdateFingerprint
 import app.revanced.patches.youtube.utils.integrations.Constants.GENERAL
 import app.revanced.patches.youtube.utils.settings.SettingsPatch
+import app.revanced.util.exception
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 
 @Patch(
@@ -52,29 +53,33 @@ object DisableRollingNumberAnimationPatch : BytecodePatch(
 
         // Animations are disabled by preventing an Image from being applied to the text span,
         // which prevents the animations from appearing.
-        RollingNumberTextViewAnimationUpdateFingerprint.result?.apply {
-            val patternScanResult = scanResult.patternScanResult!!
-            val blockStartIndex = patternScanResult.startIndex
-            val blockEndIndex = patternScanResult.endIndex + 1
-            mutableMethod.apply {
-                val freeRegister = getInstruction<OneRegisterInstruction>(blockStartIndex).registerA
+        if (SettingsPatch.upward1843) {
+            RollingNumberTextViewAnimationUpdateFingerprint.result?.apply {
+                val patternScanResult = scanResult.patternScanResult!!
+                val blockStartIndex = patternScanResult.startIndex
+                val blockEndIndex = patternScanResult.endIndex + 1
+                mutableMethod.apply {
+                    val freeRegister = getInstruction<OneRegisterInstruction>(blockStartIndex).registerA
 
-                // ReturnYouTubeDislike also makes changes to this same method,
-                // and must add control flow label to a noop instruction to
-                // ensure RYD patch adds it's changes after the control flow label.
-                addInstructions(blockEndIndex, "nop")
+                    // ReturnYouTubeDislike also makes changes to this same method,
+                    // and must add control flow label to a noop instruction to
+                    // ensure RYD patch adds it's changes after the control flow label.
+                    addInstructions(blockEndIndex, "nop")
 
-                addInstructionsWithLabels(
-                    blockStartIndex,
-                    """
-                        invoke-static {}, $GENERAL->disableRollingNumberAnimations()Z
-                        move-result v$freeRegister
-                        if-nez v$freeRegister, :disable_animations
-                    """,
-                    ExternalLabel("disable_animations", getInstruction(blockEndIndex))
-                )
-            }
-        } ?: throw PatchException("This version is not supported. Please use YouTube 18.30.37 or later.")
+                    addInstructionsWithLabels(
+                        blockStartIndex,
+                        """
+                            invoke-static {}, $GENERAL->disableRollingNumberAnimations()Z
+                            move-result v$freeRegister
+                            if-nez v$freeRegister, :disable_animations
+                        """,
+                        ExternalLabel("disable_animations", getInstruction(blockEndIndex))
+                    )
+                }
+            } ?: RollingNumberTextViewAnimationUpdateFingerprint.exception
+        } else {
+            throw PatchException("This version is not supported. Please use YouTube 18.43.45 or later.")
+        }
 
         /**
          * Add settings
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/songsearch/SongSearchPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/songsearch/SongSearchPatch.kt
@@ -79,5 +79,6 @@ object SongSearchPatch : BytecodePatch(
         )
 
         SettingsPatch.updatePatchStatus("Enable song search")
+
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/doubletapbackground/DoubleTapOverlayBackgroundPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/doubletapbackground/DoubleTapOverlayBackgroundPatch.kt
@@ -47,8 +47,7 @@ import app.revanced.patches.youtube.utils.settings.SettingsPatch
                 "19.09.37"
             ]
         )
-    ],
-    use = true
+    ]
 )
 @Suppress("unused")
 object DoubleTapOverlayBackgroundPatch : AbstractOverlayBackgroundPatch(
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/ambientmode/fingerprints/PowerSaveModeOneFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/ambientmode/fingerprints/PowerSaveModeOneFingerprint.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.ambientmode.fingerprints /** #C# Add START */
+package app.revanced.patches.youtube.misc.ambientmode.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.MethodFingerprint
@@ -40,4 +40,4 @@ object PowerSaveModeOneFingerprint : MethodFingerprint(
         }
         count == 1
     }
-) /** #C# Add END */
+)
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/ambientmode/fingerprints/PowerSaveModeTwoFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/ambientmode/fingerprints/PowerSaveModeTwoFingerprint.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.ambientmode.fingerprints /** #C# Add START */
+package app.revanced.patches.youtube.misc.ambientmode.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.MethodFingerprint
@@ -41,4 +41,4 @@ object PowerSaveModeTwoFingerprint : MethodFingerprint(
         }
         count == 1
     }
-) /** #C# Add END */
+)
diff --git a/src/main/kotlin/app/revanced/patches/youtube/navigation/navigationbuttons/NavigationButtonsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/navigation/navigationbuttons/NavigationButtonsPatch.kt
@@ -102,7 +102,7 @@ object NavigationButtonsPatch : BytecodePatch(
                 val buttonViewResult = this[1]
 
                 val enumHookInsertIndex = enumScanResult.startIndex + 2
-                val buttonHookInsertIndex = buttonViewResult.endIndex
+                val buttonHookInsertIndex = buttonViewResult.endIndex - 1
 
                 mapOf(
                     BUTTON_HOOK to buttonHookInsertIndex,
diff --git a/src/main/kotlin/app/revanced/patches/youtube/navigation/navigationbuttons/fingerprints/PivotBarShortsButtonViewFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/navigation/navigationbuttons/fingerprints/PivotBarShortsButtonViewFingerprint.kt
@@ -7,6 +7,7 @@ object PivotBarShortsButtonViewFingerprint : MethodFingerprint(
     opcodes = listOf(
         Opcode.INVOKE_VIRTUAL_RANGE,
         Opcode.MOVE_RESULT_OBJECT, // target reference
-        Opcode.GOTO,
+        null, // Opcode.GOTO_16 or Opcode.GOTO
+        Opcode.IF_NE
     )
 )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/download/hook/fingerprints/PlaylistOfflineDownloadOnClickFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/download/hook/fingerprints/PlaylistOfflineDownloadOnClickFingerprint.kt
@@ -14,7 +14,7 @@ object PlaylistOfflineDownloadOnClickFingerprint : MethodFingerprint(
         Opcode.INVOKE_STATIC,
         Opcode.MOVE_RESULT,
         Opcode.IF_EQZ,
-        null, // Opcode.RETURN_VOID, Opcode.GOTO
+        null, // Opcode.RETURN_VOID or Opcode.GOTO
         Opcode.IGET_OBJECT
     ),
     customFingerprint = { methodDef, classDef ->
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/musicbutton/HideMusicButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/musicbutton/HideMusicButtonPatch.kt
@@ -9,7 +9,6 @@ import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patches.youtube.player.musicbutton.fingerprints.MusicAppDeeplinkButtonAlternativeFingerprint
 import app.revanced.patches.youtube.player.musicbutton.fingerprints.MusicAppDeeplinkButtonFingerprint
-import app.revanced.patches.youtube.player.musicbutton.fingerprints.MusicAppDeeplinkButtonParentFingerprint
 import app.revanced.patches.youtube.utils.integrations.Constants.PLAYER
 import app.revanced.patches.youtube.utils.resourceid.SharedResourceIdPatch
 import app.revanced.patches.youtube.utils.settings.SettingsPatch
@@ -63,25 +62,38 @@ import app.revanced.util.exception
 )
 @Suppress("unused")
 object HideMusicButtonPatch : BytecodePatch(
-    setOf(MusicAppDeeplinkButtonParentFingerprint)
+    setOf(
+        MusicAppDeeplinkButtonAlternativeFingerprint,
+        MusicAppDeeplinkButtonFingerprint
+    )
 ) {
     override fun execute(context: BytecodeContext) {
 
-        MusicAppDeeplinkButtonParentFingerprint.result?.mutableClass?.let { mutableClass ->
-            MusicAppDeeplinkButtonFingerprint.also { it.resolve(context, mutableClass) }.result?.let {
-                it.mutableMethod.apply {
-                    addInstructionsWithLabels(
-                        0,
-                        """
-                            invoke-static {}, $PLAYER->hideMusicButton()Z
-                            move-result v0
-                            if-nez v0, :hidden
-                            """,
-                        ExternalLabel("hidden", getInstruction(implementation!!.instructions.size - 1))
-                    )
-                }
-            } ?: throw MusicAppDeeplinkButtonFingerprint.exception
-        } ?: throw MusicAppDeeplinkButtonParentFingerprint.exception
+        MusicAppDeeplinkButtonFingerprint.result?.let {
+            it.mutableMethod.apply {
+                addInstructionsWithLabels(
+                    0,
+                    """
+                        invoke-static {}, $PLAYER->hideMusicButton()Z
+                        move-result v0
+                        if-nez v0, :hidden
+                        """,
+                    ExternalLabel("hidden", getInstruction(implementation!!.instructions.size - 1))
+                )
+            }
+        } ?: MusicAppDeeplinkButtonAlternativeFingerprint.result?.let {
+            it.mutableMethod.apply {
+                addInstructionsWithLabels(
+                    0,
+                    """
+                        invoke-static {}, $PLAYER->hideMusicButton()Z
+                        move-result v0
+                        if-nez v0, :hidden
+                        """,
+                    ExternalLabel("hidden", getInstruction(implementation!!.instructions.size - 1))
+                )
+            }
+        } ?: throw MusicAppDeeplinkButtonFingerprint.exception
 
         /**
          * Add settings
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/musicbutton/fingerprints/MusicAppDeeplinkButtonFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/player/musicbutton/fingerprints/MusicAppDeeplinkButtonFingerprint.kt
@@ -2,11 +2,12 @@ package app.revanced.patches.youtube.player.musicbutton.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patches.youtube.utils.resourceid.SharedResourceIdPatch.MusicAppDeeplinkButtonView
-import app.revanced.patcher.fingerprint.MethodFingerprint
+import app.revanced.util.fingerprint.LiteralValueFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 
-object MusicAppDeeplinkButtonFingerprint : MethodFingerprint(
+object MusicAppDeeplinkButtonFingerprint : LiteralValueFingerprint(
     returnType = "V",
     accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
     parameters = listOf("Z", "Z"),
+    literalSupplier = { MusicAppDeeplinkButtonView }
 )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/musicbutton/fingerprints/MusicAppDeeplinkButtonParentFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/player/musicbutton/fingerprints/MusicAppDeeplinkButtonParentFingerprint.kt
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/speedoverlay/SpeedOverlayPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/speedoverlay/SpeedOverlayPatch.kt
@@ -21,15 +21,6 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
         CompatiblePackage(
             "com.google.android.youtube",
             [
-                "18.25.40",
-                "18.27.36",
-                "18.29.38",
-                "18.30.37",
-                "18.31.40",
-                "18.32.39",
-                "18.33.40",
-                "18.34.38",
-                "18.35.36",
                 "18.36.39",
                 "18.37.36",
                 "18.38.44",
diff --git a/src/main/kotlin/app/revanced/patches/youtube/swipe/controls/SwipeControlsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/swipe/controls/SwipeControlsPatch.kt
@@ -129,7 +129,7 @@ object SwipeControlsPatch : BytecodePatch(
             }
         } ?: throw FullScreenEngagementOverlayFingerprint.exception
 
-        if (SettingsPatch.upward1909) {
+        try {
             HDRBrightnessFingerprint.result?.let {
                 it.mutableMethod.apply {
                     addInstructionsWithLabels(
@@ -141,7 +141,7 @@ object SwipeControlsPatch : BytecodePatch(
                             """, ExternalLabel("default", getInstruction(0))
                     )
                 }
-            }
+            } ?: throw HDRBrightnessFingerprint.exception
 
             /**
              * Add settings
@@ -151,8 +151,11 @@ object SwipeControlsPatch : BytecodePatch(
                     "SETTINGS: SWIPE_EXPERIMENTAL_FLAGS"
                 )
             )
+        } catch (e: Exception) {
+            println("WARNING: Disable auto HDR brightness is not supported in this version. Use YouTube 19.08.36 or earlier (${e.message})")
         }
 
+
         /**
          * Add settings
          */
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/settings/SettingsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/settings/SettingsPatch.kt
@@ -105,8 +105,6 @@ object SettingsPatch : AbstractSettingsResourcePatch(
                         upward1841 = 234200000 <= playServicesVersion
                         upward1843 = 234400000 <= playServicesVersion
                         upward1904 = 240502000 <= playServicesVersion
-                        upward1905 = 240700000 <= playServicesVersion
-                        upward1909 = 241002000 > playServicesVersion
 
                         break
                     }
@@ -199,8 +197,6 @@ object SettingsPatch : AbstractSettingsResourcePatch(
     internal var upward1841: Boolean = false
     internal var upward1843: Boolean = false
     internal var upward1904: Boolean = false
-    internal var upward1905: Boolean = false
-    internal var upward1909: Boolean = false
 
     internal fun addPreference(settingArray: Array<String>) {
         contexts.addPreference(settingArray)
diff --git a/src/main/resources/youtube/settings/xml/revanced_prefs.xml b/src/main/resources/youtube/settings/xml/revanced_prefs.xml

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,6 @@ object ChangeTogglePatch : BytecodePatch(`
`70`	`70`	`)`
`71`	`71`	`) {`
`72`	`72`	`override fun execute(context: BytecodeContext) {`
`73`		`- if (SettingsPatch.upward1905) throw PatchException("This version is not supported. Please use YouTube 19.05.36 or earlier.")`
`74`	`73`
`75`	`74`	`val additionalSettingsConfigResult = AdditionalSettingsConfigFingerprint.result`
`76`	`75`	`?: throw AdditionalSettingsConfigFingerprint.exception`
`@@ -108,6 +107,7 @@ object ChangeTogglePatch : BytecodePatch(`
`108`	`107`	`}`
`109`	`108`
`110`	`109`	`private fun MethodFingerprint.injectCall(descriptor: String) {`
	`110`	`+`
`111`	`111`	`result?.let {`
`112`	`112`	`it.mutableMethod.apply {`
`113`	`113`	`val insertIndex = implementation!!.instructions.indexOfFirst { instruction ->`
`@@ -124,6 +124,7 @@ object ChangeTogglePatch : BytecodePatch(`
`124`	`124`	`"""`
`125`	`125`	`)`
`126`	`126`	`}`
`127`		`- } ?: throw exception`
	`127`	`+ } ?: throw PatchException("This version is not supported. Please use YouTube 19.05.36 or earlier.")`
	`128`	`+`
`128`	`129`	`}`
`129`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ object KeepLandScapeModePatch : BytecodePatch(`
`54`	`54`	`)`
`55`	`55`	`) {`
`56`	`56`	`override fun execute(context: BytecodeContext) {`
	`57`	`+`
`57`	`58`	`LandScapeModeConfigFingerprint.result?.let {`
`58`	`59`	`it.mutableMethod.apply {`
`59`	`60`	`val insertIndex = implementation!!.instructions.size - 1`
Original file line number	Diff line number	Diff line change
`@@ -79,5 +79,6 @@ object SongSearchPatch : BytecodePatch(`
`79`	`79`	`)`
`80`	`80`
`81`	`81`	`SettingsPatch.updatePatchStatus("Enable song search")`
	`82`	`+`
`82`	`83`	`}`
`83`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,7 @@ import app.revanced.patches.youtube.utils.settings.SettingsPatch`
`47`	`47`	`"19.09.37"`
`48`	`48`	`]`
`49`	`49`	`)`
`50`		`- ],`
`51`		`- use = true`
	`50`	`+ ]`
`52`	`51`	`)`
`53`	`52`	`@Suppress("unused")`
`54`	`53`	`object DoubleTapOverlayBackgroundPatch : AbstractOverlayBackgroundPatch(`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package app.revanced.patches.youtube.misc.ambientmode.fingerprints /** #C# Add START */`
	`1`	`+package app.revanced.patches.youtube.misc.ambientmode.fingerprints`
`2`	`2`
`3`	`3`	`import app.revanced.patcher.extensions.or`
`4`	`4`	`import app.revanced.patcher.fingerprint.MethodFingerprint`
`@@ -40,4 +40,4 @@ object PowerSaveModeOneFingerprint : MethodFingerprint(`
`40`	`40`	`}`
`41`	`41`	`count == 1`
`42`	`42`	`}`
`43`		`-) /** #C# Add END */`
	`43`	`+)`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ object PivotBarShortsButtonViewFingerprint : MethodFingerprint(`
`7`	`7`	`opcodes = listOf(`
`8`	`8`	`Opcode.INVOKE_VIRTUAL_RANGE,`
`9`	`9`	`Opcode.MOVE_RESULT_OBJECT, // target reference`
`10`		`- Opcode.GOTO,`
	`10`	`+ null, // Opcode.GOTO_16 or Opcode.GOTO`
	`11`	`+ Opcode.IF_NE`
`11`	`12`	`)`
`12`	`13`	`)`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ object SwipeControlsPatch : BytecodePatch(`
`129`	`129`	`}`
`130`	`130`	`} ?: throw FullScreenEngagementOverlayFingerprint.exception`
`131`	`131`
`132`		`- if (SettingsPatch.upward1909) {`
	`132`	`+ try {`
`133`	`133`	`HDRBrightnessFingerprint.result?.let {`
`134`	`134`	`it.mutableMethod.apply {`
`135`	`135`	`addInstructionsWithLabels(`
`@@ -141,7 +141,7 @@ object SwipeControlsPatch : BytecodePatch(`
`141`	`141`	`""", ExternalLabel("default", getInstruction(0))`
`142`	`142`	`)`
`143`	`143`	`}`
`144`		`- }`
	`144`	`+ } ?: throw HDRBrightnessFingerprint.exception`
`145`	`145`
`146`	`146`	`/**`
`147`	`147`	`* Add settings`
`@@ -151,8 +151,11 @@ object SwipeControlsPatch : BytecodePatch(`
`151`	`151`	`"SETTINGS: SWIPE_EXPERIMENTAL_FLAGS"`
`152`	`152`	`)`
`153`	`153`	`)`
	`154`	`+ } catch (e: Exception) {`
	`155`	`+ println("WARNING: Disable auto HDR brightness is not supported in this version. Use YouTube 19.08.36 or earlier (${e.message})")`
`154`	`156`	`}`
`155`	`157`
	`158`	`+`
`156`	`159`	`/**`
`157`	`160`	`* Add settings`
`158`	`161`	`*/`