From 301251262d755fc8a576ec38ec66278e9fccd02a Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 15 Jun 2021 12:20:26 +0200
Subject: [PATCH] Code review cleaning

---
 .../spaces/create/CreateSpaceViewModel.kt     | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

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 960d428581..1e47f9b690 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
@@ -92,16 +92,24 @@ class CreateSpaceViewModel @AssistedInject constructor(
                 _viewEvents.post(CreateSpaceEvents.NavigateToDetails)
             }
             is CreateSpaceAction.NameChanged            -> {
-                val tentativeAlias =
-                        getAliasFromName(action.name)
 
                 setState {
-                    copy(
-                            nameInlineError = null,
-                            name = action.name,
-                            aliasLocalPart = tentativeAlias,
-                            aliasVerificationTask = Uninitialized
-                    )
+                    if (aliasManuallyModified) {
+                        copy(
+                                nameInlineError = null,
+                                name = action.name,
+                                aliasVerificationTask = Uninitialized
+                        )
+                    } else {
+                        val tentativeAlias =
+                                getAliasFromName(action.name)
+                        copy(
+                                nameInlineError = null,
+                                name = action.name,
+                                aliasLocalPart = tentativeAlias,
+                                aliasVerificationTask = Uninitialized
+                        )
+                    }
                 }
             }
             is CreateSpaceAction.TopicChanged           -> {
@@ -112,6 +120,8 @@ class CreateSpaceViewModel @AssistedInject constructor(
                 }
             }
             is CreateSpaceAction.SpaceAliasChanged      -> {
+                // This called only when the alias is change manually
+                // not when programmatically changed via a change on name
                 setState {
                     copy(
                             aliasManuallyModified = true,
@@ -237,7 +247,7 @@ class CreateSpaceViewModel @AssistedInject constructor(
                 _viewEvents.post(CreateSpaceEvents.NavigateToChoosePrivateType)
             } else {
                 // it'a public space, let's check alias
-                val aliasLocalPart = if (state.aliasManuallyModified) state.aliasLocalPart else getAliasFromName(state.name)
+                val aliasLocalPart = state.aliasLocalPart
                 _viewEvents.post(CreateSpaceEvents.ShowModalLoading(null))
                 setState {
                     copy(aliasVerificationTask = Loading())
@@ -280,7 +290,7 @@ class CreateSpaceViewModel @AssistedInject constructor(
         viewModelScope.launch(Dispatchers.IO) {
             try {
                 val alias = if (state.spaceType == SpaceType.Public) {
-                    if (state.aliasManuallyModified) state.aliasLocalPart else getAliasFromName(state.name)
+                    state.aliasLocalPart
                 } else null
                 val result = createSpaceViewModelTask.execute(
                         CreateSpaceTaskParams(