diff --git a/network/src/commonMain/kotlin/com/wire/kalium/network/api/base/authenticated/client/ClientDTO.kt b/network/src/commonMain/kotlin/com/wire/kalium/network/api/base/authenticated/client/ClientDTO.kt index afafd3b9884..9b653492c94 100644 --- a/network/src/commonMain/kotlin/com/wire/kalium/network/api/base/authenticated/client/ClientDTO.kt +++ b/network/src/commonMain/kotlin/com/wire/kalium/network/api/base/authenticated/client/ClientDTO.kt @@ -18,7 +18,6 @@ package com.wire.kalium.network.api.base.authenticated.client -import com.wire.kalium.network.api.base.model.LocationResponse import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @@ -27,7 +26,6 @@ data class ClientDTO( @SerialName("cookie") val cookie: String?, @SerialName("time") val registrationTime: String, // yyyy-mm-ddThh:MM:ss.qqq @SerialName("last_active") val lastActive: String?, // yyyy-mm-ddThh:MM:ss.qqq - @SerialName("location") val location: LocationResponse?, @SerialName("model") val model: String?, @SerialName("id") val clientId: String, @SerialName("type") val type: ClientTypeDTO, diff --git a/network/src/commonMain/kotlin/com/wire/kalium/network/api/base/model/LocationResponse.kt b/network/src/commonMain/kotlin/com/wire/kalium/network/api/base/model/LocationResponse.kt deleted file mode 100644 index 053f62e481f..00000000000 --- a/network/src/commonMain/kotlin/com/wire/kalium/network/api/base/model/LocationResponse.kt +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Wire - * Copyright (C) 2023 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.model - -import kotlinx.serialization.SerialName -import kotlinx.serialization.Serializable - -@Serializable -data class LocationResponse( - @SerialName("lat") val latitude: String, - @SerialName("lon") val longitude: String -) diff --git a/network/src/commonTest/kotlin/com/wire/kalium/model/ClientResponseJson.kt b/network/src/commonTest/kotlin/com/wire/kalium/model/ClientResponseJson.kt index adacc673abb..5f2559ac105 100644 --- a/network/src/commonTest/kotlin/com/wire/kalium/model/ClientResponseJson.kt +++ b/network/src/commonTest/kotlin/com/wire/kalium/model/ClientResponseJson.kt @@ -24,7 +24,6 @@ import com.wire.kalium.network.api.base.authenticated.client.ClientCapabilityDTO import com.wire.kalium.network.api.base.authenticated.client.ClientDTO import com.wire.kalium.network.api.base.authenticated.client.ClientTypeDTO import com.wire.kalium.network.api.base.authenticated.client.DeviceTypeDTO -import com.wire.kalium.network.api.base.model.LocationResponse object ClientResponseJson { private val jsonProvider = { serializable: ClientDTO -> @@ -37,10 +36,6 @@ object ClientResponseJson { | "class": "${serializable.deviceType}", | "label": "${serializable.label}", | "cookie": "${serializable.cookie}", - | "location": { - | "lat": ${serializable.location!!.latitude}, - | "lon": ${serializable.location!!.longitude} - | }, | "model": "${serializable.model}", | "capabilities": { | "capabilities": [ @@ -58,7 +53,6 @@ object ClientResponseJson { deviceType = DeviceTypeDTO.Phone, registrationTime = "2021-05-12T10:52:02.671Z", lastActive = "2021-05-12T10:52:02.671Z", - location = LocationResponse(latitude = "1.2345", longitude = "6.7890"), label = "label", cookie = "sldkfmdeklmwldwlek23kl44mntiuepfojfndkjd", capabilities = Capabilities(listOf(ClientCapabilityDTO.LegalHoldImplicitConsent)), diff --git a/network/src/commonTest/kotlin/com/wire/kalium/model/NotificationEventsResponseJson.kt b/network/src/commonTest/kotlin/com/wire/kalium/model/NotificationEventsResponseJson.kt index 5dad94b0bc9..7c07e773cb8 100644 --- a/network/src/commonTest/kotlin/com/wire/kalium/model/NotificationEventsResponseJson.kt +++ b/network/src/commonTest/kotlin/com/wire/kalium/model/NotificationEventsResponseJson.kt @@ -23,7 +23,6 @@ import com.wire.kalium.model.conversation.ConversationResponseJson import com.wire.kalium.network.api.base.authenticated.client.ClientDTO import com.wire.kalium.network.api.base.authenticated.client.ClientTypeDTO import com.wire.kalium.network.api.base.authenticated.client.DeviceTypeDTO -import com.wire.kalium.network.api.base.authenticated.conversation.ConvProtocol import com.wire.kalium.network.api.base.authenticated.featureConfigs.AppLockConfigDTO import com.wire.kalium.network.api.base.authenticated.featureConfigs.ClassifiedDomainsConfigDTO import com.wire.kalium.network.api.base.authenticated.featureConfigs.FeatureConfigData @@ -38,7 +37,6 @@ import com.wire.kalium.network.api.base.authenticated.notification.EventContentD import com.wire.kalium.network.api.base.authenticated.notification.EventResponse import com.wire.kalium.network.api.base.authenticated.notification.NotificationResponse import com.wire.kalium.network.api.base.model.ConversationId -import com.wire.kalium.network.api.base.model.LocationResponse import com.wire.kalium.network.api.base.model.QualifiedID import com.wire.kalium.network.api.base.model.SupportedProtocolDTO import kotlinx.serialization.InternalSerializationApi @@ -73,7 +71,6 @@ object NotificationEventsResponseJson { ClientDTO( cookie = null, clientId = "id", - location = LocationResponse("23.2", "43.2"), registrationTime = "2022-02-15T12:54:30Z", lastActive = "2022-02-15T12:54:30Z", model = "Firefox (Temporary)", diff --git a/tango-tests/src/integrationTest/kotlin/util/ClientResponseJson.kt b/tango-tests/src/integrationTest/kotlin/util/ClientResponseJson.kt index fceb88bcb55..3c53528e5b6 100644 --- a/tango-tests/src/integrationTest/kotlin/util/ClientResponseJson.kt +++ b/tango-tests/src/integrationTest/kotlin/util/ClientResponseJson.kt @@ -23,7 +23,6 @@ import com.wire.kalium.network.api.base.authenticated.client.ClientCapabilityDTO import com.wire.kalium.network.api.base.authenticated.client.ClientDTO import com.wire.kalium.network.api.base.authenticated.client.ClientTypeDTO import com.wire.kalium.network.api.base.authenticated.client.DeviceTypeDTO -import com.wire.kalium.network.api.base.model.LocationResponse object ClientResponseJson { private val jsonProvider = { serializable: ClientDTO -> @@ -36,10 +35,6 @@ object ClientResponseJson { | "class": "${serializable.deviceType}", | "label": "${serializable.label}", | "cookie": "${serializable.cookie}", - | "location": { - | "lat": ${serializable.location!!.latitude}, - | "lon": ${serializable.location!!.longitude} - | }, | "model": "${serializable.model}", | "capabilities": { | "capabilities": [ @@ -57,7 +52,6 @@ object ClientResponseJson { deviceType = DeviceTypeDTO.Phone, registrationTime = "2023-05-12T10:52:02.671Z", lastActive = "2023-05-12T10:52:02.671Z", - location = LocationResponse(latitude = "1.2345", longitude = "6.7890"), label = "label", cookie = "sldkfmdeklmwldwlek23kl44mntiuepfojfndkjd", capabilities = Capabilities(listOf(ClientCapabilityDTO.LegalHoldImplicitConsent)), diff --git a/tango-tests/src/integrationTest/kotlin/util/ListOfClientsResponseJson.kt b/tango-tests/src/integrationTest/kotlin/util/ListOfClientsResponseJson.kt index 1995cd90eda..9f2e0f574be 100644 --- a/tango-tests/src/integrationTest/kotlin/util/ListOfClientsResponseJson.kt +++ b/tango-tests/src/integrationTest/kotlin/util/ListOfClientsResponseJson.kt @@ -23,7 +23,6 @@ import com.wire.kalium.network.api.base.authenticated.client.ClientCapabilityDTO import com.wire.kalium.network.api.base.authenticated.client.ClientDTO import com.wire.kalium.network.api.base.authenticated.client.ClientTypeDTO import com.wire.kalium.network.api.base.authenticated.client.DeviceTypeDTO -import com.wire.kalium.network.api.base.model.LocationResponse object ListOfClientsResponseJson { private val jsonProvider = { serializable: ClientDTO -> @@ -36,10 +35,6 @@ object ListOfClientsResponseJson { | "class": "${serializable.deviceType}", | "label": "${serializable.label}", | "cookie": "${serializable.cookie}", - | "location": { - | "lat": ${serializable.location!!.latitude}, - | "lon": ${serializable.location!!.longitude} - | }, | "model": "${serializable.model}", | "capabilities": { | "capabilities": [ @@ -57,7 +52,6 @@ object ListOfClientsResponseJson { deviceType = DeviceTypeDTO.Phone, registrationTime = "2023-05-12T10:52:02.671Z", lastActive = "2023-05-12T10:52:02.671Z", - location = LocationResponse(latitude = "1.2345", longitude = "6.7890"), label = "label", cookie = "sldkfmdeklmwldwlek23kl44mntiuepfojfndkjd", capabilities = Capabilities(listOf(ClientCapabilityDTO.LegalHoldImplicitConsent)),