From b53b0a00930f35fef141b03b189d9f7e1783d4d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damir=20Jeli=C4=87?= Date: Fri, 25 Jun 2021 08:13:19 +0200 Subject: [PATCH] crypto: Use a when instead of a big if/else statement --- .../internal/crypto/DefaultCryptoService.kt | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt index c21aaed6a1..bacc9e1456 100755 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt @@ -706,22 +706,26 @@ internal class DefaultCryptoService @Inject constructor( // Notify the our listeners about room keys so decryption is retried. if (toDeviceEvents.events != null) { toDeviceEvents.events.forEach { event -> - if (event.type == EventType.ROOM_KEY) { - val content = event.getClearContent().toModel() ?: return@forEach + when (event.type) { + EventType.ROOM_KEY -> { + val content = event.getClearContent().toModel() ?: return@forEach - val roomId = content.sessionId ?: return@forEach - val sessionId = content.sessionId + val roomId = content.sessionId ?: return@forEach + val sessionId = content.sessionId - notifyRoomKeyReceival(roomId, sessionId) - } else if (event.type == EventType.FORWARDED_ROOM_KEY) { - val content = event.getClearContent().toModel() ?: return@forEach + notifyRoomKeyReceived(roomId, sessionId) + } + EventType.FORWARDED_ROOM_KEY -> { + val content = event.getClearContent().toModel() ?: return@forEach - val roomId = content.sessionId ?: return@forEach - val sessionId = content.sessionId + val roomId = content.sessionId ?: return@forEach + val sessionId = content.sessionId - notifyRoomKeyReceival(roomId, sessionId) - } else { - this.verificationService?.onEvent(event) + notifyRoomKeyReceived(roomId, sessionId) + } + else -> { + this.verificationService?.onEvent(event) + } } } }