Skip to content

[Fix] Outgoing connection returns null #186

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
Oct 19, 2023
Merged

[Fix] Outgoing connection returns null #186

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee4695b
assert request & connection manager not null
cybex-dev Oct 19, 2023
c3ea733
throw exception on missing parameters
cybex-dev Oct 19, 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
18 changes: 12 additions & 6 deletions 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 @@ -472,19 +472,22 @@ class TVConnectionService : ConnectionService() {
//endregion

override fun onCreateIncomingConnection(connectionManagerPhoneAccount: PhoneAccountHandle?, request: ConnectionRequest?): Connection {
assert(request != null) { "ConnectionRequest cannot be null" }
assert(connectionManagerPhoneAccount != null) { "ConnectionManagerPhoneAccount cannot be null" }

super.onCreateIncomingConnection(connectionManagerPhoneAccount, request)
Log.d(TAG, "onCreateIncomingConnection")

val extras = request?.extras
val myBundle: Bundle = extras?.getBundle(TelecomManager.EXTRA_INCOMING_CALL_EXTRAS) ?: run {
Log.e(TAG, "onCreateIncomingConnection: request is missing Bundle EXTRA_INCOMING_CALL_EXTRAS")
return super.onCreateIncomingConnection(connectionManagerPhoneAccount, request)
throw Exception("onCreateIncomingConnection: request is missing Bundle EXTRA_INCOMING_CALL_EXTRAS");
}

myBundle.classLoader = CallInvite::class.java.classLoader
val ci: CallInvite = myBundle.getParcelableSafe(EXTRA_INCOMING_CALL_INVITE) ?: run {
Log.e(TAG, "onCreateIncomingConnection: request is missing CallInvite EXTRA_INCOMING_CALL_INVITE")
return super.onCreateIncomingConnection(connectionManagerPhoneAccount, request)
throw Exception("onCreateIncomingConnection: request is missing CallInvite EXTRA_INCOMING_CALL_INVITE");
}

// Create storage instance for call parameters
Expand Down Expand Up @@ -512,27 +515,30 @@ class TVConnectionService : ConnectionService() {
}

override fun onCreateOutgoingConnection(connectionManagerPhoneAccount: PhoneAccountHandle?, request: ConnectionRequest?): Connection {
assert(request != null) { "ConnectionRequest cannot be null" }
assert(connectionManagerPhoneAccount != null) { "ConnectionManagerPhoneAccount cannot be null" }

super.onCreateOutgoingConnection(connectionManagerPhoneAccount, request)
Log.d(TAG, "onCreateOutgoingConnection")

val extras = request?.extras
val myBundle: Bundle = extras?.getBundle(EXTRA_OUTGOING_PARAMS) ?: run {
Log.e(TAG, "onCreateOutgoingConnection: request is missing Bundle EXTRA_OUTGOING_PARAMS")
return super.onCreateOutgoingConnection(connectionManagerPhoneAccount, request)
throw Exception("onCreateOutgoingConnection: request is missing Bundle EXTRA_OUTGOING_PARAMS");
}

// check required EXTRA_TOKEN, EXTRA_TO, EXTRA_FROM
val token: String = myBundle.getString(EXTRA_TOKEN) ?: run {
Log.e(TAG, "onCreateOutgoingConnection: ACTION_PLACE_OUTGOING_CALL is missing String EXTRA_TOKEN")
return super.onCreateOutgoingConnection(connectionManagerPhoneAccount, request)
throw Exception("onCreateOutgoingConnection: ACTION_PLACE_OUTGOING_CALL is missing String EXTRA_TOKEN");
}
val to = myBundle.getString(EXTRA_TO) ?: run {
Log.e(TAG, "onCreateOutgoingConnection: ACTION_PLACE_OUTGOING_CALL is missing String EXTRA_TO")
return super.onCreateOutgoingConnection(connectionManagerPhoneAccount, request)
throw Exception("onCreateOutgoingConnection: ACTION_PLACE_OUTGOING_CALL is missing String EXTRA_TO");
}
val from = myBundle.getString(EXTRA_FROM) ?: run {
Log.e(TAG, "onCreateOutgoingConnection: ACTION_PLACE_OUTGOING_CALL is missing String EXTRA_FROM")
return super.onCreateOutgoingConnection(connectionManagerPhoneAccount, request)
throw Exception("onCreateOutgoingConnection: ACTION_PLACE_OUTGOING_CALL is missing String EXTRA_FROM");
}

// Get all params from bundle
Expand Down