From 1ea28f4df1db9fb9723b0f909b5693d560aa4d4d Mon Sep 17 00:00:00 2001
From: inotia00 <108592928+inotia00@users.noreply.github.com>
Date: Sun, 15 Sep 2024 13:11:39 +0900
Subject: [PATCH] feat(Hide ads): Remove `Close fullscreen ads` setting

---
 .../shared/patches/FullscreenAdsPatch.java    | 78 ++++++++-----------
 .../components/FullscreenAdsFilter.java       | 28 -------
 .../shared/settings/BaseSettings.java         |  1 -
 3 files changed, 31 insertions(+), 76 deletions(-)
 delete mode 100644 app/src/main/java/app/revanced/integrations/shared/patches/components/FullscreenAdsFilter.java

diff --git a/app/src/main/java/app/revanced/integrations/shared/patches/FullscreenAdsPatch.java b/app/src/main/java/app/revanced/integrations/shared/patches/FullscreenAdsPatch.java
index 92a88d9afd..4c7b7b3489 100644
--- a/app/src/main/java/app/revanced/integrations/shared/patches/FullscreenAdsPatch.java
+++ b/app/src/main/java/app/revanced/integrations/shared/patches/FullscreenAdsPatch.java
@@ -1,63 +1,47 @@
 package app.revanced.integrations.shared.patches;
 
-import static app.revanced.integrations.shared.utils.StringRef.str;
 import static app.revanced.integrations.shared.utils.Utils.hideViewBy0dpUnderCondition;
-import static app.revanced.integrations.shared.utils.Utils.showToastShort;
 
 import android.view.View;
-import android.widget.Button;
-
-import java.lang.ref.WeakReference;
 
+import app.revanced.integrations.shared.patches.components.ByteArrayFilterGroup;
 import app.revanced.integrations.shared.settings.BaseSettings;
 import app.revanced.integrations.shared.utils.Logger;
