mirror of
https://github.com/inotia00/revanced-patches.git
synced 2025-05-04 16:44:29 +02:00
rollback: fix player tracking such as history or video watchtime
This commit is contained in:
parent
f51739a4fe
commit
d6bdef650f
@ -5,13 +5,10 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
|
|||||||
import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
|
import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
|
||||||
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
|
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
|
||||||
import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
|
import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
|
||||||
import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
|
|
||||||
import app.revanced.patcher.util.smali.ExternalLabel
|
import app.revanced.patcher.util.smali.ExternalLabel
|
||||||
import app.revanced.patches.youtube.utils.fix.parameter.fingerprints.ParamsMapPutFingerprint
|
|
||||||
import app.revanced.patches.youtube.utils.fix.parameter.fingerprints.PlayerResponseModelGeneralStoryboardRendererFingerprint
|
import app.revanced.patches.youtube.utils.fix.parameter.fingerprints.PlayerResponseModelGeneralStoryboardRendererFingerprint
|
||||||
import app.revanced.patches.youtube.utils.fix.parameter.fingerprints.PlayerResponseModelLiveStreamStoryboardRendererFingerprint
|
import app.revanced.patches.youtube.utils.fix.parameter.fingerprints.PlayerResponseModelLiveStreamStoryboardRendererFingerprint
|
||||||
import app.revanced.patches.youtube.utils.fix.parameter.fingerprints.PlayerResponseModelStoryboardRecommendedLevelFingerprint
|
import app.revanced.patches.youtube.utils.fix.parameter.fingerprints.PlayerResponseModelStoryboardRecommendedLevelFingerprint
|
||||||
import app.revanced.patches.youtube.utils.fix.parameter.fingerprints.StatsQueryParameterFingerprint
|
|
||||||
import app.revanced.patches.youtube.utils.fix.parameter.fingerprints.StoryboardRendererDecoderRecommendedLevelFingerprint
|
import app.revanced.patches.youtube.utils.fix.parameter.fingerprints.StoryboardRendererDecoderRecommendedLevelFingerprint
|
||||||
import app.revanced.patches.youtube.utils.fix.parameter.fingerprints.StoryboardRendererDecoderSpecFingerprint
|
import app.revanced.patches.youtube.utils.fix.parameter.fingerprints.StoryboardRendererDecoderSpecFingerprint
|
||||||
import app.revanced.patches.youtube.utils.fix.parameter.fingerprints.StoryboardRendererSpecFingerprint
|
import app.revanced.patches.youtube.utils.fix.parameter.fingerprints.StoryboardRendererSpecFingerprint
|
||||||
@ -25,7 +22,6 @@ import app.revanced.patches.youtube.utils.settings.SettingsPatch
|
|||||||
import app.revanced.patches.youtube.utils.videoid.general.VideoIdPatch
|
import app.revanced.patches.youtube.utils.videoid.general.VideoIdPatch
|
||||||
import app.revanced.util.patch.BaseBytecodePatch
|
import app.revanced.util.patch.BaseBytecodePatch
|
||||||
import app.revanced.util.resultOrThrow
|
import app.revanced.util.resultOrThrow
|
||||||
import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
|
|
||||||
import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
|
import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
|
||||||
|
|
||||||
@Suppress("unused")
|
@Suppress("unused")
|
||||||
@ -40,11 +36,9 @@ object SpoofPlayerParameterPatch : BaseBytecodePatch(
|
|||||||
),
|
),
|
||||||
compatiblePackages = COMPATIBLE_PACKAGE,
|
compatiblePackages = COMPATIBLE_PACKAGE,
|
||||||
fingerprints = setOf(
|
fingerprints = setOf(
|
||||||
ParamsMapPutFingerprint,
|
|
||||||
PlayerResponseModelGeneralStoryboardRendererFingerprint,
|
PlayerResponseModelGeneralStoryboardRendererFingerprint,
|
||||||
PlayerResponseModelLiveStreamStoryboardRendererFingerprint,
|
PlayerResponseModelLiveStreamStoryboardRendererFingerprint,
|
||||||
PlayerResponseModelStoryboardRecommendedLevelFingerprint,
|
PlayerResponseModelStoryboardRecommendedLevelFingerprint,
|
||||||
StatsQueryParameterFingerprint,
|
|
||||||
StoryboardRendererDecoderRecommendedLevelFingerprint,
|
StoryboardRendererDecoderRecommendedLevelFingerprint,
|
||||||
StoryboardRendererDecoderSpecFingerprint,
|
StoryboardRendererDecoderSpecFingerprint,
|
||||||
StoryboardRendererSpecFingerprint,
|
StoryboardRendererSpecFingerprint,
|
||||||
@ -173,36 +167,6 @@ object SpoofPlayerParameterPatch : BaseBytecodePatch(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fix stats not being tracked.
|
|
||||||
// Due to signature spoofing "adformat" is present in query parameters made for /stats requests,
|
|
||||||
// even though, for regular videos, it should not be.
|
|
||||||
// This breaks stats tracking.
|
|
||||||
// Replace the ad parameter with the video parameter in the query parameters.
|
|
||||||
StatsQueryParameterFingerprint.resultOrThrow().let {
|
|
||||||
val putMethod = ParamsMapPutFingerprint.resultOrThrow().method.toString()
|
|
||||||
|
|
||||||
it.mutableMethod.apply {
|
|
||||||
val adParamIndex = it.scanResult.stringsScanResult!!.matches.first().index
|
|
||||||
val videoParamIndex = adParamIndex + 3
|
|
||||||
|
|
||||||
// Replace the ad parameter with the video parameter.
|
|
||||||
replaceInstruction(adParamIndex, getInstruction(videoParamIndex))
|
|
||||||
|
|
||||||
// Call paramsMap.put instead of paramsMap.putIfNotExist
|
|
||||||
// because the key is already present in the map.
|
|
||||||
val putAdParamIndex = adParamIndex + 1
|
|
||||||
val putIfKeyNotExistsInstruction = getInstruction<FiveRegisterInstruction>(putAdParamIndex)
|
|
||||||
replaceInstruction(
|
|
||||||
putAdParamIndex,
|
|
||||||
"invoke-virtual { " +
|
|
||||||
"v${putIfKeyNotExistsInstruction.registerC}, " +
|
|
||||||
"v${putIfKeyNotExistsInstruction.registerD}, " +
|
|
||||||
"v${putIfKeyNotExistsInstruction.registerE} }, " +
|
|
||||||
putMethod,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add settings
|
* Add settings
|
||||||
*/
|
*/
|
||||||
|
@ -1,24 +0,0 @@
|
|||||||
package app.revanced.patches.youtube.utils.fix.parameter.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
|
|
||||||
|
|
||||||
internal object ParamsMapPutFingerprint : MethodFingerprint(
|
|
||||||
returnType = "V",
|
|
||||||
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
|
|
||||||
parameters = listOf(
|
|
||||||
"Ljava/lang/String;",
|
|
||||||
"Ljava/lang/String;",
|
|
||||||
),
|
|
||||||
opcodes = listOf(
|
|
||||||
Opcode.CONST_4,
|
|
||||||
Opcode.CONST_4,
|
|
||||||
Opcode.CONST_4,
|
|
||||||
Opcode.MOVE_OBJECT,
|
|
||||||
Opcode.MOVE_OBJECT,
|
|
||||||
Opcode.MOVE_OBJECT,
|
|
||||||
Opcode.INVOKE_DIRECT_RANGE,
|
|
||||||
),
|
|
||||||
)
|
|
@ -1,7 +0,0 @@
|
|||||||
package app.revanced.patches.youtube.utils.fix.parameter.fingerprints
|
|
||||||
|
|
||||||
import app.revanced.patcher.fingerprint.MethodFingerprint
|
|
||||||
|
|
||||||
internal object StatsQueryParameterFingerprint : MethodFingerprint(
|
|
||||||
strings = listOf("adunit"),
|
|
||||||
)
|
|
Loading…
x
Reference in New Issue
Block a user