Cancel coroutine started in startContext when stopContext is invoked (#…

…11)
speechly · Dec 29, 2022 · 03904b9 · 03904b9
1 parent d6339f1
commit 03904b9
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/android-client/src/main/kotlin/com/speechly/client/speech/Client.kt b/android-client/src/main/kotlin/com/speechly/client/speech/Client.kt
@@ -90,6 +90,7 @@ class Client (
 ) : ApiClient {
     private val streams: MutableList<SluStream> = mutableListOf()
     private val deviceId: UUID = deviceIdProvider.getDeviceId()
+    private val coroutineScope = CoroutineScope(Job())
 
     init {
         GlobalScope.launch(Dispatchers.IO) {
@@ -184,15 +185,15 @@ class Client (
     @DelicateCoroutinesApi
     @ExperimentalCoroutinesApi
     override fun startContext() {
-        GlobalScope.launch(Dispatchers.IO) {
+        coroutineScope.launch(Dispatchers.IO) {
             val token = identityService.authenticate(appId, deviceId)
             try {
                 val audioFlow: Flow<ByteArray> = audioRecorder.startRecording()
                 val stream = sluClient.stream(token, streamConfig, audioFlow)
                 streams.add(stream)
 
                 var segment: Segment? = null
-                GlobalScope.launch(Dispatchers.Default) {
+                withContext(Dispatchers.Default) {
                     try {
                         stream.responseFlow?.collect { response: SLUResponse ->
                             if (segment == null) {
@@ -278,6 +279,7 @@ class Client (
             it.close()
             this.streams.remove(it)
         }
+        this.coroutineScope.cancel()
     }
 
     override fun close() {