From 44c88baddea7888fa69724fdee2b2f674da5d8f6 Mon Sep 17 00:00:00 2001 From: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com> Date: Mon, 20 Nov 2023 16:31:52 +0400 Subject: [PATCH] remoteHostId in entities kotlin --- .../chat/simplex/app/views/call/IncomingCallActivity.kt | 1 + .../kotlin/chat/simplex/common/model/SimpleXAPI.kt | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/apps/multiplatform/android/src/main/java/chat/simplex/app/views/call/IncomingCallActivity.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/call/IncomingCallActivity.kt index 104b654c5..f5c46a0eb 100644 --- a/apps/multiplatform/android/src/main/java/chat/simplex/app/views/call/IncomingCallActivity.kt +++ b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/call/IncomingCallActivity.kt @@ -231,6 +231,7 @@ fun PreviewIncomingCallLockScreenAlert() { ) { IncomingCallLockScreenAlertLayout( invitation = RcvCallInvitation( + remoteHostId = null, user = User.sampleData, contact = Contact.sampleData, callType = CallType(media = CallMediaType.Audio, capabilities = CallCapabilities(encryption = false)), diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt index ffb5b4251..33743974c 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt @@ -2531,7 +2531,7 @@ data class UserProtocolServers( @Serializable data class ServerCfg( - val remoteHostId: Long? = null, + val remoteHostId: Long?, val server: String, val preset: Boolean, val tested: Boolean? = null, @@ -2549,7 +2549,7 @@ data class ServerCfg( get() = server.isBlank() companion object { - val empty = ServerCfg(server = "", preset = false, tested = null, enabled = true) + val empty = ServerCfg(remoteHostId = null, server = "", preset = false, tested = null, enabled = true) class SampleData( val preset: ServerCfg, @@ -2559,18 +2559,21 @@ data class ServerCfg( val sampleData = SampleData( preset = ServerCfg( + remoteHostId = null, server = "smp://abcd@smp8.simplex.im", preset = true, tested = true, enabled = true ), custom = ServerCfg( + remoteHostId = null, server = "smp://abcd@smp9.simplex.im", preset = false, tested = false, enabled = false ), untested = ServerCfg( + remoteHostId = null, server = "smp://abcd@smp10.simplex.im", preset = false, tested = null,