Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,21 @@ internal constructor(
}
}

/**
* Cancel any in-progress reconnection and start a fresh one.
* Used when network availability changes, since the existing reconnect
* loop may be stuck in blocking calls to an unreachable server.
* Forces a full reconnect since the cancelled job may have already
* destroyed peer connections via closeResources().
*/
@Synchronized
internal fun forceReconnect() {
reconnectingJob?.cancel()
reconnectingJob = null
fullReconnectOnNext = true
reconnect()
}

/**
* reconnect Signal and PeerConnections
*/
Expand Down
16 changes: 10 additions & 6 deletions livekit-android-sdk/src/main/java/io/livekit/android/room/Room.kt
Original file line number Diff line number Diff line change
Expand Up @@ -968,9 +968,6 @@ constructor(
}

private fun reconnect() {
if (state == State.RECONNECTING) {
return
}
engine.reconnect()
}

Expand Down Expand Up @@ -1116,18 +1113,25 @@ constructor(
private val networkCallbackManager = networkCallbackManagerFactory.invoke(
object : NetworkCallback() {
override fun onLost(network: Network) {
// lost connection, flip to reconnecting
hasLostConnectivity = true
if (state == State.CONNECTED) {
state = State.RECONNECTING
eventBus.postEvent(RoomEvent.Reconnecting(this@Room), coroutineScope)
}
}

override fun onAvailable(network: Network) {
// only actually reconnect after connection is re-established
if (!hasLostConnectivity) {
return
}
LKLog.i { "network connection available, reconnecting" }
reconnect()
hasLostConnectivity = false
LKLog.i { "network connection available, reconnecting" }
// Force-restart reconnection. The engine likely already started
// its own reconnect loop (via ICE state detection) while offline,
// but that loop may be stuck in blocking calls to unreachable
// servers. Cancel it and start fresh now that network is back.
engine.forceReconnect()
}
},
)
Expand Down
Loading