From 33b2abc3b963c9eaaba78e4d8aacc6aba5d0417a Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 13 Jul 2020 10:27:39 +0200 Subject: [PATCH] Fix regression: not able to create a room without IS configured (Fixes #1679) --- CHANGES.md | 2 +- .../internal/session/room/create/CreateRoomBodyBuilder.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index a40203a588..c3eb9dd23e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -8,7 +8,7 @@ Improvements 🙌: - Bugfix 🐛: - - + - Fix regression: not able to create a room without IS configured (#1679) Translations 🗣: - diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/CreateRoomBodyBuilder.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/CreateRoomBodyBuilder.kt index 23eb88bea9..4bf54251e5 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/CreateRoomBodyBuilder.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/CreateRoomBodyBuilder.kt @@ -46,7 +46,7 @@ internal class CreateRoomBodyBuilder @Inject constructor( suspend fun build(params: CreateRoomParams): CreateRoomBody { val invite3pids = params.invite3pids .takeIf { it.isNotEmpty() } - .let { + ?.let { invites -> // This can throw Exception if Identity server is not configured ensureIdentityTokenTask.execute(Unit) @@ -54,7 +54,7 @@ internal class CreateRoomBodyBuilder @Inject constructor( ?: throw IdentityServiceError.NoIdentityServerConfigured val identityServerAccessToken = accessTokenProvider.getToken() ?: throw IdentityServiceError.NoIdentityServerConfigured - params.invite3pids.map { + invites.map { ThreePidInviteBody( id_server = identityServerUrlWithoutProtocol, id_access_token = identityServerAccessToken,