witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

Replace chatRoomSuscriptions with delegates in ConversationViewModel

Browse source
This commit is contained in:
QuentinArguillere 2024-09-27 10:37:45 +02:00
parent 035f74f59e
commit 6034d41a10
1 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -36,7 +36,7 @@ class ConversationViewModel: ObservableObject {
@Published var messageText: String = ""
private var chatRoomSuscriptions = Set<AnyCancellable?>()
private var chatRoomDelegate: ChatRoomDelegate?
private var chatMessageSuscriptions = Set<AnyCancellable?>()
@Published var conversationMessagesSection: [MessagesSection] = []
@ -77,13 +77,12 @@ class ConversationViewModel: ObservableObject {
func addConversationDelegate() {
coreContext.doOnCoreQueue { _ in
if self.displayedConversation != nil {
self.chatRoomSuscriptions.insert(self.displayedConversation?.chatRoom.publisher?.onChatMessageSending?.postOnCoreQueue { (cbValue: (chatRoom: ChatRoom, eventLog: EventLog)) in
self.getNewMessages(eventLogs: [cbValue.eventLog])
})
self.chatRoomSuscriptions.insert(self.displayedConversation?.chatRoom.publisher?.onChatMessagesReceived?.postOnCoreQueue { (cbValue: (chatRoom: ChatRoom, eventLogs: [EventLog])) in
self.getNewMessages(eventLogs: cbValue.eventLogs)
self.chatRoomDelegate = ChatRoomDelegateStub(onChatMessagesReceived: { (_: ChatRoom, eventLogs: [EventLog]) in
self.getNewMessages(eventLogs: eventLogs)
}, onChatMessageSending: { (_: ChatRoom, eventLog: EventLog) in
self.getNewMessages(eventLogs: [eventLog])
})
self.displayedConversation?.chatRoom.addDelegate(delegate: self.chatRoomDelegate!)
}
}
}
@ -181,7 +180,10 @@ class ConversationViewModel: ObservableObject {
}
func removeConversationDelegate() {
self.chatRoomSuscriptions.removeAll()
if let crDelegate = self.chatRoomDelegate {
self.displayedConversation?.chatRoom.removeDelegate(delegate: crDelegate)
}
self.chatRoomDelegate = nil
self.chatMessageSuscriptions.removeAll()
}
@ -1341,19 +1343,16 @@ class ConversationViewModel: ObservableObject {
func resetDisplayedChatRoom(conversationsList: [ConversationModel]) {
removeConversationDelegate()
if self.displayedConversation != nil {
conversationsList.forEach { conversation in
if conversation.id == self.displayedConversation!.id {
self.displayedConversation = conversation
self.chatRoomSuscriptions.insert(conversation.chatRoom.publisher?.onChatMessageSending?.postOnCoreQueue { (cbValue: (chatRoom: ChatRoom, eventLog: EventLog)) in
self.getNewMessages(eventLogs: [cbValue.eventLog])
})
self.chatRoomSuscriptions.insert(conversation.chatRoom.publisher?.onChatMessagesReceived?.postOnCoreQueue { (cbValue: (chatRoom: ChatRoom, eventLogs: [EventLog])) in
self.getNewMessages(eventLogs: cbValue.eventLogs)
self.chatRoomDelegate = ChatRoomDelegateStub(onChatMessagesReceived: { (_: ChatRoom, eventLogs: [EventLog]) in
self.getNewMessages(eventLogs: eventLogs)
}, onChatMessageSending: { (_: ChatRoom, eventLog: EventLog) in
self.getNewMessages(eventLogs: [eventLog])
})
self.displayedConversation?.chatRoom.addDelegate(delegate: self.chatRoomDelegate!)
}
}
}