mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-22 13:48:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

clear hash maps

Browse source
This commit is contained in:
Danmei Chen 2020-02-20 16:51:51 +01:00
parent 3d96726934
commit d159b4cbf1
2 changed files with 60 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
Classes/CallManager.swift
View file

@ -188,9 +188,10 @@ enum NetworkType: Int {
func displayIncomingCall(call:Call?, handle: String, hasVideo: Bool, callId: String) {
let uuid = UUID()
let callInfo = CallInfo.newIncomingCallInfo(callId: callId)
providerDelegate.callInfos.updateValue(callInfo, forKey: uuid)
providerDelegate.uuids.updateValue(uuid, forKey: callId)
providerDelegate.calls.updateValue(callId, forKey: uuid)
providerDelegate.connecteds.updateValue(false, forKey: uuid)
providerDelegate.reportIncomingCall(call:call, uuid: uuid, handle: handle, hasVideo: hasVideo)
}
@ -242,10 +243,10 @@ enum NetworkType: Int {
let startCallAction = CXStartCallAction(call: uuid, handle: handle)
let transaction = CXTransaction(action: startCallAction)
providerDelegate.addrs.updateValue(sAddr, forKey: uuid)
providerDelegate.outgoingUuids.updateValue(uuid, forKey: sAddr.asStringUriOnly())
providerDelegate.isSas.updateValue(isSas, forKey: uuid)
let callInfo = CallInfo.newOutgoingCallInfo(addr: sAddr, isSas: isSas)
providerDelegate.callInfos.updateValue(callInfo, forKey: uuid)
providerDelegate.uuids.updateValue(uuid, forKey: "")
requestTransaction(transaction, action: "startCall")
}else {
try? doCall(addr: sAddr, isSas: isSas)
@ -455,7 +456,8 @@ class CoreManager: CoreDelegate {
if (uuid != nil) {
// Tha app is now registered, updated the call already existed.
CallManager.instance().providerDelegate.updateCall(uuid: uuid!, handle: address, hasVideo: video)
let connected = CallManager.instance().providerDelegate.connecteds[uuid!] ?? false
let callInfo = CallManager.instance().providerDelegate.callInfos[uuid!]
let connected = callInfo?.connected ?? false
if (connected) {
// The call is already answered.
CallManager.instance().acceptCall(call: call, hasVideo: video)
@ -478,12 +480,13 @@ class CoreManager: CoreDelegate {
break
case .StreamsRunning:
if (CallManager.callKitEnabled()) {
let uuid = CallManager.instance().providerDelegate.outgoingUuids["\(addr!.asStringUriOnly())"]
let uuid = CallManager.instance().providerDelegate.uuids["\(callId!)"]
if (uuid != nil) {
CallManager.instance().providerDelegate.uuids.updateValue(uuid!, forKey: callId!)
CallManager.instance().providerDelegate.calls.updateValue(callId!, forKey: uuid!)
Log.directLog(BCTBX_LOG_MESSAGE, text: "CallKit: outgoing call connected with uuid \(uuid!) and callId \(callId!)")
CallManager.instance().providerDelegate.reportOutgoingCallConnected(uuid: uuid!)
let callInfo = CallManager.instance().providerDelegate.callInfos[uuid!]
if (callInfo?.isOutgoing ?? false) {
Log.directLog(BCTBX_LOG_MESSAGE, text: "CallKit: outgoing call connected with uuid \(uuid!) and callId \(callId!)")
CallManager.instance().providerDelegate.reportOutgoingCallConnected(uuid: uuid!)
}
}
}
@ -495,8 +498,14 @@ class CoreManager: CoreDelegate {
break
case .OutgoingRinging:
if (CallManager.callKitEnabled()) {
let uuid = CallManager.instance().providerDelegate.outgoingUuids["\(addr!.asStringUriOnly())"]
let uuid = CallManager.instance().providerDelegate.uuids[""]
if (uuid != nil) {
let callInfo = CallManager.instance().providerDelegate.callInfos[uuid!]
callInfo!.callId = callId!
CallManager.instance().providerDelegate.callInfos.updateValue(callInfo!, forKey: uuid!)
CallManager.instance().providerDelegate.uuids.removeValue(forKey: "")
CallManager.instance().providerDelegate.uuids.updateValue(uuid!, forKey: callId!)
Log.directLog(BCTBX_LOG_MESSAGE, text: "CallKit: outgoing call started connecting with uuid \(uuid!) and callId \(callId!)")
CallManager.instance().providerDelegate.reportOutgoingCallStartedConnecting(uuid: uuid!)
}

63
Classes/ProviderDelegate.swift
View file

@ -24,17 +24,34 @@ import linphonesw
import AVFoundation
import os
class CallInfo: NSObject {
var callId: String = ""
var connected = false
var toAddr: Address?
var isOutgoing = false
var sasEnabled = false
static func newIncomingCallInfo(callId: String) -> CallInfo {
let callInfo = CallInfo()
callInfo.callId = callId
return callInfo
}
static func newOutgoingCallInfo(addr: Address, isSas: Bool) -> CallInfo {
let callInfo = CallInfo()
callInfo.isOutgoing = true
callInfo.sasEnabled = isSas
callInfo.toAddr = addr
return callInfo
}
}
class ProviderDelegate: NSObject {
private let provider: CXProvider
private let callController: CXCallController
var uuids: [String : UUID] = [:]
var calls: [UUID : String] = [:]
var connecteds: [UUID : Bool] = [:]
var addrs: [UUID : Address] = [:]
var outgoingUuids: [String : UUID] = [:]
var isSas: [UUID : Bool] = [:]
var callInfos: [UUID : CallInfo] = [:]
override init() {
provider = CXProvider(configuration: ProviderDelegate.providerConfiguration)
@ -66,7 +83,7 @@ class ProviderDelegate: NSObject {
update.remoteHandle = CXHandle(type:.generic, value: handle)
update.hasVideo = hasVideo
let callId = CallManager.instance().providerDelegate.calls[uuid]
let callId = callInfos[uuid]?.callId
Log.directLog(BCTBX_LOG_MESSAGE, text: "CallKit: report new incoming call with call-id: [\(String(describing: callId))] and UUID: [\(uuid.description)]")
provider.reportNewIncomingCall(with: uuid, update: update) { error in
if error == nil {
@ -103,23 +120,16 @@ class ProviderDelegate: NSObject {
extension ProviderDelegate: CXProviderDelegate {
func provider(_ provider: CXProvider, perform action: CXEndCallAction) {
let uuid = action.callUUID
let callId = calls[uuid]
let addr = addrs[uuid]
let callId = callInfos[uuid]?.callId
Log.directLog(BCTBX_LOG_MESSAGE, text: "CallKit: Call ended with call-id: \(String(describing: callId)) an UUID: \(uuid.description).")
// remove call infos first, otherwise CXEndCallAction will be called more than onece
if (addr != nil) {
addrs.removeValue(forKey: uuid)
outgoingUuids.removeValue(forKey: addr!.asStringUriOnly())
isSas.removeValue(forKey: uuid)
}
let call = CallManager.instance().callByCallId(callId: callId)
if (callId != nil) {
uuids.removeValue(forKey: callId!)
}
calls.removeValue(forKey: uuid)
connecteds.removeValue(forKey: uuid)
callInfos.removeValue(forKey: uuid)
let call = CallManager.instance().callByCallId(callId: callId)
if (call != nil) {
do {
try call!.terminate()
@ -132,14 +142,16 @@ extension ProviderDelegate: CXProviderDelegate {
func provider(_ provider: CXProvider, perform action: CXAnswerCallAction) {
let uuid = action.callUUID
let callId = calls[uuid]
let callInfo = callInfos[uuid]
let callId = callInfo?.callId
Log.directLog(BCTBX_LOG_MESSAGE, text: "CallKit: answer call with call-id: \(String(describing: callId)) and UUID: \(uuid.description).")
let call = CallManager.instance().callByCallId(callId: callId)
if (call == nil) {
// The application is not yet registered, mark the call as connected. The audio session must be configured here.
CallManager.configAudioSession(audioSession: AVAudioSession.sharedInstance())
CallManager.instance().providerDelegate.connecteds.updateValue(true, forKey: uuid)
callInfo?.connected = true
callInfos.updateValue(callInfo!, forKey: uuid)
} else {
CallManager.instance().acceptCall(call: call!, hasVideo: call!.params?.videoEnabled ?? false)
}
@ -148,7 +160,7 @@ extension ProviderDelegate: CXProviderDelegate {
func provider(_ provider: CXProvider, perform action: CXSetHeldCallAction) {
let uuid = action.callUUID
let callId = calls[uuid]
let callId = callInfos[uuid]?.callId
let call = CallManager.instance().callByCallId(callId: callId)
if (call != nil && UIApplication.shared.applicationState != .active) {
@ -170,13 +182,14 @@ extension ProviderDelegate: CXProviderDelegate {
func provider(_ provider: CXProvider, perform action: CXStartCallAction) {
do {
let uuid = action.callUUID
let addr = addrs[uuid]
let callInfo = callInfos[uuid]
let addr = callInfo?.toAddr
if (addr == nil) {
Log.directLog(BCTBX_LOG_ERROR, text: "CallKit: can not call a null address!")
action.fail()
}
try CallManager.instance().doCall(addr: addr!, isSas: CallManager.instance().providerDelegate.isSas[uuid] ?? false)
try CallManager.instance().doCall(addr: addr!, isSas: callInfo?.sasEnabled ?? false)
} catch {
Log.directLog(BCTBX_LOG_ERROR, text: "CallKit: Call started failed because \(error)")
action.fail()
@ -196,7 +209,7 @@ extension ProviderDelegate: CXProviderDelegate {
func provider(_ provider: CXProvider, perform action: CXSetMutedCallAction) {
let uuid = action.callUUID
let callId = calls[uuid]
let callId = callInfos[uuid]?.callId
Log.directLog(BCTBX_LOG_MESSAGE, text: "CallKit: Call muted with call-id: \(String(describing: callId)) an UUID: \(uuid.description).")
CallManager.instance().lc!.micEnabled = !CallManager.instance().lc!.micEnabled
@ -205,7 +218,7 @@ extension ProviderDelegate: CXProviderDelegate {
func provider(_ provider: CXProvider, perform action: CXPlayDTMFCallAction) {
let uuid = action.callUUID
let callId = calls[uuid]
let callId = callInfos[uuid]?.callId
Log.directLog(BCTBX_LOG_MESSAGE, text: "CallKit: Call send dtmf with call-id: \(String(describing: callId)) an UUID: \(uuid.description).")
let call = CallManager.instance().callByCallId(callId: callId)
@ -222,7 +235,7 @@ extension ProviderDelegate: CXProviderDelegate {
func provider(_ provider: CXProvider, timedOutPerforming action: CXAction) {
let uuid = action.uuid
let callId = calls[uuid]
let callId = callInfos[uuid]?.callId
Log.directLog(BCTBX_LOG_MESSAGE, text: "CallKit: Call time out with call-id: \(String(describing: callId)) an UUID: \(uuid.description).")
action.fulfill()
}