feat(YouTube): Bump compatibility to 18.38.44 (#3071)

This commit is contained in:
LisoUseInAIKyrios 2023-10-08 05:37:42 +04:00 committed by GitHub
parent 7a78a1dcec
commit a73868cb27
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
51 changed files with 108 additions and 54 deletions

View file

@ -32,7 +32,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -26,7 +26,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -30,7 +30,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -25,7 +25,8 @@ import app.revanced.patches.youtube.video.information.VideoInformationPatch
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -25,7 +25,8 @@ import app.revanced.patches.youtube.video.information.VideoInformationPatch
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
), ),
] ]

View file

@ -23,7 +23,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
"com.google.android.youtube", "com.google.android.youtube",
[ [
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -33,7 +33,8 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -32,7 +32,8 @@ import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -30,7 +30,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
], ],

View file

@ -28,7 +28,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -38,7 +38,8 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -29,7 +29,8 @@ import com.android.tools.smali.dexlib2.Opcode
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -37,7 +37,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -33,7 +33,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction3rc
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -28,7 +28,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -28,7 +28,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -27,7 +27,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -28,7 +28,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -31,7 +31,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction21c
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -28,7 +28,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -24,7 +24,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -31,7 +31,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
CompatiblePackage( CompatiblePackage(
"com.google.android.youtube", [ "com.google.android.youtube", [
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -36,7 +36,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -24,7 +24,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -24,7 +24,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -25,7 +25,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
]) ])
] ]
) )

View file

@ -33,7 +33,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -37,7 +37,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]
@ -122,7 +123,7 @@ object HideShortsComponentsPatch : BytecodePatch(
// Required to prevent a black bar from appearing at the bottom of the screen. // Required to prevent a black bar from appearing at the bottom of the screen.
BottomNavigationBarFingerprint.result?.let { BottomNavigationBarFingerprint.result?.let {
it.mutableMethod.apply { it.mutableMethod.apply {
val moveResultIndex = it.scanResult.patternScanResult!!.startIndex val moveResultIndex = it.scanResult.patternScanResult!!.startIndex + 2
val viewRegister = getInstruction<OneRegisterInstruction>(moveResultIndex).registerA val viewRegister = getInstruction<OneRegisterInstruction>(moveResultIndex).registerA
val insertIndex = moveResultIndex + 1 val insertIndex = moveResultIndex + 1

View file

@ -1,18 +1,24 @@
package app.revanced.patches.youtube.layout.hide.shorts.fingerprints package app.revanced.patches.youtube.layout.hide.shorts.fingerprints
import app.revanced.patcher.extensions.or
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
import com.android.tools.smali.dexlib2.AccessFlags
import com.android.tools.smali.dexlib2.Opcode import com.android.tools.smali.dexlib2.Opcode
object BottomNavigationBarFingerprint : MethodFingerprint( object BottomNavigationBarFingerprint : MethodFingerprint(
returnType = "V",
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
parameters = listOf("Landroid/view/View;", "Landroid/os/Bundle;"),
opcodes = listOf( opcodes = listOf(
Opcode.MOVE_RESULT_OBJECT, // Refers to bottom navigation bar Opcode.CONST, // R.id.app_engagement_panel_wrapper
Opcode.INVOKE_VIRTUAL,
Opcode.MOVE_RESULT_OBJECT,
Opcode.IF_EQZ, Opcode.IF_EQZ,
Opcode.IGET_OBJECT, Opcode.IGET_OBJECT,
Opcode.IGET_OBJECT, Opcode.IGET_OBJECT,
Opcode.IGET_OBJECT, Opcode.IGET_OBJECT,
), ),
strings = listOf( strings = listOf(
"navigation_endpoint_interaction_logging_extension", "ReelWatchPaneFragmentViewModelKey"
"reel_watch_fragment_watch_while",
), ),
) )

View file

@ -25,7 +25,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -29,7 +29,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -25,7 +25,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -19,7 +19,8 @@ import org.w3c.dom.Element
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
], ],

View file

@ -33,7 +33,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.37.36", "18.38.44"])
] ]
) )
@Suppress("unused") @Suppress("unused")

View file

@ -28,7 +28,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -45,7 +45,8 @@ import com.android.tools.smali.dexlib2.iface.reference.StringReference
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
], ],

View file

@ -29,7 +29,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -24,7 +24,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -34,7 +34,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
) )
) )
] ]

View file

@ -26,7 +26,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -30,7 +30,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -25,7 +25,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -29,7 +29,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -29,7 +29,8 @@ import com.android.tools.smali.dexlib2.iface.reference.StringReference
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -29,7 +29,8 @@ import app.revanced.util.microg.MicroGBytecodeHelper
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -35,7 +35,8 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -58,7 +58,7 @@ object PlayerControlsBytecodePatch : BytecodePatch(
* @param descriptor The descriptor of the method which should be calleed. * @param descriptor The descriptor of the method which should be calleed.
*/ */
fun initializeControl(descriptor: String) { fun initializeControl(descriptor: String) {
inflateFingerprintResult!!.mutableMethod.addInstruction( inflateFingerprintResult.mutableMethod.addInstruction(
moveToRegisterInstructionIndex + 1, moveToRegisterInstructionIndex + 1,
"invoke-static {v$viewRegister}, $descriptor" "invoke-static {v$viewRegister}, $descriptor"
) )

View file

@ -27,7 +27,8 @@ import com.android.tools.smali.dexlib2.iface.reference.FieldReference
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -37,7 +37,8 @@ import com.android.tools.smali.dexlib2.iface.reference.FieldReference
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -19,7 +19,8 @@ import app.revanced.patches.youtube.video.speed.remember.RememberPlaybackSpeedPa
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]

View file

@ -29,7 +29,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
"18.23.35", "18.23.35",
"18.29.38", "18.29.38",
"18.32.39", "18.32.39",
"18.37.36" "18.37.36",
"18.38.44"
] ]
) )
] ]