fix(YouTube Music/Hide ads): Hide fullscreen ads setting also close…

…s non-ad dialogs inotia00/ReVanced_Extended#1971
inotia00 · May 10, 2024 · 0156128 · 0156128
1 parent 120e1d2
commit 0156128
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/src/main/kotlin/app/revanced/patches/music/ads/general/AdsPatch.kt b/src/main/kotlin/app/revanced/patches/music/ads/general/AdsPatch.kt
@@ -96,7 +96,8 @@ object AdsPatch : BaseBytecodePatch(
                 addInstructionsWithLabels(
                     0,
                     """
-                        invoke-static {}, $FULLSCREEN_ADS_CLASS_DESCRIPTOR->hideFullscreenAds()Z
+                        move-object v0, p2
+                        invoke-static {v0}, $FULLSCREEN_ADS_CLASS_DESCRIPTOR->hideFullscreenAds(Ljava/lang/Object;)Z
                         move-result v0
                         if-eqz v0, :show
                         return-void

diff --git a/...otlin/app/revanced/patches/music/ads/general/fingerprints/ShowDialogCommandFingerprint.kt b/...otlin/app/revanced/patches/music/ads/general/fingerprints/ShowDialogCommandFingerprint.kt
@@ -5,5 +5,6 @@ import app.revanced.util.fingerprint.LiteralValueFingerprint
 
 internal object ShowDialogCommandFingerprint : LiteralValueFingerprint(
     returnType = "V",
+    parameters = listOf("[B", "L"),
     literalSupplier = { SlidingDialogAnimation }
 )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/ads/general/AdsBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/ads/general/AdsBytecodePatch.kt
@@ -57,7 +57,8 @@ object AdsBytecodePatch : BytecodePatch(
                 addInstructionsWithLabels(
                     0,
                     """
-                        invoke-static {}, $ADS_CLASS_DESCRIPTOR->hideFullscreenAds()Z
+                        move-object v0, p2
+                        invoke-static {v0}, $ADS_CLASS_DESCRIPTOR->hideFullscreenAds(Ljava/lang/Object;)Z
                         move-result v0
                         if-eqz v0, :show
                         return-void

diff --git a/...lin/app/revanced/patches/youtube/ads/general/fingerprints/ShowDialogCommandFingerprint.kt b/...lin/app/revanced/patches/youtube/ads/general/fingerprints/ShowDialogCommandFingerprint.kt
@@ -5,5 +5,6 @@ import app.revanced.util.fingerprint.LiteralValueFingerprint
 
 internal object ShowDialogCommandFingerprint : LiteralValueFingerprint(
     returnType = "V",
+    parameters = listOf("[B", "L"),
     literalSupplier = { SlidingDialogAnimation }
 )