IntenseFinance/simplex-chat
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core: add remote host ID to entities

Browse Source
This commit is contained in:
Evgeny Poberezkin 2023-11-20 11:51:40 +00:00
parent 5bbf4d70a1
commit 53a31ec60e
8 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/call/CallView.android.kt
View File

@ -579,6 +579,7 @@ fun PreviewActiveCallOverlayVideo() {
SimpleXTheme {
ActiveCallOverlayLayout(
call = Call(
remoteHostId = null,
contact = Contact.sampleData,
callState = CallState.Negotiated,
localMedia = CallMediaType.Video,
@ -604,6 +605,7 @@ fun PreviewActiveCallOverlayAudio() {
SimpleXTheme {
ActiveCallOverlayLayout(
call = Call(
remoteHostId = null,
contact = Contact.sampleData,
callState = CallState.Negotiated,
localMedia = CallMediaType.Audio,

8
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt
View File

@ -616,7 +616,7 @@ enum class ChatType(val type: String) {
@Serializable
data class User(
val remoteHostId: Long? = null,
val remoteHostId: Long?,
override val userId: Long,
val userContactId: Long,
val localDisplayName: String,
@ -639,6 +639,7 @@ data class User(
companion object {
val sampleData = User(
remoteHostId = null,
userId = 1,
userContactId = 1,
localDisplayName = "alice",
@ -715,8 +716,8 @@ interface SomeChat {
}
@Serializable @Stable
data class Chat (
val remoteHostId: Long? = null,
data class Chat(
val remoteHostId: Long?,
val chatInfo: ChatInfo,
val chatItems: List<ChatItem>,
val chatStats: ChatStats = ChatStats()
@ -749,6 +750,7 @@ data class Chat (
companion object {
val sampleData = Chat(
remoteHostId = null,
chatInfo = ChatInfo.Direct.sampleData,
chatItems = arrayListOf(ChatItem.getSampleData())
)

1
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/call/IncomingCallAlertView.kt
View File

@ -106,6 +106,7 @@ fun PreviewIncomingCallAlertLayout() {
SimpleXTheme {
IncomingCallAlertLayout(
invitation = RcvCallInvitation(
remoteHostId = null,
user = User.sampleData,
contact = Contact.sampleData,
callType = CallType(media = CallMediaType.Audio, capabilities = CallCapabilities(encryption = false)),

4
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/call/WebRTC.kt
View File

@ -11,7 +11,7 @@ import java.util.*
import kotlin.collections.ArrayList
data class Call(
val remoteHostId: Long? = null,
val remoteHostId: Long?,
val contact: Contact,
val callState: CallState,
val localMedia: CallMediaType,
@ -97,7 +97,7 @@ sealed class WCallResponse {
@Serializable data class WebRTCExtraInfo(val rtcIceCandidates: String)
@Serializable data class CallType(val media: CallMediaType, val capabilities: CallCapabilities)
@Serializable data class RcvCallInvitation(
val remoteHostId: Long? = null,
val remoteHostId: Long?,
val user: User,
val contact: Contact,
val callType: CallType,

1
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatInfoView.kt
View File

@ -718,6 +718,7 @@ fun PreviewChatInfoLayout() {
SimpleXTheme {
ChatInfoLayout(
chat = Chat(
remoteHostId = null,
chatInfo = ChatInfo.Direct.sampleData,
chatItems = arrayListOf()
),

2
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
View File

@ -1418,6 +1418,7 @@ fun PreviewChatLayout() {
val searchValue = remember { mutableStateOf("") }
ChatLayout(
chat = Chat(
remoteHostId = null,
chatInfo = ChatInfo.Direct.sampleData,
chatItems = chatItems,
chatStats = Chat.ChatStats()
@ -1490,6 +1491,7 @@ fun PreviewGroupChatLayout() {
val searchValue = remember { mutableStateOf("") }
ChatLayout(
chat = Chat(
remoteHostId = null,
chatInfo = ChatInfo.Group.sampleData,
chatItems = chatItems,
chatStats = Chat.ChatStats()

1
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupChatInfoView.kt
View File

@ -524,6 +524,7 @@ fun PreviewGroupChatInfoLayout() {
SimpleXTheme {
GroupChatInfoLayout(
chat = Chat(
remoteHostId = null,
chatInfo = ChatInfo.Direct.sampleData,
chatItems = arrayListOf()
),

2
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatListNavLinkView.kt
View File

@ -772,6 +772,7 @@ fun PreviewChatListNavLinkDirect() {
chatLinkPreview = {
ChatPreviewView(
chat = Chat(
remoteHostId = null,
chatInfo = ChatInfo.Direct.sampleData,
chatItems = listOf(
ChatItem.getSampleData(
@ -815,6 +816,7 @@ fun PreviewChatListNavLinkGroup() {
chatLinkPreview = {
ChatPreviewView(
Chat(
remoteHostId = null,
chatInfo = ChatInfo.Group.sampleData,
chatItems = listOf(
ChatItem.getSampleData(