chore: detekt

wireapp · Aug 29, 2023 · 5c90090 · 5c90090
1 parent 40a354b
commit 5c90090
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/...e/kalium/network/api/v5/authenticated/networkContainer/AuthenticatedNetworkContainerV5.kt b/...e/kalium/network/api/v5/authenticated/networkContainer/AuthenticatedNetworkContainerV5.kt
@@ -65,16 +65,19 @@ import com.wire.kalium.network.defaultHttpEngine
 import com.wire.kalium.network.networkContainer.AuthenticatedHttpClientProvider
 import com.wire.kalium.network.networkContainer.AuthenticatedHttpClientProviderImpl
 import com.wire.kalium.network.networkContainer.AuthenticatedNetworkContainer
+import com.wire.kalium.network.session.CertificatePinning
 import com.wire.kalium.network.session.SessionManager
 import io.ktor.client.engine.HttpClientEngine
 
 internal class AuthenticatedNetworkContainerV5 internal constructor(
     private val networkStateObserver: NetworkStateObserver,
     private val sessionManager: SessionManager,
     private val selfUserId: UserId,
+    certificatePinning: CertificatePinning,
     engine: HttpClientEngine = defaultHttpEngine(
-        sessionManager.serverConfig().links.apiProxy,
-        sessionManager.proxyCredentials()
+        serverConfigDTOApiProxy = sessionManager.serverConfig().links.apiProxy,
+        proxyCredentials = sessionManager.proxyCredentials(),
+        certificatePinning = certificatePinning
     )
 ) : AuthenticatedNetworkContainer,
     AuthenticatedHttpClientProvider by AuthenticatedHttpClientProviderImpl(

diff --git a/...lium/network/api/v5/unauthenticated/networkContainer/UnauthenticatedNetworkContainerV5.kt b/...lium/network/api/v5/unauthenticated/networkContainer/UnauthenticatedNetworkContainerV5.kt
@@ -36,19 +36,24 @@ import com.wire.kalium.network.defaultHttpEngine
 import com.wire.kalium.network.networkContainer.UnauthenticatedNetworkClientProvider
 import com.wire.kalium.network.networkContainer.UnauthenticatedNetworkClientProviderImpl
 import com.wire.kalium.network.networkContainer.UnauthenticatedNetworkContainer
+import com.wire.kalium.network.session.CertificatePinning
 import com.wire.kalium.network.tools.ServerConfigDTO
 import io.ktor.client.engine.HttpClientEngine
 
 class UnauthenticatedNetworkContainerV5 internal constructor(
     networkStateObserver: NetworkStateObserver,
     backendLinks: ServerConfigDTO,
     proxyCredentials: ProxyCredentialsDTO?,
-    engine: HttpClientEngine = defaultHttpEngine(backendLinks.links.apiProxy, proxyCredentials)
+    certificatePinning: CertificatePinning,
+    engine: HttpClientEngine = defaultHttpEngine(
+        serverConfigDTOApiProxy = backendLinks.links.apiProxy,
+        proxyCredentials = proxyCredentials,
+        certificatePinning = certificatePinning
+    ),
 ) : UnauthenticatedNetworkContainer,
     UnauthenticatedNetworkClientProvider by UnauthenticatedNetworkClientProviderImpl(
         networkStateObserver,
         backendLinks,
-        proxyCredentials,
         engine
     ) {
     override val loginApi: LoginApi get() = LoginApiV5(unauthenticatedNetworkClient)

diff --git a/...mmonMain/kotlin/com/wire/kalium/network/networkContainer/AuthenticatedNetworkContainer.kt b/...mmonMain/kotlin/com/wire/kalium/network/networkContainer/AuthenticatedNetworkContainer.kt
@@ -153,7 +153,8 @@ interface AuthenticatedNetworkContainer {
                 5 -> AuthenticatedNetworkContainerV5(
                     networkStateObserver,
                     sessionManager,
-                    selfUserId
+                    selfUserId,
+                    certificatePinning
                 )
 
                 else -> error("Unsupported version: $version")

diff --git a/...onMain/kotlin/com/wire/kalium/network/networkContainer/UnauthenticatedNetworkContainer.kt b/...onMain/kotlin/com/wire/kalium/network/networkContainer/UnauthenticatedNetworkContainer.kt
@@ -32,6 +32,7 @@ import com.wire.kalium.network.api.v2.unauthenticated.networkContainer.Unauthent
 import com.wire.kalium.network.api.v3.unauthenticated.networkContainer.UnauthenticatedNetworkContainerV3
 import com.wire.kalium.network.api.v4.unauthenticated.networkContainer.UnauthenticatedNetworkContainerV4
 import com.wire.kalium.network.api.v5.unauthenticated.networkContainer.UnauthenticatedNetworkContainerV5
+import com.wire.kalium.network.session.CertificatePinning
 import com.wire.kalium.network.tools.ServerConfigDTO
 import io.ktor.client.engine.HttpClientEngine
 
@@ -94,7 +95,8 @@ interface UnauthenticatedNetworkContainer {
                 5 -> UnauthenticatedNetworkContainerV5(
                     networkStateObserver,
                     serverConfigDTO,
-                    proxyCredentials = proxyCredentials
+                    proxyCredentials = proxyCredentials,
+                    certificatePinning = certificatePinning,
                 )
 
                 else -> error("Unsupported version: ${serverConfigDTO.metaData.commonApiVersion.version}")