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

Display name in missed call when group call

Browse source
This commit is contained in:
Christophe Deschamps 2022-06-16 17:25:55 +02:00
parent b2a3077198
commit e7f3e840ce
1 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
Classes/Swift/CallManager.swift
View file

@ -519,6 +519,20 @@ import AVFoundation
let remoteAddress = call.remoteAddress?.asStringUriOnly()
return remoteAddress?.contains("focus") == true || remoteAddress?.contains("audiovideo") == true
}
func incomingDisplayName(call:Call) -> String {
let isConference = isConferenceCall(call: call)
let isEarlyConference = isConference && CallsViewModel.shared.currentCallData.value??.isConferenceCall.value != true // Conference info not be received yet.
if (isConference) {
if (isEarlyConference) {
return VoipTexts.conference_incoming_title
} else {
return "\(VoipTexts.conference_incoming_title): \(CallsViewModel.shared.currentCallData.value??.remoteConferenceSubject.value ?? "") (\(CallsViewModel.shared.currentCallData.value??.conferenceParticipantsCountLabel.value ?? ""))"
}
} else {
return FastAddressBook.displayName(for: call.remoteAddress?.getCobject) ?? "Unknown"
}
}
func onCallStateChanged(core: Core, call: Call, state cstate: Call.State, message: String) {
let callLog = call.callLog
@ -542,20 +556,11 @@ import AVFoundation
switch cstate {
case .IncomingReceived:
let addr = call.remoteAddress
var displayName = ""
let isConference = isConferenceCall(call: call)
let isEarlyConference = isConference && CallsViewModel.shared.currentCallData.value??.isConferenceCall.value != true // Conference info not be received yet.
if (isConference) {
if (isEarlyConference) {
displayName = VoipTexts.conference_incoming_title
} else {
displayName = "\(VoipTexts.conference_incoming_title): \(CallsViewModel.shared.currentCallData.value??.remoteConferenceSubject.value ?? "") (\(CallsViewModel.shared.currentCallData.value??.conferenceParticipantsCountLabel.value ?? ""))"
}
} else {
displayName = FastAddressBook.displayName(for: addr?.getCobject) ?? "Unknown"
}
var displayName = incomingDisplayName(call: call)
if (CallManager.callKitEnabled()) {
let isConference = isConferenceCall(call: call)
let isEarlyConference = isConference && CallsViewModel.shared.currentCallData.value??.isConferenceCall.value != true // Conference info not be received yet.
if (isEarlyConference) {
CallsViewModel.shared.currentCallData.readCurrentAndObserve { _ in
let uuid = CallManager.instance().providerDelegate.uuids["\(callId!)"]
@ -627,7 +632,9 @@ import AVFoundation
case .End,
.Error:
var displayName = "Unknown"
if let addr = call.remoteAddress, let contactName = FastAddressBook.displayName(for: addr.getCobject) {
if (call.dir == .Incoming) {
displayName = incomingDisplayName(call: call)
} else if let addr = call.remoteAddress, let contactName = FastAddressBook.displayName(for: addr.getCobject) {
displayName = contactName
}