@ -57,14 +57,9 @@ fun MatrixRoom.getDirectRoomMember(roomMembersState: MatrixRoomMembersState): St
val roomMembers = roomMembersState.roomMembers()
return remember(roomMembersState) {
derivedStateOf {
if (roomMembers == null) {
null
} else if (roomMembers.size == 2 && isDirect && isEncrypted) {
roomMembers.find { it.userId != this.sessionId }
} else {
}
roomMembers
?.takeIf { it.size == 2 && isDirect && isEncrypted }
?.find { it.userId != sessionId }
@ -100,15 +100,15 @@ class DefaultPushHandler @Inject constructor(
val clientSecret = pushData.clientSecret
val userId = if (clientSecret == null) {
// Should not happen. In this case, restore default session
// Get userId from client secret
pushClientSecret.getUserIdFromSecret(clientSecret)
} ?: run {
matrixAuthenticationService.getLatestSessionId()
// clientSecret should not be null. If this happens, restore default session
val userId = clientSecret
?.let {
?: run {
if (userId == null) {
Timber.w("Unable to get a session")
@ -63,6 +63,8 @@ style:
UseDataClass:
active: true
allowVars: false
UseLet:
coroutines:
GlobalCoroutineUsage: