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

refactor: improve weak fingerprints

Browse Source
This commit is contained in:
inotia00 2023-04-09 00:36:14 +09:00
parent 4e8c8a63c6
commit 1e4cf284c3
7 changed files with 80 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/kotlin/app/revanced/patches/youtube/layout/player/previousnextbutton/fingerprints/SupportsNextPreviousFingerprint.kt Normal file
View File

@ -0,0 +1,16 @@
package app.revanced.patches.youtube.layout.player.previousnextbutton.fingerprints
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
import org.jf.dexlib2.Opcode
import org.jf.dexlib2.iface.instruction.NarrowLiteralInstruction
object SupportsNextPreviousFingerprint : MethodFingerprint(
returnType = "V",
parameters = listOf("Z"),
opcodes = listOf(Opcode.OR_INT_LIT8),
customFingerprint = { methodDef ->
methodDef.implementation!!.instructions.any {
((it as? NarrowLiteralInstruction)?.narrowLiteral == 64)
}
}
)

22
src/main/kotlin/app/revanced/patches/youtube/layout/player/previousnextbutton/patch/HidePreviousNextButtonPatch.kt
View File

@ -6,7 +6,6 @@ import app.revanced.patcher.annotation.Name
import app.revanced.patcher.annotation.Version
import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.addInstructions
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
import app.revanced.patcher.patch.BytecodePatch
import app.revanced.patcher.patch.PatchResult
@ -15,6 +14,7 @@ import app.revanced.patcher.patch.annotations.DependsOn
import app.revanced.patcher.patch.annotations.Patch
import app.revanced.patches.shared.annotation.YouTubeCompatibility
import app.revanced.patches.shared.fingerprints.ControlsOverlayStyleFingerprint
import app.revanced.patches.youtube.layout.player.previousnextbutton.fingerprints.SupportsNextPreviousFingerprint
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.util.integrations.Constants.PLAYER
@ -29,18 +29,14 @@ class HidePreviousNextButtonPatch : BytecodePatch(
) {
override fun execute(context: BytecodeContext): PatchResult {
val controlsOverlayStyleClassDef = ControlsOverlayStyleFingerprint.result?.classDef?: return ControlsOverlayStyleFingerprint.toErrorResult()
val previousNextButtonVisibleFingerprint =
object : MethodFingerprint(returnType = "V", parameters = listOf("Z"), customFingerprint = { it.name == "j" }) {}
previousNextButtonVisibleFingerprint.resolve(context, controlsOverlayStyleClassDef)
previousNextButtonVisibleFingerprint.result?.mutableMethod?.addInstructions(
0, """
invoke-static {p1}, $PLAYER->hidePreviousNextButton(Z)Z
move-result p1
"""
)?: return previousNextButtonVisibleFingerprint.toErrorResult()
ControlsOverlayStyleFingerprint.result?.let { parentResult ->
SupportsNextPreviousFingerprint.also { it.resolve(context, parentResult.classDef) }.result?.mutableMethod?.addInstructions(
0, """
invoke-static {p1}, $PLAYER->hidePreviousNextButton(Z)Z
move-result p1
"""
) ?: return SupportsNextPreviousFingerprint.toErrorResult()
} ?: return ControlsOverlayStyleFingerprint.toErrorResult()
/*
* Add settings

10
src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/seekbarcolor/fingerprints/ProgressColorFingerprint.kt Normal file
View File

@ -0,0 +1,10 @@
package app.revanced.patches.youtube.layout.seekbar.seekbarcolor.fingerprints
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
import org.jf.dexlib2.Opcode
object ProgressColorFingerprint : MethodFingerprint(
returnType = "V",
parameters = listOf("I"),
opcodes = listOf(Opcode.OR_INT_LIT8)
)

21
src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/seekbarcolor/patch/SeekbarColorPatch.kt
View File

@ -6,7 +6,6 @@ import app.revanced.patcher.annotation.Name
import app.revanced.patcher.annotation.Version
import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.addInstructions
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
import app.revanced.patcher.patch.BytecodePatch
import app.revanced.patcher.patch.PatchResult
@ -15,6 +14,7 @@ import app.revanced.patcher.patch.annotations.DependsOn
import app.revanced.patcher.patch.annotations.Patch
import app.revanced.patches.shared.annotation.YouTubeCompatibility
import app.revanced.patches.shared.fingerprints.ControlsOverlayStyleFingerprint
import app.revanced.patches.youtube.layout.seekbar.seekbarcolor.fingerprints.ProgressColorFingerprint
import app.revanced.patches.youtube.layout.seekbar.seekbarcolor.fingerprints.SeekbarColorFingerprint
import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourceIdPatch
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
@ -57,17 +57,14 @@ class SeekbarColorPatch : BytecodePatch(
}
} ?: return SeekbarColorFingerprint.toErrorResult()
val controlsOverlayStyleClassDef = ControlsOverlayStyleFingerprint.result?.classDef?: return ControlsOverlayStyleFingerprint.toErrorResult()
val progressColorFingerprint =
object : MethodFingerprint(returnType = "V", parameters = listOf("I"), customFingerprint = { it.name == "e" }) {}
progressColorFingerprint.resolve(context, controlsOverlayStyleClassDef)
progressColorFingerprint.result?.mutableMethod?.addInstructions(
0, """
invoke-static {p1}, $SEEKBAR->enableCustomSeekbarColor(I)I
move-result p1
"""
)?: return progressColorFingerprint.toErrorResult()
ControlsOverlayStyleFingerprint.result?.let { parentResult ->
ProgressColorFingerprint.also { it.resolve(context, parentResult.classDef) }.result?.mutableMethod?.addInstructions(
0, """
invoke-static {p1}, $SEEKBAR->enableCustomSeekbarColor(I)I
move-result p1
"""
) ?: return ProgressColorFingerprint.toErrorResult()
} ?: return ControlsOverlayStyleFingerprint.toErrorResult()
/*
* Add settings

16
src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/SeekEDUVisibleFingerprint.kt Normal file
View File

@ -0,0 +1,16 @@
package app.revanced.patches.youtube.misc.playercontrols.fingerprints
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
import org.jf.dexlib2.Opcode
import org.jf.dexlib2.iface.instruction.NarrowLiteralInstruction
object SeekEDUVisibleFingerprint : MethodFingerprint(
returnType = "V",
parameters = listOf("Z"),
opcodes = listOf(Opcode.OR_INT_LIT8),
customFingerprint = { methodDef ->
methodDef.implementation!!.instructions.any {
((it as? NarrowLiteralInstruction)?.narrowLiteral == 32)
}
}
)

16
src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/UserScrubbingFingerprint.kt Normal file
View File

@ -0,0 +1,16 @@
package app.revanced.patches.youtube.misc.playercontrols.fingerprints
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
import org.jf.dexlib2.Opcode
import org.jf.dexlib2.iface.instruction.NarrowLiteralInstruction
object UserScrubbingFingerprint : MethodFingerprint(
returnType = "V",
parameters = listOf("Z"),
opcodes = listOf(Opcode.OR_INT_LIT8),
customFingerprint = { methodDef ->
methodDef.implementation!!.instructions.any {
((it as? NarrowLiteralInstruction)?.narrowLiteral == 64)
}
}
)

12
src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/patch/PlayerControlsPatch.kt
View File

@ -36,15 +36,11 @@ class PlayerControlsPatch : BytecodePatch(
val playerControlsVisibilityModelClassDef = PlayerControlsVisibilityModelFingerprint.result?.classDef?: return PlayerControlsVisibilityModelFingerprint.toErrorResult()
val seekEDUVisibleFingerprint =
object : MethodFingerprint(returnType = "V", parameters = listOf("Z"), customFingerprint = { it.name == "l" }) {}
seekEDUVisibleFingerprint.resolve(context, playerControlsVisibilityModelClassDef)
seekEDUVisibleResult = seekEDUVisibleFingerprint.result?: return seekEDUVisibleFingerprint.toErrorResult()
SeekEDUVisibleFingerprint.resolve(context, playerControlsVisibilityModelClassDef)
seekEDUVisibleResult = SeekEDUVisibleFingerprint.result?: return SeekEDUVisibleFingerprint.toErrorResult()
val userScrubbingFingerprint =
object : MethodFingerprint(returnType = "V", parameters = listOf("Z"), customFingerprint = { it.name == "o" }) {}
userScrubbingFingerprint.resolve(context, playerControlsVisibilityModelClassDef)
userScrubbingResult = userScrubbingFingerprint.result?: return userScrubbingFingerprint.toErrorResult()
UserScrubbingFingerprint.resolve(context, playerControlsVisibilityModelClassDef)
userScrubbingResult = UserScrubbingFingerprint.result?: return UserScrubbingFingerprint.toErrorResult()
playerControlsVisibilityResult = PlayerControlsVisibilityFingerprint.result?: return PlayerControlsVisibilityFingerprint.toErrorResult()
controlsLayoutInflateResult = ControlsLayoutInflateFingerprint.result?: return ControlsLayoutInflateFingerprint.toErrorResult()