Skip to content

fix(voip): enable DM nav for users with SIP extension - #7203

Merged
diegolmello merged 2 commits into
feat.voip-lib-newfrom
fix.voip-dm-for-users-with-extension
Apr 22, 2026
Merged

fix(voip): enable DM nav for users with SIP extension#7203
diegolmello merged 2 commits into
feat.voip-lib-newfrom
fix.voip-dm-for-users-with-extension

Conversation

@diegolmello

@diegolmello diegolmello commented Apr 22, 2026

Copy link
Copy Markdown
Member

Proposed changes

A Rocket.Chat user can have both a DM and a sipExtension. The existing guards treat any truthy sipExtension as "no DM exists", which wrongly disables the Message button on CallView and the header-content tap target, and also prevents the incoming-call flow from resolving roomId for that user. Pure SIP-only peers (no RC username, hence no DM) remain correctly gated by roomId == null.

  • MediaSessionInstance.resolveRoomIdFromContact — no longer early-returns when sipExtension is present; the existing !username short-circuit already covers SIP-only peers.
  • navigateToCallRoom — drops the sipExtension guard; !roomId and !username are sufficient.
  • CallButtons.messageDisabledroomId == null.
  • MediaCallHeader/components/Content.contentDisabledroomId == null.

Flipped tests: "no-op for SIP contact" / "skips DM lookup for SIP" → now expect DM resolution and navigation when the contact has both username and sipExtension.

Issue(s)

https://rocketchat.atlassian.net/browse/VMUX-95

How to test or reproduce

Place a call to (or receive one from) a Rocket.Chat user whose profile has a sipExtension set. Before: Message button + header title row appear disabled. After: both are enabled and tapping them navigates to the DM for that user. Pure SIP-dialed peers (no RC user) still disable Message and header navigation.

Screenshots

Types of changes

  • Bugfix (non-breaking change which fixes an issue)
  • Improvement (non-breaking change which improves a current function)
  • New feature (non-breaking change which adds functionality)
  • Documentation update (if none of the other choices apply)

Checklist

  • I have read the CONTRIBUTING doc
  • I have signed the CLA
  • Lint and unit tests pass locally with my changes
  • I have added tests that prove my fix is effective or that my feature works (if applicable)
  • I have added necessary documentation (if applicable)
  • Any dependent changes have been merged and published in downstream modules

Further comments

Summary by CodeRabbit

  • Bug Fixes
    • SIP contacts with associated usernames now properly resolve to their direct message rooms, enabling navigation during active calls
    • Messaging functionality is now available during calls with SIP contacts that have usernames
    • Fixed room lookup behavior for SIP-based contacts

A Rocket.Chat user with a `sipExtension` still has a DM, so the Message
button and header tap should resolve and navigate to that DM. Drop the
`sipExtension` guard in `resolveRoomIdFromContact`, `navigateToCallRoom`,
`CallButtons.messageDisabled`, and `Content.contentDisabled`. Pure
SIP-only peers remain gated by `roomId == null` (no `username` → no DM).
@coderabbitai

coderabbitai Bot commented Apr 22, 2026

Copy link
Copy Markdown
Contributor

Important

Review skipped

Review was skipped due to path filters

