ReVanced/revanced-patches-ex
1
0
Fork 0
mirror of https://github.com/inotia00/revanced-patches.git synced 2025-06-13 05:37:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(YouTube/Spoof test client): spoofing does not work correctly when the Spoof app version setting is turned on

Browse Source
This commit is contained in:
inotia00
2024-05-16 02:22:22 +09:00
parent f68098dafe
commit 707c9fd54d
2 changed files with 22 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/kotlin/app/revanced/patches/youtube/misc/test/SpoofTestClientPatch.kt
View File

@ -6,20 +6,23 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWith
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
import app.revanced.patcher.patch.PatchException import app.revanced.patcher.patch.PatchException
import app.revanced.patcher.util.smali.ExternalLabel import app.revanced.patcher.util.smali.ExternalLabel
import app.revanced.patches.shared.spoofappversion.fingerprints.ClientInfoFingerprint
import app.revanced.patches.shared.spoofappversion.fingerprints.ClientInfoParentFingerprint
import app.revanced.patches.youtube.misc.test.fingerprints.ClientNamelEnumConstructorFingerprint import app.revanced.patches.youtube.misc.test.fingerprints.ClientNamelEnumConstructorFingerprint
import app.revanced.patches.youtube.misc.test.fingerprints.OverrideBuildVersionFingerprint
import app.revanced.patches.youtube.misc.test.fingerprints.SetClientNameFingerprint import app.revanced.patches.youtube.misc.test.fingerprints.SetClientNameFingerprint
import app.revanced.patches.youtube.utils.compatibility.Constants.COMPATIBLE_PACKAGE import app.revanced.patches.youtube.utils.compatibility.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.youtube.utils.integrations.Constants.MISC_PATH import app.revanced.patches.youtube.utils.integrations.Constants.MISC_PATH
import app.revanced.patches.youtube.utils.settings.SettingsPatch import app.revanced.patches.youtube.utils.settings.SettingsPatch
import app.revanced.util.getStringInstructionIndex import app.revanced.util.getStringInstructionIndex
import app.revanced.util.getTargetIndex import app.revanced.util.getTargetIndex
import app.revanced.util.getTargetIndexReversed
import app.revanced.util.getTargetIndexWithFieldReferenceName
import app.revanced.util.getWalkerMethod import app.revanced.util.getWalkerMethod
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.Opcode import com.android.tools.smali.dexlib2.Opcode
import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
import com.android.tools.smali.dexlib2.iface.reference.MethodReference import com.android.tools.smali.dexlib2.iface.reference.MethodReference
@Suppress("unused") @Suppress("unused")
@ -29,9 +32,9 @@ object SpoofTestClientPatch : BaseBytecodePatch(
dependencies = setOf(SettingsPatch::class), dependencies = setOf(SettingsPatch::class),
compatiblePackages = COMPATIBLE_PACKAGE, compatiblePackages = COMPATIBLE_PACKAGE,
fingerprints = setOf( fingerprints = setOf(
ClientInfoParentFingerprint,
ClientNamelEnumConstructorFingerprint, ClientNamelEnumConstructorFingerprint,
OverrideBuildVersionFingerprint, SetClientNameFingerprint,
SetClientNameFingerprint
) )
) { ) {
private const val INTEGRATIONS_CLASS_DESCRIPTOR = private const val INTEGRATIONS_CLASS_DESCRIPTOR =
@ -80,17 +83,22 @@ object SpoofTestClientPatch : BaseBytecodePatch(
// region override client version // region override client version
OverrideBuildVersionFingerprint.resultOrThrow().let { ClientInfoParentFingerprint.resultOrThrow().let { parentResult ->
it.mutableMethod.apply { ClientInfoFingerprint.resolve(context, parentResult.classDef)
val insertIndex = it.scanResult.patternScanResult!!.startIndex + 1
val insertRegister = getInstruction<OneRegisterInstruction>(insertIndex + 1).registerA
addInstructions( ClientInfoFingerprint.resultOrThrow().let {
insertIndex, """ it.mutableMethod.apply {
invoke-static {v$insertRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR->spoofTestClient(Ljava/lang/String;)Ljava/lang/String; val versionIndex = getTargetIndexWithFieldReferenceName("RELEASE") + 1
move-result-object v$insertRegister val insertIndex = getTargetIndexReversed(versionIndex, Opcode.IPUT_OBJECT)
""" val insertRegister = getInstruction<TwoRegisterInstruction>(insertIndex).registerA
)
addInstructions(
insertIndex, """
invoke-static {v$insertRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR->spoofTestClient(Ljava/lang/String;)Ljava/lang/String;
move-result-object v$insertRegister
"""
)
}
} }
} }

18
src/main/kotlin/app/revanced/patches/youtube/misc/test/fingerprints/OverrideBuildVersionFingerprint.kt
View File

@ -1,18 +0,0 @@
package app.revanced.patches.youtube.misc.test.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 OverrideBuildVersionFingerprint : MethodFingerprint(
returnType = "L",
accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
parameters = listOf("L"),
opcodes = listOf(
Opcode.IGET_OBJECT,
Opcode.GOTO,
Opcode.CONST_STRING,
),
strings = listOf("pref_override_build_version_name")
)