mirror of
https://gitlab.linphone.org/BC/public/linphone-iphone.git
synced 2026-01-17 02:58:07 +00:00
Display message when a ChatMessage is queued
This commit is contained in:
parent
4cd63b53b2
commit
84ec09173c
2 changed files with 15 additions and 3 deletions
|
|
@ -2,6 +2,6 @@ import Foundation
|
|||
|
||||
public enum AppGitInfo {
|
||||
public static let branch = "master"
|
||||
public static let commit = "d4b10d38a"
|
||||
public static let commit = "4cd63b53b"
|
||||
public static let tag = "6.1.0-alpha"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -366,6 +366,13 @@ class ConversationViewModel: ObservableObject {
|
|||
|
||||
self.coreContext.doOnCoreQueue { _ in
|
||||
let chatMessageDelegate = ChatMessageDelegateStub(onMsgStateChanged: { (message: ChatMessage, msgState: ChatMessage.State) in
|
||||
if msgState == .Queued || msgState == .PendingDelivery {
|
||||
if let eventLog = message.eventLog {
|
||||
self.getNewMessages(eventLogs: [eventLog])
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
var statusTmp: Message.Status?
|
||||
switch message.state {
|
||||
case .InProgress:
|
||||
|
|
@ -537,6 +544,8 @@ class ConversationViewModel: ObservableObject {
|
|||
}
|
||||
})
|
||||
|
||||
self.chatMessageDelegateHolders.removeAll()
|
||||
|
||||
self.chatMessageDelegateHolders.append(ChatMessageDelegateHolder(message: message, delegate: chatMessageDelegate))
|
||||
}
|
||||
}
|
||||
|
|
@ -2181,9 +2190,12 @@ class ConversationViewModel: ObservableObject {
|
|||
}
|
||||
}
|
||||
|
||||
if message != nil && !message!.contents.isEmpty {
|
||||
if let message = message , !message.contents.isEmpty {
|
||||
Log.info("[ConversationViewModel] Sending message")
|
||||
message!.send()
|
||||
|
||||
self.addChatMessageDelegate(message: message)
|
||||
message.send()
|
||||
|
||||
self.sharedMainViewModel.displayedConversation!.chatRoom.stopComposing()
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue