haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ios: simplify code for handling CallKit listeners 

Replace the Swift array with an Objective-C one, since it's going to store
Objective-C objects and not Swift objects (or Swift objects which inherit from
NSObject, which is equivalent).

This avoids the need for JMCallKitEventListenerWrapper entirely, since an
NSArray can store NSObjectProtocol objects, unlike a Swift array, which prompted
the creation of the wrapper in the first place.
This commit is contained in:
Saúl Ibarra Corretgé 2019-04-25 16:28:22 +02:00 committed by Saúl Ibarra Corretgé
parent 774c5ecd18
commit 33f133ac25
1 changed files with 21 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
ios/sdk/src/callkit/JMCallKitEmitter.swift
View File

@ -20,51 +20,35 @@ import Foundation
internal final class JMCallKitEmitter: NSObject, CXProviderDelegate { internal final class JMCallKitEmitter: NSObject, CXProviderDelegate {
private var listeners = Set<JMCallKitEventListenerWrapper>() private let listeners = NSMutableArray()
internal override init() {} internal override init() {}
// MARK: - Add/remove listeners // MARK: - Add/remove listeners
func addListener(_ listener: JMCallKitListener) { func addListener(_ listener: JMCallKitListener) {
let wrapper = JMCallKitEventListenerWrapper(listener: listener) if (!listeners.contains(listener)) {
listeners.insert(wrapper) listeners.add(listener)
}
} }
func removeListener(_ listener: JMCallKitListener) { func removeListener(_ listener: JMCallKitListener) {
// XXX Constructing a new JMCallKitEventListenerWrapper instance in listeners.remove(listener)
// order to remove the specified listener from listeners is (1) a bit
// funny (though may make a statement about performance) and (2) not
// really an option because the specified listener may already be
// executing its dealloc (like RNCallKit).
listeners.forEach {
// 1. JMCallKitEventListenerWrapper weakly references
// JMCallKitListener so it may be nice to clean
// JMCallKitEventListenerWrapperinstances up if they've lost
// their associated JMCallKitListener instances (e.g. for
// example, because whoever did addListener forgot to
// removeListener). Unfortunately, I don't know how to do it
// because JMCallKitEventListenerWrapper is a struct.
//
// 2. XXX JMCallKitEventListenerWrapper implements the weird
// equality by JMCallKitListener hash which (1) I don't
// understand and (2) I don't know how to invoke without
// duplicating.
if ($0.hashValue == listener.hash) {
listeners.remove($0)
}
}
} }
// MARK: - CXProviderDelegate // MARK: - CXProviderDelegate
func providerDidReset(_ provider: CXProvider) { func providerDidReset(_ provider: CXProvider) {
listeners.forEach { $0.listener?.providerDidReset?() } listeners.forEach {
let listener = $0 as! JMCallKitListener
listener.providerDidReset?()
}
} }
func provider(_ provider: CXProvider, perform action: CXAnswerCallAction) { func provider(_ provider: CXProvider, perform action: CXAnswerCallAction) {
listeners.forEach { listeners.forEach {
$0.listener?.performAnswerCall?(UUID: action.callUUID) let listener = $0 as! JMCallKitListener
listener.performAnswerCall?(UUID: action.callUUID)
} }
action.fulfill() action.fulfill()
@ -72,7 +56,8 @@ internal final class JMCallKitEmitter: NSObject, CXProviderDelegate {
func provider(_ provider: CXProvider, perform action: CXEndCallAction) { func provider(_ provider: CXProvider, perform action: CXEndCallAction) {
listeners.forEach { listeners.forEach {
$0.listener?.performEndCall?(UUID: action.callUUID) let listener = $0 as! JMCallKitListener
listener.performEndCall?(UUID: action.callUUID)
} }
action.fulfill() action.fulfill()
@ -80,7 +65,8 @@ internal final class JMCallKitEmitter: NSObject, CXProviderDelegate {
func provider(_ provider: CXProvider, perform action: CXSetMutedCallAction) { func provider(_ provider: CXProvider, perform action: CXSetMutedCallAction) {
listeners.forEach { listeners.forEach {
$0.listener?.performSetMutedCall?(UUID: action.callUUID, isMuted: action.isMuted) let listener = $0 as! JMCallKitListener
listener.performSetMutedCall?(UUID: action.callUUID, isMuted: action.isMuted)
} }
action.fulfill() action.fulfill()
@ -88,8 +74,8 @@ internal final class JMCallKitEmitter: NSObject, CXProviderDelegate {
func provider(_ provider: CXProvider, perform action: CXStartCallAction) { func provider(_ provider: CXProvider, perform action: CXStartCallAction) {
listeners.forEach { listeners.forEach {
$0.listener?.performStartCall?(UUID: action.callUUID, let listener = $0 as! JMCallKitListener
isVideo: action.isVideo) listener.performStartCall?(UUID: action.callUUID, isVideo: action.isVideo)
} }
action.fulfill() action.fulfill()
@ -98,35 +84,16 @@ internal final class JMCallKitEmitter: NSObject, CXProviderDelegate {
func provider(_ provider: CXProvider, func provider(_ provider: CXProvider,
didActivate audioSession: AVAudioSession) { didActivate audioSession: AVAudioSession) {
listeners.forEach { listeners.forEach {
$0.listener?.providerDidActivateAudioSession?(session: audioSession) let listener = $0 as! JMCallKitListener
listener.providerDidActivateAudioSession?(session: audioSession)
} }
} }
func provider(_ provider: CXProvider, func provider(_ provider: CXProvider,
didDeactivate audioSession: AVAudioSession) { didDeactivate audioSession: AVAudioSession) {
listeners.forEach { listeners.forEach {
$0.listener?.providerDidDeactivateAudioSession?( let listener = $0 as! JMCallKitListener
session: audioSession) listener.providerDidDeactivateAudioSession?(session: audioSession)
} }
} }
} }
fileprivate struct JMCallKitEventListenerWrapper: Hashable {
internal weak var listener: JMCallKitListener?
public init(listener: JMCallKitListener) {
self.listener = listener
}
public static func ==(lhs: JMCallKitEventListenerWrapper,
rhs: JMCallKitEventListenerWrapper) -> Bool {
// XXX We're aware that "[t]wo instances with equal hash values are not
// necessarily equal to each other."
return lhs.hashValue == rhs.hashValue
}
func hash(into hasher: inout Hasher) {
hasher.combine(self.listener?.hash)
}
}