From 5c90090cc3642d51d07c9561b117ec4ea8f90d28 Mon Sep 17 00:00:00 2001 From: yamilmedina Date: Tue, 29 Aug 2023 15:32:26 +0200 Subject: [PATCH] chore: detekt --- .../networkContainer/AuthenticatedNetworkContainerV5.kt | 7 +++++-- .../UnauthenticatedNetworkContainerV5.kt | 9 +++++++-- .../networkContainer/AuthenticatedNetworkContainer.kt | 3 ++- .../networkContainer/UnauthenticatedNetworkContainer.kt | 4 +++- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/network/src/commonMain/kotlin/com/wire/kalium/network/api/v5/authenticated/networkContainer/AuthenticatedNetworkContainerV5.kt b/network/src/commonMain/kotlin/com/wire/kalium/network/api/v5/authenticated/networkContainer/AuthenticatedNetworkContainerV5.kt index 616038cb15a..3e83f3686c6 100644 --- a/network/src/commonMain/kotlin/com/wire/kalium/network/api/v5/authenticated/networkContainer/AuthenticatedNetworkContainerV5.kt +++ b/network/src/commonMain/kotlin/com/wire/kalium/network/api/v5/authenticated/networkContainer/AuthenticatedNetworkContainerV5.kt @@ -65,6 +65,7 @@ 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 @@ -72,9 +73,11 @@ 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/network/src/commonMain/kotlin/com/wire/kalium/network/api/v5/unauthenticated/networkContainer/UnauthenticatedNetworkContainerV5.kt b/network/src/commonMain/kotlin/com/wire/kalium/network/api/v5/unauthenticated/networkContainer/UnauthenticatedNetworkContainerV5.kt index aff48a0b1f8..413d4c46d1f 100644 --- a/network/src/commonMain/kotlin/com/wire/kalium/network/api/v5/unauthenticated/networkContainer/UnauthenticatedNetworkContainerV5.kt +++ b/network/src/commonMain/kotlin/com/wire/kalium/network/api/v5/unauthenticated/networkContainer/UnauthenticatedNetworkContainerV5.kt @@ -36,6 +36,7 @@ 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 @@ -43,12 +44,16 @@ 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/network/src/commonMain/kotlin/com/wire/kalium/network/networkContainer/AuthenticatedNetworkContainer.kt b/network/src/commonMain/kotlin/com/wire/kalium/network/networkContainer/AuthenticatedNetworkContainer.kt index 6e9a2dff24b..d5c2202e49f 100644 --- a/network/src/commonMain/kotlin/com/wire/kalium/network/networkContainer/AuthenticatedNetworkContainer.kt +++ b/network/src/commonMain/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/network/src/commonMain/kotlin/com/wire/kalium/network/networkContainer/UnauthenticatedNetworkContainer.kt b/network/src/commonMain/kotlin/com/wire/kalium/network/networkContainer/UnauthenticatedNetworkContainer.kt index f40bc66f52a..ea0aa6a7753 100644 --- a/network/src/commonMain/kotlin/com/wire/kalium/network/networkContainer/UnauthenticatedNetworkContainer.kt +++ b/network/src/commonMain/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}")