ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-04 10:32:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix thread-safety and dispatcher consistency in user status stubs

Browse Source
This commit is contained in:
ganfra
2026-06-12 14:56:41 +02:00
parent 42966b393f
commit 1640adcf9d
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
+5 -5
View File
@@ -260,7 +260,7 @@ class RustMatrixClient(
private var clientDelegateTaskHandle: TaskHandle? = innerClient.setDelegate(sessionDelegate) private var clientDelegateTaskHandle: TaskHandle? = innerClient.setDelegate(sessionDelegate)
private var localUserStatus: UserStatus? = null @Volatile private var localUserStatus: UserStatus? = null
private val _userProfile: MutableStateFlow<MatrixUser> = MutableStateFlow( private val _userProfile: MutableStateFlow<MatrixUser> = MutableStateFlow(
MatrixUser( MatrixUser(
@@ -482,7 +482,7 @@ class RustMatrixClient(
runCatchingExceptions { innerClient.removeAvatar() } runCatchingExceptions { innerClient.removeAvatar() }
} }
override suspend fun setUserStatus(status: UserStatus): Result<Unit> { override suspend fun setUserStatus(status: UserStatus): Result<Unit> = withContext(sessionDispatcher) {
localUserStatus = status localUserStatus = status
_userProfile.emit( _userProfile.emit(
_userProfile.value.copy( _userProfile.value.copy(
@@ -490,10 +490,10 @@ class RustMatrixClient(
displayedStatus = DisplayedStatus.UserSet(status), displayedStatus = DisplayedStatus.UserSet(status),
) )
) )
return Result.success(Unit) Result.success(Unit)
} }
override suspend fun clearUserStatus(): Result<Unit> { override suspend fun clearUserStatus(): Result<Unit> = withContext(sessionDispatcher) {
localUserStatus = null localUserStatus = null
_userProfile.emit( _userProfile.emit(
_userProfile.value.copy( _userProfile.value.copy(
@@ -501,7 +501,7 @@ class RustMatrixClient(
displayedStatus = null, displayedStatus = null,
) )
) )
return Result.success(Unit) Result.success(Unit)
} }
override suspend fun joinRoom(roomId: RoomId): Result<RoomInfo?> = withContext(sessionDispatcher) { override suspend fun joinRoom(roomId: RoomId): Result<RoomInfo?> = withContext(sessionDispatcher) {
libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt
+2 -2
View File
@@ -258,7 +258,7 @@ class FakeMatrixClient(
return removeAvatarResult return removeAvatarResult
} }
override suspend fun setUserStatus(status: UserStatus): Result<Unit> { override suspend fun setUserStatus(status: UserStatus): Result<Unit> = simulateLongTask {
setUserStatusCalled = true setUserStatusCalled = true
if (setUserStatusResult.isSuccess) { if (setUserStatusResult.isSuccess) {
_userProfile.emit(_userProfile.value.copy( _userProfile.emit(_userProfile.value.copy(
@@ -269,7 +269,7 @@ class FakeMatrixClient(
return setUserStatusResult return setUserStatusResult
} }
override suspend fun clearUserStatus(): Result<Unit> { override suspend fun clearUserStatus(): Result<Unit> = simulateLongTask {
clearUserStatusCalled = true clearUserStatusCalled = true
if (clearUserStatusResult.isSuccess) { if (clearUserStatusResult.isSuccess) {
_userProfile.emit(_userProfile.value.copy( _userProfile.emit(_userProfile.value.copy(