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

ios: fix chat not opening when contact connects via 1-time link (#7315)

Browse Source
This commit is contained in:
spaced4ndy
2026-07-27 15:04:45 +00:00
committed by GitHub
parent 45ee868e0b
commit 6152f2a7ee
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/ios/Shared/Model/ChatModel.swift
+9
View File
@@ -1244,6 +1244,15 @@ final class ChatModel: ObservableObject {
chats.insert(chat, at: position)
}
func replaceConnReqView(_ id: String, _ withId: ChatId) {
if id == showingInvitation?.pcc.id {
markShowingInvitationUsed()
dismissAllSheets(animated: true) {
ItemsModel.shared.loadOpenChat(withId)
}
}
}
func dismissConnReqView(_ id: String) {
if id == showingInvitation?.pcc.id {
markShowingInvitationUsed()
apps/ios/Shared/Model/SimpleXAPI.swift
+5 -5
View File
@@ -2439,7 +2439,7 @@ func processReceivedMsg(_ res: ChatEvent) async {
await MainActor.run {
m.updateContact(contact)
if let conn = contact.activeConn {
m.dismissConnReqView(conn.id)
m.replaceConnReqView(conn.id, contact.id)
m.removeChat(conn.id)
}
if contact.id == m.chatId, let conn = contact.activeConn {
@@ -2456,7 +2456,7 @@ func processReceivedMsg(_ res: ChatEvent) async {
await MainActor.run {
m.updateContact(contact)
if let conn = contact.activeConn {
m.dismissConnReqView(conn.id)
m.replaceConnReqView(conn.id, contact.id)
m.removeChat(conn.id)
}
}
@@ -2466,7 +2466,7 @@ func processReceivedMsg(_ res: ChatEvent) async {
await MainActor.run {
m.updateContact(contact)
if let conn = contact.activeConn {
m.dismissConnReqView(conn.id)
m.replaceConnReqView(conn.id, contact.id)
m.removeChat(conn.id)
}
}
@@ -2616,7 +2616,7 @@ func processReceivedMsg(_ res: ChatEvent) async {
await MainActor.run {
m.updateGroup(groupInfo)
if let conn = hostContact?.activeConn {
m.dismissConnReqView(conn.id)
m.replaceConnReqView(conn.id, groupInfo.id)
m.removeChat(conn.id)
}
}
@@ -2626,7 +2626,7 @@ func processReceivedMsg(_ res: ChatEvent) async {
m.updateGroup(groupInfo)
_ = m.upsertGroupMember(groupInfo, hostMember)
if let hostConn = hostMember.activeConn {
m.dismissConnReqView(hostConn.id)
m.replaceConnReqView(hostConn.id, groupInfo.id)
m.removeChat(hostConn.id)
}
}