Move getHeaders checks to io (#7225)

CrisBarreiro · web-flow · commit ec5d4b5f3cda · 2025-11-27T11:17:22.000+01:00
Task/Issue URL: https://app.asana.com/1/137249556945/project/488551667048375/task/1212150079356362?focus=true ### Description Make methods in `CustomHeadersProvider` suspend, and ensure RC flag checks are done in io. Similarly, move some dataStore queries to io as well: * Note, this is a LHF approach, and therefore I haven't migrated anything that's also used synchronously from other parts of the code ### Steps to test this PR - [x] [E2E Maestro tests](https://github.com/duckduckgo/Android/actions/runs/19707333960) passed _Feature 1_ - [ ] - [ ] ### UI changes | Before | After | | ------ | ----- | !(Upload before screenshot)|(Upload after screenshot)|
diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt
@@ -8160,7 +8160,7 @@ class BrowserTabViewModelTest {
     class FakeCustomHeadersProvider(
         var headers: Map<String, String>,
     ) : CustomHeadersProvider {
-        override fun getCustomHeaders(url: String): Map<String, String> = headers
+        override suspend fun getCustomHeaders(url: String): Map<String, String> = headers
     }
 
     class FakeContentScopeScriptsSubscriptionEventPlugin(
diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserWebViewClientTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserWebViewClientTest.kt
@@ -167,6 +167,7 @@ class BrowserWebViewClientTest {
             mockAndroidBrowserConfigFeature,
             mockFeaturesHeaderProvider,
             mock(),
+            coroutinesTestRule.testDispatcherProvider,
         )
     private val mockDuckChat: DuckChat = mock()
 
diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/WebViewRequestInterceptorTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/WebViewRequestInterceptorTest.kt
@@ -109,9 +109,12 @@ class WebViewRequestInterceptorTest {
 
     @UiThreadTest
     @Before
-    fun setup() {
+    fun setup() = runTest {
         configureUserAgent()
         configureStack()
+        whenever(mockGpc.canUrlAddHeaders(anyString(), anyMap<String, String>())).thenReturn(false)
+        whenever(mockRequest.requestHeaders).thenReturn(mutableMapOf())
+        whenever(mockGpc.getHeaders(anyString())).thenReturn(mapOf())
 
         testee = WebViewRequestInterceptor(
             trackerDetector = mockTrackerDetector,
diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt
@@ -1194,7 +1194,9 @@ class BrowserTabViewModel @Inject constructor(
                 }
 
                 site?.nextUrl = urlToNavigate
-                command.value = NavigationCommand.Navigate(urlToNavigate, getUrlHeaders(urlToNavigate))
+                viewModelScope.launch {
+                    command.value = NavigationCommand.Navigate(urlToNavigate, getUrlHeaders(urlToNavigate))
+                }
             }
         }
 
@@ -1219,7 +1221,7 @@ class BrowserTabViewModel @Inject constructor(
             currentAutoCompleteViewState().copy(showSuggestions = false, showFavorites = false, searchResults = AutoCompleteResult("", emptyList()))
     }
 
-    private fun getUrlHeaders(url: String?): Map<String, String> = url?.let { customHeadersProvider.getCustomHeaders(it) } ?: emptyMap()
+    private suspend fun getUrlHeaders(url: String?): Map<String, String> = url?.let { customHeadersProvider.getCustomHeaders(it) } ?: emptyMap()
 
     private fun extractVerticalParameter(currentUrl: String?): String? {
         val url = currentUrl ?: return null
@@ -2795,7 +2797,9 @@ class BrowserTabViewModel @Inject constructor(
         if (desktopSiteRequested && uri.isMobileSite) {
             val desktopUrl = uri.toDesktopUri().toString()
             logcat(INFO) { "Original URL $url - attempting $desktopUrl with desktop site UA string" }
-            command.value = NavigationCommand.Navigate(desktopUrl, getUrlHeaders(desktopUrl))
+            viewModelScope.launch {
+                command.value = NavigationCommand.Navigate(desktopUrl, getUrlHeaders(desktopUrl))
+            }
         } else {
             command.value = NavigationCommand.Refresh
         }
@@ -3165,7 +3169,9 @@ class BrowserTabViewModel @Inject constructor(
 
     fun nonHttpAppLinkClicked(appLink: NonHttpAppLink) {
         if (nonHttpAppLinkChecker.isPermitted(appLink.intent)) {
-            command.value = HandleNonHttpAppLink(appLink, getUrlHeaders(appLink.fallbackUrl))
+            viewModelScope.launch {
+                command.value = HandleNonHttpAppLink(appLink, getUrlHeaders(appLink.fallbackUrl))
+            }
         }
     }
 
diff --git a/app/src/main/java/com/duckduckgo/app/browser/WebViewRequestInterceptor.kt b/app/src/main/java/com/duckduckgo/app/browser/WebViewRequestInterceptor.kt
@@ -363,13 +363,13 @@ class WebViewRequestInterceptor(
         return WebResourceResponse(null, null, null)
     }
 
-    private fun getHeaders(request: WebResourceRequest): Map<String, String> {
+    private suspend fun getHeaders(request: WebResourceRequest): Map<String, String> {
         return request.requestHeaders.apply {
             putAll(gpc.getHeaders(request.url.toString()))
         }
     }
 
-    private fun shouldAddGcpHeaders(request: WebResourceRequest): Boolean {
+    private suspend fun shouldAddGcpHeaders(request: WebResourceRequest): Boolean {
         val existingHeaders = request.requestHeaders
         return (request.isForMainFrame && request.method == "GET" && gpc.canUrlAddHeaders(request.url.toString(), existingHeaders))
     }
diff --git a/app/src/main/java/com/duckduckgo/app/browser/trafficquality/AndroidFeaturesHeader.kt b/app/src/main/java/com/duckduckgo/app/browser/trafficquality/AndroidFeaturesHeader.kt
@@ -21,9 +21,11 @@ import com.duckduckgo.app.browser.trafficquality.Result.Allowed
 import com.duckduckgo.app.browser.trafficquality.Result.NotAllowed
 import com.duckduckgo.app.browser.trafficquality.remote.AndroidFeaturesHeaderProvider
 import com.duckduckgo.app.pixels.remoteconfig.AndroidBrowserConfigFeature
+import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.common.utils.plugins.headers.CustomHeadersProvider.CustomHeadersPlugin
 import com.duckduckgo.di.scopes.AppScope
 import com.squareup.anvil.annotations.ContributesMultibinding
+import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
 @ContributesMultibinding(scope = AppScope::class)
@@ -33,9 +35,10 @@ class AndroidFeaturesHeaderPlugin @Inject constructor(
     private val androidBrowserConfigFeature: AndroidBrowserConfigFeature,
     private val androidFeaturesHeaderProvider: AndroidFeaturesHeaderProvider,
     private val appVersionProvider: AppVersionHeaderProvider,
+    private val dispatchers: DispatcherProvider,
 ) : CustomHeadersPlugin {
 
-    override fun getHeaders(url: String): Map<String, String> {
+    override suspend fun getHeaders(url: String): Map<String, String> {
         if (isFeatureEnabled() && duckDuckGoUrlDetector.isDuckDuckGoQueryUrl(url)) {
             return when (val result = customHeaderAllowedChecker.isAllowed()) {
                 is Allowed -> {
@@ -58,9 +61,11 @@ class AndroidFeaturesHeaderPlugin @Inject constructor(
         }
     }
 
-    private fun isFeatureEnabled(): Boolean {
-        return androidBrowserConfigFeature.self().isEnabled() &&
-            androidBrowserConfigFeature.featuresRequestHeader().isEnabled()
+    private suspend fun isFeatureEnabled(): Boolean {
+        return withContext(dispatchers.io()) {
+            androidBrowserConfigFeature.self().isEnabled() &&
+                androidBrowserConfigFeature.featuresRequestHeader().isEnabled()
+        }
     }
 
     companion object {
diff --git a/app/src/main/java/com/duckduckgo/app/browser/trafficquality/CustomHeaderAllowedChecker.kt b/app/src/main/java/com/duckduckgo/app/browser/trafficquality/CustomHeaderAllowedChecker.kt
@@ -29,7 +29,7 @@ import java.time.temporal.ChronoUnit
 import javax.inject.Inject
 
 interface CustomHeaderAllowedChecker {
-    fun isAllowed(): Result<TrafficQualityAppVersion>
+    suspend fun isAllowed(): Result<TrafficQualityAppVersion>
 }
 
 sealed class Result<out R> {
@@ -42,7 +42,7 @@ class RealCustomHeaderGracePeriodChecker @Inject constructor(
     private val appBuildConfig: AppBuildConfig,
     private val featuresRequestHeaderStore: FeaturesRequestHeaderStore,
 ) : CustomHeaderAllowedChecker {
-    override fun isAllowed(): Result<TrafficQualityAppVersion> {
+    override suspend fun isAllowed(): Result<TrafficQualityAppVersion> {
         val config = featuresRequestHeaderStore.getConfig()
         val versionConfig = config.find { it.appVersion == appBuildConfig.versionCode }
         return if (versionConfig != null) {
diff --git a/app/src/main/java/com/duckduckgo/app/browser/trafficquality/remote/FeaturesRequestHeaderSettingStore.kt b/app/src/main/java/com/duckduckgo/app/browser/trafficquality/remote/FeaturesRequestHeaderSettingStore.kt
@@ -17,14 +17,16 @@
 package com.duckduckgo.app.browser.trafficquality.remote
 
 import com.duckduckgo.app.pixels.remoteconfig.AndroidBrowserConfigFeature
+import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.di.scopes.AppScope
 import com.squareup.anvil.annotations.ContributesBinding
 import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.Moshi
+import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
 interface FeaturesRequestHeaderStore {
-    fun getConfig(): List<TrafficQualityAppVersion>
+    suspend fun getConfig(): List<TrafficQualityAppVersion>
 }
 
 data class TrafficQualitySettingsJson(
@@ -49,19 +51,22 @@ data class TrafficQualityAppVersionFeatures(
 class FeaturesRequestHeaderSettingStore @Inject constructor(
     private val androidBrowserConfigFeature: AndroidBrowserConfigFeature,
     private val moshi: Moshi,
+    private val dispatcherProvider: DispatcherProvider,
 ) : FeaturesRequestHeaderStore {
 
     private val jsonAdapter: JsonAdapter<TrafficQualitySettingsJson> by lazy {
         moshi.adapter(TrafficQualitySettingsJson::class.java)
     }
 
-    override fun getConfig(): List<TrafficQualityAppVersion> {
-        val config = androidBrowserConfigFeature.featuresRequestHeader().getSettings()?.let {
-            runCatching {
-                val configJson = jsonAdapter.fromJson(it)
-                configJson?.versions
-            }.getOrDefault(emptyList())
-        } ?: emptyList()
-        return config
+    override suspend fun getConfig(): List<TrafficQualityAppVersion> {
+        return withContext(dispatcherProvider.io()) {
+            val config = androidBrowserConfigFeature.featuresRequestHeader().getSettings()?.let {
+                runCatching {
+                    val configJson = jsonAdapter.fromJson(it)
+                    configJson?.versions
+                }.getOrDefault(emptyList())
+            } ?: emptyList()
+            config
+        }
     }
 }
diff --git a/app/src/main/java/com/duckduckgo/app/globalprivacycontrol/ui/GlobalPrivacyControlViewModel.kt b/app/src/main/java/com/duckduckgo/app/globalprivacycontrol/ui/GlobalPrivacyControlViewModel.kt
@@ -20,6 +20,7 @@ import androidx.annotation.StringRes
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import com.duckduckgo.anvil.annotations.ContributesViewModel
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.pixels.AppPixelName.*
@@ -29,6 +30,7 @@ import com.duckduckgo.di.scopes.ActivityScope
 import com.duckduckgo.feature.toggles.api.FeatureToggle
 import com.duckduckgo.privacy.config.api.Gpc
 import com.duckduckgo.privacy.config.api.PrivacyFeatureName
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @ContributesViewModel(ActivityScope::class)
@@ -55,10 +57,13 @@ class GlobalPrivacyControlViewModel @Inject constructor(
     val command: SingleLiveEvent<Command> = SingleLiveEvent()
 
     init {
-        _viewState.value = ViewState(
-            globalPrivacyControlEnabled = gpc.isEnabled(),
-            globalPrivacyControlFeatureEnabled = featureToggle.isFeatureEnabled(PrivacyFeatureName.GpcFeatureName.value, true),
-        )
+        viewModelScope.launch {
+            _viewState.value = ViewState(
+                globalPrivacyControlEnabled = gpc.isEnabled(),
+                globalPrivacyControlFeatureEnabled = featureToggle.isFeatureEnabled(PrivacyFeatureName.GpcFeatureName.value, true),
+            )
+        }
+
         pixel.fire(SETTINGS_DO_NOT_SELL_SHOWN)
     }
 
diff --git a/app/src/test/java/com/duckduckgo/app/brokensite/api/BrokenSiteSubmitterTest.kt b/app/src/test/java/com/duckduckgo/app/brokensite/api/BrokenSiteSubmitterTest.kt
@@ -119,7 +119,7 @@ class BrokenSiteSubmitterTest {
     private lateinit var testee: BrokenSiteSubmitter
 
     @Before
-    fun before() {
+    fun before() = runTest {
         whenever(mockAppBuildConfig.deviceLocale).thenReturn(Locale.ENGLISH)
         whenever(mockAppBuildConfig.sdkInt).thenReturn(1)
         whenever(mockAppBuildConfig.manufacturer).thenReturn("manufacturer")
diff --git a/app/src/test/java/com/duckduckgo/app/browser/AndroidFeaturesHeaderPluginTest.kt b/app/src/test/java/com/duckduckgo/app/browser/AndroidFeaturesHeaderPluginTest.kt
@@ -10,11 +10,13 @@ import com.duckduckgo.app.browser.trafficquality.Result.NotAllowed
 import com.duckduckgo.app.browser.trafficquality.configEnabledForCurrentVersion
 import com.duckduckgo.app.browser.trafficquality.remote.AndroidFeaturesHeaderProvider
 import com.duckduckgo.app.pixels.remoteconfig.AndroidBrowserConfigFeature
+import com.duckduckgo.common.test.CoroutineTestRule
 import com.duckduckgo.feature.toggles.api.Toggle
 import kotlinx.coroutines.test.runTest
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Before
+import org.junit.Rule
 import org.junit.Test
 import org.mockito.kotlin.any
 import org.mockito.kotlin.doReturn
@@ -23,6 +25,9 @@ import org.mockito.kotlin.whenever
 
 class AndroidFeaturesHeaderPluginTest {
 
+    @get:Rule
+    val coroutineRule = CoroutineTestRule()
+
     private lateinit var testee: AndroidFeaturesHeaderPlugin
 
     private val mockDuckDuckGoUrlDetector: DuckDuckGoUrlDetector = mock()
@@ -37,13 +42,14 @@ class AndroidFeaturesHeaderPluginTest {
     private val SAMPLE_APP_VERSION_HEADER = "app_version_header"
 
     @Before
-    fun setup() {
+    fun setup() = runTest {
         testee = AndroidFeaturesHeaderPlugin(
             mockDuckDuckGoUrlDetector,
             mockCustomHeaderGracePeriodChecker,
             mockAndroidBrowserConfigFeature,
             mockAndroidFeaturesHeaderProvider,
             mockAppVersionHeaderProvider,
+            coroutineRule.testDispatcherProvider,
         )
 
         whenever(mockCustomHeaderGracePeriodChecker.isAllowed()).thenReturn(Allowed(configEnabledForCurrentVersion))
@@ -79,7 +85,7 @@ class AndroidFeaturesHeaderPluginTest {
     }
 
     @Test
-    fun whenGetHeadersCalledWithDuckDuckGoUrlAndFeatureDisabledThenReturnEmptyHeaders() {
+    fun whenGetHeadersCalledWithDuckDuckGoUrlAndFeatureDisabledThenReturnEmptyHeaders() = runTest {
         val url = "duckduckgo_search_url"
         whenever(mockDuckDuckGoUrlDetector.isDuckDuckGoQueryUrl(any())).thenReturn(true)
         whenever(mockAndroidBrowserConfigFeature.self()).thenReturn(mockEnabledToggle)
@@ -91,7 +97,7 @@ class AndroidFeaturesHeaderPluginTest {
     }
 
     @Test
-    fun whenGetHeadersCalledWithDuckDuckGoUrlAndHeaderNotAllowedThenReturnCorrectHeader() {
+    fun whenGetHeadersCalledWithDuckDuckGoUrlAndHeaderNotAllowedThenReturnCorrectHeader() = runTest {
         val url = "duckduckgo_search_url"
         whenever(mockDuckDuckGoUrlDetector.isDuckDuckGoQueryUrl(any())).thenReturn(true)
         whenever(mockAndroidBrowserConfigFeature.self()).thenReturn(mockEnabledToggle)
@@ -105,7 +111,7 @@ class AndroidFeaturesHeaderPluginTest {
     }
 
     @Test
-    fun whenGetHeadersCalledWithNonDuckDuckGoUrlAndFeatureEnabledThenReturnEmptyMap() {
+    fun whenGetHeadersCalledWithNonDuckDuckGoUrlAndFeatureEnabledThenReturnEmptyMap() = runTest {
         val url = "non_duckduckgo_search_url"
         whenever(mockDuckDuckGoUrlDetector.isDuckDuckGoQueryUrl(any())).thenReturn(false)
         whenever(mockAndroidBrowserConfigFeature.self()).thenReturn(mockEnabledToggle)
@@ -117,7 +123,7 @@ class AndroidFeaturesHeaderPluginTest {
     }
 
     @Test
-    fun whenGetHeadersCalledWithNonDuckDuckGoUrlAndFeatureDisabledThenReturnEmptyMap() {
+    fun whenGetHeadersCalledWithNonDuckDuckGoUrlAndFeatureDisabledThenReturnEmptyMap() = runTest {
         val url = "non_duckduckgo_search_url"
         whenever(mockDuckDuckGoUrlDetector.isDuckDuckGoQueryUrl(any())).thenReturn(false)
         whenever(mockAndroidBrowserConfigFeature.self()).thenReturn(mockEnabledToggle)
diff --git a/app/src/test/java/com/duckduckgo/app/browser/trafficquality/AndroidFeaturesHeaderProviderTest.kt b/app/src/test/java/com/duckduckgo/app/browser/trafficquality/AndroidFeaturesHeaderProviderTest.kt
@@ -61,7 +61,7 @@ class AndroidFeaturesHeaderProviderTest {
     }
 
     @Test
-    fun whenGPCFeatureEnabledAndGPCDisabledThenValueProvided() {
+    fun whenGPCFeatureEnabledAndGPCDisabledThenValueProvided() = runTest {
         whenever(mockGpc.isEnabled()).thenReturn(false)
         val config = TrafficQualityAppVersion(currentVersion, 5, 5, featuresEnabled(gpc = true))
 
@@ -71,7 +71,7 @@ class AndroidFeaturesHeaderProviderTest {
     }
 
     @Test
-    fun whenGPCFeatureEnabledAndGPCEnabledThenValueProvided() {
+    fun whenGPCFeatureEnabledAndGPCEnabledThenValueProvided() = runTest {
         whenever(mockGpc.isEnabled()).thenReturn(true)
         val config = TrafficQualityAppVersion(currentVersion, 5, 5, featuresEnabled(gpc = true))
 
diff --git a/app/src/test/java/com/duckduckgo/app/globalprivacycontrol/ui/GlobalPrivacyControlViewModelTest.kt b/app/src/test/java/com/duckduckgo/app/globalprivacycontrol/ui/GlobalPrivacyControlViewModelTest.kt
@@ -20,22 +20,27 @@ import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.lifecycle.Observer
 import com.duckduckgo.app.pixels.AppPixelName
 import com.duckduckgo.app.statistics.pixels.Pixel
+import com.duckduckgo.common.test.CoroutineTestRule
 import com.duckduckgo.common.test.InstantSchedulersRule
 import com.duckduckgo.feature.toggles.api.FeatureToggle
 import com.duckduckgo.privacy.config.api.Gpc
+import kotlinx.coroutines.test.runTest
 import org.junit.After
 import org.junit.Assert.*
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.mockito.kotlin.argumentCaptor
 import org.mockito.kotlin.atLeastOnce
-import org.mockito.kotlin.lastValue
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
 
 class GlobalPrivacyControlViewModelTest {
 
+    @get:Rule
+    val coroutineRule = CoroutineTestRule()
+
     @get:Rule
     var instantTaskExecutorRule = InstantTaskExecutorRule()
 
@@ -52,7 +57,8 @@ class GlobalPrivacyControlViewModelTest {
     lateinit var testee: GlobalPrivacyControlViewModel
 
     @Before
-    fun setup() {
+    fun setup() = runTest {
+        whenever(mockGpc.isEnabled()).thenReturn(false)
         testee = GlobalPrivacyControlViewModel(mockPixel, mockFeatureToggle, mockGpc)
         testee.command.observeForever(mockCommandObserver)
         testee.viewState.observeForever(mockViewStateObserver)
diff --git a/app/src/test/java/com/duckduckgo/app/referencetests/brokensites/BrokenSitesReferenceTest.kt b/app/src/test/java/com/duckduckgo/app/referencetests/brokensites/BrokenSitesReferenceTest.kt
@@ -50,6 +50,7 @@ import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.Moshi
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.runTest
 import org.junit.Assert.*
 import org.junit.Before
 import org.junit.Rule
@@ -167,7 +168,7 @@ class BrokenSitesReferenceTest(private val testCase: TestCase) {
     }
 
     @Test
-    fun whenReferenceTestRunsItReturnsTheExpectedResult() {
+    fun whenReferenceTestRunsItReturnsTheExpectedResult() = runTest {
         whenever(mockAppBuildConfig.sdkInt).thenReturn(testCase.os?.toInt() ?: 1)
         whenever(mockAppBuildConfig.manufacturer).thenReturn(testCase.manufacturer)
         whenever(mockAppBuildConfig.model).thenReturn(testCase.model)
diff --git a/common/common-utils/src/main/java/com/duckduckgo/common/utils/plugins/headers/CustomHeadersProvider.kt b/common/common-utils/src/main/java/com/duckduckgo/common/utils/plugins/headers/CustomHeadersProvider.kt
diff --git a/privacy-config/privacy-config-api/src/main/java/com/duckduckgo/privacy/config/api/Gpc.kt b/privacy-config/privacy-config-api/src/main/java/com/duckduckgo/privacy/config/api/Gpc.kt
diff --git a/privacy-config/privacy-config-impl/src/main/java/com/duckduckgo/privacy/config/impl/features/gpc/GpcHeaderPlugin.kt b/privacy-config/privacy-config-impl/src/main/java/com/duckduckgo/privacy/config/impl/features/gpc/GpcHeaderPlugin.kt
diff --git a/privacy-config/privacy-config-impl/src/main/java/com/duckduckgo/privacy/config/impl/features/gpc/RealGpc.kt b/privacy-config/privacy-config-impl/src/main/java/com/duckduckgo/privacy/config/impl/features/gpc/RealGpc.kt
diff --git a/privacy-config/privacy-config-impl/src/test/java/com/duckduckgo/privacy/config/impl/features/gpc/GpcHeaderPluginTest.kt b/privacy-config/privacy-config-impl/src/test/java/com/duckduckgo/privacy/config/impl/features/gpc/GpcHeaderPluginTest.kt
diff --git a/privacy-config/privacy-config-impl/src/test/java/com/duckduckgo/privacy/config/impl/features/gpc/RealGpcTest.kt b/privacy-config/privacy-config-impl/src/test/java/com/duckduckgo/privacy/config/impl/features/gpc/RealGpcTest.kt
diff --git a/privacy-config/privacy-config-impl/src/test/java/com/duckduckgo/privacy/config/impl/referencetests/gpc/GpcHeaderReferenceTest.kt b/privacy-config/privacy-config-impl/src/test/java/com/duckduckgo/privacy/config/impl/referencetests/gpc/GpcHeaderReferenceTest.kt

Original file line number	Diff line number	Diff line change
`@@ -8160,7 +8160,7 @@ class BrowserTabViewModelTest {`
`8160`	`8160`	`class FakeCustomHeadersProvider(`
`8161`	`8161`	`var headers: Map<String, String>,`
`8162`	`8162`	`) : CustomHeadersProvider {`
`8163`		`- override fun getCustomHeaders(url: String): Map<String, String> = headers`
	`8163`	`+ override suspend fun getCustomHeaders(url: String): Map<String, String> = headers`
`8164`	`8164`	`}`
`8165`	`8165`
`8166`	`8166`	`class FakeContentScopeScriptsSubscriptionEventPlugin(`
Original file line number	Diff line number	Diff line change
`@@ -167,6 +167,7 @@ class BrowserWebViewClientTest {`
`167`	`167`	`mockAndroidBrowserConfigFeature,`
`168`	`168`	`mockFeaturesHeaderProvider,`
`169`	`169`	`mock(),`
	`170`	`+ coroutinesTestRule.testDispatcherProvider,`
`170`	`171`	`)`
`171`	`172`	`private val mockDuckChat: DuckChat = mock()`
`172`	`173`
Original file line number	Diff line number	Diff line change
`@@ -1194,7 +1194,9 @@ class BrowserTabViewModel @Inject constructor(`
`1194`	`1194`	`}`
`1195`	`1195`
`1196`	`1196`	`site?.nextUrl = urlToNavigate`
`1197`		`- command.value = NavigationCommand.Navigate(urlToNavigate, getUrlHeaders(urlToNavigate))`
	`1197`	`+ viewModelScope.launch {`
	`1198`	`+ command.value = NavigationCommand.Navigate(urlToNavigate, getUrlHeaders(urlToNavigate))`
	`1199`	`+ }`
`1198`	`1200`	`}`
`1199`	`1201`	`}`
`1200`	`1202`
`@@ -1219,7 +1221,7 @@ class BrowserTabViewModel @Inject constructor(`
`1219`	`1221`	`currentAutoCompleteViewState().copy(showSuggestions = false, showFavorites = false, searchResults = AutoCompleteResult("", emptyList()))`
`1220`	`1222`	`}`
`1221`	`1223`
`1222`		`- private fun getUrlHeaders(url: String?): Map<String, String> = url?.let { customHeadersProvider.getCustomHeaders(it) } ?: emptyMap()`
	`1224`	`+ private suspend fun getUrlHeaders(url: String?): Map<String, String> = url?.let { customHeadersProvider.getCustomHeaders(it) } ?: emptyMap()`
`1223`	`1225`
`1224`	`1226`	`private fun extractVerticalParameter(currentUrl: String?): String? {`
`1225`	`1227`	`val url = currentUrl ?: return null`
`@@ -2795,7 +2797,9 @@ class BrowserTabViewModel @Inject constructor(`
`2795`	`2797`	`if (desktopSiteRequested && uri.isMobileSite) {`
`2796`	`2798`	`val desktopUrl = uri.toDesktopUri().toString()`
`2797`	`2799`	`logcat(INFO) { "Original URL $url - attempting $desktopUrl with desktop site UA string" }`
`2798`		`- command.value = NavigationCommand.Navigate(desktopUrl, getUrlHeaders(desktopUrl))`
	`2800`	`+ viewModelScope.launch {`
	`2801`	`+ command.value = NavigationCommand.Navigate(desktopUrl, getUrlHeaders(desktopUrl))`
	`2802`	`+ }`
`2799`	`2803`	`} else {`
`2800`	`2804`	`command.value = NavigationCommand.Refresh`
`2801`	`2805`	`}`
`@@ -3165,7 +3169,9 @@ class BrowserTabViewModel @Inject constructor(`
`3165`	`3169`
`3166`	`3170`	`fun nonHttpAppLinkClicked(appLink: NonHttpAppLink) {`
`3167`	`3171`	`if (nonHttpAppLinkChecker.isPermitted(appLink.intent)) {`
`3168`		`- command.value = HandleNonHttpAppLink(appLink, getUrlHeaders(appLink.fallbackUrl))`
	`3172`	`+ viewModelScope.launch {`
	`3173`	`+ command.value = HandleNonHttpAppLink(appLink, getUrlHeaders(appLink.fallbackUrl))`
	`3174`	`+ }`
`3169`	`3175`	`}`
`3170`	`3176`	`}`
`3171`	`3177`
Original file line number	Diff line number	Diff line change
`@@ -363,13 +363,13 @@ class WebViewRequestInterceptor(`
`363`	`363`	`return WebResourceResponse(null, null, null)`
`364`	`364`	`}`
`365`	`365`
`366`		`- private fun getHeaders(request: WebResourceRequest): Map<String, String> {`
	`366`	`+ private suspend fun getHeaders(request: WebResourceRequest): Map<String, String> {`
`367`	`367`	`return request.requestHeaders.apply {`
`368`	`368`	`putAll(gpc.getHeaders(request.url.toString()))`
`369`	`369`	`}`
`370`	`370`	`}`
`371`	`371`
`372`		`- private fun shouldAddGcpHeaders(request: WebResourceRequest): Boolean {`
	`372`	`+ private suspend fun shouldAddGcpHeaders(request: WebResourceRequest): Boolean {`
`373`	`373`	`val existingHeaders = request.requestHeaders`
`374`	`374`	`return (request.isForMainFrame && request.method == "GET" && gpc.canUrlAddHeaders(request.url.toString(), existingHeaders))`
`375`	`375`	`}`