From 35cfb92581fea5325e1d2a348cbe803a5b25d317 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C5=BBerko?= Date: Thu, 17 Oct 2024 08:25:20 +0200 Subject: [PATCH 1/5] chore: android gradle plugin update (#3064) --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7597114ff62..e9fd4ec8607 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -45,7 +45,7 @@ completeKotlin = "1.1.0" desugar-jdk = "2.0.4" kermit = "2.0.3" detekt = "1.23.6" -agp = "8.3.2" +agp = "8.5.2" dokka = "1.8.20" carthage = "0.0.1" libsodiumBindings = "0.8.7" From 96044bc0e47427e263e0348099a17399392b42ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Saleniuk?= <30429749+saleniuk@users.noreply.github.com> Date: Tue, 22 Oct 2024 18:27:52 +0200 Subject: [PATCH 2/5] chore: update sqlcipher [WPB-11808] (#3069) (cherry picked from commit 2ddb1830c628fe5051c34c369100ffe02b300329) --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e9fd4ec8607..15abaa964cd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -34,7 +34,7 @@ moduleGraph = "0.7.0" # if you update sqlDelight check if https://github.com/cashapp/sqldelight/issues/4154 is fixed # and delete the workaround in the dev.mk file sqldelight = "2.0.1" -sqlcipher-android = "4.5.6" +sqlcipher-android = "4.6.1" pbandk = "0.14.2" turbine = "1.1.0" avs = "9.9.5" From 708b4c461f47949236113a5b0e5e8f14972b248f Mon Sep 17 00:00:00 2001 From: Mohamad Jaara Date: Thu, 24 Oct 2024 13:47:23 +0200 Subject: [PATCH 3/5] feat: add a wild card request --- .../api/base/authenticated/WildCardApi.kt | 30 +++++++++++ .../AuthenticatedNetworkContainerV0.kt | 6 ++- .../AuthenticatedNetworkContainerV2.kt | 4 ++ .../AuthenticatedNetworkContainerV3.kt | 4 ++ .../AuthenticatedNetworkContainerV4.kt | 4 ++ .../AuthenticatedNetworkContainerV5.kt | 4 ++ .../AuthenticatedNetworkContainerV6.kt | 4 ++ .../network/api/v_common/WildCardApiImpl.kt | 50 +++++++++++++++++++ .../AuthenticatedNetworkContainer.kt | 3 ++ 9 files changed, 108 insertions(+), 1 deletion(-) create mode 100644 network/src/commonMain/kotlin/com/wire/kalium/network/api/base/authenticated/WildCardApi.kt create mode 100644 network/src/commonMain/kotlin/com/wire/kalium/network/api/v_common/WildCardApiImpl.kt diff --git a/network/src/commonMain/kotlin/com/wire/kalium/network/api/base/authenticated/WildCardApi.kt b/network/src/commonMain/kotlin/com/wire/kalium/network/api/base/authenticated/WildCardApi.kt new file mode 100644 index 00000000000..9c7bcb20372 --- /dev/null +++ b/network/src/commonMain/kotlin/com/wire/kalium/network/api/base/authenticated/WildCardApi.kt @@ -0,0 +1,30 @@ +/* + * Wire + * Copyright (C) 2024 Wire Swiss GmbH + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + */ +package com.wire.kalium.network.api.base.authenticated + +import io.ktor.http.HttpMethod + +interface WildCardApi { + suspend fun customRequest( + httpMethod: HttpMethod, + requestPath: List, + body: String?, + queryParam: Map, + customHeader: Map + ) +} diff --git a/network/src/commonMain/kotlin/com/wire/kalium/network/api/v0/authenticated/networkContainer/AuthenticatedNetworkContainerV0.kt b/network/src/commonMain/kotlin/com/wire/kalium/network/api/v0/authenticated/networkContainer/AuthenticatedNetworkContainerV0.kt index 4967bc5abfd..b881f0d6403 100644 --- a/network/src/commonMain/kotlin/com/wire/kalium/network/api/v0/authenticated/networkContainer/AuthenticatedNetworkContainerV0.kt +++ b/network/src/commonMain/kotlin/com/wire/kalium/network/api/v0/authenticated/networkContainer/AuthenticatedNetworkContainerV0.kt @@ -22,6 +22,7 @@ import com.wire.kalium.logger.KaliumLogger import com.wire.kalium.network.api.base.authenticated.AccessTokenApi import com.wire.kalium.network.api.base.authenticated.CallApi import com.wire.kalium.network.api.base.authenticated.TeamsApi +import com.wire.kalium.network.api.base.authenticated.WildCardApi import com.wire.kalium.network.api.base.authenticated.asset.AssetApi import com.wire.kalium.network.api.base.authenticated.client.ClientApi import com.wire.kalium.network.api.base.authenticated.connection.ConnectionApi @@ -60,6 +61,7 @@ import com.wire.kalium.network.api.v0.authenticated.SelfApiV0 import com.wire.kalium.network.api.v0.authenticated.TeamsApiV0 import com.wire.kalium.network.api.v0.authenticated.UserDetailsApiV0 import com.wire.kalium.network.api.v0.authenticated.UserSearchApiV0 +import com.wire.kalium.network.api.v_common.WildCardApiImpl import com.wire.kalium.network.defaultHttpEngine import com.wire.kalium.network.networkContainer.AuthenticatedHttpClientProvider import com.wire.kalium.network.networkContainer.AuthenticatedHttpClientProviderImpl @@ -79,7 +81,7 @@ internal class AuthenticatedNetworkContainerV0 internal constructor( serverConfigDTOApiProxy = sessionManager.serverConfig().links.apiProxy, proxyCredentials = sessionManager.proxyCredentials(), certificatePinning = certificatePinning - ) + ), ) : AuthenticatedNetworkContainer, AuthenticatedHttpClientProvider by AuthenticatedHttpClientProviderImpl( sessionManager = sessionManager, @@ -132,4 +134,6 @@ internal class AuthenticatedNetworkContainerV0 internal constructor( override val mlsPublicKeyApi: MLSPublicKeyApi get() = MLSPublicKeyApiV0() override val propertiesApi: PropertiesApi get() = PropertiesApiV0(networkClient) + + override val wildCardApi: WildCardApi get() = WildCardApiImpl(networkClient) } diff --git a/network/src/commonMain/kotlin/com/wire/kalium/network/api/v2/authenticated/networkContainer/AuthenticatedNetworkContainerV2.kt b/network/src/commonMain/kotlin/com/wire/kalium/network/api/v2/authenticated/networkContainer/AuthenticatedNetworkContainerV2.kt index 45e6812fcf4..17162db0fcb 100644 --- a/network/src/commonMain/kotlin/com/wire/kalium/network/api/v2/authenticated/networkContainer/AuthenticatedNetworkContainerV2.kt +++ b/network/src/commonMain/kotlin/com/wire/kalium/network/api/v2/authenticated/networkContainer/AuthenticatedNetworkContainerV2.kt @@ -22,6 +22,7 @@ import com.wire.kalium.logger.KaliumLogger import com.wire.kalium.network.api.base.authenticated.AccessTokenApi import com.wire.kalium.network.api.base.authenticated.CallApi import com.wire.kalium.network.api.base.authenticated.TeamsApi +import com.wire.kalium.network.api.base.authenticated.WildCardApi import com.wire.kalium.network.api.base.authenticated.asset.AssetApi import com.wire.kalium.network.api.base.authenticated.client.ClientApi import com.wire.kalium.network.api.base.authenticated.connection.ConnectionApi @@ -61,6 +62,7 @@ import com.wire.kalium.network.api.v2.authenticated.SelfApiV2 import com.wire.kalium.network.api.v2.authenticated.TeamsApiV2 import com.wire.kalium.network.api.v2.authenticated.UserDetailsApiV2 import com.wire.kalium.network.api.v2.authenticated.UserSearchApiV2 +import com.wire.kalium.network.api.v_common.WildCardApiImpl import com.wire.kalium.network.defaultHttpEngine import com.wire.kalium.network.networkContainer.AuthenticatedHttpClientProvider import com.wire.kalium.network.networkContainer.AuthenticatedHttpClientProviderImpl @@ -135,4 +137,6 @@ internal class AuthenticatedNetworkContainerV2 internal constructor( override val mlsPublicKeyApi: MLSPublicKeyApi get() = MLSPublicKeyApiV2() override val propertiesApi: PropertiesApi get() = PropertiesApiV2(networkClient) + + override val wildCardApi: WildCardApi get() = WildCardApiImpl(networkClient) } diff --git a/network/src/commonMain/kotlin/com/wire/kalium/network/api/v3/authenticated/networkContainer/AuthenticatedNetworkContainerV3.kt b/network/src/commonMain/kotlin/com/wire/kalium/network/api/v3/authenticated/networkContainer/AuthenticatedNetworkContainerV3.kt index cc654c55b5e..66ecc508dbe 100644 --- a/network/src/commonMain/kotlin/com/wire/kalium/network/api/v3/authenticated/networkContainer/AuthenticatedNetworkContainerV3.kt +++ b/network/src/commonMain/kotlin/com/wire/kalium/network/api/v3/authenticated/networkContainer/AuthenticatedNetworkContainerV3.kt @@ -22,6 +22,7 @@ import com.wire.kalium.logger.KaliumLogger import com.wire.kalium.network.api.base.authenticated.AccessTokenApi import com.wire.kalium.network.api.base.authenticated.CallApi import com.wire.kalium.network.api.base.authenticated.TeamsApi +import com.wire.kalium.network.api.base.authenticated.WildCardApi import com.wire.kalium.network.api.base.authenticated.asset.AssetApi import com.wire.kalium.network.api.base.authenticated.client.ClientApi import com.wire.kalium.network.api.base.authenticated.connection.ConnectionApi @@ -62,6 +63,7 @@ import com.wire.kalium.network.api.v3.authenticated.SelfApiV3 import com.wire.kalium.network.api.v3.authenticated.TeamsApiV3 import com.wire.kalium.network.api.v3.authenticated.UserDetailsApiV3 import com.wire.kalium.network.api.v3.authenticated.UserSearchApiV3 +import com.wire.kalium.network.api.v_common.WildCardApiImpl import com.wire.kalium.network.defaultHttpEngine import com.wire.kalium.network.networkContainer.AuthenticatedHttpClientProvider import com.wire.kalium.network.networkContainer.AuthenticatedHttpClientProviderImpl @@ -136,4 +138,6 @@ internal class AuthenticatedNetworkContainerV3 internal constructor( override val mlsPublicKeyApi: MLSPublicKeyApi get() = MLSPublicKeyApiV3() override val propertiesApi: PropertiesApi get() = PropertiesApiV3(networkClient) + + override val wildCardApi: WildCardApi get() = WildCardApiImpl(networkClient) } diff --git a/network/src/commonMain/kotlin/com/wire/kalium/network/api/v4/authenticated/networkContainer/AuthenticatedNetworkContainerV4.kt b/network/src/commonMain/kotlin/com/wire/kalium/network/api/v4/authenticated/networkContainer/AuthenticatedNetworkContainerV4.kt index eae3a79271e..54e661dbc8c 100644 --- a/network/src/commonMain/kotlin/com/wire/kalium/network/api/v4/authenticated/networkContainer/AuthenticatedNetworkContainerV4.kt +++ b/network/src/commonMain/kotlin/com/wire/kalium/network/api/v4/authenticated/networkContainer/AuthenticatedNetworkContainerV4.kt @@ -22,6 +22,7 @@ import com.wire.kalium.logger.KaliumLogger import com.wire.kalium.network.api.base.authenticated.AccessTokenApi import com.wire.kalium.network.api.base.authenticated.CallApi import com.wire.kalium.network.api.base.authenticated.TeamsApi +import com.wire.kalium.network.api.base.authenticated.WildCardApi import com.wire.kalium.network.api.base.authenticated.asset.AssetApi import com.wire.kalium.network.api.base.authenticated.client.ClientApi import com.wire.kalium.network.api.base.authenticated.connection.ConnectionApi @@ -61,6 +62,7 @@ import com.wire.kalium.network.api.v4.authenticated.SelfApiV4 import com.wire.kalium.network.api.v4.authenticated.TeamsApiV4 import com.wire.kalium.network.api.v4.authenticated.UserDetailsApiV4 import com.wire.kalium.network.api.v4.authenticated.UserSearchApiV4 +import com.wire.kalium.network.api.v_common.WildCardApiImpl import com.wire.kalium.network.defaultHttpEngine import com.wire.kalium.network.networkContainer.AuthenticatedHttpClientProvider import com.wire.kalium.network.networkContainer.AuthenticatedHttpClientProviderImpl @@ -135,4 +137,6 @@ internal class AuthenticatedNetworkContainerV4 internal constructor( override val mlsPublicKeyApi: MLSPublicKeyApi get() = MLSPublicKeyApiV4() override val propertiesApi: PropertiesApi get() = PropertiesApiV4(networkClient) + + override val wildCardApi: WildCardApi get() = WildCardApiImpl(networkClient) } 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 9c050af90a3..e18d6885825 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 @@ -22,6 +22,7 @@ import com.wire.kalium.logger.KaliumLogger import com.wire.kalium.network.api.base.authenticated.AccessTokenApi import com.wire.kalium.network.api.base.authenticated.CallApi import com.wire.kalium.network.api.base.authenticated.TeamsApi +import com.wire.kalium.network.api.base.authenticated.WildCardApi import com.wire.kalium.network.api.base.authenticated.asset.AssetApi import com.wire.kalium.network.api.base.authenticated.client.ClientApi import com.wire.kalium.network.api.base.authenticated.connection.ConnectionApi @@ -61,6 +62,7 @@ import com.wire.kalium.network.api.v5.authenticated.SelfApiV5 import com.wire.kalium.network.api.v5.authenticated.TeamsApiV5 import com.wire.kalium.network.api.v5.authenticated.UserDetailsApiV5 import com.wire.kalium.network.api.v5.authenticated.UserSearchApiV5 +import com.wire.kalium.network.api.v_common.WildCardApiImpl import com.wire.kalium.network.defaultHttpEngine import com.wire.kalium.network.networkContainer.AuthenticatedHttpClientProvider import com.wire.kalium.network.networkContainer.AuthenticatedHttpClientProviderImpl @@ -135,4 +137,6 @@ internal class AuthenticatedNetworkContainerV5 internal constructor( override val mlsPublicKeyApi: MLSPublicKeyApi get() = MLSPublicKeyApiV5(networkClient) override val propertiesApi: PropertiesApi get() = PropertiesApiV5(networkClient) + + override val wildCardApi: WildCardApi get() = WildCardApiImpl(networkClient) } diff --git a/network/src/commonMain/kotlin/com/wire/kalium/network/api/v6/authenticated/networkContainer/AuthenticatedNetworkContainerV6.kt b/network/src/commonMain/kotlin/com/wire/kalium/network/api/v6/authenticated/networkContainer/AuthenticatedNetworkContainerV6.kt index 98924a1c5a6..2bb0729ffc0 100644 --- a/network/src/commonMain/kotlin/com/wire/kalium/network/api/v6/authenticated/networkContainer/AuthenticatedNetworkContainerV6.kt +++ b/network/src/commonMain/kotlin/com/wire/kalium/network/api/v6/authenticated/networkContainer/AuthenticatedNetworkContainerV6.kt @@ -22,6 +22,7 @@ import com.wire.kalium.logger.KaliumLogger import com.wire.kalium.network.api.base.authenticated.AccessTokenApi import com.wire.kalium.network.api.base.authenticated.CallApi import com.wire.kalium.network.api.base.authenticated.TeamsApi +import com.wire.kalium.network.api.base.authenticated.WildCardApi import com.wire.kalium.network.api.base.authenticated.asset.AssetApi import com.wire.kalium.network.api.base.authenticated.client.ClientApi import com.wire.kalium.network.api.base.authenticated.connection.ConnectionApi @@ -61,6 +62,7 @@ import com.wire.kalium.network.api.v6.authenticated.SelfApiV6 import com.wire.kalium.network.api.v6.authenticated.TeamsApiV6 import com.wire.kalium.network.api.v6.authenticated.UserDetailsApiV6 import com.wire.kalium.network.api.v6.authenticated.UserSearchApiV6 +import com.wire.kalium.network.api.v_common.WildCardApiImpl import com.wire.kalium.network.defaultHttpEngine import com.wire.kalium.network.networkContainer.AuthenticatedHttpClientProvider import com.wire.kalium.network.networkContainer.AuthenticatedHttpClientProviderImpl @@ -135,4 +137,6 @@ internal class AuthenticatedNetworkContainerV6 internal constructor( override val mlsPublicKeyApi: MLSPublicKeyApi get() = MLSPublicKeyApiV6(networkClient) override val propertiesApi: PropertiesApi get() = PropertiesApiV6(networkClient) + + override val wildCardApi: WildCardApi get() = WildCardApiImpl(networkClient) } diff --git a/network/src/commonMain/kotlin/com/wire/kalium/network/api/v_common/WildCardApiImpl.kt b/network/src/commonMain/kotlin/com/wire/kalium/network/api/v_common/WildCardApiImpl.kt new file mode 100644 index 00000000000..4d203656f05 --- /dev/null +++ b/network/src/commonMain/kotlin/com/wire/kalium/network/api/v_common/WildCardApiImpl.kt @@ -0,0 +1,50 @@ +/* + * Wire + * Copyright (C) 2024 Wire Swiss GmbH + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + */ +package com.wire.kalium.network.api.v_common + +import com.wire.kalium.network.AuthenticatedNetworkClient +import com.wire.kalium.network.api.base.authenticated.WildCardApi +import io.ktor.client.request.parameter +import io.ktor.client.request.request +import io.ktor.client.request.setBody +import io.ktor.client.request.url +import io.ktor.http.HttpMethod + +internal class WildCardApiImpl( + private val authenticatedNetworkClient: AuthenticatedNetworkClient +) : WildCardApi { + override suspend fun customRequest( + httpMethod: HttpMethod, + requestPath: List, + body: String?, + queryParam: Map, + customHeader: Map + ) { + authenticatedNetworkClient.httpClient.request { + method = httpMethod + url(requestPath.joinToString("/")) + body?.let { setBody(it) } + queryParam.forEach { (key, value) -> + parameter(key, value) + } + customHeader.forEach { (key, value) -> + headers.append(key, value) + } + } + } +} 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 ebffd8809a5..d46fe227c44 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 @@ -24,6 +24,7 @@ import com.wire.kalium.network.AuthenticatedWebSocketClient import com.wire.kalium.network.api.base.authenticated.AccessTokenApi import com.wire.kalium.network.api.base.authenticated.CallApi import com.wire.kalium.network.api.base.authenticated.TeamsApi +import com.wire.kalium.network.api.base.authenticated.WildCardApi import com.wire.kalium.network.api.base.authenticated.asset.AssetApi import com.wire.kalium.network.api.base.authenticated.client.ClientApi import com.wire.kalium.network.api.base.authenticated.connection.ConnectionApi @@ -106,6 +107,8 @@ interface AuthenticatedNetworkContainer { val propertiesApi: PropertiesApi + val wildCardApi: WildCardApi + companion object { @Suppress("LongParameterList", "LongMethod") From bbe2424ebc6ea8c09929062d76f7b852e9b19ac2 Mon Sep 17 00:00:00 2001 From: Mohamad Jaara Date: Thu, 24 Oct 2024 13:48:49 +0200 Subject: [PATCH 4/5] return response as string --- .../wire/kalium/network/api/base/authenticated/WildCardApi.kt | 3 ++- .../com/wire/kalium/network/api/v_common/WildCardApiImpl.kt | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/network/src/commonMain/kotlin/com/wire/kalium/network/api/base/authenticated/WildCardApi.kt b/network/src/commonMain/kotlin/com/wire/kalium/network/api/base/authenticated/WildCardApi.kt index 9c7bcb20372..8840ab6cfac 100644 --- a/network/src/commonMain/kotlin/com/wire/kalium/network/api/base/authenticated/WildCardApi.kt +++ b/network/src/commonMain/kotlin/com/wire/kalium/network/api/base/authenticated/WildCardApi.kt @@ -17,6 +17,7 @@ */ package com.wire.kalium.network.api.base.authenticated +import com.wire.kalium.network.utils.NetworkResponse import io.ktor.http.HttpMethod interface WildCardApi { @@ -26,5 +27,5 @@ interface WildCardApi { body: String?, queryParam: Map, customHeader: Map - ) + ): NetworkResponse } diff --git a/network/src/commonMain/kotlin/com/wire/kalium/network/api/v_common/WildCardApiImpl.kt b/network/src/commonMain/kotlin/com/wire/kalium/network/api/v_common/WildCardApiImpl.kt index 4d203656f05..3f52c53a57e 100644 --- a/network/src/commonMain/kotlin/com/wire/kalium/network/api/v_common/WildCardApiImpl.kt +++ b/network/src/commonMain/kotlin/com/wire/kalium/network/api/v_common/WildCardApiImpl.kt @@ -19,6 +19,8 @@ package com.wire.kalium.network.api.v_common import com.wire.kalium.network.AuthenticatedNetworkClient import com.wire.kalium.network.api.base.authenticated.WildCardApi +import com.wire.kalium.network.utils.NetworkResponse +import com.wire.kalium.network.utils.wrapKaliumResponse import io.ktor.client.request.parameter import io.ktor.client.request.request import io.ktor.client.request.setBody @@ -34,7 +36,7 @@ internal class WildCardApiImpl( body: String?, queryParam: Map, customHeader: Map - ) { + ): NetworkResponse = wrapKaliumResponse { authenticatedNetworkClient.httpClient.request { method = httpMethod url(requestPath.joinToString("/")) From a7f3a78a474caa58613c028af09ac2f7c5eeea07 Mon Sep 17 00:00:00 2001 From: Mohamad Jaara Date: Thu, 24 Oct 2024 13:56:24 +0200 Subject: [PATCH 5/5] detekt package name --- .../networkContainer/AuthenticatedNetworkContainerV0.kt | 2 +- .../networkContainer/AuthenticatedNetworkContainerV2.kt | 2 +- .../networkContainer/AuthenticatedNetworkContainerV3.kt | 2 +- .../networkContainer/AuthenticatedNetworkContainerV4.kt | 2 +- .../networkContainer/AuthenticatedNetworkContainerV5.kt | 2 +- .../networkContainer/AuthenticatedNetworkContainerV6.kt | 2 +- .../kalium/network/api/{v_common => vcommon}/WildCardApiImpl.kt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) rename network/src/commonMain/kotlin/com/wire/kalium/network/api/{v_common => vcommon}/WildCardApiImpl.kt (97%) diff --git a/network/src/commonMain/kotlin/com/wire/kalium/network/api/v0/authenticated/networkContainer/AuthenticatedNetworkContainerV0.kt b/network/src/commonMain/kotlin/com/wire/kalium/network/api/v0/authenticated/networkContainer/AuthenticatedNetworkContainerV0.kt index b881f0d6403..682e57c52b7 100644 --- a/network/src/commonMain/kotlin/com/wire/kalium/network/api/v0/authenticated/networkContainer/AuthenticatedNetworkContainerV0.kt +++ b/network/src/commonMain/kotlin/com/wire/kalium/network/api/v0/authenticated/networkContainer/AuthenticatedNetworkContainerV0.kt @@ -61,7 +61,7 @@ import com.wire.kalium.network.api.v0.authenticated.SelfApiV0 import com.wire.kalium.network.api.v0.authenticated.TeamsApiV0 import com.wire.kalium.network.api.v0.authenticated.UserDetailsApiV0 import com.wire.kalium.network.api.v0.authenticated.UserSearchApiV0 -import com.wire.kalium.network.api.v_common.WildCardApiImpl +import com.wire.kalium.network.api.vcommon.WildCardApiImpl import com.wire.kalium.network.defaultHttpEngine import com.wire.kalium.network.networkContainer.AuthenticatedHttpClientProvider import com.wire.kalium.network.networkContainer.AuthenticatedHttpClientProviderImpl diff --git a/network/src/commonMain/kotlin/com/wire/kalium/network/api/v2/authenticated/networkContainer/AuthenticatedNetworkContainerV2.kt b/network/src/commonMain/kotlin/com/wire/kalium/network/api/v2/authenticated/networkContainer/AuthenticatedNetworkContainerV2.kt index 17162db0fcb..aafbf72caef 100644 --- a/network/src/commonMain/kotlin/com/wire/kalium/network/api/v2/authenticated/networkContainer/AuthenticatedNetworkContainerV2.kt +++ b/network/src/commonMain/kotlin/com/wire/kalium/network/api/v2/authenticated/networkContainer/AuthenticatedNetworkContainerV2.kt @@ -62,7 +62,7 @@ import com.wire.kalium.network.api.v2.authenticated.SelfApiV2 import com.wire.kalium.network.api.v2.authenticated.TeamsApiV2 import com.wire.kalium.network.api.v2.authenticated.UserDetailsApiV2 import com.wire.kalium.network.api.v2.authenticated.UserSearchApiV2 -import com.wire.kalium.network.api.v_common.WildCardApiImpl +import com.wire.kalium.network.api.vcommon.WildCardApiImpl import com.wire.kalium.network.defaultHttpEngine import com.wire.kalium.network.networkContainer.AuthenticatedHttpClientProvider import com.wire.kalium.network.networkContainer.AuthenticatedHttpClientProviderImpl diff --git a/network/src/commonMain/kotlin/com/wire/kalium/network/api/v3/authenticated/networkContainer/AuthenticatedNetworkContainerV3.kt b/network/src/commonMain/kotlin/com/wire/kalium/network/api/v3/authenticated/networkContainer/AuthenticatedNetworkContainerV3.kt index 66ecc508dbe..9afa50d676f 100644 --- a/network/src/commonMain/kotlin/com/wire/kalium/network/api/v3/authenticated/networkContainer/AuthenticatedNetworkContainerV3.kt +++ b/network/src/commonMain/kotlin/com/wire/kalium/network/api/v3/authenticated/networkContainer/AuthenticatedNetworkContainerV3.kt @@ -63,7 +63,7 @@ import com.wire.kalium.network.api.v3.authenticated.SelfApiV3 import com.wire.kalium.network.api.v3.authenticated.TeamsApiV3 import com.wire.kalium.network.api.v3.authenticated.UserDetailsApiV3 import com.wire.kalium.network.api.v3.authenticated.UserSearchApiV3 -import com.wire.kalium.network.api.v_common.WildCardApiImpl +import com.wire.kalium.network.api.vcommon.WildCardApiImpl import com.wire.kalium.network.defaultHttpEngine import com.wire.kalium.network.networkContainer.AuthenticatedHttpClientProvider import com.wire.kalium.network.networkContainer.AuthenticatedHttpClientProviderImpl diff --git a/network/src/commonMain/kotlin/com/wire/kalium/network/api/v4/authenticated/networkContainer/AuthenticatedNetworkContainerV4.kt b/network/src/commonMain/kotlin/com/wire/kalium/network/api/v4/authenticated/networkContainer/AuthenticatedNetworkContainerV4.kt index 54e661dbc8c..fda8298f30b 100644 --- a/network/src/commonMain/kotlin/com/wire/kalium/network/api/v4/authenticated/networkContainer/AuthenticatedNetworkContainerV4.kt +++ b/network/src/commonMain/kotlin/com/wire/kalium/network/api/v4/authenticated/networkContainer/AuthenticatedNetworkContainerV4.kt @@ -62,7 +62,7 @@ import com.wire.kalium.network.api.v4.authenticated.SelfApiV4 import com.wire.kalium.network.api.v4.authenticated.TeamsApiV4 import com.wire.kalium.network.api.v4.authenticated.UserDetailsApiV4 import com.wire.kalium.network.api.v4.authenticated.UserSearchApiV4 -import com.wire.kalium.network.api.v_common.WildCardApiImpl +import com.wire.kalium.network.api.vcommon.WildCardApiImpl import com.wire.kalium.network.defaultHttpEngine import com.wire.kalium.network.networkContainer.AuthenticatedHttpClientProvider import com.wire.kalium.network.networkContainer.AuthenticatedHttpClientProviderImpl 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 e18d6885825..4bd93b1eb39 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 @@ -62,7 +62,7 @@ import com.wire.kalium.network.api.v5.authenticated.SelfApiV5 import com.wire.kalium.network.api.v5.authenticated.TeamsApiV5 import com.wire.kalium.network.api.v5.authenticated.UserDetailsApiV5 import com.wire.kalium.network.api.v5.authenticated.UserSearchApiV5 -import com.wire.kalium.network.api.v_common.WildCardApiImpl +import com.wire.kalium.network.api.vcommon.WildCardApiImpl import com.wire.kalium.network.defaultHttpEngine import com.wire.kalium.network.networkContainer.AuthenticatedHttpClientProvider import com.wire.kalium.network.networkContainer.AuthenticatedHttpClientProviderImpl diff --git a/network/src/commonMain/kotlin/com/wire/kalium/network/api/v6/authenticated/networkContainer/AuthenticatedNetworkContainerV6.kt b/network/src/commonMain/kotlin/com/wire/kalium/network/api/v6/authenticated/networkContainer/AuthenticatedNetworkContainerV6.kt index 2bb0729ffc0..1499d064c38 100644 --- a/network/src/commonMain/kotlin/com/wire/kalium/network/api/v6/authenticated/networkContainer/AuthenticatedNetworkContainerV6.kt +++ b/network/src/commonMain/kotlin/com/wire/kalium/network/api/v6/authenticated/networkContainer/AuthenticatedNetworkContainerV6.kt @@ -62,7 +62,7 @@ import com.wire.kalium.network.api.v6.authenticated.SelfApiV6 import com.wire.kalium.network.api.v6.authenticated.TeamsApiV6 import com.wire.kalium.network.api.v6.authenticated.UserDetailsApiV6 import com.wire.kalium.network.api.v6.authenticated.UserSearchApiV6 -import com.wire.kalium.network.api.v_common.WildCardApiImpl +import com.wire.kalium.network.api.vcommon.WildCardApiImpl import com.wire.kalium.network.defaultHttpEngine import com.wire.kalium.network.networkContainer.AuthenticatedHttpClientProvider import com.wire.kalium.network.networkContainer.AuthenticatedHttpClientProviderImpl diff --git a/network/src/commonMain/kotlin/com/wire/kalium/network/api/v_common/WildCardApiImpl.kt b/network/src/commonMain/kotlin/com/wire/kalium/network/api/vcommon/WildCardApiImpl.kt similarity index 97% rename from network/src/commonMain/kotlin/com/wire/kalium/network/api/v_common/WildCardApiImpl.kt rename to network/src/commonMain/kotlin/com/wire/kalium/network/api/vcommon/WildCardApiImpl.kt index 3f52c53a57e..1c46937799c 100644 --- a/network/src/commonMain/kotlin/com/wire/kalium/network/api/v_common/WildCardApiImpl.kt +++ b/network/src/commonMain/kotlin/com/wire/kalium/network/api/vcommon/WildCardApiImpl.kt @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see http://www.gnu.org/licenses/. */ -package com.wire.kalium.network.api.v_common +package com.wire.kalium.network.api.vcommon import com.wire.kalium.network.AuthenticatedNetworkClient import com.wire.kalium.network.api.base.authenticated.WildCardApi