Don't wait for ice connection onJoin to fix race condition

@@ -33,16 +33,7 @@ constructor(
 
 
     var listener: Listener? = null
     var listener: Listener? = null
     var rtcConnected: Boolean = false
     var rtcConnected: Boolean = false
-    var joinResponse: LivekitRtc.JoinResponse? = null
     var iceConnected: Boolean = false
     var iceConnected: Boolean = false
-        set(value) {
-            field = value
-            val savedJoinResponse = joinResponse
-            if (field && savedJoinResponse != null) {
-                listener?.onJoin(savedJoinResponse)
-                joinResponse = null
-            }
-        }
     private val pendingTrackResolvers: MutableMap<String, Continuation<LivekitModels.TrackInfo>> =
     private val pendingTrackResolvers: MutableMap<String, Continuation<LivekitModels.TrackInfo>> =
         mutableMapOf()
         mutableMapOf()
 
 
@@ -145,7 +136,6 @@ constructor(
     }
     }
 
 
     override fun onJoin(info: LivekitRtc.JoinResponse) {
     override fun onJoin(info: LivekitRtc.JoinResponse) {
-        joinResponse = info
 
 
         val iceServers = mutableListOf<PeerConnection.IceServer>()
         val iceServers = mutableListOf<PeerConnection.IceServer>()
         for(serverInfo in info.iceServersList){
         for(serverInfo in info.iceServersList){
@@ -163,7 +153,6 @@ constructor(
         if(iceServers.isEmpty()){
         if(iceServers.isEmpty()){
             iceServers.addAll(RTCClient.DEFAULT_ICE_SERVERS)
             iceServers.addAll(RTCClient.DEFAULT_ICE_SERVERS)
         }
         }
-
         info.iceServersList.forEach {
         info.iceServersList.forEach {
             Timber.e{ "username = \"${it.username}\""}
             Timber.e{ "username = \"${it.username}\""}
             Timber.e{ "credential = \"${it.credential}\""}
             Timber.e{ "credential = \"${it.credential}\""}
@@ -172,6 +161,7 @@ constructor(
                 Timber.e{"   $it"}
                 Timber.e{"   $it"}
             }
             }
         }
         }
+        listener?.onJoin(info)
 
 
         val rtcConfig = PeerConnection.RTCConfiguration(iceServers).apply {
         val rtcConfig = PeerConnection.RTCConfiguration(iceServers).apply {
             sdpSemantics = PeerConnection.SdpSemantics.UNIFIED_PLAN
             sdpSemantics = PeerConnection.SdpSemantics.UNIFIED_PLAN

@@ -80,6 +80,7 @@ constructor(
         listener?.onParticipantDisconnected(this, removedParticipant)
         listener?.onParticipantDisconnected(this, removedParticipant)
     }
     }
 
 
+    @Synchronized
     private fun getOrCreateRemoteParticipant(
     private fun getOrCreateRemoteParticipant(
         sid: String,
         sid: String,
         info: LivekitModels.ParticipantInfo? = null
         info: LivekitModels.ParticipantInfo? = null
@@ -157,6 +158,8 @@ constructor(
 
 
         if (!response.hasParticipant()) {
         if (!response.hasParticipant()) {
             listener?.onFailedToConnect(this, RoomException.ConnectException("server didn't return any participants"))
             listener?.onFailedToConnect(this, RoomException.ConnectException("server didn't return any participants"))
+            connectContinuation?.resume(Unit)
+            connectContinuation = null
             return
             return
         }
         }