Is/bug fix/call event (#342)

* Version Bump

* Send CallId for ByeResult

* Release AudioManger from tests

* Fix Call Tests

Author: isaacakakpo1

app/src/main/java/com/telnyx/webrtc/sdk/ui/MainActivity.kt

@@ -212,6 +212,8 @@ class MainActivity : AppCompatActivity() {
 
                             SocketMethod.BYE.methodName -> {
                                 onByeReceivedViews()
+                                val callId = (data.result as ByeResponse).callId
+                                supportFragmentManager.beginTransaction().remove(callInstanceFragment!!).commit()
                             }
                         }
                     }
@@ -360,8 +362,6 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun mockInputs() {
-        sip_username_id.setText(MOCK_USERNAME)
-        sip_password_id.setText(MOCK_PASSWORD)
         caller_id_name_id.setText(MOCK_CALLER_NAME)
         caller_id_number_id.setText(MOCK_CALLER_NUMBER)
         call_input_id.setText(MOCK_DESTINATION_NUMBER)

telnyx_rtc/build.gradle

@@ -13,7 +13,7 @@ apply plugin: 'maven-publish'
 apply plugin: "com.bugsnag.android.gradle"
 
 def getVersionName = { ->
-    return "1.3.1"
+    return "1.3.3"
 }
 
 def getArtifactId = { ->

telnyx_rtc/src/main/java/com/telnyx/webrtc/sdk/Call.kt

@@ -19,6 +19,7 @@ import com.telnyx.webrtc.sdk.peer.Peer
 import com.telnyx.webrtc.sdk.peer.PeerConnectionObserver
 import com.telnyx.webrtc.sdk.socket.TxSocket
 import com.telnyx.webrtc.sdk.socket.TxSocketListener
+import com.telnyx.webrtc.sdk.telnyx_rtc.BuildConfig
 import com.telnyx.webrtc.sdk.utilities.encodeBase64
 import com.telnyx.webrtc.sdk.verto.receive.*
 import com.telnyx.webrtc.sdk.verto.send.*
@@ -80,9 +81,13 @@ data class Call(
     private val loudSpeakerLiveData = MutableLiveData(false)
 
     init {
-        audioManager.mode = AudioManager.MODE_IN_COMMUNICATION
+        if (!BuildConfig.IS_TESTING.get()) {
+            if (audioManager.mode != AudioManager.MODE_IN_COMMUNICATION) {
+                audioManager.mode = AudioManager.MODE_IN_COMMUNICATION
+            }
+        }
 
-        callStateLiveData.postValue(CallState.RINGING)
+        callStateLiveData.postValue(CallState.CONNECTING)
         // Ensure that loudSpeakerLiveData is correct based on possible options provided from client.
         loudSpeakerLiveData.postValue(audioManager.isSpeakerphoneOn)
     }

telnyx_rtc/src/main/java/com/telnyx/webrtc/sdk/TelnyxClient.kt

@@ -261,12 +261,13 @@ class TelnyxClient(
                     )
                 )
             )
+            val byeResponse = ByeResponse(callId)
             // send bye message to the UI
             client.socketResponseLiveData.postValue(
                 SocketResponse.messageReceived(
                     ReceivedMessageBody(
                         SocketMethod.BYE.methodName,
-                        null
+                        byeResponse
                     )
                 )
             )
@@ -1005,11 +1006,14 @@ class TelnyxClient(
         val byeCall = calls[callId]
         byeCall?.apply {
             Timber.d("[%s] :: onByeReceived", this.javaClass.simpleName)
+            val byeResponse = ByeResponse(
+                callId
+            )
             client.socketResponseLiveData.postValue(
                 SocketResponse.messageReceived(
                     ReceivedMessageBody(
                         SocketMethod.BYE.methodName,
-                        null
+                        byeResponse
                     )
                 )
             )
@@ -1020,6 +1024,7 @@ class TelnyxClient(
             resetCallOptions()
             client.stopMediaPlayer()
             peerConnection?.release()
+            byeCall.endCall(callId)
         }
 
     }
@@ -1212,11 +1217,21 @@ class TelnyxClient(
             } else {
                 UUID.randomUUID()
             }
+            val customHeaders =
+                params.get("dialogParams")?.asJsonObject?.get("custom_headers")?.asJsonArray
+
+            val ringingResponse = RingingResponse(
+                UUID.fromString(callId),
+                params.get("caller_id_name").asString,
+                params.get("caller_id_number").asString,
+                sessionId,
+                customHeaders?.toCustomHeaders() ?: arrayListOf()
+            )
             client.socketResponseLiveData.postValue(
                 SocketResponse.messageReceived(
                     ReceivedMessageBody(
                         SocketMethod.RINGING.methodName,
-                        null
+                        ringingResponse
                     )
                 )
             )

telnyx_rtc/src/main/java/com/telnyx/webrtc/sdk/verto/receive/ReceivedResult.kt

@@ -46,6 +46,12 @@ data class LoginResponse(
     val sessid: String
 ) : ReceivedResult(), Parcelable
 
+
+data class ByeResponse(
+    @SerializedName("sessid")
+    val callId : UUID
+) : ReceivedResult()
+
 /**
  * A response to an invitation that the user created. Someone has answered your call.
  *
@@ -125,3 +131,16 @@ data class InviteResponse(
         }
     }
 }
+
+data class RingingResponse(
+    @SerializedName("callID")
+    val callId: UUID,
+    @SerializedName("callerIdName")
+    val callerIdName: String,
+    @SerializedName("callerIdNumber")
+    val callerIdNumber: String,
+    @SerializedName("sessid")
+    val sessid: String,
+    @SerializedName("custom_headers")
+    val customHeaders: ArrayList<CustomHeaders> = arrayListOf()
+) : ReceivedResult()

telnyx_rtc/src/test/java/com/telnyx/webrtc/sdk/CallTest.kt

@@ -194,7 +194,7 @@ class CallTest : BaseTest() {
         call = Mockito.spy(
             Call(mockContext, client, client.socket, "123", audioManager)
         )
-        assertEquals(call.getCallState().value, CallState.RINGING)
+        assertEquals(call.getCallState().value, CallState.CONNECTING)
     }
 
     // NOOP tests, methods that should literally do nothing -- included for test coverage