From 6f6c3184dd272914641dccef803e95d310c0c0d5 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Wed, 29 Jan 2020 17:10:06 +0100
Subject: [PATCH] Avoid test if previous result is null

---
 .../android/internal/session/room/create/CreateRoomTask.kt      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/CreateRoomTask.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/CreateRoomTask.kt
index 8576c71e96..9fa9eeb02d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/CreateRoomTask.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/CreateRoomTask.kt
@@ -60,7 +60,7 @@ internal class DefaultCreateRoomTask @Inject constructor(
     override suspend fun execute(params: CreateRoomParams): String {
         val createRoomParams = params
                 .takeIf { it.enableEncryptionIfInvitedUsersSupportIt }
-                .takeIf { crossSigningService.isCrossSigningEnabled() }
+                ?.takeIf { crossSigningService.isCrossSigningEnabled() }
                 ?.takeIf { it.invite3pids.isNullOrEmpty() }
                 ?.invitedUserIds
                 ?.let { userIds ->