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

Protect access to member timeline with a Mutex and clean the code.

Browse source
This commit is contained in:
Benoit Marty 2025-01-29 10:35:52 +01:00
parent 47763cc7a9
commit c059c3fd27
1 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaTimeline.kt
View file

@ -18,6 +18,8 @@ import io.element.android.libraries.mediaviewer.impl.model.GroupedMediaItems
import io.element.android.libraries.mediaviewer.impl.model.MediaItem
import io.element.android.libraries.mediaviewer.impl.model.hasEvent
import kotlinx.collections.immutable.persistentListOf
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
import javax.inject.Inject
interface MediaTimeline {
@ -37,19 +39,15 @@ class LiveMediaTimeline @Inject constructor(
private val room: MatrixRoom,
) : MediaTimeline {
private var timeline: Timeline? = null
override suspend fun getTimeline(): Result<Timeline> {
return if (timeline == null) {
room.mediaTimeline(null).fold(
{
timeline = it
Result.success(it)
},
{
Result.failure(it)
},
)
private val mutex = Mutex()
override suspend fun getTimeline(): Result<Timeline> = mutex.withLock {
val currentTimeline = timeline
if (currentTimeline == null) {
room.mediaTimeline(null)
.onSuccess { timeline = it }
} else {
Result.success(timeline!!)
Result.success(currentTimeline)
}
}