Extract matcher

Author: CrisBarreiro

ad-blocking/ad-blocking-impl/src/main/java/com/duckduckgo/adblocking/impl/AdBlockingExtensionDomainMatcher.kt

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2026 DuckDuckGo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.duckduckgo.adblocking.impl
+
+import androidx.core.net.toUri
+import com.duckduckgo.app.browser.Domain
+import com.duckduckgo.app.browser.UriString
+import com.duckduckgo.di.scopes.AppScope
+import dagger.SingleInstanceIn
+import javax.inject.Inject
+
+/**
+ * Single source of truth for the domains the ad-blocking extension operates on. A subdomain
+ * match means `youtube.com` also covers `m.youtube.com`, `www.youtube.com`, etc.
+ */
+@SingleInstanceIn(AppScope::class)
+class AdBlockingExtensionDomainMatcher @Inject constructor() {
+
+    fun matches(url: String?): Boolean {
+        val uri = url?.toUri() ?: return false
+        return DOMAINS.any { UriString.sameOrSubdomain(uri, it) }
+    }
+
+    private companion object {
+        val DOMAINS = listOf(
+            Domain("youtube.com"),
+            Domain("youtube-nocookie.com"),
+        )
+    }
+}

ad-blocking/ad-blocking-impl/src/main/java/com/duckduckgo/adblocking/impl/AdBlockingExtensionJsInjectorPlugin.kt

@@ -18,10 +18,7 @@ package com.duckduckgo.adblocking.impl
 
 import android.webkit.WebView
 import androidx.annotation.UiThread
-import androidx.core.net.toUri
 import com.duckduckgo.adblocking.impl.domain.AdBlockingStatusChecker
-import com.duckduckgo.app.browser.Domain
-import com.duckduckgo.app.browser.UriString
 import com.duckduckgo.app.di.AppCoroutineScope
 import com.duckduckgo.app.global.model.Site
 import com.duckduckgo.browser.api.JsInjectorPlugin
@@ -43,6 +40,7 @@ class AdBlockingExtensionJsInjectorPlugin @Inject constructor(
     private val statusChecker: AdBlockingStatusChecker,
     repository: AdBlockingExtensionRepository,
     private val contingencyMessageHandler: ContingencyMessageHandler,
+    private val domainMatcher: AdBlockingExtensionDomainMatcher,
     @AppCoroutineScope appScope: CoroutineScope,
 ) : JsInjectorPlugin {
 
@@ -62,8 +60,7 @@ class AdBlockingExtensionJsInjectorPlugin @Inject constructor(
             logcat { "Status checker rejected injection, skipping" }
             return
         }
-        val uri = url?.toUri() ?: return
-        if (domains.none { UriString.sameOrSubdomain(uri, it) }) {
+        if (!domainMatcher.matches(url)) {
             logcat { "No domains matching, skipping" }
             return
         }
@@ -86,9 +83,4 @@ class AdBlockingExtensionJsInjectorPlugin @Inject constructor(
             .takeUnless { it.isEmpty() }
             ?.sortedBy { it.name }
             ?.joinToString(separator = "\n") { it.content }
-
-    private val domains = listOf(
-        Domain("youtube.com"),
-        Domain("youtube-nocookie.com"),
-    )
 }

ad-blocking/ad-blocking-impl/src/main/java/com/duckduckgo/adblocking/impl/ContingencyMessageHandler.kt

@@ -18,13 +18,9 @@ package com.duckduckgo.adblocking.impl
 
 import android.webkit.WebView
 import androidx.annotation.UiThread
-import androidx.core.net.toUri
 import androidx.lifecycle.LifecycleOwner
-import com.duckduckgo.adblocking.api.duckplayer.YOUTUBE_HOST
-import com.duckduckgo.adblocking.api.duckplayer.YOUTUBE_MOBILE_HOST
 import com.duckduckgo.adblocking.impl.remoteconfig.AdBlockingExtensionFeature
 import com.duckduckgo.adblocking.impl.remoteconfig.ContingencyMessageStore
-import com.duckduckgo.app.browser.UriString
 import com.duckduckgo.app.di.AppCoroutineScope
 import com.duckduckgo.app.lifecycle.MainProcessLifecycleObserver
 import com.duckduckgo.common.utils.DispatcherProvider
@@ -50,6 +46,7 @@ class RealContingencyMessageHandler @Inject constructor(
     private val feature: AdBlockingExtensionFeature,
     private val store: ContingencyMessageStore,
     private val view: ContingencyMessageView,
+    private val domainMatcher: AdBlockingExtensionDomainMatcher,
     @AppCoroutineScope private val appScope: CoroutineScope,
     private val dispatchers: DispatcherProvider,
 ) : ContingencyMessageHandler, MainProcessLifecycleObserver {
@@ -86,10 +83,8 @@ class RealContingencyMessageHandler @Inject constructor(
         val uxImprovements = feature.adBlockingUXImprovements().isEnabled()
         val contingency = feature.enableContingencyMode().isEnabled()
         val shown = shownInSession || store.shown.value
-        val uri = url?.toUri()
-        val isYouTube = uri != null &&
-            (UriString.sameOrSubdomain(uri, YOUTUBE_HOST) || UriString.sameOrSubdomain(uri, YOUTUBE_MOBILE_HOST))
-        val result = uxImprovements && contingency && isYouTube && !shown
+        val isExtensionDomain = domainMatcher.matches(url)
+        val result = uxImprovements && contingency && isExtensionDomain && !shown
         return result
     }
 }

ad-blocking/ad-blocking-impl/src/test/java/com/duckduckgo/adblocking/impl/AdBlockingExtensionJsInjectorPluginTest.kt

@@ -66,6 +66,7 @@ class AdBlockingExtensionJsInjectorPluginTest {
             statusChecker = statusChecker,
             repository = repository,
             contingencyMessageHandler = contingencyMessageHandler,
+            domainMatcher = AdBlockingExtensionDomainMatcher(),
             appScope = testScope,
         )
     }

ad-blocking/ad-blocking-impl/src/test/java/com/duckduckgo/adblocking/impl/RealContingencyMessageHandlerTest.kt

@@ -65,6 +65,7 @@ class RealContingencyMessageHandlerTest {
         feature = feature,
         store = store,
         view = view,
+        domainMatcher = AdBlockingExtensionDomainMatcher(),
         appScope = coroutineRule.testScope,
         dispatchers = coroutineRule.testDispatcherProvider,
     )
@@ -88,6 +89,13 @@ class RealContingencyMessageHandlerTest {
         assertTrue(handler.shouldShow("https://m.youtube.com/watch?v=abc"))
     }
 
+    @Test
+    fun whenYouTubeNoCookieThenShouldShow() {
+        setToggles(uxImprovements = true, contingency = true)
+
+        assertTrue(handler.shouldShow("https://youtube-nocookie.com/watch?v=abc"))
+    }
+
     @Test
     fun whenUxImprovementsDisabledThenShouldNotShow() {
         setToggles(uxImprovements = false, contingency = true)
@@ -207,6 +215,7 @@ class RealContingencyMessageHandlerTest {
         feature = feature,
         store = store,
         view = view,
+        domainMatcher = AdBlockingExtensionDomainMatcher(),
         appScope = coroutineRule.testScope,
         dispatchers = coroutineRule.testDispatcherProvider,
     )