Make the initialisation resilient when the OkHttp intereceptor is cre…

…ated before SDK config
DataDog · Mar 4, 2021 · cf6fe44 · cf6fe44
1 parent d890710
commit cf6fe44
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/dd-sdk-android/src/main/kotlin/com/datadog/android/core/internal/CoreFeature.kt b/dd-sdk-android/src/main/kotlin/com/datadog/android/core/internal/CoreFeature.kt
@@ -102,7 +102,7 @@ internal object CoreFeature {
         initializeClockSync(appContext)
         setupInfoProviders(appContext, consent)
         setupOkHttpClient(configuration.needsClearTextHttp)
-        firstPartyHostDetector = FirstPartyHostDetector(configuration.firstPartyHosts)
+        firstPartyHostDetector.addKnownHosts(configuration.firstPartyHosts)
         setupExecutors()
 
         initialized.set(true)

diff --git a/...k-android/src/main/kotlin/com/datadog/android/core/internal/net/FirstPartyHostDetector.kt b/...k-android/src/main/kotlin/com/datadog/android/core/internal/net/FirstPartyHostDetector.kt
@@ -33,6 +33,6 @@ internal class FirstPartyHostDetector(
     }
 
     fun addKnownHosts(hosts: List<String>) {
-        knownHosts = knownHosts + hosts
+        knownHosts = knownHosts + hosts.map { it.toLowerCase(Locale.US) }
     }
 }