Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix coroutine scope (#4820)

Browse source 
* Inject the session scope instead of the application scope where it's possible.

* Create AppCoroutineScope annotation to let developers explicitly choose the appropriate CoroutineScope when injecting one.
This commit is contained in:
Benoit Marty 2025-06-04 17:33:51 +02:00 • committed by GitHub
parent 36c7c7ab9b
commit 5f191d9f9c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
58 changed files with 172 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libraries/voiceplayer/impl/src/main/kotlin/io/element/android/libraries/voiceplayer/impl/DefaultVoiceMessagePresenterFactory.kt
View file

@ -10,6 +10,7 @@ package io.element.android.libraries.voiceplayer.impl
import com.squareup.anvil.annotations.ContributesBinding
import io.element.android.libraries.architecture.Presenter
import io.element.android.libraries.di.RoomScope
import io.element.android.libraries.di.annotations.SessionCoroutineScope
import io.element.android.libraries.matrix.api.core.EventId
import io.element.android.libraries.matrix.api.media.MediaSource
import io.element.android.libraries.voiceplayer.api.VoiceMessagePresenterFactory
@ -22,7 +23,8 @@ import kotlin.time.Duration
@ContributesBinding(RoomScope::class)
class DefaultVoiceMessagePresenterFactory @Inject constructor(
private val analyticsService: AnalyticsService,
private val scope: CoroutineScope,
@SessionCoroutineScope
private val sessionCoroutineScope: CoroutineScope,
private val voiceMessagePlayerFactory: VoiceMessagePlayer.Factory,
) : VoiceMessagePresenterFactory {
override fun createVoiceMessagePresenter(
@ -41,7 +43,7 @@ class DefaultVoiceMessagePresenterFactory @Inject constructor(
return VoiceMessagePresenter(
analyticsService = analyticsService,
scope = scope,
sessionCoroutineScope = sessionCoroutineScope,
player = player,
eventId = eventId,
duration = duration,

4
libraries/voiceplayer/impl/src/main/kotlin/io/element/android/libraries/voiceplayer/impl/VoiceMessagePresenter.kt
View file

@ -31,7 +31,7 @@ import kotlin.time.Duration.Companion.milliseconds
class VoiceMessagePresenter(
private val analyticsService: AnalyticsService,
private val scope: CoroutineScope,
private val sessionCoroutineScope: CoroutineScope,
private val player: VoiceMessagePlayer,
private val eventId: EventId?,
private val duration: Duration,
@ -92,7 +92,7 @@ class VoiceMessagePresenter(
} else if (playerState.isReady) {
player.play()
} else {
scope.launch {
sessionCoroutineScope.launch {
play.runUpdatingState(
errorTransform = {
analyticsService.trackError(

2
libraries/voiceplayer/impl/src/test/kotlin/io/element/android/libraries/voiceplayer/impl/VoiceMessagePresenterTest.kt
View file

@ -236,7 +236,7 @@ fun TestScope.createVoiceMessagePresenter(
mediaSource: MediaSource = MediaSource(contentUri),
) = VoiceMessagePresenter(
analyticsService = analyticsService,
scope = this,
sessionCoroutineScope = this,
player = DefaultVoiceMessagePlayer(
mediaPlayer = mediaPlayer,
voiceMessageMediaRepoFactory = { _, _, _ -> voiceMessageMediaRepo },