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

Check core state before using an asynchronous function

Browse source 
Fix markAsRead crash
This commit is contained in:
Benoit Martins 2024-05-30 11:50:59 +02:00
parent 7dca3300e1
commit 00a7f305a5
4 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Linphone/Contacts/ContactsManager.swift
View file

@ -145,8 +145,7 @@ final class ContactsManager: ObservableObject {
MagicSearchSingleton.shared.searchForContacts(sourceFlags: MagicSearch.Source.Friends.rawValue | MagicSearch.Source.LdapServers.rawValue)
self.friendListSuscription = nil
}
MagicSearchSingleton.shared.searchForContacts(sourceFlags: MagicSearch.Source.Friends.rawValue | MagicSearch.Source.LdapServers.rawValue)
}
}

4
Linphone/Core/CoreContext.swift
View file

@ -64,7 +64,9 @@ final class CoreContext: ObservableObject {
}
} else {
coreQueue.async {
lambda(self.mCore)
if self.mCore.globalState != .Off {
lambda(self.mCore)
}
}
}
}

10
Linphone/UI/Main/Conversations/Model/ConversationModel.swift
View file

@ -109,11 +109,15 @@ class ConversationModel: ObservableObject {
func markAsRead() {
coreContext.doOnCoreQueue { _ in
self.chatRoom.markAsRead()
let unreadMessagesCountTmp = self.chatRoom.unreadMessagesCount
if unreadMessagesCountTmp > 0 {
self.chatRoom.markAsRead()
}
DispatchQueue.main.async {
self.unreadMessagesCount = unreadMessagesCountTmp
if self.unreadMessagesCount != unreadMessagesCountTmp {
self.unreadMessagesCount = unreadMessagesCountTmp
}
}
}
}

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

@ -85,10 +85,15 @@ class ConversationViewModel: ObservableObject {
func markAsRead() {
coreContext.doOnCoreQueue { _ in
self.displayedConversation!.chatRoom.markAsRead()
let unreadMessagesCount = self.displayedConversation!.chatRoom.unreadMessagesCount
if unreadMessagesCount > 0 {
self.displayedConversation!.chatRoom.markAsRead()
}
DispatchQueue.main.async {
self.displayedConversationUnreadMessagesCount = unreadMessagesCount
if self.displayedConversationUnreadMessagesCount != unreadMessagesCount {
self.displayedConversationUnreadMessagesCount = unreadMessagesCount
}
}
}
}