mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 11:08:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix getChatRoomId and conference join/leave callbacks

Browse source
This commit is contained in:
Benoit Martins 2025-06-23 11:56:34 +02:00
parent 8731387351
commit 1ecc1232a1
2 changed files with 16 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
Linphone/UI/Main/Conversations/ViewModel/ConversationViewModel.swift
View file

@ -123,50 +123,6 @@ class ConversationViewModel: ObservableObject {
}
}
func addConversationDelegate() {
coreContext.doOnCoreQueue { _ in
if let chatroom = self.sharedMainViewModel.displayedConversation?.chatRoom {
let chatRoomDelegate = ChatRoomDelegateStub( onIsComposingReceived: { (_: ChatRoom, _: Address, _: Bool) in
self.computeComposingLabel()
}, onChatMessagesReceived: { (_: ChatRoom, eventLogs: [EventLog]) in
self.getNewMessages(eventLogs: eventLogs)
}, onChatMessageSending: { (_: ChatRoom, eventLog: EventLog) in
self.getNewMessages(eventLogs: [eventLog])
}, onParticipantAdded: { (_: ChatRoom, eventLogs: EventLog) in
self.getNewMessages(eventLogs: [eventLogs])
self.getParticipantConversationModel()
}, onParticipantRemoved: { (_: ChatRoom, eventLogs: EventLog) in
self.getNewMessages(eventLogs: [eventLogs])
self.getParticipantConversationModel()
}, onParticipantAdminStatusChanged: { (_: ChatRoom, eventLogs: EventLog) in
self.getNewMessages(eventLogs: [eventLogs])
self.getParticipantConversationModel()
}, onSubjectChanged: { (_: ChatRoom, eventLogs: EventLog) in
self.getNewMessages(eventLogs: [eventLogs])
}, onConferenceJoined: {(_: ChatRoom, eventLog: EventLog) in
self.getNewMessages(eventLogs: [eventLog])
if self.sharedMainViewModel.displayedConversation != nil {
DispatchQueue.main.async {
self.sharedMainViewModel.displayedConversation!.isReadOnly = false
}
}
}, onConferenceLeft: {(_: ChatRoom, eventLog: EventLog) in
self.getNewMessages(eventLogs: [eventLog])
if self.sharedMainViewModel.displayedConversation != nil {
DispatchQueue.main.async {
self.sharedMainViewModel.displayedConversation!.isReadOnly = true
}
}
}, onEphemeralEvent: {(_: ChatRoom, eventLogs: EventLog) in
self.getNewMessages(eventLogs: [eventLogs])
}, onEphemeralMessageDeleted: {(_: ChatRoom, eventLog: EventLog) in
self.removeMessage(eventLog)
})
self.chatRoomDelegateHolder = ChatRoomDelegateHolder(chatroom: chatroom, delegate: chatRoomDelegate)
}
}
}
func addConversationDelegate(chatRoom: ChatRoom) {
let chatRoomDelegate = ChatRoomDelegateStub( onIsComposingReceived: { (_: ChatRoom, _: Address, _: Bool) in
self.computeComposingLabel()
@ -189,18 +145,24 @@ class ConversationViewModel: ObservableObject {
self.getParticipantConversationModel()
}, onSubjectChanged: { (_: ChatRoom, eventLog: EventLog) in
self.getEventMessage(eventLog: eventLog)
}, onConferenceJoined: {(_: ChatRoom, eventLog: EventLog) in
self.getEventMessage(eventLog: eventLog)
if self.sharedMainViewModel.displayedConversation != nil {
}, onConferenceJoined: {(chatRoom: ChatRoom, eventLog: EventLog) in
if let displayedConversation = self.sharedMainViewModel.displayedConversation {
if displayedConversation.isGroup {
self.getEventMessage(eventLog: eventLog)
}
let isReadOnly = chatRoom.isReadOnly
DispatchQueue.main.async {
self.sharedMainViewModel.displayedConversation!.isReadOnly = false
displayedConversation.isReadOnly = isReadOnly
}
}
}, onConferenceLeft: {(_: ChatRoom, eventLog: EventLog) in
self.getEventMessage(eventLog: eventLog)
if self.sharedMainViewModel.displayedConversation != nil {
}, onConferenceLeft: {(chatRoom: ChatRoom, eventLog: EventLog) in
if let displayedConversation = self.sharedMainViewModel.displayedConversation {
if displayedConversation.isGroup {
self.getEventMessage(eventLog: eventLog)
}
let isReadOnly = chatRoom.isReadOnly
DispatchQueue.main.async {
self.sharedMainViewModel.displayedConversation!.isReadOnly = true
displayedConversation.isReadOnly = isReadOnly
}
}
}, onEphemeralEvent: {(_: ChatRoom, eventLog: EventLog) in

3
Linphone/Utils/LinphoneUtils.swift
View file

@ -45,7 +45,8 @@ class LinphoneUtils: NSObject {
}
public class func getChatRoomId(room: ChatRoom) -> String {
return getChatRoomId(localAddress: room.localAddress!, remoteAddress: room.peerAddress!)
return room.identifier ?? ""
//return getChatRoomId(localAddress: room.localAddress!, remoteAddress: room.peerAddress!)
}
public class func getChatRoomId(localAddress: Address, remoteAddress: Address) -> String {