mirror of https://github.com/oxen-io/session-ios
merge CallKitProviderDelegate into CallKitCallUIAdaptee
There was not a clear distinction in responsibilities and mostly the Adaptee was just delegating to the CKProviderDelegatepull/1/head
Michael Kirk
8 years ago
committed by
Matthew Chen
parent
ce3780e44a
commit
9e248168b9
@ -1,62 +1,290 @@
|
|||||||
// Created by Michael Kirk on 1/3/17.
|
// Created by Michael Kirk on 12/23/16.
|
||||||
// Copyright © 2017 Open Whisper Systems. All rights reserved.
|
// Copyright © 2016 Open Whisper Systems. All rights reserved.
|
||||||
|
|
||||||
import Foundation
|
import Foundation
|
||||||
|
import UIKit
|
||||||
|
import CallKit
|
||||||
|
import AVFoundation
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* CallKit backed implementation of UI Activity related to Signal Calls
|
* Connects user interface to the CallService usin CallKit.
|
||||||
* TODO: Code Cleanup: It might be more straight forward to roll this into the CallKitProviderDelegate.
|
*
|
||||||
|
* User interface is mapped to CXCall action requests, and if the CXProvider accepts them,
|
||||||
|
* their corresponding consequences are requested via the CallService
|
||||||
*/
|
*/
|
||||||
@available(iOS 10.0, *)
|
@available(iOS 10.0, *)
|
||||||
class CallKitCallUIAdaptee: CallUIAdaptee {
|
final class CallKitCallUIAdaptee: NSObject, CallUIAdaptee, CXProviderDelegate {
|
||||||
|
|
||||||
let TAG = "[CallKitCallUIAdaptee]"
|
let TAG = "[CallKitCallUIAdaptee]"
|
||||||
let providerDelegate: CallKitProviderDelegate
|
|
||||||
let callManager: CallKitCallManager
|
|
||||||
let notificationsAdapter: CallNotificationsAdapter
|
|
||||||
|
|
||||||
init(callService: CallService, notificationsAdapter: CallNotificationsAdapter) {
|
private let callManager: CallKitCallManager
|
||||||
|
private let callService: CallService
|
||||||
|
internal let notificationsAdapter: CallNotificationsAdapter
|
||||||
|
private let provider: CXProvider
|
||||||
|
|
||||||
|
// FIXME - I might be thinking about this the wrong way.
|
||||||
|
// It seems like the provider delegate wants to stop/start the audio recording
|
||||||
|
// process, but the ProviderDelegate is an app singleton
|
||||||
|
// and the audio recording process is currently controlled (I think) by
|
||||||
|
// the PeerConnectionClient instance, which is one per call (NOT a singleton).
|
||||||
|
// It seems like a mess to reconcile this difference in cardinality. But... here we are.
|
||||||
|
var audioManager: SignalCallAudioManager?
|
||||||
|
|
||||||
|
/// The app's provider configuration, representing its CallKit capabilities
|
||||||
|
static var providerConfiguration: CXProviderConfiguration {
|
||||||
|
let localizedName = NSLocalizedString("APPLICATION_NAME", comment: "Name of application")
|
||||||
|
let providerConfiguration = CXProviderConfiguration(localizedName: localizedName)
|
||||||
|
|
||||||
|
providerConfiguration.supportsVideo = true
|
||||||
|
|
||||||
|
providerConfiguration.maximumCallsPerCallGroup = 1
|
||||||
|
|
||||||
|
providerConfiguration.supportedHandleTypes = [.phoneNumber]
|
||||||
|
|
||||||
|
if let iconMaskImage = UIImage(named: "IconMask") {
|
||||||
|
providerConfiguration.iconTemplateImageData = UIImagePNGRepresentation(iconMaskImage)
|
||||||
|
}
|
||||||
|
|
||||||
|
providerConfiguration.ringtoneSound = "r.caf"
|
||||||
|
|
||||||
|
return providerConfiguration
|
||||||
|
}
|
||||||
|
|
||||||
|
init(callService: CallService, notificationsAdapter: CallNotificationsAdapter) {
|
||||||
self.callManager = CallKitCallManager()
|
self.callManager = CallKitCallManager()
|
||||||
self.providerDelegate = CallKitProviderDelegate(callService: callService, notificationsAdapter: notificationsAdapter)
|
self.callService = callService
|
||||||
self.notificationsAdapter = notificationsAdapter
|
self.notificationsAdapter = notificationsAdapter
|
||||||
|
self.provider = CXProvider(configuration: type(of: self).providerConfiguration)
|
||||||
|
|
||||||
|
super.init()
|
||||||
|
|
||||||
|
self.provider.setDelegate(self, queue: nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
public func startOutgoingCall(_ call: SignalCall) {
|
// MARK: CallUIAdaptee
|
||||||
|
|
||||||
|
internal func startOutgoingCall(_ call: SignalCall) {
|
||||||
// Add the new outgoing call to the app's list of calls.
|
// Add the new outgoing call to the app's list of calls.
|
||||||
// So we can find it in the provider delegate callbacks.
|
// So we can find it in the provider delegate callbacks.
|
||||||
// self.callManager.addCall(call)
|
callManager.addCall(call)
|
||||||
// providerDelegate.callManager.startCall(call)
|
callManager.startCall(call)
|
||||||
}
|
}
|
||||||
|
|
||||||
public func reportIncomingCall(_ call: SignalCall, callerName: String, audioManager: SignalCallAudioManager) {
|
// TODO CodeCleanup: remove unused audiomanager
|
||||||
// FIXME weird to pass the audio manager in here.
|
internal func reportIncomingCall(_ call: SignalCall, callerName: String, audioManager: SignalCallAudioManager) {
|
||||||
// Crux is, the peerconnectionclient is what controls the audio channel.
|
// Construct a CXCallUpdate describing the incoming call, including the caller.
|
||||||
// But a peerconnectionclient is per call.
|
let update = CXCallUpdate()
|
||||||
// While this providerDelegate is an app singleton.
|
update.remoteHandle = CXHandle(type: .phoneNumber, value: call.remotePhoneNumber)
|
||||||
// providerDelegate.audioManager = audioManager
|
update.hasVideo = call.hasVideo
|
||||||
//
|
|
||||||
// providerDelegate.reportIncomingCall(call) { error in
|
|
||||||
// if error == nil {
|
|
||||||
// Logger.debug("\(self.TAG) successfully reported incoming call.")
|
|
||||||
// } else {
|
|
||||||
// Logger.error("\(self.TAG) providerDelegate.reportIncomingCall failed with error: \(error)")
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
}
|
|
||||||
|
|
||||||
public func reportMissedCall(_ call: SignalCall, callerName: String) {
|
// Report the incoming call to the system
|
||||||
notificationsAdapter.presentMissedCall(call, callerName: callerName)
|
provider.reportNewIncomingCall(with: call.localId, update: update) { error in
|
||||||
|
/*
|
||||||
|
Only add incoming call to the app's list of calls if the call was allowed (i.e. there was no error)
|
||||||
|
since calls may be "denied" for various legitimate reasons. See CXErrorCodeIncomingCallError.
|
||||||
|
*/
|
||||||
|
guard error == nil else {
|
||||||
|
Logger.error("\(self.TAG) failed to report new incoming call")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
self.callManager.addCall(call)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func answerCall(_ call: SignalCall) {
|
internal func answerCall(_ call: SignalCall) {
|
||||||
showCall(call)
|
showCall(call)
|
||||||
}
|
}
|
||||||
|
|
||||||
public func declineCall(_ call: SignalCall) {
|
internal func declineCall(_ call: SignalCall) {
|
||||||
callManager.end(call: call)
|
callManager.end(call: call)
|
||||||
}
|
}
|
||||||
|
|
||||||
func endCall(_ call: SignalCall) {
|
internal func endCall(_ call: SignalCall) {
|
||||||
callManager.end(call: call)
|
callManager.end(call: call)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// MARK: CXProviderDelegate
|
||||||
|
|
||||||
|
func providerDidReset(_ provider: CXProvider) {
|
||||||
|
Logger.debug("\(TAG) in \(#function)")
|
||||||
|
|
||||||
|
stopAudio()
|
||||||
|
|
||||||
|
/*
|
||||||
|
End any ongoing calls if the provider resets, and remove them from the app's list of calls,
|
||||||
|
since they are no longer valid.
|
||||||
|
*/
|
||||||
|
// This is a little goofy because CallKit assumes multiple calls (maybe some are held, or group calls?)
|
||||||
|
// but CallService currently just has one call at a time.
|
||||||
|
for call in callManager.calls {
|
||||||
|
callService.handleFailedCall(error: .providerReset)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Remove all calls from the app's list of calls.
|
||||||
|
callManager.removeAllCalls()
|
||||||
|
}
|
||||||
|
|
||||||
|
func provider(_ provider: CXProvider, perform action: CXStartCallAction) {
|
||||||
|
Logger.debug("\(TAG) in \(#function) CXStartCallAction")
|
||||||
|
|
||||||
|
/*
|
||||||
|
Configure the audio session, but do not start call audio here, since it must be done once
|
||||||
|
the audio session has been activated by the system after having its priority elevated.
|
||||||
|
*/
|
||||||
|
configureAudioSession()
|
||||||
|
|
||||||
|
// TODO does this work when `action.handle.value` is not in e164 format, e.g. if called via intent?
|
||||||
|
guard let call = callManager.callWithLocalId(action.callUUID) else {
|
||||||
|
Logger.error("\(TAG) unable to find call in \(#function)")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
CallService.signalingQueue.async {
|
||||||
|
self.callService.handleOutgoingCall(call).then {
|
||||||
|
action.fulfill()
|
||||||
|
}.catch { error in
|
||||||
|
self.callManager.removeCall(call)
|
||||||
|
action.fail()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO FIXME
|
||||||
|
// /*
|
||||||
|
// Set callback blocks for significant events in the call's lifecycle, so that the CXProvider may be updated
|
||||||
|
// to reflect the updated state.
|
||||||
|
// */
|
||||||
|
// call.hasStartedConnectingDidChange = { [weak self] in
|
||||||
|
// self?.provider.reportOutgoingCall(with: call.uuid, startedConnectingAt: call.connectingDate)
|
||||||
|
// }
|
||||||
|
// call.hasConnectedDidChange = { [weak self] in
|
||||||
|
// self?.provider.reportOutgoingCall(with: call.uuid, connectedAt: call.connectDate)
|
||||||
|
// }
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
func provider(_ provider: CXProvider, perform action: CXAnswerCallAction) {
|
||||||
|
Logger.debug("\(TAG) Received \(#function) CXAnswerCallAction")
|
||||||
|
// Retrieve the SpeakerboxCall instance corresponding to the action's call UUID
|
||||||
|
guard let call = callManager.callWithLocalId(action.callUUID) else {
|
||||||
|
action.fail()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Original Speakerbox implementation
|
||||||
|
// /*
|
||||||
|
// Configure the audio session, but do not start call audio here, since it must be done once
|
||||||
|
// the audio session has been activated by the system after having its priority elevated.
|
||||||
|
// */
|
||||||
|
// configureAudioSession()
|
||||||
|
//
|
||||||
|
// // Trigger the call to be answered via the underlying network service.
|
||||||
|
// call.answerSpeakerboxCall()
|
||||||
|
|
||||||
|
// Synchronous to ensure work is done before call is displayed as "answered"
|
||||||
|
CallService.signalingQueue.sync {
|
||||||
|
self.callService.handleAnswerCall(call)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Signal to the system that the action has been successfully performed.
|
||||||
|
action.fulfill()
|
||||||
|
}
|
||||||
|
|
||||||
|
func provider(_ provider: CXProvider, perform action: CXEndCallAction) {
|
||||||
|
Logger.debug("\(TAG) Received \(#function) CXEndCallAction")
|
||||||
|
guard let call = callManager.callWithLocalId(action.callUUID) else {
|
||||||
|
action.fail()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Original Speakerbox implementation
|
||||||
|
// // Stop call audio whenever ending the call.
|
||||||
|
// stopAudio()
|
||||||
|
// // Trigger the call to be ended via the underlying network service.
|
||||||
|
// call.endSpeakerboxCall()
|
||||||
|
|
||||||
|
// Synchronous to ensure call is terminated before call is displayed as "ended"
|
||||||
|
CallService.signalingQueue.sync {
|
||||||
|
self.callService.handleLocalHungupCall(call)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Signal to the system that the action has been successfully performed.
|
||||||
|
action.fulfill()
|
||||||
|
|
||||||
|
// Remove the ended call from the app's list of calls.
|
||||||
|
callManager.removeCall(call)
|
||||||
|
}
|
||||||
|
|
||||||
|
func provider(_ provider: CXProvider, perform action: CXSetHeldCallAction) {
|
||||||
|
Logger.debug("\(TAG) Received \(#function) CXSetHeldCallAction")
|
||||||
|
guard let call = callManager.callWithLocalId(action.callUUID) else {
|
||||||
|
action.fail()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
Logger.warn("TODO, set held call: \(call)")
|
||||||
|
|
||||||
|
// TODO FIXME
|
||||||
|
// // Update the SpeakerboxCall's underlying hold state.
|
||||||
|
// call.isOnHold = action.isOnHold
|
||||||
|
//
|
||||||
|
// // Stop or start audio in response to holding or unholding the call.
|
||||||
|
// if call.isOnHold {
|
||||||
|
// stopAudio()
|
||||||
|
// } else {
|
||||||
|
// startAudio()
|
||||||
|
// }
|
||||||
|
|
||||||
|
// Signal to the system that the action has been successfully performed.
|
||||||
|
action.fulfill()
|
||||||
|
}
|
||||||
|
|
||||||
|
func provider(_ provider: CXProvider, timedOutPerforming action: CXAction) {
|
||||||
|
Logger.debug("\(TAG) Timed out \(#function)")
|
||||||
|
|
||||||
|
// React to the action timeout if necessary, such as showing an error UI.
|
||||||
|
}
|
||||||
|
|
||||||
|
func provider(_ provider: CXProvider, didActivate audioSession: AVAudioSession) {
|
||||||
|
Logger.debug("\(TAG) Received \(#function)")
|
||||||
|
|
||||||
|
startAudio()
|
||||||
|
}
|
||||||
|
|
||||||
|
func provider(_ provider: CXProvider, didDeactivate audioSession: AVAudioSession) {
|
||||||
|
Logger.debug("\(TAG) Received \(#function)")
|
||||||
|
|
||||||
|
/*
|
||||||
|
Restart any non-call related audio now that the app's audio session has been
|
||||||
|
de-activated after having its priority restored to normal.
|
||||||
|
*/
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Audio
|
||||||
|
|
||||||
|
func startAudio() {
|
||||||
|
guard let audioManager = self.audioManager else {
|
||||||
|
Logger.error("\(TAG) audioManager was unexpectedly nil while tryign to start audio")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
audioManager.startAudio()
|
||||||
|
}
|
||||||
|
|
||||||
|
func stopAudio() {
|
||||||
|
guard let audioManager = self.audioManager else {
|
||||||
|
Logger.error("\(TAG) audioManager was unexpectedly nil while tryign to stop audio")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
audioManager.stopAudio()
|
||||||
|
}
|
||||||
|
|
||||||
|
func configureAudioSession() {
|
||||||
|
guard let audioManager = self.audioManager else {
|
||||||
|
Logger.error("\(TAG) audioManager was unexpectedly nil while trying to: \(#function)")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
audioManager.configureAudioSession()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,289 +0,0 @@
|
|||||||
// Created by Michael Kirk on 12/23/16.
|
|
||||||
// Copyright © 2016 Open Whisper Systems. All rights reserved.
|
|
||||||
|
|
||||||
import Foundation
|
|
||||||
import UIKit
|
|
||||||
import CallKit
|
|
||||||
import AVFoundation
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Connects requests for CallKit actions (CXActions) with their corresponding consequences in CallService
|
|
||||||
*
|
|
||||||
* TODO: Code cleanup: The responsibilities largely overlap with the CallKitCallUIAdapter. Maybe they should be merged.
|
|
||||||
*/
|
|
||||||
@available(iOS 10.0, *)
|
|
||||||
final class CallKitProviderDelegate: NSObject, CallUIAdaptee, CXProviderDelegate {
|
|
||||||
|
|
||||||
let TAG = "[CallKitProviderDelegate]"
|
|
||||||
|
|
||||||
private let callManager: CallKitCallManager
|
|
||||||
private let callService: CallService
|
|
||||||
internal let notificationsAdapter: CallNotificationsAdapter
|
|
||||||
private let provider: CXProvider
|
|
||||||
|
|
||||||
// FIXME - I might be thinking about this the wrong way.
|
|
||||||
// It seems like the provider delegate wants to stop/start the audio recording
|
|
||||||
// process, but the ProviderDelegate is an app singleton
|
|
||||||
// and the audio recording process is currently controlled (I think) by
|
|
||||||
// the PeerConnectionClient instance, which is one per call (NOT a singleton).
|
|
||||||
// It seems like a mess to reconcile this difference in cardinality. But... here we are.
|
|
||||||
var audioManager: SignalCallAudioManager?
|
|
||||||
|
|
||||||
/// The app's provider configuration, representing its CallKit capabilities
|
|
||||||
static var providerConfiguration: CXProviderConfiguration {
|
|
||||||
let localizedName = NSLocalizedString("APPLICATION_NAME", comment: "Name of application")
|
|
||||||
let providerConfiguration = CXProviderConfiguration(localizedName: localizedName)
|
|
||||||
|
|
||||||
providerConfiguration.supportsVideo = true
|
|
||||||
|
|
||||||
providerConfiguration.maximumCallsPerCallGroup = 1
|
|
||||||
|
|
||||||
providerConfiguration.supportedHandleTypes = [.phoneNumber]
|
|
||||||
|
|
||||||
if let iconMaskImage = UIImage(named: "IconMask") {
|
|
||||||
providerConfiguration.iconTemplateImageData = UIImagePNGRepresentation(iconMaskImage)
|
|
||||||
}
|
|
||||||
|
|
||||||
providerConfiguration.ringtoneSound = "r.caf"
|
|
||||||
|
|
||||||
return providerConfiguration
|
|
||||||
}
|
|
||||||
|
|
||||||
init(callService: CallService, notificationsAdapter: CallNotificationsAdapter) {
|
|
||||||
self.callManager = CallKitCallManager()
|
|
||||||
self.callService = callService
|
|
||||||
self.notificationsAdapter = notificationsAdapter
|
|
||||||
self.provider = CXProvider(configuration: type(of: self).providerConfiguration)
|
|
||||||
|
|
||||||
super.init()
|
|
||||||
|
|
||||||
self.provider.setDelegate(self, queue: nil)
|
|
||||||
}
|
|
||||||
|
|
||||||
// MARK: CallUIAdaptee
|
|
||||||
|
|
||||||
internal func startOutgoingCall(_ call: SignalCall) {
|
|
||||||
// Add the new outgoing call to the app's list of calls.
|
|
||||||
// So we can find it in the provider delegate callbacks.
|
|
||||||
callManager.addCall(call)
|
|
||||||
callManager.startCall(call)
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO CodeCleanup: remove unused audiomanager
|
|
||||||
internal func reportIncomingCall(_ call: SignalCall, callerName: String, audioManager: SignalCallAudioManager) {
|
|
||||||
// Construct a CXCallUpdate describing the incoming call, including the caller.
|
|
||||||
let update = CXCallUpdate()
|
|
||||||
update.remoteHandle = CXHandle(type: .phoneNumber, value: call.remotePhoneNumber)
|
|
||||||
update.hasVideo = call.hasVideo
|
|
||||||
|
|
||||||
// Report the incoming call to the system
|
|
||||||
provider.reportNewIncomingCall(with: call.localId, update: update) { error in
|
|
||||||
/*
|
|
||||||
Only add incoming call to the app's list of calls if the call was allowed (i.e. there was no error)
|
|
||||||
since calls may be "denied" for various legitimate reasons. See CXErrorCodeIncomingCallError.
|
|
||||||
*/
|
|
||||||
guard error == nil else {
|
|
||||||
Logger.error("\(self.TAG) failed to report new incoming call")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
self.callManager.addCall(call)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
internal func answerCall(_ call: SignalCall) {
|
|
||||||
showCall(call)
|
|
||||||
}
|
|
||||||
|
|
||||||
internal func declineCall(_ call: SignalCall) {
|
|
||||||
callManager.end(call: call)
|
|
||||||
}
|
|
||||||
|
|
||||||
internal func endCall(_ call: SignalCall) {
|
|
||||||
callManager.end(call: call)
|
|
||||||
}
|
|
||||||
|
|
||||||
// MARK: CXProviderDelegate
|
|
||||||
|
|
||||||
func providerDidReset(_ provider: CXProvider) {
|
|
||||||
Logger.debug("\(TAG) in \(#function)")
|
|
||||||
|
|
||||||
stopAudio()
|
|
||||||
|
|
||||||
/*
|
|
||||||
End any ongoing calls if the provider resets, and remove them from the app's list of calls,
|
|
||||||
since they are no longer valid.
|
|
||||||
*/
|
|
||||||
// This is a little goofy because CallKit assumes multiple calls (maybe some are held, or group calls?)
|
|
||||||
// but CallService currently just has one call at a time.
|
|
||||||
for call in callManager.calls {
|
|
||||||
callService.handleFailedCall(error: .providerReset)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Remove all calls from the app's list of calls.
|
|
||||||
callManager.removeAllCalls()
|
|
||||||
}
|
|
||||||
|
|
||||||
func provider(_ provider: CXProvider, perform action: CXStartCallAction) {
|
|
||||||
Logger.debug("\(TAG) in \(#function) CXStartCallAction")
|
|
||||||
|
|
||||||
/*
|
|
||||||
Configure the audio session, but do not start call audio here, since it must be done once
|
|
||||||
the audio session has been activated by the system after having its priority elevated.
|
|
||||||
*/
|
|
||||||
configureAudioSession()
|
|
||||||
|
|
||||||
// TODO does this work when `action.handle.value` is not in e164 format, e.g. if called via intent?
|
|
||||||
guard let call = callManager.callWithLocalId(action.callUUID) else {
|
|
||||||
Logger.error("\(TAG) unable to find call in \(#function)")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
CallService.signalingQueue.async {
|
|
||||||
self.callService.handleOutgoingCall(call).then {
|
|
||||||
action.fulfill()
|
|
||||||
}.catch { error in
|
|
||||||
self.callManager.removeCall(call)
|
|
||||||
action.fail()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO FIXME
|
|
||||||
// /*
|
|
||||||
// Set callback blocks for significant events in the call's lifecycle, so that the CXProvider may be updated
|
|
||||||
// to reflect the updated state.
|
|
||||||
// */
|
|
||||||
// call.hasStartedConnectingDidChange = { [weak self] in
|
|
||||||
// self?.provider.reportOutgoingCall(with: call.uuid, startedConnectingAt: call.connectingDate)
|
|
||||||
// }
|
|
||||||
// call.hasConnectedDidChange = { [weak self] in
|
|
||||||
// self?.provider.reportOutgoingCall(with: call.uuid, connectedAt: call.connectDate)
|
|
||||||
// }
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
func provider(_ provider: CXProvider, perform action: CXAnswerCallAction) {
|
|
||||||
Logger.debug("\(TAG) Received \(#function) CXAnswerCallAction")
|
|
||||||
// Retrieve the SpeakerboxCall instance corresponding to the action's call UUID
|
|
||||||
guard let call = callManager.callWithLocalId(action.callUUID) else {
|
|
||||||
action.fail()
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Original Speakerbox implementation
|
|
||||||
// /*
|
|
||||||
// Configure the audio session, but do not start call audio here, since it must be done once
|
|
||||||
// the audio session has been activated by the system after having its priority elevated.
|
|
||||||
// */
|
|
||||||
// configureAudioSession()
|
|
||||||
//
|
|
||||||
// // Trigger the call to be answered via the underlying network service.
|
|
||||||
// call.answerSpeakerboxCall()
|
|
||||||
|
|
||||||
// Synchronous to ensure work is done before call is displayed as "answered"
|
|
||||||
CallService.signalingQueue.sync {
|
|
||||||
self.callService.handleAnswerCall(call)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Signal to the system that the action has been successfully performed.
|
|
||||||
action.fulfill()
|
|
||||||
}
|
|
||||||
|
|
||||||
func provider(_ provider: CXProvider, perform action: CXEndCallAction) {
|
|
||||||
Logger.debug("\(TAG) Received \(#function) CXEndCallAction")
|
|
||||||
guard let call = callManager.callWithLocalId(action.callUUID) else {
|
|
||||||
action.fail()
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Original Speakerbox implementation
|
|
||||||
// // Stop call audio whenever ending the call.
|
|
||||||
// stopAudio()
|
|
||||||
// // Trigger the call to be ended via the underlying network service.
|
|
||||||
// call.endSpeakerboxCall()
|
|
||||||
|
|
||||||
// Synchronous to ensure call is terminated before call is displayed as "ended"
|
|
||||||
CallService.signalingQueue.sync {
|
|
||||||
self.callService.handleLocalHungupCall(call)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Signal to the system that the action has been successfully performed.
|
|
||||||
action.fulfill()
|
|
||||||
|
|
||||||
// Remove the ended call from the app's list of calls.
|
|
||||||
callManager.removeCall(call)
|
|
||||||
}
|
|
||||||
|
|
||||||
func provider(_ provider: CXProvider, perform action: CXSetHeldCallAction) {
|
|
||||||
Logger.debug("\(TAG) Received \(#function) CXSetHeldCallAction")
|
|
||||||
guard let call = callManager.callWithLocalId(action.callUUID) else {
|
|
||||||
action.fail()
|
|
||||||
return
|
|
||||||
}
|
|
||||||
Logger.warn("TODO, set held call: \(call)")
|
|
||||||
|
|
||||||
// TODO FIXME
|
|
||||||
// // Update the SpeakerboxCall's underlying hold state.
|
|
||||||
// call.isOnHold = action.isOnHold
|
|
||||||
//
|
|
||||||
// // Stop or start audio in response to holding or unholding the call.
|
|
||||||
// if call.isOnHold {
|
|
||||||
// stopAudio()
|
|
||||||
// } else {
|
|
||||||
// startAudio()
|
|
||||||
// }
|
|
||||||
|
|
||||||
// Signal to the system that the action has been successfully performed.
|
|
||||||
action.fulfill()
|
|
||||||
}
|
|
||||||
|
|
||||||
func provider(_ provider: CXProvider, timedOutPerforming action: CXAction) {
|
|
||||||
Logger.debug("\(TAG) Timed out \(#function)")
|
|
||||||
|
|
||||||
// React to the action timeout if necessary, such as showing an error UI.
|
|
||||||
}
|
|
||||||
|
|
||||||
func provider(_ provider: CXProvider, didActivate audioSession: AVAudioSession) {
|
|
||||||
Logger.debug("\(TAG) Received \(#function)")
|
|
||||||
|
|
||||||
startAudio()
|
|
||||||
}
|
|
||||||
|
|
||||||
func provider(_ provider: CXProvider, didDeactivate audioSession: AVAudioSession) {
|
|
||||||
Logger.debug("\(TAG) Received \(#function)")
|
|
||||||
|
|
||||||
/*
|
|
||||||
Restart any non-call related audio now that the app's audio session has been
|
|
||||||
de-activated after having its priority restored to normal.
|
|
||||||
*/
|
|
||||||
}
|
|
||||||
|
|
||||||
// MARK: - Audio
|
|
||||||
|
|
||||||
func startAudio() {
|
|
||||||
guard let audioManager = self.audioManager else {
|
|
||||||
Logger.error("\(TAG) audioManager was unexpectedly nil while tryign to start audio")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
audioManager.startAudio()
|
|
||||||
}
|
|
||||||
|
|
||||||
func stopAudio() {
|
|
||||||
guard let audioManager = self.audioManager else {
|
|
||||||
Logger.error("\(TAG) audioManager was unexpectedly nil while tryign to stop audio")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
audioManager.stopAudio()
|
|
||||||
}
|
|
||||||
|
|
||||||
func configureAudioSession() {
|
|
||||||
guard let audioManager = self.audioManager else {
|
|
||||||
Logger.error("\(TAG) audioManager was unexpectedly nil while trying to: \(#function)")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
audioManager.configureAudioSession()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue