Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 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 a668e7e7b1
commit 243ce23055
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.MediaItem
import io.element.android.libraries.mediaviewer.impl.model.hasEvent import io.element.android.libraries.mediaviewer.impl.model.hasEvent
import kotlinx.collections.immutable.persistentListOf import kotlinx.collections.immutable.persistentListOf
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
import javax.inject.Inject import javax.inject.Inject
interface MediaTimeline { interface MediaTimeline {
@ -37,19 +39,15 @@ class LiveMediaTimeline @Inject constructor(
private val room: MatrixRoom, private val room: MatrixRoom,
) : MediaTimeline { ) : MediaTimeline {
private var timeline: Timeline? = null private var timeline: Timeline? = null
override suspend fun getTimeline(): Result<Timeline> { private val mutex = Mutex()
return if (timeline == null) {
room.mediaTimeline(null).fold( override suspend fun getTimeline(): Result<Timeline> = mutex.withLock {
{ val currentTimeline = timeline
timeline = it if (currentTimeline == null) {
Result.success(it) room.mediaTimeline(null)
}, .onSuccess { timeline = it }
{
Result.failure(it)
},
)
} else { } else {
Result.success(timeline!!) Result.success(currentTimeline)
} }
} }