Skip to content

Fix custom RTCConfigurations not picking up server-provided ice servers when needed #993

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
davidliu merged 1 commit into from
Aug 5, 2026
Merged

Fix custom RTCConfigurations not picking up server-provided ice servers when needed #993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions .changeset/tricky-grapes-compare.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"client-sdk-android": patch
---

Fix custom RTCConfigurations not picking up server-provided ice servers when user-provided list is empty
9 changes: 4 additions & 5 deletions livekit-android-sdk/src/main/java/io/livekit/android/room/RTCEngine.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -998,14 +998,13 @@ internal constructor(

// Only use server-provided servers if user doesn't provide any.
if (mergedServers.isEmpty()) {
iceServers.forEach { server ->
if (!mergedServers.contains(server)) {
mergedServers.add(server)
}
}
mergedServers.addAll(serverIceServers)
}

iceServers = mergedServers
sdpSemantics = PeerConnection.SdpSemantics.UNIFIED_PLAN
continualGatheringPolicy =
PeerConnection.ContinualGatheringPolicy.GATHER_CONTINUALLY
}
?: RTCConfiguration(serverIceServers).apply {
sdpSemantics = PeerConnection.SdpSemantics.UNIFIED_PLAN
Expand Down
33 changes: 33 additions & 0 deletions livekit-android-test/src/test/java/io/livekit/android/room/RTCEngineMockE2ETest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package io.livekit.android.room

import com.google.protobuf.ByteString
import io.livekit.android.ConnectOptions
import io.livekit.android.room.track.TrackException
import io.livekit.android.test.MockE2ETest
import io.livekit.android.test.events.FlowCollector
Expand Down Expand Up @@ -84,6 +85,38 @@ class RTCEngineMockE2ETest : MockE2ETest() {
assertEquals(sentIceServers, subPeerConnection.rtcConfig.iceServers)
}

@Test
fun customRtcConfigWithEmptyIceServersUsesServerIceServers() = runTest {
val connectJob = async {
room.connect(
url = TestData.EXAMPLE_URL,
token = "token",
options = ConnectOptions(
rtcConfig = PeerConnection.RTCConfiguration(emptyList()).apply {
iceTransportsType = PeerConnection.IceTransportsType.RELAY
},
),
)
}
prepareSignal(TestData.JOIN)
connectJob.await()
connectPeerConnection()

val subPeerConnection = getSubscriberPeerConnection()
assertEquals(PeerConnection.IceTransportsType.RELAY, subPeerConnection.rtcConfig.iceTransportsType)
val sentIceServers = TestData.JOIN.join.iceServersList
.map { it.toWebrtc() }
assertEquals(sentIceServers, subPeerConnection.rtcConfig.iceServers)
assertEquals(
PeerConnection.SdpSemantics.UNIFIED_PLAN,
subPeerConnection.rtcConfig.sdpSemantics,
)
assertEquals(
PeerConnection.ContinualGatheringPolicy.GATHER_CONTINUALLY,
subPeerConnection.rtcConfig.continualGatheringPolicy,
)
}

@Test
fun roomConnectDoesNotHangOnWebSocketFailure() = runTest {
val connectJob = async {
Expand Down
Loading