dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-07-28 14:19:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

desktop: fix opening contact request leaving previous open chat in connecting state (#7302)

Browse Source
This commit is contained in:
spaced4ndy
2026-07-25 14:47:31 +01:00
committed by GitHub
parent cdef9f51e6
commit c7e83d88ae
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
+14 -10
View File
@@ -181,19 +181,23 @@ fun ChatView(
availableContent.value = ContentFilter.initialList
selectedChatItems.value = null
selectionManager?.clearSelection()
val cInfo = activeChat.value?.chatInfo
// The outer chat/chatInfo/chatRh are captured once by LaunchedEffect(Unit) and go stale on desktop, where
// ChatView is reused across chat switches; read the opened chat fresh to avoid regressing the previous one.
val openedChat = chatModel.getChat(chatId)
val cInfo = openedChat?.chatInfo
val openedChatRh = openedChat?.remoteHostId
if (chatsCtx.secondaryContextFilter == null && (cInfo is ChatInfo.Direct || cInfo is ChatInfo.Group || cInfo is ChatInfo.Local)) {
updateAvailableContent(chatRh, activeChat, availableContent)
updateAvailableContent(openedChatRh, activeChat, availableContent)
}
if (chat.chatInfo is ChatInfo.Direct && chat.chatInfo.contact.activeConn != null) {
if (cInfo is ChatInfo.Direct && cInfo.contact.activeConn != null) {
withBGApi {
val r = chatModel.controller.apiContactInfo(chatRh, chatInfo.apiId)
val r = chatModel.controller.apiContactInfo(openedChatRh, cInfo.apiId)
if (r != null) {
val contactStats = r.first
if (contactStats != null)
withContext(Dispatchers.Main) {
chatModel.chatsContext.updateContactConnectionStats(chatRh, chat.chatInfo.contact, contactStats)
chatModel.chatAgentConnId.value = chat.chatInfo.contact.activeConn.agentConnId
chatModel.chatsContext.updateContactConnectionStats(openedChatRh, cInfo.contact, contactStats)
chatModel.chatAgentConnId.value = cInfo.contact.activeConn.agentConnId
chatModel.chatSubStatus.value = contactStats.subStatus
}
}
@@ -206,17 +210,17 @@ fun ChatView(
}
if (cInfo is ChatInfo.Group && cInfo.groupInfo.useRelays) {
withBGApi {
setGroupMembers(chatRh, cInfo.groupInfo, chatModel)
setGroupMembers(openedChatRh, cInfo.groupInfo, chatModel)
if (cInfo.groupInfo.membership.memberRole == GroupMemberRole.Owner) {
val relays = chatModel.controller.apiGetGroupRelays(chatRh, cInfo.groupInfo.groupId)
val relays = chatModel.controller.apiGetGroupRelays(openedChatRh, cInfo.groupInfo.groupId)
withContext(Dispatchers.Main) {
ChannelRelaysModel.set(cInfo.groupInfo.groupId, relays)
}
} else if (cInfo.groupInfo.membership.memberCurrent) {
val gInfo = chatModel.controller.apiGetUpdatedGroupLinkData(chatRh, cInfo.groupInfo.groupId)
val gInfo = chatModel.controller.apiGetUpdatedGroupLinkData(openedChatRh, cInfo.groupInfo.groupId)
if (gInfo != null) {
withContext(Dispatchers.Main) {
chatModel.chatsContext.updateGroup(chatRh, gInfo)
chatModel.chatsContext.updateGroup(openedChatRh, gInfo)
}
}
}