Don't check featuresRequestHeader from main in renderOmnibarViewState

Author: CrisBarreiro

app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt

@@ -1192,7 +1192,9 @@ class BrowserTabViewModel @Inject constructor(
                 }
 
                 site?.nextUrl = urlToNavigate
-                command.value = NavigationCommand.Navigate(urlToNavigate, getUrlHeaders(urlToNavigate))
+                viewModelScope.launch {
+                    command.value = NavigationCommand.Navigate(urlToNavigate, getUrlHeaders(urlToNavigate))
+                }
             }
         }
 
@@ -1217,7 +1219,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
@@ -2769,7 +2771,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
         }
@@ -3139,7 +3143,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))
+            }
         }
     }
 

common/common-utils/src/main/java/com/duckduckgo/common/utils/plugins/headers/CustomHeadersProvider.kt

@@ -17,9 +17,11 @@
 package com.duckduckgo.common.utils.plugins.headers
 
 import com.duckduckgo.anvil.annotations.ContributesPluginPoint
+import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.common.utils.plugins.PluginPoint
 import com.duckduckgo.di.scopes.AppScope
 import com.squareup.anvil.annotations.ContributesBinding
+import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
 interface CustomHeadersProvider {
@@ -29,7 +31,7 @@ interface CustomHeadersProvider {
      * @param url The url of the request.
      * @return A [Map] of headers.
      */
-    fun getCustomHeaders(url: String): Map<String, String>
+    suspend fun getCustomHeaders(url: String): Map<String, String>
 
     /**
      * A plugin point for custom headers that should be added to all requests.
@@ -50,13 +52,16 @@ interface CustomHeadersProvider {
 @ContributesBinding(AppScope::class)
 class RealCustomHeadersProvider @Inject constructor(
     private val customHeadersPluginPoint: PluginPoint<CustomHeadersProvider.CustomHeadersPlugin>,
+    private val dispatcherProvider: DispatcherProvider,
 ) : CustomHeadersProvider {
 
-    override fun getCustomHeaders(url: String): Map<String, String> {
-        val customHeaders = mutableMapOf<String, String>()
-        customHeadersPluginPoint.getPlugins().forEach {
-            customHeaders.putAll(it.getHeaders(url))
+    override suspend fun getCustomHeaders(url: String): Map<String, String> {
+        return withContext(dispatcherProvider.io()) {
+            val customHeaders = mutableMapOf<String, String>()
+            customHeadersPluginPoint.getPlugins().forEach {
+                customHeaders.putAll(it.getHeaders(url))
+            }
+            return@withContext customHeaders.toMap()
         }
-        return customHeaders.toMap()
     }
 }