ReVanced/revanced-patches-ex
1
0
Fork 0
mirror of https://github.com/inotia00/revanced-patches.git synced 2025-05-07 10:04:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(YouTube Music/Enable old player background): force close occurs when the app is first installed after including the patch in a specific version

Browse Source
This commit is contained in:
inotia00 2024-03-20 02:17:12 +09:00
parent d1ea7103a3
commit dfe243cd64
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/kotlin/app/revanced/patches/music/player/oldplayerbackground/OldPlayerBackgroundPatch.kt
View File

@ -2,6 +2,7 @@ package app.revanced.patches.music.player.oldplayerbackground
import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.InstructionExtensions.addInstructions import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.BytecodePatch
import app.revanced.patcher.patch.PatchException import app.revanced.patcher.patch.PatchException
import app.revanced.patcher.patch.annotation.CompatiblePackage import app.revanced.patcher.patch.annotation.CompatiblePackage
@ -10,6 +11,10 @@ import app.revanced.patches.music.player.oldplayerbackground.fingerprints.OldPla
import app.revanced.patches.music.utils.integrations.Constants.PLAYER import app.revanced.patches.music.utils.integrations.Constants.PLAYER
import app.revanced.patches.music.utils.settings.CategoryType import app.revanced.patches.music.utils.settings.CategoryType
import app.revanced.patches.music.utils.settings.SettingsPatch import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.util.getTargetIndex
import app.revanced.util.getWideLiteralInstructionIndex
import com.android.tools.smali.dexlib2.Opcode
import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
@Patch( @Patch(
name = "Enable old player background", name = "Enable old player background",
@ -42,11 +47,14 @@ object OldPlayerBackgroundPatch : BytecodePatch(
OldPlayerBackgroundFingerprint.result?.let { OldPlayerBackgroundFingerprint.result?.let {
it.mutableMethod.apply { it.mutableMethod.apply {
val startIndex = getWideLiteralInstructionIndex(45415319)
val targetIndex = getTargetIndex(startIndex, Opcode.MOVE_RESULT)
val targetRegister = getInstruction<OneRegisterInstruction>(targetIndex).registerA
addInstructions( addInstructions(
0, """ targetIndex + 1, """
invoke-static {}, $PLAYER->enableOldPlayerBackground()Z invoke-static {v$targetRegister}, $PLAYER->enableOldPlayerBackground(Z)Z
move-result v0 move-result v$targetRegister
return v0
""" """
) )
} }

16
src/main/kotlin/app/revanced/patches/music/player/oldplayerlayout/OldPlayerLayoutPatch.kt
View File

@ -2,6 +2,7 @@ package app.revanced.patches.music.player.oldplayerlayout
import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.InstructionExtensions.addInstructions import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.BytecodePatch
import app.revanced.patcher.patch.PatchException import app.revanced.patcher.patch.PatchException
import app.revanced.patcher.patch.annotation.CompatiblePackage import app.revanced.patcher.patch.annotation.CompatiblePackage
@ -10,6 +11,10 @@ import app.revanced.patches.music.player.oldplayerlayout.fingerprints.OldPlayerL
import app.revanced.patches.music.utils.integrations.Constants.PLAYER import app.revanced.patches.music.utils.integrations.Constants.PLAYER
import app.revanced.patches.music.utils.settings.CategoryType import app.revanced.patches.music.utils.settings.CategoryType
import app.revanced.patches.music.utils.settings.SettingsPatch import app.revanced.patches.music.utils.settings.SettingsPatch
import app.revanced.util.getTargetIndex
import app.revanced.util.getWideLiteralInstructionIndex
import com.android.tools.smali.dexlib2.Opcode
import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
@Patch( @Patch(
name = "Enable old player layout", name = "Enable old player layout",
@ -42,11 +47,14 @@ object OldPlayerLayoutPatch : BytecodePatch(
OldPlayerLayoutFingerprint.result?.let { OldPlayerLayoutFingerprint.result?.let {
it.mutableMethod.apply { it.mutableMethod.apply {
val startIndex = getWideLiteralInstructionIndex(45399578)
val targetIndex = getTargetIndex(startIndex, Opcode.MOVE_RESULT)
val targetRegister = getInstruction<OneRegisterInstruction>(targetIndex).registerA
addInstructions( addInstructions(
0, """ targetIndex + 1, """
invoke-static {}, $PLAYER->enableOldPlayerLayout()Z invoke-static {v$targetRegister}, $PLAYER->enableOldPlayerLayout(Z)Z
move-result v0 move-result v$targetRegister
return v0
""" """
) )
} }