-import app.revanced.integrations.shared.utils.Utils;
 
 @SuppressWarnings("unused")
 public class FullscreenAdsPatch {
     private static final boolean hideFullscreenAdsEnabled = BaseSettings.HIDE_FULLSCREEN_ADS.get();
-    private static final boolean closeFullscreenAdsEnabled = BaseSettings.HIDE_FULLSCREEN_ADS_TYPE.get();
-    private static final boolean closeDialog = hideFullscreenAdsEnabled && closeFullscreenAdsEnabled;
-    private static final boolean disableDialog = hideFullscreenAdsEnabled && !closeFullscreenAdsEnabled;
-
-    private static volatile long lastTimeClosedFullscreenAd;
-
-    private static WeakReference<Button> buttonRef = new WeakReference<>(null);
-
-    public static boolean disableFullscreenAds(int code) {
-        if (!disableDialog) return false;
+    private static final ByteArrayFilterGroup exception =
+            new ByteArrayFilterGroup(
+                    null,
+                    "post_image_lightbox.eml" // Community post image in fullscreen
+            );
+
+    public static boolean disableFullscreenAds(final byte[] bytes, int type) {
+        if (!hideFullscreenAdsEnabled) {
+            return false;
+        }
 
-        final DialogType dialogType = DialogType.getDialogType(code);
+        final DialogType dialogType = DialogType.getDialogType(type);
         final String dialogName = dialogType.name();
-        Logger.printDebug(() -> "DialogType: " + dialogName);
-
-        // This method is also invoked in the 'Create new playlist' dialog,
-        // in which case the DialogType is {@code DialogType.ALERT}.
-        if (dialogType == DialogType.ALERT) return false;
 
-        showToastShort(str("revanced_hide_fullscreen_ads_blocked_success", dialogName));
-        return true;
-    }
-
-    public static void setCloseButton(final Button button) {
-        if (!closeDialog) return;
-        buttonRef = new WeakReference<>(button);
-    }
-
-    public static void closeFullscreenAds() {
-        if (!closeDialog) return;
+        // The dialog type of a fullscreen dialog is always {@code DialogType.FULLSCREEN}
+        if (dialogType != DialogType.FULLSCREEN) {
+            Logger.printDebug(() -> "Ignoring dialogType " + dialogName);
+            return false;
+        }
 
-        Utils.runOnMainThreadDelayed(() -> {
-            final Button button = buttonRef.get();
-            if (button == null) return;
-            button.callOnClick();
+        // Image in community post in fullscreen is not filtered
+        final boolean isException = bytes != null &&
+                exception.check(bytes).isFiltered();
 
-            final long currentTime = System.currentTimeMillis();
-            if (currentTime - lastTimeClosedFullscreenAd < 10000) return;
-            lastTimeClosedFullscreenAd = currentTime;
+        if (isException) {
+            Logger.printDebug(() -> "Ignoring exception");
+        } else {
+            Logger.printDebug(() -> "Blocked fullscreen ads");
+        }
 
-            showToastShort(str("revanced_hide_fullscreen_ads_closed_success"));
-        }, 1000);
+        return !isException;
     }
 
     public static void hideFullscreenAds(View view) {
@@ -73,15 +57,15 @@ private enum DialogType {
         FULLSCREEN(2),
         LAYOUT_FULLSCREEN(3);
 
-        private final int code;
+        private final int type;
 
-        DialogType(int code) {
-            this.code = code;
+        DialogType(int type) {
+            this.type = type;
         }
 
-        private static DialogType getDialogType(int code) {
+        private static DialogType getDialogType(int type) {
             for (DialogType val : values())
-                if (code == val.code) return val;
+                if (type == val.type) return val;
 
             return DialogType.NULL;
         }
diff --git a/app/src/main/java/app/revanced/integrations/shared/patches/components/FullscreenAdsFilter.java b/app/src/main/java/app/revanced/integrations/shared/patches/components/FullscreenAdsFilter.java
deleted file mode 100644
index 3aadc12a83..0000000000
--- a/app/src/main/java/app/revanced/integrations/shared/patches/components/FullscreenAdsFilter.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package app.revanced.integrations.shared.patches.components;
-
-import static app.revanced.integrations.shared.patches.FullscreenAdsPatch.closeFullscreenAds;
-
-import androidx.annotation.Nullable;
-
-import app.revanced.integrations.shared.settings.BaseSettings;
-
-@SuppressWarnings("unused")
-public final class FullscreenAdsFilter extends Filter {
-
-    public FullscreenAdsFilter() {
-        addPathCallbacks(
-                new StringFilterGroup(
-                        BaseSettings.HIDE_FULLSCREEN_ADS,
-                        "_interstitial"
-                )
-        );
-    }
-
-    @Override
-    public boolean isFiltered(String path, @Nullable String identifier, String allValue, byte[] protobufBufferArray,
-                              StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
-        if (path.contains("|ImageType|")) closeFullscreenAds();
-
-        return false; // Do not actually filter the fullscreen ad otherwise it will leave a dimmed screen.
-    }
-}
diff --git a/app/src/main/java/app/revanced/integrations/shared/settings/BaseSettings.java b/app/src/main/java/app/revanced/integrations/shared/settings/BaseSettings.java
index 4c443fdd8e..789017b65f 100644
--- a/app/src/main/java/app/revanced/integrations/shared/settings/BaseSettings.java
+++ b/app/src/main/java/app/revanced/integrations/shared/settings/BaseSettings.java
@@ -23,7 +23,6 @@ public class BaseSettings {
      * These settings are used by YouTube and YouTube Music.
      */
     public static final BooleanSetting HIDE_FULLSCREEN_ADS = new BooleanSetting("revanced_hide_fullscreen_ads", TRUE, true);
-    public static final BooleanSetting HIDE_FULLSCREEN_ADS_TYPE = new BooleanSetting("revanced_hide_fullscreen_ads_type", TRUE, true);
     public static final BooleanSetting HIDE_PROMOTION_ALERT_BANNER = new BooleanSetting("revanced_hide_promotion_alert_banner", TRUE);
 
     public static final BooleanSetting HIDE_SETTINGS_MENU = new BooleanSetting("revanced_hide_settings_menu", FALSE);