Skip to content

fix(voip): resolve closure capture ordering in handleNativeAccept #7209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
diegolmello merged 2 commits into from
Apr 22, 2026
Merged

fix(voip): resolve closure capture ordering in handleNativeAccept #7209

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ce408b
fix(voip): resolve closure capture ordering in handleNativeAccept
diegolmello Apr 22, 2026
b9548bf
fix(voip): restore storeInitialEvents in failure path for cold-start …
diegolmello Apr 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 19 additions & 31 deletions ios/Libraries/VoipService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,21 +457,11 @@ public final class VoipService: NSObject {

cancelIncomingCallTimeout(for: payload.callId)

// 10-second timeout guard: if REST hasn't completed by then, call finishAccept(false).
let timeoutWorkItem = DispatchWorkItem { [weak payload] in
var finishAcceptInvoked = false
let finishAccept: (Bool) -> Void = { [weak payload] success in
guard !finishAcceptInvoked else { return }
finishAcceptInvoked = true
guard let payload else { return }
// Check the callId is still tracked (not already cleaned up).
nativeAcceptLock.lock()
let isStillTracked = nativeAcceptHandledCallIds.contains(payload.callId)
nativeAcceptLock.unlock()
if isStillTracked {
finishAccept(false)
}
}
DispatchQueue.main.asyncAfter(deadline: .now() + 10.0, execute: timeoutWorkItem)

let finishAccept: (Bool) -> Void = { [weak timeoutWorkItem] success in
timeoutWorkItem?.cancel()
stopDDPClientInternal(callId: payload.callId)
if success {
storeInitialEvents(payload)
Expand All @@ -497,30 +487,28 @@ public final class VoipService: NSObject {
voipAcceptFailed: true
)
storeInitialEvents(failedPayload)
var acceptFailedUserInfo: [String: Any] = [
"callId": failedPayload.callId,
"caller": failedPayload.caller,
"username": failedPayload.username,
"host": failedPayload.host,
"type": failedPayload.type,
"hostName": failedPayload.hostName,
"notificationId": failedPayload.notificationId,
"voipAcceptFailed": true
]
if let avatarUrl = failedPayload.avatarUrl {
acceptFailedUserInfo["avatarUrl"] = avatarUrl
}
if let createdAt = failedPayload.createdAt {
acceptFailedUserInfo["createdAt"] = createdAt
}
NotificationCenter.default.post(
name: NSNotification.Name("VoipAcceptFailed"),
object: nil,
userInfo: acceptFailedUserInfo
userInfo: failedPayload.toDictionary()
)
}
}

// 10-second timeout guard: if REST hasn't completed by then, call finishAccept(false).
let timeoutWorkItem = DispatchWorkItem { [weak payload, finishAcceptInvoked] in
guard let payload else { return }
guard !finishAcceptInvoked else { return }
// Check the callId is still tracked (not already cleaned up).
nativeAcceptLock.lock()
let isStillTracked = nativeAcceptHandledCallIds.contains(payload.callId)
nativeAcceptLock.unlock()
if isStillTracked {
finishAccept(false)
}
}
DispatchQueue.main.asyncAfter(deadline: .now() + 10.0, execute: timeoutWorkItem)

guard let api = API(server: payload.host) else {
#if DEBUG
print("[\(TAG)] Failed to create API for host: \(payload.host)")
Expand Down
Loading