From 4680772038a02124cd9f4485197ed8f49270b85d Mon Sep 17 00:00:00 2001 From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com> Date: Thu, 28 Sep 2023 00:10:08 +0400 Subject: [PATCH 1/2] fix(YouTube - Hide info cards): Fix info cards not hiding for some users --- .../youtube/layout/hide/infocards/HideInfoCardsPatch.kt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/HideInfoCardsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/HideInfoCardsPatch.kt index 0c111dd81c..acab4478c7 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/HideInfoCardsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/HideInfoCardsPatch.kt @@ -13,6 +13,7 @@ import app.revanced.patches.youtube.layout.hide.infocards.fingerprints.Infocards import app.revanced.patches.youtube.layout.hide.infocards.fingerprints.InfocardsIncognitoParentFingerprint import app.revanced.patches.youtube.layout.hide.infocards.fingerprints.InfocardsMethodCallFingerprint import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch +import app.revanced.patches.youtube.misc.litho.filter.LithoFilterPatch import com.android.tools.smali.dexlib2.Opcode import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction @@ -45,6 +46,9 @@ object HideInfoCardsPatch : BytecodePatch( InfocardsMethodCallFingerprint, ) ) { + private const val FILTER_CLASS_DESCRIPTOR = + "Lapp/revanced/integrations/patches/components/HideInfoCardsFilterPatch;" + override fun execute(context: BytecodeContext) { InfocardsIncognitoFingerprint.also { it.resolve(context, InfocardsIncognitoParentFingerprint.result!!.classDef) @@ -79,5 +83,8 @@ object HideInfoCardsPatch : BytecodePatch( ) ) } + + // Info cards can also appear as litho components. + LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR) } } \ No newline at end of file From d9d61db96b33b7ada1768e4227f6a18ee37784a5 Mon Sep 17 00:00:00 2001 From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com> Date: Thu, 28 Sep 2023 00:17:43 +0400 Subject: [PATCH 2/2] fix: add missing dependency --- .../patches/youtube/layout/hide/infocards/HideInfoCardsPatch.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/HideInfoCardsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/HideInfoCardsPatch.kt index acab4478c7..08e116f499 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/HideInfoCardsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/HideInfoCardsPatch.kt @@ -23,6 +23,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction description = "Hides info cards in videos.", dependencies = [ IntegrationsPatch::class, + LithoFilterPatch::class, HideInfocardsResourcePatch::class ], compatiblePackages = [