Merge branch 'refs/heads/develop'

GetStream · Jul 8, 2024 · 1ee29d0 · 1ee29d0
2 parents 9005fa2 + 177913d
commit 1ee29d0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/buildSrc/src/main/kotlin/io/getstream/video/android/Configuration.kt b/buildSrc/src/main/kotlin/io/getstream/video/android/Configuration.kt
@@ -6,9 +6,9 @@ object Configuration {
     const val minSdk = 24
     const val majorVersion = 1
     const val minorVersion = 0
-    const val patchVersion = 9
+    const val patchVersion = 10
     const val versionName = "$majorVersion.$minorVersion.$patchVersion"
-    const val versionCode = 33
+    const val versionCode = 34
     const val snapshotVersionName = "$majorVersion.$minorVersion.${patchVersion + 1}-SNAPSHOT"
     const val artifactGroup = "io.getstream"
     const val streamVideoCallGooglePlayVersion = "1.1.4"

diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/StreamVideoImpl.kt b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/StreamVideoImpl.kt
@@ -63,6 +63,7 @@ import io.getstream.video.android.model.User
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.InternalCoroutinesApi
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
@@ -124,7 +125,6 @@ import retrofit2.HttpException
 import java.net.ConnectException
 import java.util.*
 import kotlin.coroutines.Continuation
-import kotlin.coroutines.resumeWithException
 
 internal const val WAIT_FOR_CONNECTION_ID_TIMEOUT = 5000L
 internal const val defaultAudioUsage = AudioAttributes.USAGE_VOICE_COMMUNICATION
@@ -1025,6 +1025,7 @@ internal class StreamVideoImpl internal constructor(
         }
     }
 
+    @OptIn(InternalCoroutinesApi::class)
     suspend fun _selectLocation(): Result<String> {
         return wrapAPICall {
             val url = "https://hint.stream-io-video.com/"
@@ -1033,7 +1034,9 @@ internal class StreamVideoImpl internal constructor(
             val response = suspendCancellableCoroutine { continuation ->
                 call.enqueue(object : Callback {
                     override fun onFailure(call: okhttp3.Call, e: java.io.IOException) {
-                        continuation.resumeWithException(e)
+                        continuation.tryResumeWithException(e)?.let {
+                            continuation.completeResume(it)
+                        }
                     }
 
                     override fun onResponse(call: okhttp3.Call, response: Response) {

diff --git a/...o-android-core/src/main/kotlin/io/getstream/video/android/core/socket/PersistentSocket.kt b/...o-android-core/src/main/kotlin/io/getstream/video/android/core/socket/PersistentSocket.kt
@@ -23,6 +23,7 @@ import io.getstream.video.android.core.internal.network.NetworkStateProvider
 import io.getstream.video.android.core.socket.internal.HealthMonitor
 import kotlinx.coroutines.CancellableContinuation
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.InternalCoroutinesApi
 import kotlinx.coroutines.asCoroutineDispatcher
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -44,8 +45,6 @@ import java.net.ConnectException
 import java.net.SocketTimeoutException
 import java.net.UnknownHostException
 import java.util.concurrent.Executors
-import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
 
 /**
  * PersistentSocket architecture
@@ -282,12 +281,15 @@ public open class PersistentSocket<T>(
         healthMonitor.ack()
     }
 
+    @OptIn(InternalCoroutinesApi::class)
     protected fun setConnectedStateAndContinue(message: VideoEvent) {
         _connectionState.value = SocketState.Connected(message)
 
         if (!connectContinuationCompleted) {
             connectContinuationCompleted = true
-            connectContinuation.resume(message as T)
+            connectContinuation.tryResume(message as T)?.let {
+                connectContinuation.completeResume(it)
+            }
         }
     }
 
@@ -370,9 +372,12 @@ public open class PersistentSocket<T>(
         }
     }
 
+    @OptIn(InternalCoroutinesApi::class)
     private fun resumeConnectionPhaseWithException(error: Throwable) {
         connectContinuationCompleted = true
-        connectContinuation.resumeWithException(error)
+        connectContinuation.tryResumeWithException(error)?.let {
+            connectContinuation.completeResume(it)
+        }
     }
 
     /**