feat(youtube/general-ads): merge hide-get-premium patch into general-ads patch

2023-05-24 21:37:00 +02:00
parent 1ba0abbac1
commit 82524885bb
4 changed files with 28 additions and 19 deletions
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.getpremium.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class HideGetPremiumCompatibility
@@ -1,17 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.getpremium.bytecode.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
-
-object GetPremiumViewFingerprint : MethodFingerprint(
-    opcodes = listOf(
-        Opcode.ADD_INT_2ADDR,
-        Opcode.ADD_INT_2ADDR,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.RETURN_VOID
-    ),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass == "Lcom/google/android/apps/youtube/app/red/presenter/CompactYpcOfferModuleView;"
-                && methodDef.name == "onMeasure"
-    }
-)
@@ -1,77 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.getpremium.bytecode.patch
-
-import app.revanced.extensions.toErrorResult
-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.addInstructions
-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.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.layout.hide.getpremium.annotations.HideGetPremiumCompatibility
-import app.revanced.patches.youtube.layout.hide.getpremium.bytecode.fingerprints.GetPremiumViewFingerprint
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
-
-@Patch
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
-@Name("hide-get-premium")
-@Description("Hides advertisement for YouTube Premium under the video player.")
-@HideGetPremiumCompatibility
-@Version("0.0.1")
-class HideGetPremiumPatch : BytecodePatch(
-    listOf(
-        GetPremiumViewFingerprint,
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            SwitchPreference(
-                "revanced_hide_get_premium",
-                StringResource("revanced_hide_get_premium_title", "Hide YouTube Premium advertisement"),
-                StringResource("revanced_hide_get_premium_summary_on", "YouTube Premium advertisement are hidden"),
-                StringResource("revanced_hide_get_premium_summary_off", "YouTube Premium advertisement are shown")
-            )
-        )
-
-        GetPremiumViewFingerprint.result?.let {
-            it.mutableMethod.apply {
-                val startIndex = it.scanResult.patternScanResult!!.startIndex
-                val measuredWidthRegister = instruction<TwoRegisterInstruction>(startIndex).registerA
-                val measuredHeightInstruction = instruction<TwoRegisterInstruction>(startIndex + 1)
-
-                val measuredHeightRegister = measuredHeightInstruction.registerA
-                val tempRegister = measuredHeightInstruction.registerB
-
-                addInstructions(
-                    startIndex + 2,
-                    """
-                        # Override the internal measurement of the layout with zero values.
-                        invoke-static {}, $INTEGRATIONS_CLASS_DESCRIPTOR->hideGetPremiumView()Z
-                        move-result v$tempRegister
-                        if-eqz v$tempRegister, :allow
-                        const/4 v$measuredWidthRegister, 0x0
-                        const/4 v$measuredHeightRegister, 0x0
-                        :allow
-                        nop
-                        # Layout width/height is then passed to a protected class method.
-                    """
-                )
-            }
-        } ?: return GetPremiumViewFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        const val INTEGRATIONS_CLASS_DESCRIPTOR =
-            "Lapp/revanced/integrations/patches/HideGetPremiumPatch;"
-    }
-}