mirror of
https://github.com/ReVanced/revanced-patches.git
synced 2026-01-25 03:31:03 +00:00
Compare commits
9 Commits
v2.191.0-d
...
v2.191.0-d
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
928df2428d | ||
|
|
3e9e1e2577 | ||
|
|
5ebec9b424 | ||
|
|
0204ff67a9 | ||
|
|
7d2a707030 | ||
|
|
26e0e4cd1d | ||
|
|
40f0a8cd0d | ||
|
|
47c858ef4e | ||
|
|
b17cd14d7d |
28
CHANGELOG.md
28
CHANGELOG.md
@@ -1,3 +1,31 @@
|
|||||||
|
# [2.191.0-dev.23](https://github.com/ReVanced/revanced-patches/compare/v2.191.0-dev.22...v2.191.0-dev.23) (2023-09-30)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **SPB Serviceportal Bund:** Add `Remove root detection` patch ([#3049](https://github.com/ReVanced/revanced-patches/issues/3049)) ([481bf58](https://github.com/ReVanced/revanced-patches/commit/481bf583afbf954bef1c4e5349a62ea1c623115a))
|
||||||
|
|
||||||
|
# [2.191.0-dev.22](https://github.com/ReVanced/revanced-patches/compare/v2.191.0-dev.21...v2.191.0-dev.22) (2023-09-28)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **YouTube - Premium heading:** Correct inverted logic ([#3042](https://github.com/ReVanced/revanced-patches/issues/3042)) ([b33ed75](https://github.com/ReVanced/revanced-patches/commit/b33ed757370653b8eb0002b0977eedfbc73dbe5e))
|
||||||
|
|
||||||
|
# [2.191.0-dev.21](https://github.com/ReVanced/revanced-patches/compare/v2.191.0-dev.20...v2.191.0-dev.21) (2023-09-28)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **YouTube - ReturnYouTubeDislike:** Revert support for 18.37.36 ([#3041](https://github.com/ReVanced/revanced-patches/issues/3041)) ([3761073](https://github.com/ReVanced/revanced-patches/commit/37610732da87549c22a430bb62d10793dfa2e696))
|
||||||
|
|
||||||
|
# [2.191.0-dev.20](https://github.com/ReVanced/revanced-patches/compare/v2.191.0-dev.19...v2.191.0-dev.20) (2023-09-28)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **YouTube - Video Id:** Fix video id not showing the currently playing video ([#3038](https://github.com/ReVanced/revanced-patches/issues/3038)) ([f6f226b](https://github.com/ReVanced/revanced-patches/commit/f6f226ba281823cb5d2d468c32f6e48551971726))
|
||||||
|
|
||||||
# [2.191.0-dev.19](https://github.com/ReVanced/revanced-patches/compare/v2.191.0-dev.18...v2.191.0-dev.19) (2023-09-28)
|
# [2.191.0-dev.19](https://github.com/ReVanced/revanced-patches/compare/v2.191.0-dev.18...v2.191.0-dev.19) (2023-09-28)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
org.gradle.parallel = true
|
org.gradle.parallel = true
|
||||||
org.gradle.caching = true
|
org.gradle.caching = true
|
||||||
kotlin.code.style = official
|
kotlin.code.style = official
|
||||||
version = 2.191.0-dev.19
|
version = 2.191.0-dev.23
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -0,0 +1,21 @@
|
|||||||
|
package app.revanced.patches.serviceportalbund.detection.root
|
||||||
|
|
||||||
|
import app.revanced.patcher.data.BytecodeContext
|
||||||
|
import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
|
||||||
|
import app.revanced.patcher.patch.BytecodePatch
|
||||||
|
import app.revanced.patcher.patch.annotation.CompatiblePackage
|
||||||
|
import app.revanced.patcher.patch.annotation.Patch
|
||||||
|
import app.revanced.patches.serviceportalbund.detection.root.fingerprints.RootDetectionFingerprint
|
||||||
|
|
||||||
|
@Patch(
|
||||||
|
name = "Remove root detection",
|
||||||
|
description = "Removes the check for root permissions and unlocked bootloader.",
|
||||||
|
compatiblePackages = [CompatiblePackage("at.gv.bka.serviceportal")]
|
||||||
|
)
|
||||||
|
@Suppress("unused")
|
||||||
|
object RootDetectionPatch : BytecodePatch(
|
||||||
|
setOf(RootDetectionFingerprint)
|
||||||
|
) {
|
||||||
|
override fun execute(context: BytecodeContext) =
|
||||||
|
RootDetectionFingerprint.result!!.mutableMethod.addInstruction(0, "return-void")
|
||||||
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
package app.revanced.patches.serviceportalbund.detection.root.fingerprints
|
||||||
|
|
||||||
|
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
|
||||||
|
import com.android.tools.smali.dexlib2.AccessFlags
|
||||||
|
|
||||||
|
object RootDetectionFingerprint : MethodFingerprint(
|
||||||
|
"V",
|
||||||
|
accessFlags = AccessFlags.PUBLIC.value,
|
||||||
|
customFingerprint = { methodDef, _ ->
|
||||||
|
methodDef.definingClass.endsWith("/DeviceIntegrityCheck;")
|
||||||
|
}
|
||||||
|
)
|
||||||
@@ -32,9 +32,9 @@ object PremiumHeadingPatch : ResourcePatch() {
|
|||||||
val resDirectory = context["res"]
|
val resDirectory = context["res"]
|
||||||
|
|
||||||
val (original, replacement) = if (usePremiumHeading!!)
|
val (original, replacement) = if (usePremiumHeading!!)
|
||||||
DEFAULT_HEADING_RES to PREMIUM_HEADING_RES
|
|
||||||
else
|
|
||||||
PREMIUM_HEADING_RES to DEFAULT_HEADING_RES
|
PREMIUM_HEADING_RES to DEFAULT_HEADING_RES
|
||||||
|
else
|
||||||
|
DEFAULT_HEADING_RES to PREMIUM_HEADING_RES
|
||||||
|
|
||||||
val variants = arrayOf("light", "dark")
|
val variants = arrayOf("light", "dark")
|
||||||
|
|
||||||
|
|||||||
@@ -24,7 +24,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
|
|||||||
"18.20.39",
|
"18.20.39",
|
||||||
"18.23.35",
|
"18.23.35",
|
||||||
"18.29.38",
|
"18.29.38",
|
||||||
"18.32.39"
|
"18.32.39",
|
||||||
|
"18.37.36"
|
||||||
])
|
])
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
|
|||||||
PlayerTypeHookPatch::class,
|
PlayerTypeHookPatch::class,
|
||||||
],
|
],
|
||||||
compatiblePackages = [
|
compatiblePackages = [
|
||||||
CompatiblePackage("com.google.android.youtube", ["18.37.36"])
|
CompatiblePackage("com.google.android.youtube", ["18.32.39"])
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
@Suppress("unused")
|
@Suppress("unused")
|
||||||
@@ -51,9 +51,7 @@ object ReturnYouTubeDislikePatch : BytecodePatch(
|
|||||||
override fun execute(context: BytecodeContext) {
|
override fun execute(context: BytecodeContext) {
|
||||||
// region Inject newVideoLoaded event handler to update dislikes when a new video is loaded.
|
// region Inject newVideoLoaded event handler to update dislikes when a new video is loaded.
|
||||||
|
|
||||||
// This patch needs a few adjustments and lots of testing before it can change to the new video id hook.
|
VideoIdPatch.hookVideoId("$INTEGRATIONS_CLASS_DESCRIPTOR->newVideoLoaded(Ljava/lang/String;)V")
|
||||||
// There's a few corner cases and some weirdness when loading new videos (specifically with detecting shorts).
|
|
||||||
VideoIdPatch.legacyInjectCall("$INTEGRATIONS_CLASS_DESCRIPTOR->newVideoLoaded(Ljava/lang/String;)V")
|
|
||||||
|
|
||||||
// endregion
|
// endregion
|
||||||
|
|
||||||
@@ -91,40 +89,49 @@ object ReturnYouTubeDislikePatch : BytecodePatch(
|
|||||||
throw TextComponentAtomicReferenceFingerprint.exception
|
throw TextComponentAtomicReferenceFingerprint.exception
|
||||||
}?.let { textComponentContextFingerprintResult ->
|
}?.let { textComponentContextFingerprintResult ->
|
||||||
val conversionContextIndex = textComponentContextFingerprintResult
|
val conversionContextIndex = textComponentContextFingerprintResult
|
||||||
.scanResult.patternScanResult!!.endIndex
|
.scanResult.patternScanResult!!.startIndex
|
||||||
val atomicReferenceStartIndex = TextComponentAtomicReferenceFingerprint.result!!
|
val atomicReferenceStartIndex = TextComponentAtomicReferenceFingerprint.result!!
|
||||||
.scanResult.patternScanResult!!.startIndex
|
.scanResult.patternScanResult!!.startIndex
|
||||||
|
|
||||||
val insertIndex = atomicReferenceStartIndex + 9
|
val insertIndex = atomicReferenceStartIndex + 6
|
||||||
|
|
||||||
textComponentContextFingerprintResult.mutableMethod.apply {
|
textComponentContextFingerprintResult.mutableMethod.apply {
|
||||||
// Get the conversion context obfuscated field name
|
// Get the conversion context obfuscated field name, and the registers for the AtomicReference and CharSequence
|
||||||
val conversionContextFieldReference =
|
val conversionContextFieldReference =
|
||||||
getInstruction<ReferenceInstruction>(conversionContextIndex).reference
|
getInstruction<ReferenceInstruction>(conversionContextIndex).reference
|
||||||
|
|
||||||
// Free register to hold the conversion context
|
// Reuse the free register to make room for the atomic reference register.
|
||||||
val freeRegister =
|
val freeRegister =
|
||||||
getInstruction<TwoRegisterInstruction>(atomicReferenceStartIndex).registerB
|
getInstruction<TwoRegisterInstruction>(atomicReferenceStartIndex).registerB
|
||||||
|
|
||||||
val atomicReferenceRegister =
|
val atomicReferenceRegister =
|
||||||
getInstruction<FiveRegisterInstruction>(atomicReferenceStartIndex + 6).registerC
|
getInstruction<FiveRegisterInstruction>(atomicReferenceStartIndex + 1).registerC
|
||||||
|
|
||||||
// Instruction that is replaced, and also has the CharacterSequence register.
|
val moveCharSequenceInstruction = getInstruction<TwoRegisterInstruction>(insertIndex - 1)
|
||||||
val moveCharSequenceInstruction = getInstruction<TwoRegisterInstruction>(insertIndex)
|
|
||||||
val charSequenceSourceRegister = moveCharSequenceInstruction.registerB
|
val charSequenceSourceRegister = moveCharSequenceInstruction.registerB
|
||||||
val charSequenceTargetRegister = moveCharSequenceInstruction.registerA
|
val charSequenceTargetRegister = moveCharSequenceInstruction.registerA
|
||||||
|
|
||||||
|
// In order to preserve the atomic reference register, because it is overwritten,
|
||||||
|
// use another free register to store it.
|
||||||
|
replaceInstruction(
|
||||||
|
atomicReferenceStartIndex + 2,
|
||||||
|
"move-result-object v$freeRegister"
|
||||||
|
)
|
||||||
|
replaceInstruction(
|
||||||
|
atomicReferenceStartIndex + 3,
|
||||||
|
"move-object v$charSequenceSourceRegister, v$freeRegister"
|
||||||
|
)
|
||||||
|
|
||||||
// Move the current instance to the free register, and get the conversion context from it.
|
// Move the current instance to the free register, and get the conversion context from it.
|
||||||
// Must replace the instruction to preserve the control flow label.
|
replaceInstruction(insertIndex - 1, "move-object/from16 v$freeRegister, p0")
|
||||||
replaceInstruction(insertIndex, "move-object/from16 v$freeRegister, p0")
|
|
||||||
addInstructions(
|
addInstructions(
|
||||||
insertIndex + 1,
|
insertIndex,
|
||||||
"""
|
"""
|
||||||
# Move context to free register
|
# Move context to free register
|
||||||
iget-object v$freeRegister, v$freeRegister, $conversionContextFieldReference
|
iget-object v$freeRegister, v$freeRegister, $conversionContextFieldReference
|
||||||
invoke-static {v$freeRegister, v$atomicReferenceRegister, v$charSequenceSourceRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR->onLithoTextLoaded(Ljava/lang/Object;Ljava/util/concurrent/atomic/AtomicReference;Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
|
invoke-static {v$freeRegister, v$atomicReferenceRegister, v$charSequenceSourceRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR->onLithoTextLoaded(Ljava/lang/Object;Ljava/util/concurrent/atomic/AtomicReference;Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
|
||||||
move-result-object v$freeRegister
|
move-result-object v$freeRegister
|
||||||
# Replace the original instruction
|
# Replace the original char sequence with the modified one.
|
||||||
move-object v${charSequenceTargetRegister}, v${freeRegister}
|
move-object v${charSequenceTargetRegister}, v${freeRegister}
|
||||||
"""
|
"""
|
||||||
)
|
)
|
||||||
@@ -143,7 +150,7 @@ object ReturnYouTubeDislikePatch : BytecodePatch(
|
|||||||
val isDisLikesBooleanReference = getInstruction<ReferenceInstruction>(patternResult.endIndex).reference
|
val isDisLikesBooleanReference = getInstruction<ReferenceInstruction>(patternResult.endIndex).reference
|
||||||
|
|
||||||
val textViewFieldReference = // Like/Dislike button TextView field
|
val textViewFieldReference = // Like/Dislike button TextView field
|
||||||
getInstruction<ReferenceInstruction>(patternResult.endIndex - 1).reference
|
getInstruction<ReferenceInstruction>(patternResult.endIndex - 2).reference
|
||||||
|
|
||||||
// Check if the hooked TextView object is that of the dislike button.
|
// Check if the hooked TextView object is that of the dislike button.
|
||||||
// If RYD is disabled, or the TextView object is not that of the dislike button, the execution flow is not interrupted.
|
// If RYD is disabled, or the TextView object is not that of the dislike button, the execution flow is not interrupted.
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ object ShortsTextViewFingerprint : MethodFingerprint(
|
|||||||
Opcode.IF_EQ,
|
Opcode.IF_EQ,
|
||||||
Opcode.RETURN_VOID,
|
Opcode.RETURN_VOID,
|
||||||
Opcode.IGET_OBJECT, // TextView field
|
Opcode.IGET_OBJECT, // TextView field
|
||||||
|
Opcode.CHECK_CAST,
|
||||||
Opcode.IGET_BOOLEAN, // boolean field
|
Opcode.IGET_BOOLEAN, // boolean field
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
@@ -13,17 +13,13 @@ object TextComponentAtomicReferenceFingerprint : MethodFingerprint(
|
|||||||
accessFlags = AccessFlags.PROTECTED or AccessFlags.FINAL,
|
accessFlags = AccessFlags.PROTECTED or AccessFlags.FINAL,
|
||||||
parameters = listOf("L"),
|
parameters = listOf("L"),
|
||||||
opcodes = listOf(
|
opcodes = listOf(
|
||||||
Opcode.MOVE_OBJECT, // Register B is free register
|
Opcode.MOVE_OBJECT, // Register A and B is context, use B as context, reuse A as free register
|
||||||
Opcode.MOVE_OBJECT_FROM16,
|
|
||||||
Opcode.MOVE_OBJECT_FROM16,
|
|
||||||
Opcode.MOVE_OBJECT_FROM16,
|
|
||||||
Opcode.MOVE_OBJECT_FROM16,
|
|
||||||
Opcode.MOVE_OBJECT_FROM16,
|
|
||||||
Opcode.INVOKE_VIRTUAL, // Register C is atomic reference
|
Opcode.INVOKE_VIRTUAL, // Register C is atomic reference
|
||||||
Opcode.MOVE_RESULT_OBJECT, // Register A is char sequence
|
Opcode.MOVE_RESULT_OBJECT, // Register A is char sequence
|
||||||
|
Opcode.MOVE_OBJECT,
|
||||||
Opcode.CHECK_CAST,
|
Opcode.CHECK_CAST,
|
||||||
Opcode.MOVE_OBJECT, // Replace this instruction with patch code
|
Opcode.MOVE_OBJECT,
|
||||||
Opcode.INVOKE_INTERFACE,
|
Opcode.INVOKE_INTERFACE, // Insert hook here
|
||||||
Opcode.MOVE_RESULT,
|
Opcode.MOVE_RESULT,
|
||||||
Opcode.IF_EQZ,
|
Opcode.IF_EQZ,
|
||||||
Opcode.INVOKE_INTERFACE,
|
Opcode.INVOKE_INTERFACE,
|
||||||
|
|||||||
@@ -13,14 +13,12 @@ object TextComponentContextFingerprint : MethodFingerprint(
|
|||||||
accessFlags = AccessFlags.PROTECTED or AccessFlags.FINAL,
|
accessFlags = AccessFlags.PROTECTED or AccessFlags.FINAL,
|
||||||
parameters = listOf("L"),
|
parameters = listOf("L"),
|
||||||
opcodes = listOf(
|
opcodes = listOf(
|
||||||
Opcode.MOVE_OBJECT_FROM16,
|
|
||||||
Opcode.MOVE_OBJECT_FROM16,
|
|
||||||
Opcode.INVOKE_STATIC_RANGE,
|
|
||||||
Opcode.MOVE_RESULT_OBJECT,
|
|
||||||
Opcode.IGET_OBJECT,
|
|
||||||
Opcode.IGET_OBJECT,
|
|
||||||
Opcode.IGET_OBJECT,
|
|
||||||
Opcode.IGET_OBJECT,
|
|
||||||
Opcode.IGET_OBJECT, // conversion context field name
|
Opcode.IGET_OBJECT, // conversion context field name
|
||||||
|
Opcode.IGET_OBJECT,
|
||||||
|
Opcode.IGET_OBJECT,
|
||||||
|
Opcode.IGET_BOOLEAN,
|
||||||
|
Opcode.IGET,
|
||||||
|
Opcode.IGET,
|
||||||
|
Opcode.IGET,
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
@@ -96,11 +96,8 @@ object SponsorBlockBytecodePatch : BytecodePatch(
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* Set current video id.
|
* Set current video id.
|
||||||
*
|
|
||||||
* The new video id hook seems to work without issues,
|
|
||||||
* but it's easier to keep using this hook as it's well tested and has no known problems.
|
|
||||||
*/
|
*/
|
||||||
VideoIdPatch.legacyInjectCallBackgroundPlay("$INTEGRATIONS_SEGMENT_PLAYBACK_CONTROLLER_CLASS_DESCRIPTOR->setCurrentVideoId(Ljava/lang/String;)V")
|
VideoIdPatch.hookBackgroundPlayVideoId("$INTEGRATIONS_SEGMENT_PLAYBACK_CONTROLLER_CLASS_DESCRIPTOR->setCurrentVideoId(Ljava/lang/String;)V")
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Seekbar drawing
|
* Seekbar drawing
|
||||||
|
|||||||
@@ -88,7 +88,9 @@ object SpoofSignaturePatch : BytecodePatch(
|
|||||||
)
|
)
|
||||||
|
|
||||||
// Hook the player parameters.
|
// Hook the player parameters.
|
||||||
PlayerResponseMethodHookPatch.injectProtoBufferHook("$INTEGRATIONS_CLASS_DESCRIPTOR->spoofParameter(Ljava/lang/String;)Ljava/lang/String;")
|
PlayerResponseMethodHookPatch + PlayerResponseMethodHookPatch.Hook.ProtoBufferParameter(
|
||||||
|
"$INTEGRATIONS_CLASS_DESCRIPTOR->spoofParameter(Ljava/lang/String;)Ljava/lang/String;"
|
||||||
|
)
|
||||||
|
|
||||||
// Force the seekbar time and chapters to always show up.
|
// Force the seekbar time and chapters to always show up.
|
||||||
// This is used only if the storyboard spec fetch fails, or when viewing paid videos.
|
// This is used only if the storyboard spec fetch fails, or when viewing paid videos.
|
||||||
|
|||||||
@@ -109,9 +109,13 @@ object VideoInformationPatch : BytecodePatch(
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Inject call for video id
|
* Inject call for video ids
|
||||||
*/
|
*/
|
||||||
VideoIdPatch.injectCall("$INTEGRATIONS_CLASS_DESCRIPTOR->setVideoId(Ljava/lang/String;)V")
|
val videoIdMethodDescriptor = "$INTEGRATIONS_CLASS_DESCRIPTOR->setVideoId(Ljava/lang/String;)V"
|
||||||
|
VideoIdPatch.hookVideoId(videoIdMethodDescriptor)
|
||||||
|
VideoIdPatch.hookBackgroundPlayVideoId(videoIdMethodDescriptor)
|
||||||
|
VideoIdPatch.hookPlayerResponseVideoId(
|
||||||
|
"$INTEGRATIONS_CLASS_DESCRIPTOR->setPlayerResponseVideoId(Ljava/lang/String;)V")
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Set the video time method
|
* Set the video time method
|
||||||
|
|||||||
@@ -7,66 +7,58 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
|
|||||||
import app.revanced.patcher.patch.BytecodePatch
|
import app.revanced.patcher.patch.BytecodePatch
|
||||||
import app.revanced.patcher.patch.annotation.Patch
|
import app.revanced.patcher.patch.annotation.Patch
|
||||||
import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
|
import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
|
||||||
import app.revanced.patches.youtube.misc.fix.playback.SpoofSignaturePatch
|
|
||||||
import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
|
import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
|
||||||
import app.revanced.patches.youtube.video.playerresponse.fingerprint.PlayerParameterBuilderFingerprint
|
import app.revanced.patches.youtube.video.playerresponse.fingerprint.PlayerParameterBuilderFingerprint
|
||||||
import app.revanced.patches.youtube.video.videoid.VideoIdPatch
|
import java.io.Closeable
|
||||||
|
|
||||||
@Patch(
|
@Patch(
|
||||||
dependencies = [IntegrationsPatch::class],
|
dependencies = [IntegrationsPatch::class],
|
||||||
)
|
)
|
||||||
object PlayerResponseMethodHookPatch : BytecodePatch(
|
object PlayerResponseMethodHookPatch :
|
||||||
setOf(
|
BytecodePatch(setOf(PlayerParameterBuilderFingerprint)),
|
||||||
PlayerParameterBuilderFingerprint,
|
Closeable,
|
||||||
)
|
MutableSet<PlayerResponseMethodHookPatch.Hook> by mutableSetOf() {
|
||||||
) {
|
private const val VIDEO_ID_PARAMETER = 1
|
||||||
private const val playerResponseVideoIdParameter = 1
|
private const val PROTO_BUFFER_PARAMETER_PARAMETER = 3
|
||||||
private const val playerResponseProtoBufferParameter = 3
|
|
||||||
/**
|
|
||||||
* Insert index when adding a video id hook.
|
|
||||||
*/
|
|
||||||
private var playerResponseVideoIdInsertIndex = 0
|
|
||||||
/**
|
|
||||||
* Insert index when adding a proto buffer override.
|
|
||||||
* Must be after all video id hooks in the same method.
|
|
||||||
*/
|
|
||||||
private var playerResponseProtoBufferInsertIndex = 0
|
|
||||||
private lateinit var playerResponseMethod: MutableMethod
|
private lateinit var playerResponseMethod: MutableMethod
|
||||||
|
|
||||||
override fun execute(context: BytecodeContext) {
|
override fun execute(context: BytecodeContext) {
|
||||||
|
playerResponseMethod = PlayerParameterBuilderFingerprint.result?.mutableMethod
|
||||||
// Hook player parameter.
|
?: throw PlayerParameterBuilderFingerprint.exception
|
||||||
PlayerParameterBuilderFingerprint.result?.let {
|
|
||||||
playerResponseMethod = it.mutableMethod
|
|
||||||
} ?: throw PlayerParameterBuilderFingerprint.exception
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
override fun close() {
|
||||||
* Modify the player parameter proto buffer value.
|
fun hookVideoId(hook: Hook) = playerResponseMethod.addInstruction(
|
||||||
* Used exclusively by [SpoofSignaturePatch].
|
0, "invoke-static {p$VIDEO_ID_PARAMETER}, $hook"
|
||||||
*/
|
)
|
||||||
fun injectProtoBufferHook(methodDescriptor: String) {
|
|
||||||
playerResponseMethod.addInstructions(
|
fun hookProtoBufferParameter(hook: Hook) = playerResponseMethod.addInstructions(
|
||||||
playerResponseProtoBufferInsertIndex,
|
0,
|
||||||
"""
|
"""
|
||||||
invoke-static {p$playerResponseProtoBufferParameter}, $methodDescriptor
|
invoke-static {p$PROTO_BUFFER_PARAMETER_PARAMETER}, $hook
|
||||||
move-result-object p$playerResponseProtoBufferParameter
|
move-result-object p$PROTO_BUFFER_PARAMETER_PARAMETER
|
||||||
"""
|
"""
|
||||||
)
|
)
|
||||||
playerResponseProtoBufferInsertIndex += 2
|
|
||||||
|
// Reverse the order in order to preserve insertion order of the hooks.
|
||||||
|
val beforeVideoIdHooks = filterIsInstance<Hook.ProtoBufferParameterBeforeVideoId>().asReversed()
|
||||||
|
val videoIdHooks = filterIsInstance<Hook.VideoId>().asReversed()
|
||||||
|
val afterVideoIdHooks = filterIsInstance<Hook.ProtoBufferParameter>().asReversed()
|
||||||
|
|
||||||
|
// Add the hooks in this specific order as they insert instructions at the beginning of the method.
|
||||||
|
afterVideoIdHooks.forEach(::hookProtoBufferParameter)
|
||||||
|
videoIdHooks.forEach(::hookVideoId)
|
||||||
|
beforeVideoIdHooks.forEach(::hookProtoBufferParameter)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
internal abstract class Hook(private val methodDescriptor: String) {
|
||||||
* Used by [VideoIdPatch].
|
internal class VideoId(methodDescriptor: String) : Hook(methodDescriptor)
|
||||||
*/
|
|
||||||
internal fun injectVideoIdHook(methodDescriptor: String) {
|
internal class ProtoBufferParameter(methodDescriptor: String) : Hook(methodDescriptor)
|
||||||
playerResponseMethod.addInstruction(
|
internal class ProtoBufferParameterBeforeVideoId(methodDescriptor: String) : Hook(methodDescriptor)
|
||||||
// Keep injection calls in the order they're added,
|
|
||||||
// and all video id hooks run before proto buffer hooks.
|
override fun toString() = methodDescriptor
|
||||||
playerResponseVideoIdInsertIndex++,
|
|
||||||
"invoke-static {p$playerResponseVideoIdParameter}, $methodDescriptor"
|
|
||||||
)
|
|
||||||
playerResponseProtoBufferInsertIndex++
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -26,8 +26,8 @@ object VideoIdPatch : BytecodePatch(
|
|||||||
)
|
)
|
||||||
) {
|
) {
|
||||||
private var videoIdRegister = 0
|
private var videoIdRegister = 0
|
||||||
private var insertIndex = 0
|
private var videoIdInsertIndex = 0
|
||||||
private lateinit var insertMethod: MutableMethod
|
private lateinit var videoIdMethod: MutableMethod
|
||||||
|
|
||||||
private var backgroundPlaybackVideoIdRegister = 0
|
private var backgroundPlaybackVideoIdRegister = 0
|
||||||
private var backgroundPlaybackInsertIndex = 0
|
private var backgroundPlaybackInsertIndex = 0
|
||||||
@@ -52,8 +52,8 @@ object VideoIdPatch : BytecodePatch(
|
|||||||
} ?: throw VideoIdFingerprint.exception
|
} ?: throw VideoIdFingerprint.exception
|
||||||
|
|
||||||
VideoIdFingerprint.setFields { method, index, register ->
|
VideoIdFingerprint.setFields { method, index, register ->
|
||||||
insertMethod = method
|
videoIdMethod = method
|
||||||
insertIndex = index
|
videoIdInsertIndex = index
|
||||||
videoIdRegister = register
|
videoIdRegister = register
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -65,21 +65,7 @@ object VideoIdPatch : BytecodePatch(
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Adds an invoke-static instruction, called with the new id when the video changes.
|
* Hooks the new video id when the video changes.
|
||||||
*
|
|
||||||
* Called as soon as the player response is parsed, and called before many other hooks are
|
|
||||||
* updated such as [PlayerTypeHookPatch].
|
|
||||||
*
|
|
||||||
* Supports all videos and functions in all situations.
|
|
||||||
*
|
|
||||||
* Be aware, this can be called multiple times for the same video id.
|
|
||||||
*
|
|
||||||
* @param methodDescriptor which method to call. Params have to be `Ljava/lang/String;`
|
|
||||||
*/
|
|
||||||
fun injectCall(methodDescriptor: String) = PlayerResponseMethodHookPatch.injectVideoIdHook(methodDescriptor)
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Adds an invoke-static instruction, called with the new id when the video changes.
|
|
||||||
*
|
*
|
||||||
* Supports all videos (regular videos and Shorts).
|
* Supports all videos (regular videos and Shorts).
|
||||||
*
|
*
|
||||||
@@ -89,10 +75,10 @@ object VideoIdPatch : BytecodePatch(
|
|||||||
*
|
*
|
||||||
* @param methodDescriptor which method to call. Params have to be `Ljava/lang/String;`
|
* @param methodDescriptor which method to call. Params have to be `Ljava/lang/String;`
|
||||||
*/
|
*/
|
||||||
fun legacyInjectCall(
|
fun hookVideoId(
|
||||||
methodDescriptor: String
|
methodDescriptor: String
|
||||||
) = insertMethod.addInstruction(
|
) = videoIdMethod.addInstruction(
|
||||||
insertIndex++,
|
videoIdInsertIndex++,
|
||||||
"invoke-static {v$videoIdRegister}, $methodDescriptor"
|
"invoke-static {v$videoIdRegister}, $methodDescriptor"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -106,11 +92,37 @@ object VideoIdPatch : BytecodePatch(
|
|||||||
*
|
*
|
||||||
* @param methodDescriptor which method to call. Params have to be `Ljava/lang/String;`
|
* @param methodDescriptor which method to call. Params have to be `Ljava/lang/String;`
|
||||||
*/
|
*/
|
||||||
fun legacyInjectCallBackgroundPlay(
|
fun hookBackgroundPlayVideoId(
|
||||||
methodDescriptor: String
|
methodDescriptor: String
|
||||||
) = backgroundPlaybackMethod.addInstruction(
|
) = backgroundPlaybackMethod.addInstruction(
|
||||||
backgroundPlaybackInsertIndex++, // move-result-object offset
|
backgroundPlaybackInsertIndex++, // move-result-object offset
|
||||||
"invoke-static {v$backgroundPlaybackVideoIdRegister}, $methodDescriptor"
|
"invoke-static {v$backgroundPlaybackVideoIdRegister}, $methodDescriptor"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Hooks the video id of every video when loaded.
|
||||||
|
* Supports all videos and functions in all situations.
|
||||||
|
*
|
||||||
|
* Hook is always called off the main thread.
|
||||||
|
*
|
||||||
|
* This hook is called as soon as the player response is parsed,
|
||||||
|
* and called before many other hooks are updated such as [PlayerTypeHookPatch].
|
||||||
|
*
|
||||||
|
* Note: The video id returned here may not be the current video that's being played.
|
||||||
|
* It's common for multiple Shorts to load at once in preparation
|
||||||
|
* for the user swiping to the next Short.
|
||||||
|
*
|
||||||
|
* For most use cases, you probably want to use
|
||||||
|
* [hookVideoId] or [hookBackgroundPlayVideoId] instead.
|
||||||
|
*
|
||||||
|
* Be aware, this can be called multiple times for the same video id.
|
||||||
|
*
|
||||||
|
* @param methodDescriptor which method to call. Params have to be `Ljava/lang/String;`
|
||||||
|
*/
|
||||||
|
fun hookPlayerResponseVideoId(methodDescriptor: String) {
|
||||||
|
PlayerResponseMethodHookPatch + PlayerResponseMethodHookPatch.Hook.VideoId(
|
||||||
|
methodDescriptor
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user