Skip to content

Fix: no Connected event on outbound Android calls #160

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
merged 2 commits into from
Sep 8, 2023
Merged

Fix: no Connected event on outbound Android calls #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e7f321
Updated Twilio Call event listener attach order (see details)
cybex-dev Sep 8, 2023
a88eeee
Minor refactor `TVConnectionService`
cybex-dev Sep 8, 2023
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
10 changes: 5 additions & 5 deletions android/src/main/kotlin/com/twilio/twilio_voice/service/TVConnection.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,26 +170,26 @@ open class TVCallConnection(
setInitialized()
}
}
onCallStateListener?.withValue(call.state)
onEvent?.onChange(TVNativeCallEvents.EVENT_RINGING, Bundle().apply {
putString(TVBroadcastReceiver.EXTRA_CALL_HANDLE, callParams?.callSid)
putString(TVBroadcastReceiver.EXTRA_CALL_FROM, callParams?.fromRaw)
putString(TVBroadcastReceiver.EXTRA_CALL_TO, callParams?.toRaw)
putInt(TVBroadcastReceiver.EXTRA_CALL_DIRECTION, callDirection.id)
})
onCallStateListener?.withValue(call.state)
}

override fun onConnected(call: Call) {
Log.d(TAG, "onConnected: onConnected")
twilioCall = call
setActive()
onCallStateListener?.withValue(call.state)
onEvent?.onChange(TVNativeCallEvents.EVENT_CONNECTED, Bundle().apply {
putString(TVBroadcastReceiver.EXTRA_CALL_HANDLE, callParams?.callSid)
putString(TVBroadcastReceiver.EXTRA_CALL_FROM, callParams?.fromRaw)
putString(TVBroadcastReceiver.EXTRA_CALL_TO, callParams?.toRaw)
putInt(TVBroadcastReceiver.EXTRA_CALL_DIRECTION, callDirection.id)
})
onCallStateListener?.withValue(call.state)
}

/**
Expand All @@ -205,14 +205,14 @@ open class TVCallConnection(
*/
override fun onReconnecting(call: Call, callException: CallException) {
twilioCall = call
onCallStateListener?.withValue(call.state)
onEvent?.onChange(TVNativeCallEvents.EVENT_RECONNECTING, Bundle().apply {
putString(TVBroadcastReceiver.EXTRA_CALL_HANDLE, callParams?.callSid)
putString(TVBroadcastReceiver.EXTRA_CALL_FROM, callParams?.fromRaw)
putString(TVBroadcastReceiver.EXTRA_CALL_TO, callParams?.toRaw)
putInt(TVBroadcastReceiver.EXTRA_CALL_DIRECTION, callDirection.id)
putExtras(callException.toBundle())
})
onCallStateListener?.withValue(call.state)
}

/**
Expand All @@ -223,25 +223,25 @@ open class TVCallConnection(
override fun onReconnected(call: Call) {
twilioCall = call
setActive()
onCallStateListener?.withValue(call.state)
onEvent?.onChange(TVNativeCallEvents.EVENT_RECONNECTED, Bundle().apply {
putString(TVBroadcastReceiver.EXTRA_CALL_HANDLE, callParams?.callSid)
putString(TVBroadcastReceiver.EXTRA_CALL_FROM, callParams?.fromRaw)
putString(TVBroadcastReceiver.EXTRA_CALL_TO, callParams?.toRaw)
putInt(TVBroadcastReceiver.EXTRA_CALL_DIRECTION, callDirection.id)
});
onCallStateListener?.withValue(call.state)
}

override fun onDisconnected(call: Call, reason: CallException?) {
// TODO run below only if we did NOT ended call i.e. remove disconnect from other client
Log.d(TAG, "onDisconnected: onDisconnected, reason: ${reason?.message}.\nException: ${reason.toString()}")
twilioCall = null
onCallStateListener?.withValue(call.state)
onEvent?.onChange(TVNativeCallEvents.EVENT_DISCONNECTED_REMOTE, Bundle().apply {
reason?.toBundle()?.let { putExtras(it) }
})
setDisconnected(DisconnectCause(DisconnectCause.REMOTE))
onDisconnected?.withValue(DisconnectCause(DisconnectCause.REMOTE))
onCallStateListener?.withValue(call.state)
destroy()
}
//endregion
Expand Down
2 changes: 1 addition & 1 deletion android/src/main/kotlin/com/twilio/twilio_voice/service/TVConnectionService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ class TVConnectionService : ConnectionService() {
val callSid = call.sid!!

// Resolve call parameters
val callParams = TVCallParametersImpl(mStorage, connection.twilioCall!!, to, from, params)
val callParams = TVCallParametersImpl(mStorage, call, to, from, params)
connection.setCallParameters(callParams)

// If call is not attached, attach it
Expand Down