accuradio: inspect bigContentView and tickerView

Apart from contentView, also inspect bigContentView and tickerView.
abertschi · Dec 7, 2023 · 5f1c7d3 · 5f1c7d3
1 parent 51ceb5f
commit 5f1c7d3
Showing 1 changed file with 16 additions and 3 deletions.
diff --git a/app/src/main/java/ch/abertschi/adfree/detector/AccuradioDetector.kt b/app/src/main/java/ch/abertschi/adfree/detector/AccuradioDetector.kt
@@ -55,10 +55,9 @@ class AccuradioDetector : AdDetectable, AnkoLogger, AbstractNotificationDetector
         }
     }
 
-    override fun flagAsAdvertisement(payload: AdPayload): Boolean {
+
+    private fun inspectContentViews(contentView: RemoteViews?): Boolean {
         try {
-            val contentView = payload.statusbarNotification?.notification?.contentView
-            info(payload)
             if (contentView != null) {
                 val actions = extractObject(contentView, "mActions") as List<*>?
                 if (actions != null) {
@@ -88,4 +87,18 @@ class AccuradioDetector : AdDetectable, AnkoLogger, AbstractNotificationDetector
         }
         return false
     }
+
+    override fun flagAsAdvertisement(payload: AdPayload): Boolean {
+        info(payload)
+        val contentView = payload.statusbarNotification?.notification?.contentView
+        val bigView = payload.statusbarNotification?.notification?.bigContentView
+        val tickerView = payload.statusbarNotification?.notification?.tickerView
+
+        for (v in listOf(contentView, bigView, tickerView)) {
+            if (inspectContentViews(v)) {
+                return true;
+            }
+        }
+        return false;
+    }
 }