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

Fix code quality.

Browse source
This commit is contained in:
Benoit Marty 2024-10-08 11:09:46 +02:00
parent 351f058f06
commit c8ff0d5641
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStatePresenter.kt
View file

@ -59,9 +59,11 @@ class IdentityChangeStatePresenter @Inject constructor(
) )
} }
private fun CoroutineScope.observeRoomMemberIdentityStateChange(roomMemberIdentityStateChange: MutableState<PersistentList<RoomMemberIdentityStateChange>>) { private fun CoroutineScope.observeRoomMemberIdentityStateChange(
combine(room.identityStateChangesFlow, room.membersStateFlow) { IdentityStateChanges, membersState -> roomMemberIdentityStateChange: MutableState<PersistentList<RoomMemberIdentityStateChange>>
IdentityStateChanges.map { identityStateChange -> ) {
combine(room.identityStateChangesFlow, room.membersStateFlow) { identityStateChanges, membersState ->
identityStateChanges.map { identityStateChange ->
val member = membersState.roomMembers() val member = membersState.roomMembers()
?.firstOrNull { roomMember -> roomMember.userId == identityStateChange.userId } ?.firstOrNull { roomMember -> roomMember.userId == identityStateChange.userId }
?: createDefaultRoomMemberForIdentityChange(identityStateChange.userId) ?: createDefaultRoomMemberForIdentityChange(identityStateChange.userId)

2
libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/identity/IdentityState.kt
View file

@ -8,7 +8,7 @@
package io.element.android.libraries.matrix.api.encryption.identity package io.element.android.libraries.matrix.api.encryption.identity
enum class IdentityState { enum class IdentityState {
/** The user is verified with us */ /** The user is verified with us. */
Verified, Verified,
/** /**

2
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustEncryptionService.kt
View file

@ -205,7 +205,7 @@ internal class RustEncryptionService(
} }
override suspend fun pinUserIdentity(userId: UserId): Result<Unit> = runCatching { override suspend fun pinUserIdentity(userId: UserId): Result<Unit> = runCatching {
val userIdentity = service.getUserIdentity(userId.value) ?: throw IllegalStateException("User identity not found") val userIdentity = service.getUserIdentity(userId.value) ?: error("User identity not found")
userIdentity.pin() userIdentity.pin()
} }
} }