fix(ios): capture finishAcceptInvoked by reference in DispatchWorkItem closure#7219
Merged
Merged
Conversation
…m closure Wrap finishAcceptInvoked in [false] array so DispatchWorkItem closure sees mutations. Prevents 10s timeout from firing finishAccept(false) after user already accepted call. Closes #6918
diegolmello
had a problem deploying
to
approve_e2e_testing
GitHub Actions
Failure
Contributor
WalkthroughChanged the deduplication flag in Changes
Estimated code review effort🎯 2 (Simple) | ⏱️ ~10 minutes Possibly related PRs
Suggested labels
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
diegolmello
temporarily deployed
to
experimental_ios_build
GitHub Actions
Inactive
diegolmello
had a problem deploying
to
official_android_build
GitHub Actions
Failure
diegolmello
had a problem deploying
to
experimental_android_build
GitHub Actions
Failure
diegolmello
had a problem deploying
to
official_ios_build
GitHub Actions
Failure
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
ios/Libraries/VoipService.swift (1)
460-501:⚠️ Potential issue | 🟠 MajorArray capture semantics create invisible state divergence between closures
The
finishAcceptInvokedarray at line 460 is captured by value in thetimeoutWorkItemclosure (line 499) via the explicit capture list. WhenfinishAcceptmutatesfinishAcceptInvoked[0]at line 463, that mutation occurs on a different Array instance than the copy held by the timeout closure. Copy-on-write semantics ensure these independent copies diverge—the timeout guard at line 501 will not observe the mutation, defeating the dedupe logic.Proposed fix (use a reference wrapper for shared mutable state)
- var finishAcceptInvoked = [false] + final class FinishAcceptState { + var invoked = false + } + let finishAcceptState = FinishAcceptState() let finishAccept: (Bool) -> Void = { [weak payload] success in - guard !finishAcceptInvoked[0] else { return } - finishAcceptInvoked[0] = true + guard !finishAcceptState.invoked else { return } + finishAcceptState.invoked = true guard let payload else { return } stopDDPClientInternal(callId: payload.callId) if success { @@ - let timeoutWorkItem = DispatchWorkItem { [weak payload, finishAcceptInvoked] in + let timeoutWorkItem = DispatchWorkItem { [weak payload] in guard let payload else { return } - guard !finishAcceptInvoked[0] else { return } + guard !finishAcceptState.invoked else { return }🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@ios/Libraries/VoipService.swift` around lines 460 - 501, The dedupe flag currently uses an Array (finishAcceptInvoked) which gets copied into timeoutWorkItem's capture list causing divergent state; replace that shared mutable state with a reference type (e.g., a small class wrapper like FinishAcceptInvokedBox with a Bool property or an Atomic/ThreadSafeBool) and update references in finishAccept and timeoutWorkItem to read/write that single shared instance (e.g., finishAcceptInvoked.value) so both closures observe the same mutation; ensure the same reference is captured (no value-capture in the closure capture lists) and keep existing guard checks and mutation logic otherwise unchanged.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Outside diff comments:
In `@ios/Libraries/VoipService.swift`:
- Around line 460-501: The dedupe flag currently uses an Array
(finishAcceptInvoked) which gets copied into timeoutWorkItem's capture list
causing divergent state; replace that shared mutable state with a reference type
(e.g., a small class wrapper like FinishAcceptInvokedBox with a Bool property or
an Atomic/ThreadSafeBool) and update references in finishAccept and
timeoutWorkItem to read/write that single shared instance (e.g.,
finishAcceptInvoked.value) so both closures observe the same mutation; ensure
the same reference is captured (no value-capture in the closure capture lists)
and keep existing guard checks and mutation logic otherwise unchanged.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro
Run ID: 1ca81cb6-d700-4511-a70f-17a2f5a48700
📒 Files selected for processing (1)
ios/Libraries/VoipService.swift
📜 Review details
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (1)
- GitHub Check: ESLint and Test / run-eslint-and-test
🧰 Additional context used
🧠 Learnings (1)
📓 Common learnings
Learnt from: OtavioStasiak
Repo: RocketChat/Rocket.Chat.ReactNative PR: 6499
File: app/containers/ServerItem/index.tsx:34-36
Timestamp: 2025-12-17T15:56:22.578Z
Learning: In the Rocket.Chat React Native codebase, for radio button components on iOS, include the selection state ("Selected"/"Unselected") in the accessibilityLabel instead of using accessibilityState={{ checked: hasCheck }}, because iOS VoiceOver has known issues with accessibilityRole="radio" + accessibilityState that prevent correct state announcement.
|
iOS Build Available Rocket.Chat Experimental 4.72.0.108608 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Test plan
Summary by CodeRabbit