From 2e7f3218a321fb43e203614416eda87494fb9d20 Mon Sep 17 00:00:00 2001
From: KGCybeX <k4gcybex@gmail.com>
Date: Fri, 8 Sep 2023 23:27:31 +0200
Subject: [PATCH 1/2] Updated Twilio Call event listener attach order (see
 details)

Due to the Twilio Call's SID only being available some time after the call being placed, we need to account for the `RINGING` / `CONNECTED` event being fired before being able to attach event listeners and add the `TVConnection` to the `activeConnections` cache.

The order of handling call event listeners is of significant importance, changing the order to handle call state changes before events resolved the `Connected` event not being fired.
---
 .../com/twilio/twilio_voice/service/TVConnection.kt    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/android/src/main/kotlin/com/twilio/twilio_voice/service/TVConnection.kt b/android/src/main/kotlin/com/twilio/twilio_voice/service/TVConnection.kt
index bde607fc..48ab4c87 100644
--- a/android/src/main/kotlin/com/twilio/twilio_voice/service/TVConnection.kt
+++ b/android/src/main/kotlin/com/twilio/twilio_voice/service/TVConnection.kt
@@ -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)
     }
 
     /**
@@ -205,6 +205,7 @@ 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)
@@ -212,7 +213,6 @@ open class TVCallConnection(
             putInt(TVBroadcastReceiver.EXTRA_CALL_DIRECTION, callDirection.id)
             putExtras(callException.toBundle())
         })
-        onCallStateListener?.withValue(call.state)
     }
 
     /**
@@ -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

From a88eeee6bae713f73d9a44c82d4e942bcea1d331 Mon Sep 17 00:00:00 2001
From: KGCybeX <k4gcybex@gmail.com>
Date: Fri, 8 Sep 2023 23:27:59 +0200
Subject: [PATCH 2/2] Minor refactor `TVConnectionService`

---
 .../com/twilio/twilio_voice/service/TVConnectionService.kt      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/src/main/kotlin/com/twilio/twilio_voice/service/TVConnectionService.kt b/android/src/main/kotlin/com/twilio/twilio_voice/service/TVConnectionService.kt
index d329e854..0bf00e76 100644
--- a/android/src/main/kotlin/com/twilio/twilio_voice/service/TVConnectionService.kt
+++ b/android/src/main/kotlin/com/twilio/twilio_voice/service/TVConnectionService.kt
@@ -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