⛔ Files ignored due to path filters (1)
  • app/views/CallView/__snapshots__/index.test.tsx.snap is excluded by !**/*.snap

CodeRabbit blocks several paths by default. You can override this behavior by explicitly including those paths in the path filters. For example, including **/dist/** will override the default block on the dist directory, by removing the pattern from both the lists.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 9bf5a1d0-3ab6-4eb6-b14e-e60a98894195

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Walkthrough

The changes enable VoIP room resolution and navigation for SIP contacts that have both a username and sipExtension, removing previous logic that treated such contacts as peer-only and disabled room lookup and messaging features.

Changes

Cohort / File(s) Summary
MediaCallHeader
app/containers/MediaCallHeader/MediaCallHeader.test.tsx, app/containers/MediaCallHeader/components/Content.tsx
Test assertion updated to expect navigation when contact has both username and sipExtension. Content component's disable logic changed to exclude sipExtension check, now only disables when roomId is absent.
MediaSessionInstance
app/lib/services/voip/MediaSessionInstance.test.ts, app/lib/services/voip/MediaSessionInstance.ts
Early return condition relaxed to only exit when contact is absent. Tests updated to expect DM subscription lookup for contacts with both username and sipExtension, replacing prior assertions that skipped lookup.
navigateToCallRoom
app/lib/services/voip/navigateToCallRoom.test.ts, app/lib/services/voip/navigateToCallRoom.ts
Function no longer skips navigation for contacts with sipExtension; now only returns early when roomId or username is missing. Test case updated to assert navigation occurs for SIP contacts with both username and extension.
CallButtons
app/views/CallView/components/CallButtons.tsx
Removed contact dependency from store. Message disable logic changed to only check roomId, no longer disabling when sipExtension is present.

Sequence Diagram

sequenceDiagram
    actor User
    participant Content as Content Component
    participant MediaSession as MediaSessionInstance
    participant DM as DM Subscription Service
    participant Navigation as Navigation Service
    
    User->>Content: Press call button (SIP contact with username & extension)
    Content->>MediaSession: initiateCall() with contact
    MediaSession->>MediaSession: resolveRoomIdFromContact()
    MediaSession->>DM: getDMSubscriptionByUsername(contact.username)
    DM-->>MediaSession: { rid: 'dm-ext' }
    MediaSession->>MediaSession: setRoomId('dm-ext')
    MediaSession-->>Content: roomId resolved
    Content->>Navigation: navigateToCallRoom({ isMasterDetail: true })
    Navigation->>Navigation: Lookup room by roomId
    Navigation-->>User: Navigate to call room
Loading

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~22 minutes

Suggested labels

type: bug

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately summarizes the main fix: enabling DM navigation for users who have both a SIP extension and a Rocket.Chat username, which is the core intent of all changes across test files and components.
Docstring Coverage ✅ Passed Docstring coverage is 100.00% which is sufficient. The required threshold is 80.00%.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.

✏️ 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.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@diegolmello
diegolmello had a problem deploying to official_android_build April 22, 2026 15:05 — with GitHub Actions Failure
@diegolmello
diegolmello had a problem deploying to experimental_ios_build April 22, 2026 15:05 — with GitHub Actions Failure
@diegolmello
diegolmello had a problem deploying to experimental_android_build April 22, 2026 15:05 — with GitHub Actions Failure
@diegolmello
diegolmello merged commit 3e7dc9e into feat.voip-lib-new Apr 22, 2026
6 of 11 checks passed
@diegolmello
diegolmello deleted the fix.voip-dm-for-users-with-extension branch April 22, 2026 15:08
diegolmello added a commit that referenced this pull request Apr 22, 2026
…/Decline (#7215)

* merge feat.voip-lib

* feat(voip): enhance call handling with UUID mapping and event listeners

* Base call UI

* feat(voip): integrate Zustand for call state management and enhance CallView UI

* feat(voip): add simulateCall function for mock call handling in UI development

* refactor(CallView): update button handlers and improve UI responsiveness

* Add pause-shape-unfilled icon

* Base CallHeader

* toggleFocus

* collapse buttons

* Header components

* Hide header when no call

* Timer

* Add use memo

* Add voice call item on sidebar

* cleanup

* Temp use @rocket.chat/media-signaling from .tgz

* cleanup

* Check module and permissions to enable voip

* Refactor stop method to use optional chaining for media signal listeners

* voip push first test

* Add VoIP call handling with pending call management

- Implemented VoIP push notification handling in index.js, including storing call info for later processing.
- Added CallKeep event handlers for answering and ending calls from a cold start.
- Introduced a new CallIdUUID module to convert call IDs to deterministic UUIDs for compatibility with CallKit.
- Created a pending call store to manage incoming calls when the app is not fully initialized.
- Updated deep linking actions to include VoIP call handling.
- Enhanced MediaSessionInstance to process pending calls and manage call states effectively.

* Remove pending store and create getInitialEvents on app/index

* Attempt to make iOS calls work from cold state

* lint and format

* Patch callkeep ios

* Temp send iOS voip push token on gcm

* Temp fix require cycle

* chore: format code and fix lint issues [skip ci]

* CallIDUUID module on android and voip push

* Add setCallUUID on useCallStore to persist calls accepted on native Android

* remove callkeep from notification

* Android Incoming Call UI POC

* Refactor VoIP handling: Migrate VoIP-related classes to a new package structure, removing deprecated modules and consolidating functionality. Update imports in MainApplication and NotificationIntentHandler to reflect changes. This cleanup enhances code organization and prepares for future VoIP feature enhancements.

* Remove VoipForegroundService

* cleanup and use caller instead of callerName

* Cleanup and make iOS build again

* Refactor VoIP handling: Remove unused event emissions for call answered and declined, switch from SharedPreferences to in-memory storage for pending VoIP call data, and update method signatures for better clarity. This cleanup enhances performance and prepares for future VoIP feature improvements.

* Refactor VoIP handling: Introduce a new VoipPayload class to encapsulate call data, streamline notification processing, and enhance method signatures across the VoIP module. This update improves code clarity and prepares for future feature enhancements.

* Migrate react-native-voip-push-notifications to VoipModule

* Refactor VoIP module: Update package structure by moving VoipTurboPackage to the main package and removing the obsolete NativeVoipSpec class. Adjust imports in MainApplication and VoipModule to reflect these changes, enhancing code organization and maintainability.

* Unify emitters

* Move CallKeep listeners from MediaSessionInstance to getInitialEvents

* Clear callkeep on endcall

* Unify getInitialEvents logic

* getInitialEvents -> MediaCallEvents

* chore: format code and fix lint issues [skip ci]

* feat(Android): Add full screen incoming call (#6977)

* feat: Update call UI (#6990)

* feat: Handle audio routing, e.g., Bluetooth headset vs. internal speaker switching (#6992)

* fix: empty space when not on call (#6993)

* feat: Dialpad (#7000)

* action: organized translations

* feat: start call (#7024)

* chore: format code and fix lint issues

* feat: Pre flight (#7038)

* action: organized translations

* feat: Receive voip push notifications from backend (#7045)

* feat: Refactor media session handling and improve disconnect logic (#7065)

* feat: Control incoming call from native (#7066)

* feat: Voice message blocks (#7057)

* feat: native accept success event (#7068)

* feat(voip): call waiting, busy detection, and videoconf blocking (#7077)

* action: organized translations

* feat(voip): tap-to-hide call controls with animations (#7078)

* feat(voip): navigate to call DM from message button and header (#7082)

* feat(voip): tablet and landscape layout (#7110)

* chore: develop into feat.voip-lib-new (RN 81 + Expo 54 + reanimated 4 + true-sheet + iOS 26) (#7114)

* chore: format code and fix lint issues

* feat(voip): android landscape layout for IncomingCallActivity (#7116)

* Update agents files

* feat(voip): Support a11y (#7106)

* Fix content cutting on iOS on some edge cases

* pods

* Ignore .worktrees on jest

* chore: Merge develop into feat.voip-lib-new (#7129)

* fix(voip): show CallKit UI when call is active in background (#7128)

* chore: Update media-signaling to 0.2.0 (#7153)

* feat(voip): migrate iOS accept/reject from DDP to REST (#7124)

* Fix icons

* feat(voip): migrate Android accept/reject from DDP to REST (#7127)

* test(voip): integration tests for CallView pipeline (#7161)

* feat(voip): display video conf provider as subtitle (#7160)

* fix(voip): CallView button grid and correct landscape/dialpad layouts (#7164)

* fix(voip): prevent stale MMKV cache on Android first-install accept

MMKVKeyManager.initialize ran in MainApplication.onCreate before the JS
engine started and opened the default MMKV file via the Tencent 1.2 JAR
when it was still empty. Tencent caches instances per-ID in a singleton
registry, so that empty-state view was held for the rest of the process.
JS later wrote credentials through react-native-mmkv (MMKV Core 2.0),
which has its own separate registry. When a VoIP push arrived,
Ejson.getMMKV() got the cached empty Tencent instance and reported
"No userId found in MMKV for server". Closing and reopening the app
cleared the cache, which is why only the very first call after install
failed.

Drop the open/verify block — the encryption key is already cached from
SecureKeystore, so no MMKV handle is needed here. The first Tencent
instance is now created inside Ejson.getMMKV() after JS has written,
so it scans the file fresh.

* fix(voip): prevent duplicate ringtone on Android incoming call (#7158)

* fix(voip): set explicit snaps for NewMediaCall bottom sheet (#7165)

* Update app/lib/services/voip/MediaSessionStore.ts

Co-authored-by: Pierre Lehnen <55164754+pierre-lehnen-rc@users.noreply.github.com>

* fix: make startVoipFork reactive to permissions-changed (#7151)

* fix(android): remove MediaProjectionService from merged manifest (#7190)

* fix(voip): Phone account creation (#7170)

* feat: add Enable Mobile Ringing toggle in user preferences (#7155)

* fix(voip): ship blockers for PushKit, licensing, outbound calls, push tokens (#7167)

* fix(android): Play Store mic discoverability, safer FCM logs, avatar auth via headers (#7171)

* fix(ios): serialize VoipService bridge statics (#7169)

* fix(voip): Android DDP thread safety and VoipPayload bundle parity (#7168)

* chore(voip): dead-code and hygiene sweep (#7174)

* refactor(voip): decouple navigateToCallRoom from Redux and backfill REST/connect tests (#7176)

* test(voip): tighten ringing endCall assertion and add VideoConf VoIP-lock saga coverage (#7177)

* fix(ios): harden VoIP DDP WebSocket client on receive failures and TLS (#7173)

* refactor(voip): MediaCallEvents Redux adapters and resetVoipState (#7178)

* refactor(voip): decouple peer autocomplete from Redux; simplify NewMediaCall (#7175)

* fix(ios): add NS_SWIFT_NAME to Challenge.runChallenge for Swift 6.2 compatibility

Swift 6.2 (Xcode 26.x / macos-26 runner) auto-renames the Objective-C
method runChallenge:didReceiveChallenge:completionHandler: to
run(_:didReceive:completionHandler:) when imported into Swift.

Add NS_SWIFT_NAME to explicitly pin the Swift import name, preventing
the compiler from applying its heuristics. This keeps the existing
Swift call site in DDPClient.swift working without changes.

* fix(ios): cancel old URLSession/webSocketTask before reconnecting in DDPClient.connect (#7197)

* fix(ios): add NSLock to nativeAcceptHandledCallIds and 10s REST timeout to handleNativeAccept (#7198)

* feat(android): create VoipCallService with FOREGROUND_SERVICE_MICROPHONE (#7199)

* fix(android): start VoipCallService on accept, stop on hangup/timeout, install end-call listener (#7200)

* fix(voip): enable DM nav for users with SIP extension (#7203)

* fix(android): handle null VoiceConnection in answerIncomingCall, notify JS (#7201)

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

* fix(android): integrate VoIP modules with SSL-pinned OkHttpClient (#7208)

* fix(push): gate id and voipToken behind server version checks, fix VideoConf caller extra (#7210)

* fix(voip): remove sensitive data from production logs (#7207)

* fix(android): remove isRunning guard + add double-tap guard on Accept/Decline

- VoipCallService: remove if (!isRunning) guard, call startForeground unconditionally
  (idempotent on Android, fixes Android 14+ foreground service requirement)
- IncomingCallActivity: add AtomicBoolean guard on handleAccept/handleDecline
  to prevent double-tap from triggering multiple service starts

---------

Co-authored-by: diegolmello <diegolmello@users.noreply.github.com>
Co-authored-by: Pierre Lehnen <55164754+pierre-lehnen-rc@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant