mirror of
https://github.com/inotia00/revanced-patches.git
synced 2025-05-04 08:34:27 +02:00
fix(YouTube Music/Enable color match player): apply fingerprints compatible with the wider version
This commit is contained in:
inotia00
parent
e3a1a8a0fe
commit
1afc292dd8
@ -4,29 +4,35 @@ import app.revanced.patcher.data.BytecodeContext
|
||||
import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
|
||||
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
|
||||
import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
|
||||
import app.revanced.patcher.extensions.or
|
||||
import app.revanced.patcher.patch.BytecodePatch
|
||||
import app.revanced.patcher.patch.PatchException
|
||||
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.patcher.util.smali.ExternalLabel
|
||||
import app.revanced.patches.music.player.colormatchplayer.fingerprints.NewPlayerColorFingerprint
|
||||
import app.revanced.patches.music.utils.fingerprints.PlayerColorFingerprint
|
||||
import app.revanced.patches.music.utils.fingerprints.SwitchToggleColorFingerprint
|
||||
import app.revanced.patches.music.utils.fingerprints.MiniPlayerConstructorFingerprint
|
||||
import app.revanced.patches.music.utils.integrations.Constants.PLAYER
|
||||
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch
|
||||
import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.ColorGrey
|
||||
import app.revanced.patches.music.utils.settings.CategoryType
|
||||
import app.revanced.patches.music.utils.settings.SettingsPatch
|
||||
import app.revanced.util.exception
|
||||
import app.revanced.util.getTargetIndex
|
||||
import app.revanced.util.getTargetIndexReversed
|
||||
import app.revanced.util.getWideLiteralInstructionIndex
|
||||
import com.android.tools.smali.dexlib2.AccessFlags
|
||||
import com.android.tools.smali.dexlib2.Opcode
|
||||
import com.android.tools.smali.dexlib2.iface.instruction.Instruction
|
||||
import com.android.tools.smali.dexlib2.iface.MethodParameter
|
||||
import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
|
||||
import com.android.tools.smali.dexlib2.iface.reference.FieldReference
|
||||
import com.android.tools.smali.dexlib2.iface.reference.Reference
|
||||
import kotlin.properties.Delegates
|
||||
|
||||
@Patch(
|
||||
name = "Enable color match player",
|
||||
description = "Adds an option to match the color of the miniplayer to the fullscreen player. Deprecated on YT Music 6.34.51+.",
|
||||
dependencies = [SettingsPatch::class],
|
||||
description = "Adds an option to match the color of the miniplayer to the fullscreen player.",
|
||||
dependencies = [
|
||||
SettingsPatch::class,
|
||||
SharedResourceIdPatch::class
|
||||
],
|
||||
compatiblePackages = [
|
||||
CompatiblePackage(
|
||||
"com.google.android.apps.youtube.music",
|
||||
@ -43,129 +49,72 @@ import kotlin.properties.Delegates
|
||||
"6.33.52"
|
||||
]
|
||||
)
|
||||
],
|
||||
use = false
|
||||
]
|
||||
)
|
||||
@Suppress("unused")
|
||||
object ColorMatchPlayerPatch : BytecodePatch(
|
||||
setOf(PlayerColorFingerprint)
|
||||
setOf(MiniPlayerConstructorFingerprint)
|
||||
) {
|
||||
private lateinit var miniPlayerReference1: Reference
|
||||
private lateinit var miniPlayerReference2: Reference
|
||||
private lateinit var miniPlayerReference3: Reference
|
||||
private lateinit var miniPlayerReference4: Reference
|
||||
private lateinit var miniPlayerReference5: Reference
|
||||
private lateinit var miniPlayerReference6: Reference
|
||||
|
||||
private lateinit var miniPlayerIntReference1: Reference
|
||||
private lateinit var miniPlayerIntReference2: Reference
|
||||
private lateinit var miniPlayerIntReference3: Reference
|
||||
|
||||
private var relativeIndex by Delegates.notNull<Int>()
|
||||
|
||||
private fun MutableMethod.descriptor(index: Int): Reference {
|
||||
return getInstruction<ReferenceInstruction>(relativeIndex + index).reference
|
||||
}
|
||||
|
||||
private fun MutableMethod.opcodeIndex(opcode: Opcode): Int {
|
||||
return implementation!!.instructions.indexOfFirst { instruction ->
|
||||
instruction.opcode == opcode
|
||||
}
|
||||
}
|
||||
private lateinit var invokeVirtualReference: Reference
|
||||
private lateinit var iGetReference: Reference
|
||||
private lateinit var iPutReference: Reference
|
||||
private lateinit var methodParameter: List<MethodParameter>
|
||||
|
||||
override fun execute(context: BytecodeContext) {
|
||||
|
||||
PlayerColorFingerprint.result?.let { parentResult ->
|
||||
parentResult.mutableMethod.apply {
|
||||
relativeIndex = parentResult.scanResult.patternScanResult!!.startIndex
|
||||
MiniPlayerConstructorFingerprint.result?.let { parentResult ->
|
||||
// Resolves fingerprints
|
||||
SwitchToggleColorFingerprint.resolve(context, parentResult.classDef)
|
||||
|
||||
miniPlayerReference1 = descriptor(2)
|
||||
miniPlayerReference2 = descriptor(3)
|
||||
miniPlayerReference3 = descriptor(4)
|
||||
miniPlayerReference4 = descriptor(7)
|
||||
miniPlayerReference5 = descriptor(8)
|
||||
miniPlayerReference6 = descriptor(9)
|
||||
|
||||
relativeIndex = opcodeIndex(Opcode.IGET_OBJECT) - 4
|
||||
|
||||
miniPlayerIntReference1 = descriptor(0)
|
||||
miniPlayerIntReference2 = descriptor(3)
|
||||
|
||||
relativeIndex = opcodeIndex(Opcode.IF_GEZ)
|
||||
miniPlayerIntReference3 = descriptor(1)
|
||||
|
||||
val insertIndex = opcodeIndex(Opcode.IPUT_OBJECT)
|
||||
val jumpInstruction = getInstruction<Instruction>(insertIndex)
|
||||
val replaceReference =
|
||||
getInstruction<ReferenceInstruction>(insertIndex - 1).reference
|
||||
|
||||
addInstructionsWithLabels(
|
||||
insertIndex, """
|
||||
invoke-static {}, $PLAYER->enableColorMatchPlayer()Z
|
||||
move-result v2
|
||||
if-eqz v2, :off
|
||||
iget v0, p0, $miniPlayerReference1
|
||||
if-eq v0, v2, :switch
|
||||
iput v2, p0, $miniPlayerReference1
|
||||
iget-object v0, p0, $miniPlayerReference2
|
||||
invoke-virtual {v0, v2, p2, p3}, $miniPlayerReference3
|
||||
:switch
|
||||
iget v0, p0, $miniPlayerReference4
|
||||
if-eq v0, v1, :exit
|
||||
iput v1, p0, $miniPlayerReference4
|
||||
iget-object v0, p0, $miniPlayerReference5
|
||||
invoke-virtual {v0, v1, p2, p3}, $miniPlayerReference6
|
||||
goto :exit
|
||||
:off
|
||||
invoke-direct {p0}, $replaceReference
|
||||
""", ExternalLabel("exit", jumpInstruction)
|
||||
)
|
||||
removeInstruction(insertIndex - 1)
|
||||
}
|
||||
|
||||
NewPlayerColorFingerprint.also {
|
||||
it.resolve(
|
||||
context,
|
||||
parentResult.classDef
|
||||
)
|
||||
}.result?.let {
|
||||
SwitchToggleColorFingerprint.result?.let {
|
||||
it.mutableMethod.apply {
|
||||
val insertIndex = it.scanResult.patternScanResult!!.endIndex
|
||||
val replaceReference =
|
||||
getInstruction<ReferenceInstruction>(insertIndex - 1).reference
|
||||
methodParameter = parameters
|
||||
|
||||
addInstructionsWithLabels(
|
||||
insertIndex, """
|
||||
invoke-static {}, $PLAYER->enableColorMatchPlayer()Z
|
||||
move-result v1
|
||||
if-eqz v1, :off
|
||||
iget v0, p0, $miniPlayerReference1
|
||||
if-eq v0, v1, :switch
|
||||
iput v1, p0, $miniPlayerReference1
|
||||
iget-object v0, p0, $miniPlayerReference2
|
||||
invoke-virtual {v0, v1, p2, p3}, $miniPlayerReference3
|
||||
:switch
|
||||
invoke-virtual {p1}, $miniPlayerIntReference1
|
||||
move-result-object v1
|
||||
check-cast v1, ${(miniPlayerIntReference2 as FieldReference).definingClass}
|
||||
iget v1, v1, $miniPlayerIntReference2
|
||||
invoke-static {v1}, $miniPlayerIntReference3
|
||||
move-result v1
|
||||
iget v0, p0, $miniPlayerReference4
|
||||
if-eq v0, v1, :exit
|
||||
iput v1, p0, $miniPlayerReference4
|
||||
iget-object v0, p0, $miniPlayerReference5
|
||||
invoke-virtual {v0, v1, p2, p3}, $miniPlayerReference6
|
||||
:exit
|
||||
return-void
|
||||
:off
|
||||
invoke-direct {p0}, $replaceReference
|
||||
"""
|
||||
)
|
||||
removeInstruction(insertIndex - 1)
|
||||
val relativeIndex = it.scanResult.patternScanResult!!.endIndex + 1
|
||||
val invokeVirtualIndex = getTargetIndex(relativeIndex, Opcode.INVOKE_VIRTUAL)
|
||||
val iGetIndex = getTargetIndex(relativeIndex, Opcode.IGET)
|
||||
|
||||
invokeVirtualReference = getInstruction<ReferenceInstruction>(invokeVirtualIndex).reference
|
||||
iGetReference = getInstruction<ReferenceInstruction>(iGetIndex).reference
|
||||
}
|
||||
} ?: throw NewPlayerColorFingerprint.exception
|
||||
} ?: throw PatchException("This version is not supported. Please use YT Music 6.33.52 or earlier.")
|
||||
|
||||
parentResult.mutableMethod.apply {
|
||||
val colorGreyIndex = getWideLiteralInstructionIndex(ColorGrey)
|
||||
val iPutIndex = getTargetIndex(colorGreyIndex, Opcode.IPUT)
|
||||
|
||||
iPutReference = getInstruction<ReferenceInstruction>(iPutIndex).reference
|
||||
}
|
||||
|
||||
parentResult.mutableClass.methods.filter { method ->
|
||||
method.accessFlags == AccessFlags.PUBLIC or AccessFlags.FINAL
|
||||
&& method.parameters == methodParameter
|
||||
&& method.returnType == "V"
|
||||
}.forEach { mutableMethod ->
|
||||
mutableMethod.apply {
|
||||
val freeRegister = implementation!!.registerCount - parameters.size - 3
|
||||
|
||||
val invokeDirectIndex = getTargetIndexReversed(implementation!!.instructions.size - 1, Opcode.INVOKE_DIRECT)
|
||||
val invokeDirectReference = getInstruction<ReferenceInstruction>(invokeDirectIndex).reference
|
||||
|
||||
addInstructionsWithLabels(
|
||||
invokeDirectIndex + 1, """
|
||||
invoke-static {}, $PLAYER->enableColorMatchPlayer()Z
|
||||
move-result v$freeRegister
|
||||
if-eqz v$freeRegister, :off
|
||||
invoke-virtual {p1}, $invokeVirtualReference
|
||||
move-result-object v$freeRegister
|
||||
check-cast v$freeRegister, ${(iGetReference as FieldReference).definingClass}
|
||||
iget v$freeRegister, v$freeRegister, $iGetReference
|
||||
iput v$freeRegister, p0, $iPutReference
|
||||
:off
|
||||
invoke-direct {p0}, $invokeDirectReference
|
||||
"""
|
||||
)
|
||||
removeInstruction(invokeDirectIndex)
|
||||
}
|
||||
}
|
||||
} ?: throw SwitchToggleColorFingerprint.exception
|
||||
} ?: throw MiniPlayerConstructorFingerprint.exception
|
||||
|
||||
SettingsPatch.addMusicPreference(
|
||||
CategoryType.PLAYER,
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
package app.revanced.patches.music.player.colormatchplayer.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
|
||||
|
||||
object NewPlayerColorFingerprint : MethodFingerprint(
|
||||
returnType = "V",
|
||||
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
|
||||
parameters = listOf("L", "J"),
|
||||
opcodes = listOf(
|
||||
Opcode.INVOKE_DIRECT,
|
||||
Opcode.RETURN_VOID,
|
||||
Opcode.INVOKE_DIRECT,
|
||||
Opcode.RETURN_VOID
|
||||
)
|
||||
)
|
||||
@ -1,24 +0,0 @@
|
||||
package app.revanced.patches.music.utils.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
|
||||
|
||||
object PlayerColorFingerprint : MethodFingerprint(
|
||||
returnType = "V",
|
||||
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
|
||||
parameters = listOf("L", "J"),
|
||||
opcodes = listOf(
|
||||
Opcode.IGET,
|
||||
Opcode.IF_EQ,
|
||||
Opcode.IPUT,
|
||||
Opcode.IGET_OBJECT,
|
||||
Opcode.INVOKE_VIRTUAL,
|
||||
Opcode.IGET,
|
||||
Opcode.IF_EQ,
|
||||
Opcode.IPUT,
|
||||
Opcode.IGET_OBJECT,
|
||||
Opcode.INVOKE_VIRTUAL
|
||||
)
|
||||
)
|
||||
Loading…
x
Reference in New Issue
Block a user