forked from eatvio/eatvio_app
feat(video_calls): ios voip push handling fix
This commit is contained in:
@@ -15,6 +15,8 @@ import flutter_foreground_task
|
||||
private var voipDiagnosticsChannel: FlutterMethodChannel?
|
||||
private let voipDiagnosticsStorageKey = "EatvioVoipDiagnostics"
|
||||
private let pendingAcceptedVoipCallKey = "EatvioPendingAcceptedVoipCall"
|
||||
private let pendingAcceptedAtKey = "eatvioAcceptedAt"
|
||||
private let pendingAcceptedCallTtl: TimeInterval = 120
|
||||
private let voipDiagnosticsChannelName = "com.eatvioapp/voip_diagnostics"
|
||||
private let callAudioSessionChannelName = "com.eatvioapp/call_audio_session"
|
||||
private let appUrlScheme = "eatvio"
|
||||
@@ -234,6 +236,26 @@ import flutter_foreground_task
|
||||
return nil
|
||||
}
|
||||
|
||||
private func voipBool(_ value: Any?) -> Bool? {
|
||||
if let bool = value as? Bool {
|
||||
return bool
|
||||
}
|
||||
if let number = value as? NSNumber {
|
||||
return number.intValue != 0
|
||||
}
|
||||
if let text = value as? String {
|
||||
switch text.trimmingCharacters(in: .whitespacesAndNewlines).lowercased() {
|
||||
case "1", "true", "yes":
|
||||
return true
|
||||
case "0", "false", "no":
|
||||
return false
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
private func conversationUuid(fromActionUrl actionUrl: String?) -> String? {
|
||||
guard
|
||||
let actionUrl = actionUrl,
|
||||
@@ -282,16 +304,31 @@ import flutter_foreground_task
|
||||
}
|
||||
|
||||
private func storePendingAcceptedCall(_ call: Call) {
|
||||
let payload = sanitizedDiagnosticValue(call.data.toJSON()) as? [String: Any] ?? [:]
|
||||
var payload = sanitizedDiagnosticValue(call.data.toJSON()) as? [String: Any] ?? [:]
|
||||
payload[pendingAcceptedAtKey] = Date().timeIntervalSince1970
|
||||
UserDefaults.standard.set(payload, forKey: pendingAcceptedVoipCallKey)
|
||||
}
|
||||
|
||||
/// An accept that Flutter never consumed (the process died before the
|
||||
/// scene opened) must not open the call screen on a later launch: that
|
||||
/// screen requests a token, and the token request rings the other person.
|
||||
private func drainPendingAcceptedVoipCall() -> [String: Any]? {
|
||||
let defaults = UserDefaults.standard
|
||||
guard let payload = defaults.dictionary(forKey: pendingAcceptedVoipCallKey) else {
|
||||
guard var payload = defaults.dictionary(forKey: pendingAcceptedVoipCallKey) else {
|
||||
return nil
|
||||
}
|
||||
defaults.removeObject(forKey: pendingAcceptedVoipCallKey)
|
||||
let acceptedAt = (payload.removeValue(forKey: pendingAcceptedAtKey) as? NSNumber)?.doubleValue
|
||||
if let acceptedAt, Date().timeIntervalSince1970 - acceptedAt > pendingAcceptedCallTtl {
|
||||
recordVoipDiagnostic(
|
||||
"pending_accepted_call_expired",
|
||||
data: [
|
||||
"callKitId": payload["id"] as? String ?? "",
|
||||
"ageSeconds": Date().timeIntervalSince1970 - acceptedAt,
|
||||
]
|
||||
)
|
||||
return nil
|
||||
}
|
||||
return payload
|
||||
}
|
||||
|
||||
@@ -515,6 +552,13 @@ import flutter_foreground_task
|
||||
handle: conversation,
|
||||
type: 1
|
||||
)
|
||||
// The plugin sends this payload with its "ended" event. Dart uses the
|
||||
// marker to tell a remote end from a decline by the user.
|
||||
var endExtra: [String: Any] = ["endedPush": true]
|
||||
if !conversation.isEmpty {
|
||||
endExtra["conversationUuid"] = conversation
|
||||
}
|
||||
endData.extra = endExtra as NSDictionary
|
||||
plugin.endCall(endData)
|
||||
releaseIncomingCallClaim(id)
|
||||
}
|
||||
@@ -686,12 +730,18 @@ import flutter_foreground_task
|
||||
} else if !nameCaller.isEmpty {
|
||||
extra["counterpartName"] = nameCaller
|
||||
}
|
||||
if let isConsultant = voipBool(dict["is_consultant"] ?? dict["isConsultant"]) {
|
||||
extra["counterpartIsConsultant"] = isConsultant
|
||||
}
|
||||
// Closing this report looks like a user decline. Dart must not tell the
|
||||
// backend, or the server sends another ended VoIP and the other phone
|
||||
// shows it as a new incoming call.
|
||||
if isEndedPush {
|
||||
extra["endedPush"] = true
|
||||
}
|
||||
// An ended push with no ringing call still has to be reported. That
|
||||
// report is closed at once, so it must not leave a trace anywhere.
|
||||
let isPhantomEndedReport = isEndedPush && callKitIdSourceName != "active_conversation"
|
||||
|
||||
let data = flutter_callkit_incoming.Data(
|
||||
id: id,
|
||||
@@ -699,8 +749,15 @@ import flutter_foreground_task
|
||||
handle: trimmedConversationUuid.isEmpty ? nameCaller : trimmedConversationUuid,
|
||||
type: isVideo ? 1 : 0
|
||||
)
|
||||
data.appName = "Итвио"
|
||||
data.handleType = "generic"
|
||||
data.supportsVideo = true
|
||||
data.duration = 45000
|
||||
data.extra = extra as NSDictionary
|
||||
data.missedNotificationSubtitle = "Пропущенный видеозвонок"
|
||||
data.missedNotificationCallbackText = "Перезвонить"
|
||||
data.isShowMissedCallNotification = !isEndedPush
|
||||
data.includesCallsInRecents = !isPhantomEndedReport
|
||||
// The plugin activates AVAudioSession itself on answer and again 1.2s
|
||||
// later. That drops the ringing UI and leaves one side silent. CallKit
|
||||
// and WebRTC own the session instead.
|
||||
@@ -736,18 +793,25 @@ import flutter_foreground_task
|
||||
callKitIdSourceName: callKitIdSourceName,
|
||||
conversationUuid: conversationUuid,
|
||||
endAfterReport: isEndedPush,
|
||||
endImmediately: isPhantomEndedReport,
|
||||
completion: completion
|
||||
)
|
||||
}
|
||||
|
||||
/// PushKit kills the app unless every VoIP push is reported to CallKit and
|
||||
/// its completion handler runs. Both happen here, including an "ended" push.
|
||||
///
|
||||
/// `endImmediately` is for an ended push that matched no ringing call. The
|
||||
/// report is closed inside its own completion, before the incoming UI has a
|
||||
/// chance to show. An end transaction would take one more round trip and
|
||||
/// would also reach `onDecline`, which resets the in-app audio restart.
|
||||
private func reportVoipPushToCallKit(
|
||||
_ data: flutter_callkit_incoming.Data,
|
||||
callKitId: String,
|
||||
callKitIdSourceName: String,
|
||||
conversationUuid: String,
|
||||
endAfterReport: Bool,
|
||||
endImmediately: Bool,
|
||||
completion: @escaping () -> Void
|
||||
) {
|
||||
let gate = VoipPushCompletion(completion)
|
||||
@@ -757,6 +821,12 @@ import flutter_foreground_task
|
||||
}
|
||||
|
||||
let afterReport = {
|
||||
if endAfterReport, endImmediately,
|
||||
let plugin = SwiftFlutterCallkitIncomingPlugin.sharedInstance
|
||||
{
|
||||
// Reason 6 is CXCallEndedReason.remoteEnded in the plugin.
|
||||
plugin.saveEndCall(callKitId, 6)
|
||||
}
|
||||
if endAfterReport {
|
||||
DispatchQueue.main.async {
|
||||
self.endCallsForEndedPush(
|
||||
|
||||
Reference in New Issue
Block a user