Skip to content

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

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(android): start VoipCallService on accept, stop on hangup/timeout, install end-call listener #7200

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8fb15d7
fix(android): start VoipCallService on accept, stop on hangup/timeout…
diegolmello Apr 22, 2026
42f46ae
chore(android): drop H3 plan identifier from VoipNotification comment
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
9 changes: 9 additions & 0 deletions android/app/src/main/java/chat/rocket/reactnative/voip/VoipNotification.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ class VoipNotification(private val context: Context) {
fun handleTimeout(context: Context, payload: VoipPayload) {
cancelTimeout(payload.callId)
disconnectTimedOutCall(payload.callId)
VoipCallService.stopService(context)
cancelById(context, payload.notificationId)
LocalBroadcastManager.getInstance(context).sendBroadcast(
Intent(ACTION_TIMEOUT).apply {
Expand Down Expand Up @@ -239,6 +240,13 @@ class VoipNotification(private val context: Context) {
Log.d(TAG, "Accept action triggered for callId: ${payload.callId}")
cancelTimeout(payload.callId)

// Install the DDP end-call listener here so the notification-accept path
// also tears down on hangup; previously only showIncomingCall installed it.
startListeningForCallEnd(context, payload)

// Start foreground service to keep call alive in background.
VoipCallService.startService(context, payload.callId)

val appCtx = context.applicationContext
// Guard so finish() is called at most once, whether by the REST callback or the timeout.
val finished = AtomicBoolean(false)
Expand Down Expand Up @@ -481,6 +489,7 @@ class VoipNotification(private val context: Context) {
}
cancelTimeout(callId)
disconnectIncomingCall(callId, false)
VoipCallService.stopService(appContext)
cancelById(appContext, payload.notificationId)
LocalBroadcastManager.getInstance(appContext).sendBroadcast(
Intent(ACTION_DISMISS).apply {
Expand Down
Loading