From 30d7c73b2dba086401589e7c14096bbe8ffc3939 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 29 Apr 2021 11:56:57 +0200
Subject: [PATCH] code review

---
 .../features/roomdirectory/createroom/CreateRoomViewModel.kt  | 4 ++--
 .../im/vector/app/features/spaces/SpaceCreationActivity.kt    | 4 +---
 .../vector/app/features/spaces/create/CreateSpaceViewModel.kt | 1 -
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
index 952f08c380..4eb05fb697 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
@@ -44,7 +44,7 @@ import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomPreset
 import timber.log.Timber
 
-class CreateRoomViewModel @AssistedInject constructor(@Assisted val initialState: CreateRoomViewState,
+class CreateRoomViewModel @AssistedInject constructor(@Assisted private val initialState: CreateRoomViewState,
                                                       private val session: Session,
                                                       private val rawService: RawService
 ) : VectorViewModel<CreateRoomViewState, CreateRoomAction, CreateRoomViewEvents>(initialState) {
@@ -236,7 +236,7 @@ class CreateRoomViewModel @AssistedInject constructor(@Assisted val initialState
                         if (initialState.parentSpaceId != null) {
                             // add it as a child
                             try {
-                                val via = session.sessionParams.homeServerHost?.let { listOf(it) } ?: emptyList()
+                                val via = session.sessionParams.homeServerHost?.let { listOf(it) }.orEmpty()
                                 session.spaceService()
                                         .getSpace(initialState.parentSpaceId)
                                         ?.addChildren(roomId, viaServers = via, order = null)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
index 21617a1259..bc06d1a52b 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
@@ -107,9 +107,7 @@ class SpaceCreationActivity : SimpleFragmentActivity(), CreateSpaceViewModel.Fac
                     setResult(RESULT_OK, Intent().apply {
                         putExtra(RESULT_DATA_CREATED_SPACE_ID, it.spaceId)
                         putExtra(RESULT_DATA_DEFAULT_ROOM_ID, it.defaultRoomId)
-                        if (it.topology == SpaceTopology.JustMe) {
-                            putExtra(RESULT_DATA_CREATED_SPACE_IS_JUST_ME, true)
-                        }
+                        putExtra(RESULT_DATA_CREATED_SPACE_IS_JUST_ME, it.topology == SpaceTopology.JustMe)
                     })
                     finish()
                 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
index ef2f5029e7..9881232f4d 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
@@ -130,7 +130,6 @@ class CreateSpaceViewModel @AssistedInject constructor(
                             defaultRooms = emptyMap()
                     )
                 }
-                // XXX finish and open the add rooms directly
                 handleNextFromDefaultRooms()
             }
             SpaceTopology.MeAndTeammates -> {