feat(youtubevanced): general-ads patch (#1693)

2023-03-14 15:09:10 +01:00
parent 9ffcb97a90
commit 4d97ead9b7
11 changed files with 109 additions and 12 deletions
@@ -18,7 +18,7 @@ import app.revanced.patches.youtube.ad.general.annotation.GeneralAdsCompatibilit
 import app.revanced.patches.youtube.ad.general.bytecode.fingerprints.ReelConstructorFingerprint
 import app.revanced.patches.youtube.ad.general.resource.patch.GeneralAdsResourcePatch
 import app.revanced.patches.youtube.misc.fix.backtoexitgesture.patch.FixBackToExitGesturePatch
-import app.revanced.patches.youtube.misc.fix.verticalscroll.patch.VerticalScrollPatch
+import app.revanced.patches.shared.misc.fix.verticalscroll.patch.VerticalScrollPatch
 import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
 import org.jf.dexlib2.iface.instruction.formats.Instruction31i
 import org.jf.dexlib2.iface.instruction.formats.Instruction35c
@@ -1,13 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.spoof.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [
-        Package("com.google.android.youtube"),
-        Package("com.vanced.android.youtube")
-    ]
-)
-@Target(AnnotationTarget.CLASS)
-internal annotation class ClientSpoofCompatibility
@@ -1,11 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.spoof.fingerprints
-
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
-
-object UserAgentHeaderBuilderFingerprint : MethodFingerprint(
-    parameters = listOf("L", "L", "L"),
-    opcodes = listOf(Opcode.MOVE_RESULT_OBJECT, Opcode.INVOKE_VIRTUAL),
-    strings = listOf("(Linux; U; Android "),
-)
@@ -1,37 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.spoof.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.addInstruction
-import app.revanced.patcher.extensions.instruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.misc.fix.spoof.annotations.ClientSpoofCompatibility
-import app.revanced.patches.youtube.misc.fix.spoof.fingerprints.UserAgentHeaderBuilderFingerprint
-import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
-
-@Patch
-@Name("client-spoof")
-@Description("Spoofs the YouTube or Vanced client to prevent playback issues.")
-@ClientSpoofCompatibility
-@Version("0.0.1")
-class ClientSpoofPatch : BytecodePatch(
-    listOf(UserAgentHeaderBuilderFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        val result = UserAgentHeaderBuilderFingerprint.result!!
-        val method = result.mutableMethod
-
-        val insertIndex = result.scanResult.patternScanResult!!.endIndex
-        val packageNameRegister = (method.instruction(insertIndex) as FiveRegisterInstruction).registerD
-
-        val originalPackageName = "com.google.android.youtube"
-        method.addInstruction(insertIndex, "const-string v$packageNameRegister, \"$originalPackageName\"")
-
-        return PatchResultSuccess()
-    }
-}
@@ -1,12 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.verticalscroll.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [
-        Package("com.google.android.youtube"),
-    ]
-)
-@Target(AnnotationTarget.CLASS)
-internal annotation class VerticalScrollCompatibility
@@ -1,17 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.verticalscroll.fingerprints
-
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
-
-object CanScrollVerticallyFingerprint : MethodFingerprint(
-    "Z",
-    parameters = emptyList(),
-    opcodes = listOf(
-        Opcode.MOVE_RESULT,
-        Opcode.RETURN,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-    ),
-    customFingerprint = { methodDef -> methodDef.definingClass.endsWith("SwipeRefreshLayout;") }
-)
@@ -1,39 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.verticalscroll.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.addInstruction
-import app.revanced.patcher.extensions.instruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patches.youtube.misc.fix.verticalscroll.annotations.VerticalScrollCompatibility
-import app.revanced.patches.youtube.misc.fix.verticalscroll.fingerprints.CanScrollVerticallyFingerprint
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-
-@Description("Fixes issues with scrolling on the home screen when the first component is of type EmptyComponent.")
-@VerticalScrollCompatibility
-@Version("0.0.1")
-class VerticalScrollPatch : BytecodePatch(
-    listOf(CanScrollVerticallyFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        val result = CanScrollVerticallyFingerprint.result ?: return CanScrollVerticallyFingerprint.toErrorResult()
-
-        with(result) {
-            val method = mutableMethod
-
-            val moveResultIndex = scanResult.patternScanResult!!.endIndex
-            val moveResultRegister = (method.instruction(moveResultIndex) as OneRegisterInstruction).registerA
-
-            method.addInstruction(
-                moveResultIndex + 1,
-                "const/4 v$moveResultRegister, 0x0"
-            )
-        }
-
-        return PatchResultSuccess()
-    }
-}
@@ -11,7 +11,7 @@ import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.shared.fingerprints.WatchWhileActivityFingerprint
 import app.revanced.patches.youtube.layout.buttons.cast.patch.HideCastButtonPatch
-import app.revanced.patches.youtube.misc.fix.spoof.patch.ClientSpoofPatch
+import app.revanced.patches.shared.misc.fix.spoof.patch.ClientSpoofPatch
 import app.revanced.patches.youtube.misc.fix.playback.patch.SpoofSignatureVerificationPatch
 import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility
 import app.revanced.patches.youtube.misc.microg.fingerprints.*