Skip to content

Commit

Permalink
Remove Unwanted IPS from SDP (#358)
Browse files Browse the repository at this point in the history 
* - Remove Unwanted IPS from SDP
 Outbound
 Inbound
 Attach

* - Fix Answer Test

* - Deprecated `callStateLiveData` and introduced callStateFlow as a Flow variable.

* - Set Initial callState for Call
  • Loading branch information
@isaacakakpo1
isaacakakpo1 authored Nov 18, 2024
1 parent f243f3f commit 9c07e5f
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 36 deletions.
28 changes: 16 additions & 12 deletions telnyx_rtc/src/main/java/com/telnyx/webrtc/sdk/Call.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,17 @@ import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import com.google.gson.Gson
import com.google.gson.JsonArray
import com.google.gson.JsonObject
import com.google.gson.JsonSyntaxException
import com.telnyx.webrtc.sdk.model.CallState
import com.telnyx.webrtc.sdk.model.CauseCode
import com.telnyx.webrtc.sdk.model.SocketMethod
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.*
import org.jetbrains.annotations.TestOnly
import org.webrtc.IceCandidate
import org.webrtc.SessionDescription
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import timber.log.Timber
import java.util.*
import kotlin.concurrent.timerTask

/**
* Class that represents a Call and handles all call related actions, including answering and ending a call.
Expand Down Expand Up @@ -67,7 +59,12 @@ data class Call(
internal var telnyxSessionId: UUID? = null
internal var telnyxLegId: UUID? = null

internal val callStateLiveData = MutableLiveData(CallState.NEW)

private val callStateLiveData = MutableLiveData(CallState.NEW)

private val _callStateFlow = MutableStateFlow(CallState.NEW)

val callStateFlow: StateFlow<CallState> = _callStateFlow

// Ongoing call options
// Mute toggle live data
Expand All @@ -80,7 +77,8 @@ data class Call(
private val loudSpeakerLiveData = MutableLiveData(false)

init {
callStateLiveData.postValue(CallState.CONNECTING)
updateCallState(CallState.CONNECTING)

// Ensure that loudSpeakerLiveData is correct based on possible options provided from client.
loudSpeakerLiveData.postValue(audioManager.isSpeakerphoneOn)
}
Expand All @@ -91,6 +89,11 @@ data class Call(
peerConnection?.startTimer()
}

internal fun updateCallState(value: CallState) {
callStateLiveData.postValue(value)
_callStateFlow.value = value
}

fun stopDebug() {
Timber.d("Peer connection debug stopped")
peerConnection?.stopTimer()
Expand Down Expand Up @@ -285,6 +288,7 @@ data class Call(
* @see [CallState]
* @return [LiveData]
*/
@Deprecated("Use `getCallState` instead", ReplaceWith("callStateFlow"))
fun getCallState(): LiveData<CallState> = callStateLiveData

/**
Expand Down
69 changes: 45 additions & 24 deletions telnyx_rtc/src/main/java/com/telnyx/webrtc/sdk/TelnyxClient.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ class TelnyxClient(
val call: Call? by lazy {
if (calls.isNotEmpty()) {
val allCalls = calls.values
val activeCall = allCalls.firstOrNull { it.getCallState().value == CallState.ACTIVE }
val activeCall = allCalls.firstOrNull { it.callStateFlow.value == CallState.ACTIVE }
activeCall ?: allCalls.first() // return the first
} else {
buildCall()
Expand Down Expand Up @@ -165,7 +165,7 @@ class TelnyxClient(
val sessionDescriptionString =
peerConnection?.getLocalDescription()?.description
if (sessionDescriptionString == null) {
callStateLiveData.postValue(CallState.ERROR)
updateCallState(CallState.ERROR)
} else {
val answerBodyMessage = SendingMessageBody(
uuid, SocketMethod.ANSWER.methodName,
Expand All @@ -179,18 +179,21 @@ class TelnyxClient(
)
)
)
updateCallState(CallState.ACTIVE)
socket.send(answerBodyMessage)
client.stopMediaPlayer()
// reset audio mode to communication
speakerState?.let { setSpeakerMode(it) }
speakerState.let { setSpeakerMode(it) }


callStateLiveData.postValue(CallState.ACTIVE)
// callStateLiveData.value = CallState.ACTIVE
client.callOngoing()

}
}

this.addToCalls(acceptCall)
Timber.d("Event-Check Active ${calls[callId]?.callStateFlow?.value}")
Timber.d("Event-Check2 Active ${ calls[callId]?.getCallState()?.value}")

return acceptCall
}

Expand All @@ -214,14 +217,21 @@ class TelnyxClient(
val inviteCallId: UUID = UUID.randomUUID()

callId = inviteCallId
val call = this

// Create new peer
peerConnection = Peer(
context, client, providedTurn, providedStun, callId.toString(),
object : PeerConnectionObserver() {
override fun onIceCandidate(p0: IceCandidate?) {
super.onIceCandidate(p0)
peerConnection?.addIceCandidate(p0)
Timber.d("Event-IceCandidate Generated")
if (call.callStateFlow.value != CallState.ACTIVE) {
peerConnection?.let { connection ->
connection.addIceCandidate(p0)
Timber.d("Event-IceCandidate Added")
}
}
}
}
)
Expand Down Expand Up @@ -293,7 +303,7 @@ class TelnyxClient(
)
)
)
callStateLiveData.postValue(CallState.DONE)
updateCallState(CallState.DONE)
client.removeFromCalls(callId)
client.callNotOngoing()
socket.send(byeMessageBody)
Expand All @@ -311,7 +321,7 @@ class TelnyxClient(
* @param call, and instance of [Call]
*/
internal fun addToCalls(call: Call) {
calls.getOrPut(call.callId) { call }
calls[call.callId] = call
}

/**
Expand Down Expand Up @@ -1247,7 +1257,7 @@ class TelnyxClient(
)
)

callStateLiveData.postValue(CallState.DONE)
updateCallState(CallState.DONE)
client.removeFromCalls(callId)
client.callNotOngoing()
resetCallOptions()
Expand All @@ -1273,7 +1283,7 @@ class TelnyxClient(

peerConnection?.onRemoteSessionReceived(sdp)

callStateLiveData.postValue(CallState.ACTIVE)
updateCallState(CallState.ACTIVE)

val answerResponse = AnswerResponse(
UUID.fromString(callId),
Expand All @@ -1292,7 +1302,7 @@ class TelnyxClient(
}

earlySDP -> {
callStateLiveData.postValue(CallState.CONNECTING)
updateCallState(CallState.CONNECTING)
val stringSdp = peerConnection?.getLocalDescription()?.description
val answerResponse = AnswerResponse(
UUID.fromString(callId),
Expand All @@ -1308,18 +1318,21 @@ class TelnyxClient(
)
)
)
callStateLiveData.postValue(CallState.ACTIVE)
updateCallState(CallState.ACTIVE)
}

else -> {
// There was no SDP in the response, there was an error.
callStateLiveData.postValue(CallState.DONE)
updateCallState(CallState.DONE)
client.removeFromCalls(UUID.fromString(callId))
}
}
client.callOngoing()
client.stopMediaPlayer()
}
answeredCall?.let {
addToCalls(it)
}

}

Expand Down Expand Up @@ -1359,7 +1372,7 @@ class TelnyxClient(

} else {
// There was no SDP in the response, there was an error.
callStateLiveData.postValue(CallState.DONE)
updateCallState(CallState.DONE)
client.removeFromCalls(UUID.fromString(callId))
}

Expand Down Expand Up @@ -1405,6 +1418,7 @@ class TelnyxClient(

// Set global callID
callId = offerCallId
val call = this

//retrieve custom headers
val customHeaders =
Expand All @@ -1414,8 +1428,13 @@ class TelnyxClient(
object : PeerConnectionObserver() {
override fun onIceCandidate(p0: IceCandidate?) {
super.onIceCandidate(p0)
peerConnection?.addIceCandidate(p0)
Timber.d("On IceCandidate Added")
Timber.d("Event-IceCandidate Generated")
if (calls[callId]?.getCallState()?.value != CallState.ACTIVE) {
peerConnection?.let { connection ->
connection.addIceCandidate(p0)
Timber.d("Event-IceCandidate Added")
}
}
}

override fun onRenegotiationNeeded() {
Expand Down Expand Up @@ -1514,7 +1533,7 @@ class TelnyxClient(

override fun onIceCandidateReceived(iceCandidate: IceCandidate) {
call?.apply {
callStateLiveData.postValue(CallState.CONNECTING)
updateCallState(CallState.CONNECTING)
}
}

Expand All @@ -1540,8 +1559,6 @@ class TelnyxClient(
}

override fun onAttachReceived(jsonObject: JsonObject) {
/* val params = jsonObject.getAsJsonObject("params")
val callId = UUID.fromString(params.get("callID").asString)*/

val attachCall = call!!.copy(
context = context,
Expand Down Expand Up @@ -1572,14 +1589,18 @@ class TelnyxClient(
// Set global callID
callId = offerCallId


peerConnection = Peer(
context, client, providedTurn, providedStun, offerCallId.toString(),
object : PeerConnectionObserver() {
override fun onIceCandidate(p0: IceCandidate?) {
super.onIceCandidate(p0)
peerConnection?.addIceCandidate(p0)
Timber.d("On IceCandidate Added")
Timber.d("Event-IceCandidate Generated")
if (calls[callId]?.callStateFlow?.value != CallState.ACTIVE) {
peerConnection?.let { connection ->
connection.addIceCandidate(p0)
Timber.d("Event-IceCandidate Added")
}
}
}

override fun onRenegotiationNeeded() {
Expand Down Expand Up @@ -1608,7 +1629,7 @@ class TelnyxClient(
Call.ICE_CANDIDATE_DELAY
)
}

attachCall.updateCallState(CallState.ACTIVE)
calls[attachCall.callId] = attachCall
}

Expand Down

0 comments on commit 9c07e5f

Please sign in to comment.