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

Fix markAsRead for conversation

Browse source
This commit is contained in:
Benoit Martins 2025-09-01 13:11:03 +02:00
parent 8079921236
commit 7ddc584a2a
2 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Linphone/UI/Main/Conversations/Fragments/ConversationFragment.swift
View file

@ -454,11 +454,11 @@ struct ConversationFragment: View {
.environmentObject(conversationViewModel)
.environmentObject(conversationsListViewModel)
}
/*
.onAppear {
conversationViewModel.getMessages()
}
*/
if conversationViewModel.displayedConversationUnreadMessagesCount > 0 {
conversationViewModel.markAsRead()
}
}
.onDisappear {
conversationViewModel.resetMessage()
}

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

@ -219,23 +219,20 @@ class ConversationsListViewModel: ObservableObject {
SharedMainViewModel.shared.updateUnreadMessagesCount()
}
}, onChatRoomRead: { (_: Core, chatRoom: ChatRoom) in
if let defaultAddress = core.defaultAccount?.contactAddress,
let localAddress = chatRoom.localAddress,
defaultAddress.weakEqual(address2: localAddress) {
let idTmp = LinphoneUtils.getChatRoomId(room: chatRoom)
let model = self.conversationsList.first(where: { $0.id == idTmp }) ?? ConversationModel(chatRoom: chatRoom)
model.getContentTextMessage(chatRoom: chatRoom)
let index = self.conversationsList.firstIndex(where: { $0.id == idTmp })
DispatchQueue.main.async {
if index != nil {
self.conversationsList.remove(at: index!)
self.conversationsList.insert(model, at: index!)
} else {
self.conversationsList.insert(model, at: 0)
}
}
SharedMainViewModel.shared.updateUnreadMessagesCount()
}
print("markAsRead 00 ---- \(chatRoom.subject ?? "No subject")")
print("markAsRead 01 ---- \(core.defaultAccount != nil )")
print("markAsRead 02 ---- \(core.defaultAccount?.contactAddress?.asStringUriOnly() ?? "No default address")")
print("markAsRead 03 ---- \(chatRoom.localAddress?.asStringUriOnly() ?? "No local address")")
let idTmp = LinphoneUtils.getChatRoomId(room: chatRoom)
let model = self.conversationsList.first(where: { $0.id == idTmp }) ?? ConversationModel(chatRoom: chatRoom)
model.getContentTextMessage(chatRoom: chatRoom)
if let index = self.conversationsList.firstIndex(where: { $0.id == idTmp }) {
DispatchQueue.main.async {
self.conversationsList.remove(at: index)
self.conversationsList.insert(model, at: index)
}
}
SharedMainViewModel.shared.updateUnreadMessagesCount()
}, onChatRoomStateChanged: { (core: Core, chatroom: ChatRoom, state: ChatRoom.State) in
// Log.info("[ConversationsListViewModel] Conversation [${LinphoneUtils.getChatRoomId(chatRoom)}] state changed [$state]")
if let defaultAddress = core.defaultAccount?.contactAddress,