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

Use an AtomicBoolean instead of a MutableStateFlow to atomically init the RustMatrixRoom. Should improve #951.

Browse source
This commit is contained in:
Benoit Marty 2023-07-24 18:04:21 +02:00
parent 138bf142a9
commit 0ef49ca6ca
1 changed files with 32 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

14
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt
View file

@ -65,6 +65,7 @@ import org.matrix.rustcomponents.sdk.genTransactionId
import org.matrix.rustcomponents.sdk.messageEventContentFromMarkdown import org.matrix.rustcomponents.sdk.messageEventContentFromMarkdown
import timber.log.Timber import timber.log.Timber
import java.io.File import java.io.File
import java.util.concurrent.atomic.AtomicBoolean
@OptIn(ExperimentalCoroutinesApi::class) @OptIn(ExperimentalCoroutinesApi::class)
class RustMatrixRoom( class RustMatrixRoom(
@ -88,7 +89,7 @@ class RustMatrixRoom(
private val roomCoroutineScope = sessionCoroutineScope.childScope(coroutineDispatchers.main, "RoomScope-$roomId") private val roomCoroutineScope = sessionCoroutineScope.childScope(coroutineDispatchers.main, "RoomScope-$roomId")
private val _membersStateFlow = MutableStateFlow<MatrixRoomMembersState>(MatrixRoomMembersState.Unknown) private val _membersStateFlow = MutableStateFlow<MatrixRoomMembersState>(MatrixRoomMembersState.Unknown)
private val isInit = MutableStateFlow(false) private val isInit = AtomicBoolean(false)
private val _syncUpdateFlow = MutableStateFlow(0L) private val _syncUpdateFlow = MutableStateFlow(0L)
private val _timeline by lazy { private val _timeline by lazy {
RustMatrixTimeline( RustMatrixTimeline(
@ -107,7 +108,9 @@ class RustMatrixRoom(
override val timeline: MatrixTimeline = _timeline override val timeline: MatrixTimeline = _timeline
override fun open(): Result<Unit> { override fun open(): Result<Unit> {
if (isInit.value) return Result.failure(IllegalStateException("Listener already registered")) return if (isInit.getAndSet(true)) {
Result.failure(IllegalStateException("Listener already registered"))
} else {
val settings = RoomSubscription( val settings = RoomSubscription(
requiredState = listOf( requiredState = listOf(
RequiredState(key = EventType.STATE_ROOM_CANONICAL_ALIAS, value = ""), RequiredState(key = EventType.STATE_ROOM_CANONICAL_ALIAS, value = ""),
@ -135,13 +138,12 @@ class RustMatrixRoom(
fetchMembers() fetchMembers()
} }
isInit.value = true Result.success(Unit)
return Result.success(Unit) }
} }
override fun close() { override fun close() {
if (isInit.value) { if (isInit.getAndSet(false)) {
isInit.value = false
roomCoroutineScope.cancel() roomCoroutineScope.cancel()
roomListItem.unsubscribe() roomListItem.unsubscribe()
innerRoom.destroy() innerRoom.destroy()