From c3cf22158b539434f21f90a80f63bc81c0bd58d0 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Wed, 30 Mar 2022 17:08:51 +0100
Subject: [PATCH 01/20] adding barebones server selection UI

---
 .../FtueAuthCombinedRegisterFragment.kt       |  10 +
 ...FtueAuthCombinedServerSelectionFragment.kt |  44 +++
 .../main/res/drawable/ic_choose_server.xml    |   9 +
 vector/src/main/res/drawable/ic_ems_logo.xml  |  22 ++
 ...ragment_ftue_server_selection_combined.xml | 256 ++++++++++++++++++
 .../layout/fragment_ftue_sign_up_combined.xml |   1 -
 vector/src/main/res/values/donottranslate.xml |   8 +
 7 files changed, 349 insertions(+), 1 deletion(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
 create mode 100644 vector/src/main/res/drawable/ic_choose_server.xml
 create mode 100644 vector/src/main/res/drawable/ic_ems_logo.xml
 create mode 100644 vector/src/main/res/layout/fragment_ftue_server_selection_combined.xml

diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt
index 3a7d51d14b..5096598386 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt
@@ -22,6 +22,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
+import androidx.appcompat.app.AppCompatActivity
 import androidx.autofill.HintConstants
 import androidx.core.text.isDigitsOnly
 import androidx.core.view.isVisible
@@ -29,6 +30,8 @@ import androidx.lifecycle.lifecycleScope
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import im.vector.app.R
+import im.vector.app.core.extensions.addFragment
+import im.vector.app.core.extensions.commitTransaction
 import im.vector.app.core.extensions.content
 import im.vector.app.core.extensions.editText
 import im.vector.app.core.extensions.hasContentFlow
@@ -36,6 +39,7 @@ import im.vector.app.core.extensions.hasSurroundingSpaces
 import im.vector.app.core.extensions.hideKeyboard
 import im.vector.app.core.extensions.hidePassword
 import im.vector.app.core.extensions.realignPercentagesToParent
+import im.vector.app.core.extensions.toMvRxBundle
 import im.vector.app.databinding.FragmentFtueSignUpCombinedBinding
 import im.vector.app.features.login.LoginMode
 import im.vector.app.features.login.SSORedirectRouterActivity
@@ -67,6 +71,12 @@ class FtueAuthCombinedRegisterFragment @Inject constructor() : AbstractSSOFtueAu
 
         views.createAccountRoot.realignPercentagesToParent()
 
+        views.editServerButton.debouncedClicks {
+            requireActivity().supportFragmentManager.commitTransaction(true) {
+                add(R.id.loginFragmentContainer, FtueAuthCombinedServerSelectionFragment(), null)
+            }
+        }
+
         views.createAccountPasswordInput.editText().setOnEditorActionListener { _, actionId, _ ->
             if (actionId == EditorInfo.IME_ACTION_DONE) {
                 submit()
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
new file mode 100644
index 0000000000..fdd81b99c0
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.onboarding.ftueauth
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import im.vector.app.databinding.FragmentFtueServerSelectionCombinedBinding
+import im.vector.app.features.onboarding.OnboardingAction
+import im.vector.app.features.onboarding.OnboardingViewEvents
+import javax.inject.Inject
+
+class FtueAuthCombinedServerSelectionFragment @Inject constructor() : AbstractSSOFtueAuthFragment<FragmentFtueServerSelectionCombinedBinding>() {
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentFtueServerSelectionCombinedBinding {
+        return FragmentFtueServerSelectionCombinedBinding.inflate(inflater, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        views.chooseServerToolbar.setNavigationOnClickListener {
+            viewModel.handle(OnboardingAction.PostViewEvent(OnboardingViewEvents.OnBack))
+        }
+    }
+
+    override fun resetViewModel() {
+
+    }
+}
diff --git a/vector/src/main/res/drawable/ic_choose_server.xml b/vector/src/main/res/drawable/ic_choose_server.xml
new file mode 100644
index 0000000000..26c8e75222
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_choose_server.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="70dp"
+    android:height="70dp"
+    android:viewportWidth="70"
+    android:viewportHeight="70">
+  <path
+      android:pathData="M47.25,36.75H22.75C20.825,36.75 19.25,38.325 19.25,40.25V47.25C19.25,49.175 20.825,50.75 22.75,50.75H47.25C49.175,50.75 50.75,49.175 50.75,47.25V40.25C50.75,38.325 49.175,36.75 47.25,36.75ZM26.25,47.25C24.325,47.25 22.75,45.675 22.75,43.75C22.75,41.825 24.325,40.25 26.25,40.25C28.175,40.25 29.75,41.825 29.75,43.75C29.75,45.675 28.175,47.25 26.25,47.25ZM47.25,19.25H22.75C20.825,19.25 19.25,20.825 19.25,22.75V29.75C19.25,31.675 20.825,33.25 22.75,33.25H47.25C49.175,33.25 50.75,31.675 50.75,29.75V22.75C50.75,20.825 49.175,19.25 47.25,19.25ZM26.25,29.75C24.325,29.75 22.75,28.175 22.75,26.25C22.75,24.325 24.325,22.75 26.25,22.75C28.175,22.75 29.75,24.325 29.75,26.25C29.75,28.175 28.175,29.75 26.25,29.75Z"
+      android:fillColor="#ff0000"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_ems_logo.xml b/vector/src/main/res/drawable/ic_ems_logo.xml
new file mode 100644
index 0000000000..68c2aeb190
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_ems_logo.xml
@@ -0,0 +1,22 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="50dp"
+    android:height="50dp"
+    android:viewportWidth="50"
+    android:viewportHeight="50">
+  <path
+      android:pathData="M20.43,11.649C20.43,10.64 21.249,9.822 22.26,9.822C29.114,9.822 34.671,15.366 34.671,22.206C34.671,23.215 33.851,24.033 32.84,24.033C31.828,24.033 31.008,23.215 31.008,22.206C31.008,17.385 27.092,13.476 22.26,13.476C21.249,13.476 20.43,12.658 20.43,11.649Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M38.347,20.379C39.359,20.379 40.178,21.197 40.178,22.206C40.178,29.045 34.622,34.59 27.768,34.59C26.757,34.59 25.937,33.772 25.937,32.763C25.937,31.754 26.757,30.936 27.768,30.936C32.6,30.936 36.516,27.027 36.516,22.206C36.516,21.197 37.336,20.379 38.347,20.379Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M29.6,38.352C29.6,39.361 28.78,40.18 27.768,40.18C20.915,40.18 15.359,34.635 15.359,27.795C15.359,26.786 16.178,25.968 17.19,25.968C18.201,25.968 19.021,26.786 19.021,27.795C19.021,32.617 22.937,36.525 27.768,36.525C28.78,36.525 29.6,37.343 29.6,38.352Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M11.653,29.622C10.642,29.622 9.822,28.804 9.822,27.795C9.822,20.956 15.378,15.411 22.232,15.411C23.243,15.411 24.063,16.229 24.063,17.238C24.063,18.247 23.243,19.065 22.232,19.065C17.401,19.065 13.484,22.974 13.484,27.795C13.484,28.804 12.664,29.622 11.653,29.622Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/vector/src/main/res/layout/fragment_ftue_server_selection_combined.xml b/vector/src/main/res/layout/fragment_ftue_server_selection_combined.xml
new file mode 100644
index 0000000000..8da4958007
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_ftue_server_selection_combined.xml
@@ -0,0 +1,256 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    style="@style/LoginFormScrollView"
+    android:layout_height="match_parent"
+    android:background="?android:colorBackground"
+    android:fillViewport="true"
+    android:paddingTop="0dp"
+    android:paddingBottom="0dp">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/chooseServerRoot"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/chooseServerGutterStart"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            app:layout_constraintGuide_percent="@dimen/ftue_auth_gutter_start_percent" />
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/chooseServerGutterEnd"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            app:layout_constraintGuide_percent="@dimen/ftue_auth_gutter_end_percent" />
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/chooseServerToolbar"
+            style="@style/Widget.Vector.Toolbar.Settings"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@android:color/transparent"
+            app:layout_constraintBottom_toTopOf="@id/chooseServerHeaderIcon"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0"
+            app:layout_constraintVertical_chainStyle="packed"
+            app:navigationIcon="@drawable/ic_close_24dp" />
+
+        <ImageView
+            android:id="@+id/chooseServerHeaderIcon"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:adjustViewBounds="true"
+            android:background="@drawable/circle"
+            android:backgroundTint="?colorSecondary"
+            android:contentDescription="@null"
+            android:src="@drawable/ic_choose_server"
+            app:layout_constraintBottom_toTopOf="@id/chooseServerHeaderTitle"
+            app:layout_constraintEnd_toEndOf="@id/chooseServerGutterEnd"
+            app:layout_constraintHeight_percent="0.10"
+            app:layout_constraintStart_toStartOf="@id/chooseServerGutterStart"
+            app:layout_constraintTop_toBottomOf="@id/chooseServerToolbar"
+            app:tint="@color/palette_white" />
+
+        <TextView
+            android:id="@+id/chooseServerHeaderTitle"
+            style="@style/Widget.Vector.TextView.Title.Medium"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:gravity="center"
+            android:text="@string/ftue_auth_choose_server_title"
+            android:textColor="?vctr_content_primary"
+            app:layout_constraintBottom_toTopOf="@id/chooseServerHeaderSubtitle"
+            app:layout_constraintEnd_toEndOf="@id/chooseServerGutterEnd"
+            app:layout_constraintStart_toStartOf="@id/chooseServerGutterStart"
+            app:layout_constraintTop_toBottomOf="@id/chooseServerHeaderIcon" />
+
+        <TextView
+            android:id="@+id/chooseServerHeaderSubtitle"
+            style="@style/Widget.Vector.TextView.Subtitle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:gravity="center"
+            android:text="@string/ftue_auth_choose_server_subtitle"
+            android:textColor="?vctr_content_secondary"
+            app:layout_constraintBottom_toTopOf="@id/titleContentSpacing"
+            app:layout_constraintEnd_toEndOf="@id/chooseServerGutterEnd"
+            app:layout_constraintStart_toStartOf="@id/chooseServerGutterStart"
+            app:layout_constraintTop_toBottomOf="@id/chooseServerHeaderTitle" />
+
+        <Space
+            android:id="@+id/titleContentSpacing"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toTopOf="@id/chooseServerInput"
+            app:layout_constraintHeight_percent="0.03"
+            app:layout_constraintTop_toBottomOf="@id/chooseServerHeaderSubtitle" />
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/chooseServerInput"
+            style="@style/Widget.Vector.TextInputLayout.Username"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:hint="@string/ftue_auth_choose_server_entry_hint"
+            app:layout_constraintBottom_toTopOf="@id/chooseServerEntryFooter"
+            app:layout_constraintEnd_toEndOf="@id/chooseServerGutterEnd"
+            app:layout_constraintStart_toStartOf="@id/chooseServerGutterStart"
+            app:layout_constraintTop_toBottomOf="@id/titleContentSpacing">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:imeOptions="actionNext"
+                android:inputType="text"
+                android:maxLines="1" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <TextView
+            android:id="@+id/chooseServerEntryFooter"
+            style="@style/Widget.Vector.TextView.Micro"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:text="@string/ftue_auth_choose_server_entry_footer"
+            app:layout_constraintBottom_toTopOf="@id/actionSpacing"
+            app:layout_constraintEnd_toEndOf="@id/chooseServerGutterEnd"
+            app:layout_constraintStart_toStartOf="@id/chooseServerGutterStart"
+            app:layout_constraintTop_toBottomOf="@id/chooseServerInput" />
+
+        <Space
+            android:id="@+id/actionSpacing"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toTopOf="@id/chooseServerSubmit"
+            app:layout_constraintHeight_percent="0.02"
+            app:layout_constraintTop_toBottomOf="@id/chooseServerEntryFooter" />
+
+        <Button
+            android:id="@+id/chooseServerSubmit"
+            style="@style/Widget.Vector.Button.Login"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="@string/login_signup_submit"
+            android:textAllCaps="true"
+            app:layout_constraintBottom_toTopOf="@id/chooseServerEmsContainer"
+            app:layout_constraintEnd_toEndOf="@id/chooseServerGutterEnd"
+            app:layout_constraintStart_toStartOf="@id/chooseServerGutterStart"
+            app:layout_constraintTop_toBottomOf="@id/actionSpacing" />
+
+        <Space
+            android:id="@+id/submitSpacing"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toTopOf="@id/emsTopSpacing"
+            app:layout_constraintHeight_percent="0.02"
+            app:layout_constraintTop_toBottomOf="@id/chooseServerSubmit" />
+
+        <View
+            android:id="@+id/chooseServerEmsContainer"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:background="@drawable/rounded_rect_shape_8"
+            android:backgroundTint="?vctr_system"
+            app:layout_constraintBottom_toBottomOf="@id/emsCtaSpacing"
+            app:layout_constraintEnd_toEndOf="@id/chooseServerGutterEnd"
+            app:layout_constraintHorizontal_bias="1.0"
+            app:layout_constraintStart_toStartOf="@id/chooseServerGutterStart"
+            app:layout_constraintTop_toTopOf="@id/emsTopSpacing"
+            app:layout_constraintVertical_bias="0.0" />
+
+        <Space
+            android:id="@+id/emsTopSpacing"
+            android:layout_width="match_parent"
+            android:layout_height="24dp"
+            app:layout_constraintBottom_toTopOf="@id/chooseServerEmsIcon"
+            app:layout_constraintTop_toBottomOf="@id/chooseServerSubmit"
+            app:layout_constraintVertical_bias="1"
+            app:layout_constraintVertical_chainStyle="packed" />
+
+        <ImageView
+            android:id="@+id/chooseServerEmsIcon"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_marginBottom="22dp"
+            android:adjustViewBounds="true"
+            android:background="@drawable/circle"
+            android:backgroundTint="@color/palette_ems"
+            android:contentDescription="@null"
+            android:src="@drawable/ic_ems_logo"
+            app:layout_constraintBottom_toTopOf="@id/chooseServerEmsTitle"
+            app:layout_constraintEnd_toEndOf="@id/chooseServerGutterEnd"
+            app:layout_constraintHeight_percent="0.08"
+            app:layout_constraintStart_toStartOf="@id/chooseServerGutterStart"
+            app:layout_constraintTop_toBottomOf="@id/emsTopSpacing"
+            app:layout_constraintVertical_bias="1"
+            app:tint="@color/palette_white" />
+
+        <TextView
+            android:id="@+id/chooseServerEmsTitle"
+            style="@style/Widget.Vector.TextView.HeadlineMedium"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="12dp"
+            android:gravity="center"
+            android:text="@string/ftue_auth_choose_server_ems_title"
+            app:layout_constraintBottom_toTopOf="@id/chooseServerEmsSubtitle"
+            app:layout_constraintEnd_toEndOf="@id/chooseServerGutterEnd"
+            app:layout_constraintStart_toStartOf="@id/chooseServerGutterStart"
+            app:layout_constraintTop_toBottomOf="@id/chooseServerEmsIcon" />
+
+        <TextView
+            android:id="@+id/chooseServerEmsSubtitle"
+            style="@style/Widget.Vector.TextView.Body"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="16dp"
+            android:gravity="center"
+            android:text="@string/ftue_auth_choose_server_ems_subtitle"
+            app:layout_constraintBottom_toTopOf="@id/chooseServerGetInTouch"
+            app:layout_constraintEnd_toEndOf="@id/chooseServerGutterEnd"
+            app:layout_constraintStart_toStartOf="@id/chooseServerGutterStart"
+            app:layout_constraintTop_toBottomOf="@id/chooseServerEmsTitle" />
+
+        <Button
+            android:id="@+id/chooseServerGetInTouch"
+            style="@style/Widget.Vector.Button.Login"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:backgroundTint="@color/palette_ems"
+            android:text="@string/ftue_auth_choose_server_ems_cta"
+            android:textAllCaps="true"
+            app:layout_constraintBottom_toTopOf="@id/emsCtaSpacing"
+            app:layout_constraintEnd_toEndOf="@id/chooseServerGutterEnd"
+            app:layout_constraintStart_toStartOf="@id/chooseServerGutterStart"
+            app:layout_constraintTop_toBottomOf="@id/chooseServerEmsSubtitle" />
+
+        <Space
+            android:id="@+id/emsCtaSpacing"
+            android:layout_width="match_parent"
+            android:layout_height="16dp"
+            app:layout_constraintBottom_toTopOf="@id/footerSpacing"
+            app:layout_constraintTop_toBottomOf="@id/chooseServerGetInTouch" />
+
+        <Space
+            android:id="@+id/footerSpacing"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintHeight_percent="0.03"
+            app:layout_constraintTop_toBottomOf="@id/emsCtaSpacing" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.core.widget.NestedScrollView>
diff --git a/vector/src/main/res/layout/fragment_ftue_sign_up_combined.xml b/vector/src/main/res/layout/fragment_ftue_sign_up_combined.xml
index 9602dd0231..ae51808d3a 100644
--- a/vector/src/main/res/layout/fragment_ftue_sign_up_combined.xml
+++ b/vector/src/main/res/layout/fragment_ftue_sign_up_combined.xml
@@ -139,7 +139,6 @@
             android:paddingEnd="12dp"
             android:text="@string/ftue_auth_create_account_edit_server_selection"
             android:textAllCaps="true"
-            android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="@id/selectedServerDescription"
             app:layout_constraintEnd_toEndOf="@id/createAccountGutterEnd"
             app:layout_constraintTop_toTopOf="@id/chooseYourServerHeader" />
diff --git a/vector/src/main/res/values/donottranslate.xml b/vector/src/main/res/values/donottranslate.xml
index 48d2950cd5..fc946c3b3f 100755
--- a/vector/src/main/res/values/donottranslate.xml
+++ b/vector/src/main/res/values/donottranslate.xml
@@ -20,4 +20,12 @@
     <string name="ftue_auth_create_account_matrix_dot_org_server_name">matrix.org</string>
     <string name="ftue_auth_create_account_edit_server_selection">Edit</string>
 
+    <string name="ftue_auth_choose_server_title">Choose your server</string>
+    <string name="ftue_auth_choose_server_subtitle">What is the address of your server? Server is like a home for all your data</string>
+    <string name="ftue_auth_choose_server_entry_hint">Server URL</string>
+    <string name="ftue_auth_choose_server_entry_footer">You can only connect to a server that has already been set up</string>
+    <string name="ftue_auth_choose_server_ems_title">Want to host your own server?</string>
+    <string name="ftue_auth_choose_server_ems_subtitle">Element Matrix Services (EMS) is a robust and reliable hosting service for fast, secure and real time communication. Find out how on element.io.ems</string>
+    <string name="ftue_auth_choose_server_ems_cta">Get in touch</string>
+
 </resources>

From 7f90dda96f1aa1cde3b74ff78f72f477c5aa0e48 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 31 Mar 2022 12:52:18 +0100
Subject: [PATCH 02/20] adding dedicated server selection state to onboarding
 state - replaces previous separately url strings with state usage - makes use
 of the state for updating the sign up and server selection fields

---
 .../onboarding/OnboardingViewModel.kt         | 21 ++++++++++++-------
 .../onboarding/OnboardingViewState.kt         | 16 ++++++++------
 .../ftueauth/FtueAuthCaptchaFragment.kt       |  2 +-
 .../FtueAuthCombinedRegisterFragment.kt       |  4 ++++
 ...FtueAuthCombinedServerSelectionFragment.kt | 10 +++++++++
 .../ftueauth/FtueAuthLoginFragment.kt         |  4 ++--
 .../ftueauth/FtueAuthResetPasswordFragment.kt |  2 +-
 .../FtueAuthSignUpSignInSelectionFragment.kt  |  6 +++---
 .../ftueauth/terms/FtueAuthTermsFragment.kt   |  2 +-
 .../layout/fragment_ftue_sign_up_combined.xml |  2 --
 vector/src/main/res/values/donottranslate.xml |  3 +--
 11 files changed, 47 insertions(+), 25 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
index dbd257464e..8a427abdd1 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
@@ -291,21 +291,20 @@ class OnboardingViewModel @AssistedInject constructor(
         currentJob = null
 
         when (action) {
-            OnboardingAction.ResetHomeServerType -> {
+            OnboardingAction.ResetHomeServerType        -> {
                 setState {
                     copy(
                             serverType = ServerType.Unknown
                     )
                 }
             }
-            OnboardingAction.ResetHomeServerUrl  -> {
+            OnboardingAction.ResetHomeServerUrl         -> {
                 viewModelScope.launch {
                     authenticationService.reset()
                     setState {
                         copy(
                                 isLoading = false,
-                                homeServerUrlFromUser = null,
-                                homeServerUrl = null,
+                                serverSelectionState = ServerSelectionState(),
                                 loginMode = LoginMode.Unknown,
                                 serverType = ServerType.Unknown,
                                 loginModeSupportedTypes = emptyList()
@@ -571,7 +570,7 @@ class OnboardingViewModel @AssistedInject constructor(
     }
 
     private fun handleWebLoginSuccess(action: OnboardingAction.WebLoginSuccess) = withState { state ->
-        val homeServerConnectionConfigFinal = homeServerConnectionConfigFactory.create(state.homeServerUrl)
+        val homeServerConnectionConfigFinal = homeServerConnectionConfigFactory.create(state.serverSelectionState.hostedUrl)
 
         if (homeServerConnectionConfigFinal == null) {
             // Should not happen
@@ -647,11 +646,19 @@ class OnboardingViewModel @AssistedInject constructor(
                 else                                                               -> LoginMode.Unsupported
             }
 
+            val serverSelection = ServerSelectionState(
+                    description = when (data.homeServerUrl) {
+                        matrixOrgUrl -> stringProvider.getString(R.string.ftue_auth_create_account_matrix_dot_org_server_description)
+                        else         -> null
+                    },
+                    userUrlInput = homeServerConnectionConfig.homeServerUri.toString(),
+                    hostedUrl = data.homeServerUrl
+            )
+
             setState {
                 copy(
                         isLoading = false,
-                        homeServerUrlFromUser = homeServerConnectionConfig.homeServerUri.toString(),
-                        homeServerUrl = data.homeServerUrl,
+                        serverSelectionState = serverSelection,
                         loginMode = loginMode,
                         loginModeSupportedTypes = data.supportedLoginTypes.toList()
                 )
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt
index b98e811679..99a5c595e5 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt
@@ -40,12 +40,6 @@ data class OnboardingViewState(
         val signMode: SignMode = SignMode.Unknown,
         @PersistState
         val resetPasswordEmail: String? = null,
-        @PersistState
-        val homeServerUrlFromUser: String? = null,
-
-        // Can be modified after a Wellknown request
-        @PersistState
-        val homeServerUrl: String? = null,
 
         // For SSO session recovery
         @PersistState
@@ -60,6 +54,9 @@ data class OnboardingViewState(
         val knownCustomHomeServersUrls: List<String> = emptyList(),
         val isForceLoginFallbackEnabled: Boolean = false,
 
+        @PersistState
+        val serverSelectionState: ServerSelectionState = ServerSelectionState(),
+
         @PersistState
         val personalizationState: PersonalizationState = PersonalizationState()
 ) : MavericksState
@@ -70,6 +67,13 @@ enum class OnboardingFlow {
     SignInSignUp
 }
 
+@Parcelize
+data class ServerSelectionState(
+        val description: String? = null,
+        val userUrlInput: String? = null,
+        val hostedUrl: String? = null,
+) : Parcelable
+
 @Parcelize
 data class PersonalizationState(
         val supportsChangingDisplayName: Boolean = false,
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCaptchaFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCaptchaFragment.kt
index c9c693ef3b..f10ef68850 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCaptchaFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCaptchaFragment.kt
@@ -77,7 +77,7 @@ class FtueAuthCaptchaFragment @Inject constructor(
         val mime = "text/html"
         val encoding = "utf-8"
 
-        val homeServerUrl = state.homeServerUrl ?: error("missing url of homeserver")
+        val homeServerUrl = state.serverSelectionState.hostedUrl ?: error("missing url of homeserver")
         views.loginCaptchaWevView.loadDataWithBaseURL(homeServerUrl, html, mime, encoding, null)
         views.loginCaptchaWevView.requestLayout()
 
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt
index 5096598386..c24dc22de2 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt
@@ -40,6 +40,7 @@ import im.vector.app.core.extensions.hideKeyboard
 import im.vector.app.core.extensions.hidePassword
 import im.vector.app.core.extensions.realignPercentagesToParent
 import im.vector.app.core.extensions.toMvRxBundle
+import im.vector.app.core.extensions.toReducedUrl
 import im.vector.app.databinding.FragmentFtueSignUpCombinedBinding
 import im.vector.app.features.login.LoginMode
 import im.vector.app.features.login.SSORedirectRouterActivity
@@ -174,6 +175,9 @@ class FtueAuthCombinedRegisterFragment @Inject constructor() : AbstractSSOFtueAu
         setupUi(state)
         setupAutoFill()
 
+        views.selectedServerName.text = state.serverSelectionState.userUrlInput.toReducedUrl()
+        views.selectedServerDescription.text = state.serverSelectionState.description
+
         if (state.isLoading) {
             // Ensure password is hidden
             views.createAccountPasswordInput.editText().hidePassword()
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
index fdd81b99c0..66707f371d 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
@@ -20,9 +20,13 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import im.vector.app.core.extensions.editText
+import im.vector.app.core.extensions.realignPercentagesToParent
+import im.vector.app.core.extensions.toReducedUrl
 import im.vector.app.databinding.FragmentFtueServerSelectionCombinedBinding
 import im.vector.app.features.onboarding.OnboardingAction
 import im.vector.app.features.onboarding.OnboardingViewEvents
+import im.vector.app.features.onboarding.OnboardingViewState
 import javax.inject.Inject
 
 class FtueAuthCombinedServerSelectionFragment @Inject constructor() : AbstractSSOFtueAuthFragment<FragmentFtueServerSelectionCombinedBinding>() {
@@ -33,12 +37,18 @@ class FtueAuthCombinedServerSelectionFragment @Inject constructor() : AbstractSS
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        views.chooseServerRoot.realignPercentagesToParent()
+
         views.chooseServerToolbar.setNavigationOnClickListener {
             viewModel.handle(OnboardingAction.PostViewEvent(OnboardingViewEvents.OnBack))
         }
     }
 
     override fun resetViewModel() {
+        // do nothing
+    }
 
+    override fun updateWithState(state: OnboardingViewState) {
+        views.chooseServerInput.editText().setText(state.serverSelectionState.userUrlInput.toReducedUrl())
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt
index e561f85f25..e21210065b 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt
@@ -184,7 +184,7 @@ class FtueAuthLoginFragment @Inject constructor() : AbstractSSOFtueAuthFragment<
                 ServerType.MatrixOrg -> {
                     views.loginServerIcon.isVisible = true
                     views.loginServerIcon.setImageResource(R.drawable.ic_logo_matrix_org)
-                    views.loginTitle.text = getString(resId, state.homeServerUrlFromUser.toReducedUrl())
+                    views.loginTitle.text = getString(resId, state.serverSelectionState.userUrlInput.toReducedUrl())
                     views.loginNotice.text = getString(R.string.login_server_matrix_org_text)
                 }
                 ServerType.EMS       -> {
@@ -195,7 +195,7 @@ class FtueAuthLoginFragment @Inject constructor() : AbstractSSOFtueAuthFragment<
                 }
                 ServerType.Other     -> {
                     views.loginServerIcon.isVisible = false
-                    views.loginTitle.text = getString(resId, state.homeServerUrlFromUser.toReducedUrl())
+                    views.loginTitle.text = getString(resId, state.serverSelectionState.userUrlInput.toReducedUrl())
                     views.loginNotice.text = getString(R.string.login_server_other_text)
                 }
                 ServerType.Unknown   -> Unit /* Should not happen */
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordFragment.kt
index b612ec34b5..67dafbd9c2 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordFragment.kt
@@ -59,7 +59,7 @@ class FtueAuthResetPasswordFragment @Inject constructor() : AbstractFtueAuthFrag
     }
 
     private fun setupUi(state: OnboardingViewState) {
-        views.resetPasswordTitle.text = getString(R.string.login_reset_password_on, state.homeServerUrlFromUser.toReducedUrl())
+        views.resetPasswordTitle.text = getString(R.string.login_reset_password_on, state.serverSelectionState.userUrlInput.toReducedUrl())
     }
 
     private fun setupSubmitButton() {
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSignUpSignInSelectionFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSignUpSignInSelectionFragment.kt
index e9ae5022e2..74c98c0366 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSignUpSignInSelectionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSignUpSignInSelectionFragment.kt
@@ -60,19 +60,19 @@ class FtueAuthSignUpSignInSelectionFragment @Inject constructor() : AbstractSSOF
             ServerType.MatrixOrg -> {
                 views.loginSignupSigninServerIcon.setImageResource(R.drawable.ic_logo_matrix_org)
                 views.loginSignupSigninServerIcon.isVisible = true
-                views.loginSignupSigninTitle.text = getString(R.string.login_connect_to, state.homeServerUrlFromUser.toReducedUrl())
+                views.loginSignupSigninTitle.text = getString(R.string.login_connect_to, state.serverSelectionState.userUrlInput.toReducedUrl())
                 views.loginSignupSigninText.text = getString(R.string.login_server_matrix_org_text)
             }
             ServerType.EMS       -> {
                 views.loginSignupSigninServerIcon.setImageResource(R.drawable.ic_logo_element_matrix_services)
                 views.loginSignupSigninServerIcon.isVisible = true
                 views.loginSignupSigninTitle.text = getString(R.string.login_connect_to_modular)
-                views.loginSignupSigninText.text = state.homeServerUrlFromUser.toReducedUrl()
+                views.loginSignupSigninText.text = state.serverSelectionState.userUrlInput.toReducedUrl()
             }
             ServerType.Other     -> {
                 views.loginSignupSigninServerIcon.isVisible = false
                 views.loginSignupSigninTitle.text = getString(R.string.login_server_other_title)
-                views.loginSignupSigninText.text = getString(R.string.login_connect_to, state.homeServerUrlFromUser.toReducedUrl())
+                views.loginSignupSigninText.text = getString(R.string.login_connect_to, state.serverSelectionState.userUrlInput.toReducedUrl())
             }
             ServerType.Unknown   -> Unit /* Should not happen */
         }
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/terms/FtueAuthTermsFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/terms/FtueAuthTermsFragment.kt
index f6a7769cbd..7d8f19b1b0 100755
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/terms/FtueAuthTermsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/terms/FtueAuthTermsFragment.kt
@@ -116,7 +116,7 @@ class FtueAuthTermsFragment @Inject constructor(
     }
 
     override fun updateWithState(state: OnboardingViewState) {
-        policyController.homeServer = state.homeServerUrlFromUser.toReducedUrl()
+        policyController.homeServer = state.serverSelectionState.userUrlInput.toReducedUrl()
         renderState()
     }
 
diff --git a/vector/src/main/res/layout/fragment_ftue_sign_up_combined.xml b/vector/src/main/res/layout/fragment_ftue_sign_up_combined.xml
index ae51808d3a..5c3fa9cf8f 100644
--- a/vector/src/main/res/layout/fragment_ftue_sign_up_combined.xml
+++ b/vector/src/main/res/layout/fragment_ftue_sign_up_combined.xml
@@ -109,7 +109,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="12dp"
-            android:text="@string/ftue_auth_create_account_matrix_dot_org_server_name"
             android:textColor="?vctr_content_primary"
             app:layout_constraintBottom_toTopOf="@id/selectedServerDescription"
             app:layout_constraintEnd_toStartOf="@id/editServerButton"
@@ -122,7 +121,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="12dp"
-            android:text="@string/ftue_auth_create_account_matrix_dot_org_server_description"
             android:textColor="?vctr_content_tertiary"
             app:layout_constraintBottom_toTopOf="@id/serverSelectionSpacing"
             app:layout_constraintEnd_toStartOf="@id/editServerButton"
diff --git a/vector/src/main/res/values/donottranslate.xml b/vector/src/main/res/values/donottranslate.xml
index fc946c3b3f..c0ac6a4989 100755
--- a/vector/src/main/res/values/donottranslate.xml
+++ b/vector/src/main/res/values/donottranslate.xml
@@ -17,11 +17,10 @@
     <string name="ftue_auth_create_account_choose_server_header">Choose your server to store your data</string>
     <string name="ftue_auth_create_account_sso_section_header">Or</string>
     <string name="ftue_auth_create_account_matrix_dot_org_server_description">Join millions for free on the largest public server</string>
-    <string name="ftue_auth_create_account_matrix_dot_org_server_name">matrix.org</string>
     <string name="ftue_auth_create_account_edit_server_selection">Edit</string>
 
     <string name="ftue_auth_choose_server_title">Choose your server</string>
-    <string name="ftue_auth_choose_server_subtitle">What is the address of your server? Server is like a home for all your data</string>
+    <string name="ftue_auth_choose_server_subtitle">What is the address of your server? Server is like a home for all your data.</string>
     <string name="ftue_auth_choose_server_entry_hint">Server URL</string>
     <string name="ftue_auth_choose_server_entry_footer">You can only connect to a server that has already been set up</string>
     <string name="ftue_auth_choose_server_ems_title">Want to host your own server?</string>

From 985dbfe97d8d46eb67b9c9754234cad667203a29 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 31 Mar 2022 13:01:04 +0100
Subject: [PATCH 03/20] keeping the http:// schema in the server selection
 input field - helps to highlight a non secture connection, for https we strip
 the prefix

---
 .../main/java/im/vector/app/core/extensions/UrlExtensions.kt | 4 ++--
 .../ftueauth/FtueAuthCombinedServerSelectionFragment.kt      | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/extensions/UrlExtensions.kt b/vector/src/main/java/im/vector/app/core/extensions/UrlExtensions.kt
index 5037f78445..749da0d987 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/UrlExtensions.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/UrlExtensions.kt
@@ -19,8 +19,8 @@ package im.vector.app.core.extensions
 /**
  * Ex: "https://matrix.org/" -> "matrix.org"
  */
-fun String?.toReducedUrl(): String {
+fun String?.toReducedUrl(keepSchema: Boolean = false): String {
     return (this ?: "")
-            .substringAfter("://")
+            .run { if (keepSchema) this else substringAfter("://") }
             .trim { it == '/' }
 }
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
index 66707f371d..dbee2ad045 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
@@ -49,6 +49,9 @@ class FtueAuthCombinedServerSelectionFragment @Inject constructor() : AbstractSS
     }
 
     override fun updateWithState(state: OnboardingViewState) {
-        views.chooseServerInput.editText().setText(state.serverSelectionState.userUrlInput.toReducedUrl())
+        val userUrlInput = state.serverSelectionState.userUrlInput?.toReducedUrlKeepingSchemaIfInsecure()
+        views.chooseServerInput.editText().setText(userUrlInput)
     }
+
+    private fun String.toReducedUrlKeepingSchemaIfInsecure() = toReducedUrl(keepSchema = this.startsWith("http://"))
 }

From 51c294a6fc955f5586cd44da265215af3d0f8ab2 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 31 Mar 2022 16:33:09 +0100
Subject: [PATCH 04/20] launching the edit selection from the ftue variant
 entry point

---
 .../onboarding/OnboardingViewEvents.kt         |  1 +
 .../features/onboarding/OnboardingViewModel.kt | 18 ++++++++----------
 .../FtueAuthCombinedRegisterFragment.kt        | 11 ++---------
 .../FtueAuthCombinedServerSelectionFragment.kt |  7 ++++++-
 .../onboarding/ftueauth/FtueAuthVariant.kt     |  7 +++++++
 5 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewEvents.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewEvents.kt
index 853b0c330e..dddf350542 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewEvents.kt
@@ -37,6 +37,7 @@ sealed class OnboardingViewEvents : VectorViewEvents {
     object OpenUseCaseSelection : OnboardingViewEvents()
     object OpenServerSelection : OnboardingViewEvents()
     object OpenCombinedRegister : OnboardingViewEvents()
+    object EditServerSelection : OnboardingViewEvents()
     data class OnServerSelectionDone(val serverType: ServerType) : OnboardingViewEvents()
     object OnLoginFlowRetrieved : OnboardingViewEvents()
     data class OnSignModeSelected(val signMode: SignMode) : OnboardingViewEvents()
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
index 8a427abdd1..73b632e351 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
@@ -646,19 +646,17 @@ class OnboardingViewModel @AssistedInject constructor(
                 else                                                               -> LoginMode.Unsupported
             }
 
-            val serverSelection = ServerSelectionState(
-                    description = when (data.homeServerUrl) {
-                        matrixOrgUrl -> stringProvider.getString(R.string.ftue_auth_create_account_matrix_dot_org_server_description)
-                        else         -> null
-                    },
-                    userUrlInput = homeServerConnectionConfig.homeServerUri.toString(),
-                    hostedUrl = data.homeServerUrl
-            )
-
             setState {
                 copy(
+                        serverSelectionState = serverSelectionState.copy(
+                                description = when (data.homeServerUrl) {
+                                    matrixOrgUrl -> stringProvider.getString(R.string.ftue_auth_create_account_matrix_dot_org_server_description)
+                                    else         -> null
+                                },
+                                userUrlInput = homeServerConnectionConfig.homeServerUri.toString(),
+                                hostedUrl = data.homeServerUrl
+                        ),
                         isLoading = false,
-                        serverSelectionState = serverSelection,
                         loginMode = loginMode,
                         loginModeSupportedTypes = data.supportedLoginTypes.toList()
                 )
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt
index c24dc22de2..537adf977d 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt
@@ -22,7 +22,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
-import androidx.appcompat.app.AppCompatActivity
 import androidx.autofill.HintConstants
 import androidx.core.text.isDigitsOnly
 import androidx.core.view.isVisible
@@ -30,8 +29,6 @@ import androidx.lifecycle.lifecycleScope
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import im.vector.app.R
-import im.vector.app.core.extensions.addFragment
-import im.vector.app.core.extensions.commitTransaction
 import im.vector.app.core.extensions.content
 import im.vector.app.core.extensions.editText
 import im.vector.app.core.extensions.hasContentFlow
@@ -39,7 +36,6 @@ import im.vector.app.core.extensions.hasSurroundingSpaces
 import im.vector.app.core.extensions.hideKeyboard
 import im.vector.app.core.extensions.hidePassword
 import im.vector.app.core.extensions.realignPercentagesToParent
-import im.vector.app.core.extensions.toMvRxBundle
 import im.vector.app.core.extensions.toReducedUrl
 import im.vector.app.databinding.FragmentFtueSignUpCombinedBinding
 import im.vector.app.features.login.LoginMode
@@ -47,6 +43,7 @@ import im.vector.app.features.login.SSORedirectRouterActivity
 import im.vector.app.features.login.ServerType
 import im.vector.app.features.login.SocialLoginButtonsView
 import im.vector.app.features.onboarding.OnboardingAction
+import im.vector.app.features.onboarding.OnboardingViewEvents
 import im.vector.app.features.onboarding.OnboardingViewState
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.launchIn
@@ -69,13 +66,9 @@ class FtueAuthCombinedRegisterFragment @Inject constructor() : AbstractSSOFtueAu
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setupSubmitButton()
-
         views.createAccountRoot.realignPercentagesToParent()
-
         views.editServerButton.debouncedClicks {
-            requireActivity().supportFragmentManager.commitTransaction(true) {
-                add(R.id.loginFragmentContainer, FtueAuthCombinedServerSelectionFragment(), null)
-            }
+            viewModel.handle(OnboardingAction.PostViewEvent(OnboardingViewEvents.EditServerSelection))
         }
 
         views.createAccountPasswordInput.editText().setOnEditorActionListener { _, actionId, _ ->
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
index dbee2ad045..f94a243cd9 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
@@ -20,6 +20,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import im.vector.app.core.extensions.content
 import im.vector.app.core.extensions.editText
 import im.vector.app.core.extensions.realignPercentagesToParent
 import im.vector.app.core.extensions.toReducedUrl
@@ -29,7 +30,7 @@ import im.vector.app.features.onboarding.OnboardingViewEvents
 import im.vector.app.features.onboarding.OnboardingViewState
 import javax.inject.Inject
 
-class FtueAuthCombinedServerSelectionFragment @Inject constructor() : AbstractSSOFtueAuthFragment<FragmentFtueServerSelectionCombinedBinding>() {
+class FtueAuthCombinedServerSelectionFragment @Inject constructor() : AbstractFtueAuthFragment<FragmentFtueServerSelectionCombinedBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentFtueServerSelectionCombinedBinding {
         return FragmentFtueServerSelectionCombinedBinding.inflate(inflater, container, false)
@@ -42,6 +43,10 @@ class FtueAuthCombinedServerSelectionFragment @Inject constructor() : AbstractSS
         views.chooseServerToolbar.setNavigationOnClickListener {
             viewModel.handle(OnboardingAction.PostViewEvent(OnboardingViewEvents.OnBack))
         }
+
+        views.chooseServerSubmit.debouncedClicks {
+            viewModel.handle(OnboardingAction.UpdateHomeServer(views.chooseServerInput.content()))
+        }
     }
 
     override fun resetViewModel() {
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
index 4c7bf47233..104a37f256 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
@@ -233,6 +233,13 @@ class FtueAuthVariant(
             OnboardingViewEvents.OnChooseProfilePicture                        -> onChooseProfilePicture()
             OnboardingViewEvents.OnPersonalizationComplete                     -> onPersonalizationComplete()
             OnboardingViewEvents.OnBack                                        -> activity.popBackstack()
+            OnboardingViewEvents.EditServerSelection                           -> {
+                activity.addFragmentToBackstack(
+                        views.loginFragmentContainer,
+                        FtueAuthCombinedServerSelectionFragment::class.java,
+                        option = commonOption
+                )
+            }
         }
     }
 

From f34df3997dc48491f2c4e11ebdd94bb107bc070e Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Fri, 1 Apr 2022 15:21:04 +0100
Subject: [PATCH 05/20] extracting the authentication start logic to a
 dedicated use case - moves some of the homeserver specific state to the
 selectServer model

---
 .../onboarding/OnboardingViewModel.kt         | 137 ++++++------------
 .../onboarding/OnboardingViewState.kt         |  17 +--
 .../StartAuthenticationFlowUseCase.kt         |  67 +++++++++
 .../ftueauth/AbstractSSOFtueAuthFragment.kt   |   6 +-
 .../ftueauth/FtueAuthCaptchaFragment.kt       |   2 +-
 .../FtueAuthCombinedRegisterFragment.kt       |  13 +-
 ...FtueAuthCombinedServerSelectionFragment.kt |   2 +-
 .../ftueauth/FtueAuthLoginFragment.kt         |   8 +-
 .../ftueauth/FtueAuthResetPasswordFragment.kt |   2 +-
 .../FtueAuthSignUpSignInSelectionFragment.kt  |  14 +-
 .../onboarding/ftueauth/FtueAuthVariant.kt    |   8 +-
 .../ftueauth/terms/FtueAuthTermsFragment.kt   |   2 +-
 .../onboarding/OnboardingViewModelTest.kt     |   1 +
 13 files changed, 150 insertions(+), 129 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCase.kt

diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
index 73b632e351..b3bf87bab8 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
@@ -47,7 +47,6 @@ import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.auth.AuthenticationService
 import org.matrix.android.sdk.api.auth.HomeServerHistoryService
 import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
-import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
 import org.matrix.android.sdk.api.auth.login.LoginWizard
 import org.matrix.android.sdk.api.auth.registration.FlowResult
 import org.matrix.android.sdk.api.auth.registration.RegistrationResult
@@ -75,6 +74,7 @@ class OnboardingViewModel @AssistedInject constructor(
         private val uriFilenameResolver: UriFilenameResolver,
         private val registrationActionHandler: RegistrationActionHandler,
         private val directLoginUseCase: DirectLoginUseCase,
+        private val startAuthenticationFlowUseCase: StartAuthenticationFlowUseCase,
         private val vectorOverrides: VectorOverrides
 ) : VectorViewModel<OnboardingViewState, OnboardingAction, OnboardingViewEvents>(initialState) {
 
@@ -176,7 +176,7 @@ class OnboardingViewModel @AssistedInject constructor(
                 Timber.w("Url from config url was invalid: $configUrl")
                 continueToPageAfterSplash(onboardingFlow)
             } else {
-                getLoginFlow(homeServerConnectionConfig, ServerType.Other)
+                startAuthenticationFlow(homeServerConnectionConfig, ServerType.Other)
             }
         } else {
             continueToPageAfterSplash(onboardingFlow)
@@ -203,7 +203,7 @@ class OnboardingViewModel @AssistedInject constructor(
             is OnboardingAction.UpdateHomeServer -> {
                 currentHomeServerConnectionConfig
                         ?.let { it.copy(allowedFingerprints = it.allowedFingerprints + action.fingerprint) }
-                        ?.let { getLoginFlow(it) }
+                        ?.let { startAuthenticationFlow(it) }
             }
             is OnboardingAction.LoginOrRegister  ->
                 handleDirectLogin(
@@ -292,11 +292,7 @@ class OnboardingViewModel @AssistedInject constructor(
 
         when (action) {
             OnboardingAction.ResetHomeServerType        -> {
-                setState {
-                    copy(
-                            serverType = ServerType.Unknown
-                    )
-                }
+                setState { copy(serverType = ServerType.Unknown) }
             }
             OnboardingAction.ResetHomeServerUrl         -> {
                 viewModelScope.launch {
@@ -304,10 +300,7 @@ class OnboardingViewModel @AssistedInject constructor(
                     setState {
                         copy(
                                 isLoading = false,
-                                serverSelectionState = ServerSelectionState(),
-                                loginMode = LoginMode.Unknown,
-                                serverType = ServerType.Unknown,
-                                loginModeSupportedTypes = emptyList()
+                                selectedHomeserver = SelectedHomeserverState(),
                         )
                     }
                 }
@@ -317,8 +310,6 @@ class OnboardingViewModel @AssistedInject constructor(
                     copy(
                             isLoading = false,
                             signMode = SignMode.Unknown,
-                            loginMode = LoginMode.Unknown,
-                            loginModeSupportedTypes = emptyList()
                     )
                 }
             }
@@ -570,7 +561,7 @@ class OnboardingViewModel @AssistedInject constructor(
     }
 
     private fun handleWebLoginSuccess(action: OnboardingAction.WebLoginSuccess) = withState { state ->
-        val homeServerConnectionConfigFinal = homeServerConnectionConfigFactory.create(state.serverSelectionState.hostedUrl)
+        val homeServerConnectionConfigFinal = homeServerConnectionConfigFactory.create(state.selectedHomeserver.declaredUrl)
 
         if (homeServerConnectionConfigFinal == null) {
             // Should not happen
@@ -593,93 +584,59 @@ class OnboardingViewModel @AssistedInject constructor(
             // This is invalid
             _viewEvents.post(OnboardingViewEvents.Failure(Throwable("Unable to create a HomeServerConnectionConfig")))
         } else {
-            getLoginFlow(homeServerConnectionConfig)
+            startAuthenticationFlow(homeServerConnectionConfig)
         }
     }
 
-    private fun getLoginFlow(homeServerConnectionConfig: HomeServerConnectionConfig,
-                             serverTypeOverride: ServerType? = null) {
+    private fun startAuthenticationFlow(homeServerConnectionConfig: HomeServerConnectionConfig, serverTypeOverride: ServerType? = null) {
         currentHomeServerConnectionConfig = homeServerConnectionConfig
 
         currentJob = viewModelScope.launch {
-            authenticationService.cancelPendingLoginOrRegistration()
+            setState { copy(isLoading = true) }
 
-            setState {
-                copy(
-                        isLoading = true,
-                        // If user has entered https://matrix.org, ensure that server type is ServerType.MatrixOrg
-                        // It is also useful to set the value again in the case of a certificate error on matrix.org
-                        serverType = if (homeServerConnectionConfig.homeServerUri.toString() == matrixOrgUrl) {
-                            ServerType.MatrixOrg
-                        } else {
-                            serverTypeOverride ?: serverType
+            runCatching { startAuthenticationFlowUseCase.execute(homeServerConnectionConfig) }.fold(
+                    onSuccess = {
+                        rememberHomeServer(homeServerConnectionConfig.homeServerUri.toString())
+                        if (it.isHomeserverOutdated) {
+                            _viewEvents.post(OnboardingViewEvents.OutdatedHomeserver)
                         }
-                )
-            }
 
-            val data = try {
-                authenticationService.getLoginFlow(homeServerConnectionConfig)
-            } catch (failure: Throwable) {
-                setState {
-                    copy(
-                            isLoading = false,
-                            // If we were trying to retrieve matrix.org login flow, also reset the serverType
-                            serverType = if (serverType == ServerType.MatrixOrg) ServerType.Unknown else serverType
-                    )
-                }
-                _viewEvents.post(OnboardingViewEvents.Failure(failure))
-                null
-            }
-
-            data ?: return@launch
-
-            // Valid Homeserver, add it to the history.
-            // Note: we add what the user has input, data.homeServerUrlBase can be different
-            rememberHomeServer(homeServerConnectionConfig.homeServerUri.toString())
-
-            val loginMode = when {
-                // SSO login is taken first
-                data.supportedLoginTypes.contains(LoginFlowTypes.SSO) &&
-                        data.supportedLoginTypes.contains(LoginFlowTypes.PASSWORD) -> LoginMode.SsoAndPassword(data.ssoIdentityProviders)
-                data.supportedLoginTypes.contains(LoginFlowTypes.SSO)              -> LoginMode.Sso(data.ssoIdentityProviders)
-                data.supportedLoginTypes.contains(LoginFlowTypes.PASSWORD)         -> LoginMode.Password
-                else                                                               -> LoginMode.Unsupported
-            }
-
-            setState {
-                copy(
-                        serverSelectionState = serverSelectionState.copy(
-                                description = when (data.homeServerUrl) {
-                                    matrixOrgUrl -> stringProvider.getString(R.string.ftue_auth_create_account_matrix_dot_org_server_description)
-                                    else         -> null
-                                },
-                                userUrlInput = homeServerConnectionConfig.homeServerUri.toString(),
-                                hostedUrl = data.homeServerUrl
-                        ),
-                        isLoading = false,
-                        loginMode = loginMode,
-                        loginModeSupportedTypes = data.supportedLoginTypes.toList()
-                )
-            }
-            if ((loginMode == LoginMode.Password && !data.isLoginAndRegistrationSupported) ||
-                    data.isOutdatedHomeserver) {
-                // Notify the UI
-                _viewEvents.post(OnboardingViewEvents.OutdatedHomeserver)
-            }
-
-            withState {
-                if (loginMode.supportsSignModeScreen()) {
-                    when (it.onboardingFlow) {
-                        OnboardingFlow.SignIn -> handleUpdateSignMode(OnboardingAction.UpdateSignMode(SignMode.SignIn))
-                        OnboardingFlow.SignUp -> handleUpdateSignMode(OnboardingAction.UpdateSignMode(SignMode.SignUp))
-                        OnboardingFlow.SignInSignUp,
-                        null                  -> {
-                            _viewEvents.post(OnboardingViewEvents.OnLoginFlowRetrieved)
+                        setState {
+                            copy(
+                                    // If user has entered https://matrix.org, ensure that server type is ServerType.MatrixOrg
+                                    // It is also useful to set the value again in the case of a certificate error on matrix.org
+                                    serverType = if (homeServerConnectionConfig.homeServerUri.toString() == matrixOrgUrl) {
+                                        ServerType.MatrixOrg
+                                    } else {
+                                        serverTypeOverride ?: serverType
+                                    },
+                                    selectedHomeserver = it.serverSelectionState,
+                                    isLoading = false,
+                            )
                         }
+                        onAuthenticationStartedSuccess()
+                    },
+                    onFailure = {
+                        setState { copy(isLoading = false) }
+                        _viewEvents.post(OnboardingViewEvents.Failure(it))
+                    }
+            )
+        }
+    }
+
+    private fun onAuthenticationStartedSuccess() {
+        withState {
+            if (it.selectedHomeserver.preferredLoginMode.supportsSignModeScreen()) {
+                when (it.onboardingFlow) {
+                    OnboardingFlow.SignIn -> handleUpdateSignMode(OnboardingAction.UpdateSignMode(SignMode.SignIn))
+                    OnboardingFlow.SignUp -> handleUpdateSignMode(OnboardingAction.UpdateSignMode(SignMode.SignUp))
+                    OnboardingFlow.SignInSignUp,
+                    null                  -> {
+                        _viewEvents.post(OnboardingViewEvents.OnLoginFlowRetrieved)
                     }
-                } else {
-                    _viewEvents.post(OnboardingViewEvents.OnLoginFlowRetrieved)
                 }
+            } else {
+                _viewEvents.post(OnboardingViewEvents.OnLoginFlowRetrieved)
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt
index 99a5c595e5..c9c5e05d57 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt
@@ -45,17 +45,11 @@ data class OnboardingViewState(
         @PersistState
         val deviceId: String? = null,
 
-        // Network result
-        @PersistState
-        val loginMode: LoginMode = LoginMode.Unknown,
-        // Supported types for the login. We cannot use a sealed class for LoginType because it is not serializable
-        @PersistState
-        val loginModeSupportedTypes: List<String> = emptyList(),
         val knownCustomHomeServersUrls: List<String> = emptyList(),
         val isForceLoginFallbackEnabled: Boolean = false,
 
         @PersistState
-        val serverSelectionState: ServerSelectionState = ServerSelectionState(),
+        val selectedHomeserver: SelectedHomeserverState = SelectedHomeserverState(),
 
         @PersistState
         val personalizationState: PersonalizationState = PersonalizationState()
@@ -68,10 +62,13 @@ enum class OnboardingFlow {
 }
 
 @Parcelize
-data class ServerSelectionState(
+data class SelectedHomeserverState(
         val description: String? = null,
-        val userUrlInput: String? = null,
-        val hostedUrl: String? = null,
+        val sourceUrl: String? = null,
+        val declaredUrl: String? = null,
+        val preferredLoginMode: LoginMode = LoginMode.Unknown,
+        // Supported types for the login. We cannot use a sealed class for LoginType because it is not serializable
+        val loginModeSupportedTypes: List<String> = emptyList(),
 ) : Parcelable
 
 @Parcelize
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCase.kt b/vector/src/main/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCase.kt
new file mode 100644
index 0000000000..9c773923b4
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCase.kt
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.onboarding
+
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.utils.ensureTrailingSlash
+import im.vector.app.features.login.LoginMode
+import org.matrix.android.sdk.api.auth.AuthenticationService
+import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
+import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
+import javax.inject.Inject
+
+class StartAuthenticationFlowUseCase @Inject constructor(
+        private val authenticationService: AuthenticationService,
+        private val stringProvider: StringProvider
+) {
+
+    data class Bar(
+            val isHomeserverOutdated: Boolean,
+            val serverSelectionState: SelectedHomeserverState,
+            val loginMode: LoginMode,
+            val supportedLoginTypes: List<String>,
+    )
+
+    suspend fun execute(config: HomeServerConnectionConfig): Bar {
+        authenticationService.cancelPendingLoginOrRegistration()
+        val authFlow = authenticationService.getLoginFlow(config)
+
+        val loginMode = when {
+            // SSO login is taken first
+            authFlow.supportedLoginTypes.contains(LoginFlowTypes.SSO) &&
+                    authFlow.supportedLoginTypes.contains(LoginFlowTypes.PASSWORD) -> LoginMode.SsoAndPassword(authFlow.ssoIdentityProviders)
+            authFlow.supportedLoginTypes.contains(LoginFlowTypes.SSO)              -> LoginMode.Sso(authFlow.ssoIdentityProviders)
+            authFlow.supportedLoginTypes.contains(LoginFlowTypes.PASSWORD)         -> LoginMode.Password
+            else                                                                   -> LoginMode.Unsupported
+        }
+
+        val matrixOrgUrl = stringProvider.getString(R.string.matrix_org_server_url).ensureTrailingSlash()
+        val selection = SelectedHomeserverState(
+                description = when (authFlow.homeServerUrl) {
+                    matrixOrgUrl -> stringProvider.getString(R.string.ftue_auth_create_account_matrix_dot_org_server_description)
+                    else         -> null
+                },
+                sourceUrl = config.homeServerUri.toString(),
+                declaredUrl = authFlow.homeServerUrl,
+                preferredLoginMode = loginMode,
+                loginModeSupportedTypes = authFlow.supportedLoginTypes
+        )
+        val isOutdated = (loginMode == LoginMode.Password && !authFlow.isLoginAndRegistrationSupported) || authFlow.isOutdatedHomeserver
+        return Bar(isOutdated, selection, loginMode, authFlow.supportedLoginTypes.toList())
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/AbstractSSOFtueAuthFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/AbstractSSOFtueAuthFragment.kt
index 2e9925516c..a032181e4d 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/AbstractSSOFtueAuthFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/AbstractSSOFtueAuthFragment.kt
@@ -37,7 +37,7 @@ abstract class AbstractSSOFtueAuthFragment<VB : ViewBinding> : AbstractFtueAuthF
 
     override fun onStart() {
         super.onStart()
-        val hasSSO = withState(viewModel) { it.loginMode.hasSso() }
+        val hasSSO = withState(viewModel) { it.selectedHomeserver.preferredLoginMode.hasSso() }
         if (hasSSO) {
             val packageName = CustomTabsClient.getPackageName(requireContext(), null)
 
@@ -67,7 +67,7 @@ abstract class AbstractSSOFtueAuthFragment<VB : ViewBinding> : AbstractFtueAuthF
 
     override fun onStop() {
         super.onStop()
-        val hasSSO = withState(viewModel) { it.loginMode.hasSso() }
+        val hasSSO = withState(viewModel) { it.selectedHomeserver.preferredLoginMode.hasSso() }
         if (hasSSO) {
             customTabsServiceConnection?.let { requireContext().unbindService(it) }
             customTabsServiceConnection = null
@@ -88,7 +88,7 @@ abstract class AbstractSSOFtueAuthFragment<VB : ViewBinding> : AbstractFtueAuthF
 
     private fun prefetchIfNeeded() {
         withState(viewModel) { state ->
-            if (state.loginMode.hasSso() && state.loginMode.ssoIdentityProviders().isNullOrEmpty()) {
+            if (state.selectedHomeserver.preferredLoginMode.hasSso() && state.selectedHomeserver.preferredLoginMode.ssoIdentityProviders().isNullOrEmpty()) {
                 // in this case we can prefetch (not other cases for privacy concerns)
                 viewModel.getSsoUrl(
                         redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCaptchaFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCaptchaFragment.kt
index f10ef68850..74c020223a 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCaptchaFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCaptchaFragment.kt
@@ -77,7 +77,7 @@ class FtueAuthCaptchaFragment @Inject constructor(
         val mime = "text/html"
         val encoding = "utf-8"
 
-        val homeServerUrl = state.serverSelectionState.hostedUrl ?: error("missing url of homeserver")
+        val homeServerUrl = state.selectedHomeserver.declaredUrl ?: error("missing url of homeserver")
         views.loginCaptchaWevView.loadDataWithBaseURL(homeServerUrl, html, mime, encoding, null)
         views.loginCaptchaWevView.requestLayout()
 
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt
index 537adf977d..1f57c55206 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt
@@ -40,7 +40,6 @@ import im.vector.app.core.extensions.toReducedUrl
 import im.vector.app.databinding.FragmentFtueSignUpCombinedBinding
 import im.vector.app.features.login.LoginMode
 import im.vector.app.features.login.SSORedirectRouterActivity
-import im.vector.app.features.login.ServerType
 import im.vector.app.features.login.SocialLoginButtonsView
 import im.vector.app.features.onboarding.OnboardingAction
 import im.vector.app.features.onboarding.OnboardingViewEvents
@@ -168,8 +167,8 @@ class FtueAuthCombinedRegisterFragment @Inject constructor() : AbstractSSOFtueAu
         setupUi(state)
         setupAutoFill()
 
-        views.selectedServerName.text = state.serverSelectionState.userUrlInput.toReducedUrl()
-        views.selectedServerDescription.text = state.serverSelectionState.description
+        views.selectedServerName.text = state.selectedHomeserver.sourceUrl.toReducedUrl()
+        views.selectedServerDescription.text = state.selectedHomeserver.description
 
         if (state.isLoading) {
             // Ensure password is hidden
@@ -178,8 +177,8 @@ class FtueAuthCombinedRegisterFragment @Inject constructor() : AbstractSSOFtueAu
     }
 
     private fun setupUi(state: OnboardingViewState) {
-        when (state.loginMode) {
-            is LoginMode.SsoAndPassword -> renderSsoProviders(state.deviceId, state.loginMode.ssoIdentityProviders)
+        when (state.selectedHomeserver.preferredLoginMode) {
+            is LoginMode.SsoAndPassword -> renderSsoProviders(state.deviceId, state.selectedHomeserver.preferredLoginMode.ssoIdentityProviders)
             else                        -> hideSsoProviders()
         }
     }
@@ -208,6 +207,6 @@ class FtueAuthCombinedRegisterFragment @Inject constructor() : AbstractSSOFtueAu
             views.createAccountPasswordInput.setAutofillHints(HintConstants.AUTOFILL_HINT_NEW_PASSWORD)
         }
     }
-}
 
-private fun OnboardingViewState.isNumericOnlyUserIdForbidden() = serverType == ServerType.MatrixOrg
+    private fun OnboardingViewState.isNumericOnlyUserIdForbidden() = selectedHomeserver.sourceUrl == getString(R.string.matrix_org_server_url)
+}
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
index f94a243cd9..f97470feb0 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
@@ -54,7 +54,7 @@ class FtueAuthCombinedServerSelectionFragment @Inject constructor() : AbstractFt
     }
 
     override fun updateWithState(state: OnboardingViewState) {
-        val userUrlInput = state.serverSelectionState.userUrlInput?.toReducedUrlKeepingSchemaIfInsecure()
+        val userUrlInput = state.selectedHomeserver.sourceUrl?.toReducedUrlKeepingSchemaIfInsecure()
         views.chooseServerInput.editText().setText(userUrlInput)
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt
index e21210065b..a0b844f918 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt
@@ -184,7 +184,7 @@ class FtueAuthLoginFragment @Inject constructor() : AbstractSSOFtueAuthFragment<
                 ServerType.MatrixOrg -> {
                     views.loginServerIcon.isVisible = true
                     views.loginServerIcon.setImageResource(R.drawable.ic_logo_matrix_org)
-                    views.loginTitle.text = getString(resId, state.serverSelectionState.userUrlInput.toReducedUrl())
+                    views.loginTitle.text = getString(resId, state.selectedHomeserver.sourceUrl.toReducedUrl())
                     views.loginNotice.text = getString(R.string.login_server_matrix_org_text)
                 }
                 ServerType.EMS       -> {
@@ -195,16 +195,16 @@ class FtueAuthLoginFragment @Inject constructor() : AbstractSSOFtueAuthFragment<
                 }
                 ServerType.Other     -> {
                     views.loginServerIcon.isVisible = false
-                    views.loginTitle.text = getString(resId, state.serverSelectionState.userUrlInput.toReducedUrl())
+                    views.loginTitle.text = getString(resId, state.selectedHomeserver.sourceUrl.toReducedUrl())
                     views.loginNotice.text = getString(R.string.login_server_other_text)
                 }
                 ServerType.Unknown   -> Unit /* Should not happen */
             }
             views.loginPasswordNotice.isVisible = false
 
-            if (state.loginMode is LoginMode.SsoAndPassword) {
+            if (state.selectedHomeserver.preferredLoginMode is LoginMode.SsoAndPassword) {
                 views.loginSocialLoginContainer.isVisible = true
-                views.loginSocialLoginButtons.ssoIdentityProviders = state.loginMode.ssoIdentityProviders?.sorted()
+                views.loginSocialLoginButtons.ssoIdentityProviders = state.selectedHomeserver.preferredLoginMode.ssoIdentityProviders?.sorted()
                 views.loginSocialLoginButtons.listener = object : SocialLoginButtonsView.InteractionListener {
                     override fun onProviderSelected(id: String?) {
                         viewModel.getSsoUrl(
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordFragment.kt
index 67dafbd9c2..521dfe65cf 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordFragment.kt
@@ -59,7 +59,7 @@ class FtueAuthResetPasswordFragment @Inject constructor() : AbstractFtueAuthFrag
     }
 
     private fun setupUi(state: OnboardingViewState) {
-        views.resetPasswordTitle.text = getString(R.string.login_reset_password_on, state.serverSelectionState.userUrlInput.toReducedUrl())
+        views.resetPasswordTitle.text = getString(R.string.login_reset_password_on, state.selectedHomeserver.sourceUrl.toReducedUrl())
     }
 
     private fun setupSubmitButton() {
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSignUpSignInSelectionFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSignUpSignInSelectionFragment.kt
index 74c98c0366..946f16a2e8 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSignUpSignInSelectionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSignUpSignInSelectionFragment.kt
@@ -60,27 +60,27 @@ class FtueAuthSignUpSignInSelectionFragment @Inject constructor() : AbstractSSOF
             ServerType.MatrixOrg -> {
                 views.loginSignupSigninServerIcon.setImageResource(R.drawable.ic_logo_matrix_org)
                 views.loginSignupSigninServerIcon.isVisible = true
-                views.loginSignupSigninTitle.text = getString(R.string.login_connect_to, state.serverSelectionState.userUrlInput.toReducedUrl())
+                views.loginSignupSigninTitle.text = getString(R.string.login_connect_to, state.selectedHomeserver.sourceUrl.toReducedUrl())
                 views.loginSignupSigninText.text = getString(R.string.login_server_matrix_org_text)
             }
             ServerType.EMS       -> {
                 views.loginSignupSigninServerIcon.setImageResource(R.drawable.ic_logo_element_matrix_services)
                 views.loginSignupSigninServerIcon.isVisible = true
                 views.loginSignupSigninTitle.text = getString(R.string.login_connect_to_modular)
-                views.loginSignupSigninText.text = state.serverSelectionState.userUrlInput.toReducedUrl()
+                views.loginSignupSigninText.text = state.selectedHomeserver.sourceUrl.toReducedUrl()
             }
             ServerType.Other     -> {
                 views.loginSignupSigninServerIcon.isVisible = false
                 views.loginSignupSigninTitle.text = getString(R.string.login_server_other_title)
-                views.loginSignupSigninText.text = getString(R.string.login_connect_to, state.serverSelectionState.userUrlInput.toReducedUrl())
+                views.loginSignupSigninText.text = getString(R.string.login_connect_to, state.selectedHomeserver.sourceUrl.toReducedUrl())
             }
             ServerType.Unknown   -> Unit /* Should not happen */
         }
 
-        when (state.loginMode) {
+        when (state.selectedHomeserver.preferredLoginMode) {
             is LoginMode.SsoAndPassword -> {
                 views.loginSignupSigninSignInSocialLoginContainer.isVisible = true
-                views.loginSignupSigninSocialLoginButtons.ssoIdentityProviders = state.loginMode.ssoIdentityProviders()?.sorted()
+                views.loginSignupSigninSocialLoginButtons.ssoIdentityProviders = state.selectedHomeserver.preferredLoginMode.ssoIdentityProviders()?.sorted()
                 views.loginSignupSigninSocialLoginButtons.listener = object : SocialLoginButtonsView.InteractionListener {
                     override fun onProviderSelected(id: String?) {
                         viewModel.getSsoUrl(
@@ -101,7 +101,7 @@ class FtueAuthSignUpSignInSelectionFragment @Inject constructor() : AbstractSSOF
     }
 
     private fun setupButtons(state: OnboardingViewState) {
-        when (state.loginMode) {
+        when (state.selectedHomeserver.preferredLoginMode) {
             is LoginMode.Sso -> {
                 // change to only one button that is sign in with sso
                 views.loginSignupSigninSubmit.text = getString(R.string.login_signin_sso)
@@ -115,7 +115,7 @@ class FtueAuthSignUpSignInSelectionFragment @Inject constructor() : AbstractSSOF
     }
 
     private fun submit() = withState(viewModel) { state ->
-        if (state.loginMode is LoginMode.Sso) {
+        if (state.selectedHomeserver.preferredLoginMode is LoginMode.Sso) {
             viewModel.getSsoUrl(
                     redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
                     deviceId = state.deviceId,
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
index 104a37f256..c46d0ed5ee 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
@@ -306,18 +306,18 @@ class FtueAuthVariant(
 
     private fun handleSignInSelected(state: OnboardingViewState) {
         if (isForceLoginFallbackEnabled) {
-            onLoginModeNotSupported(state.loginModeSupportedTypes)
+            onLoginModeNotSupported(state.selectedHomeserver.loginModeSupportedTypes)
         } else {
             disambiguateLoginMode(state)
         }
     }
 
-    private fun disambiguateLoginMode(state: OnboardingViewState) = when (state.loginMode) {
+    private fun disambiguateLoginMode(state: OnboardingViewState) = when (state.selectedHomeserver.preferredLoginMode) {
         LoginMode.Unknown,
         is LoginMode.Sso      -> error("Developer error")
         is LoginMode.SsoAndPassword,
         LoginMode.Password    -> openAuthLoginFragmentWithTag(FRAGMENT_LOGIN_TAG)
-        LoginMode.Unsupported -> onLoginModeNotSupported(state.loginModeSupportedTypes)
+        LoginMode.Unsupported -> onLoginModeNotSupported(state.selectedHomeserver.loginModeSupportedTypes)
     }
 
     private fun openAuthLoginFragmentWithTag(tag: String) {
@@ -338,7 +338,7 @@ class FtueAuthVariant(
 
     private fun handleSignInWithMatrixId(state: OnboardingViewState) {
         if (isForceLoginFallbackEnabled) {
-            onLoginModeNotSupported(state.loginModeSupportedTypes)
+            onLoginModeNotSupported(state.selectedHomeserver.loginModeSupportedTypes)
         } else {
             openAuthLoginFragmentWithTag(FRAGMENT_LOGIN_TAG)
         }
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/terms/FtueAuthTermsFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/terms/FtueAuthTermsFragment.kt
index 7d8f19b1b0..853225b452 100755
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/terms/FtueAuthTermsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/terms/FtueAuthTermsFragment.kt
@@ -116,7 +116,7 @@ class FtueAuthTermsFragment @Inject constructor(
     }
 
     override fun updateWithState(state: OnboardingViewState) {
-        policyController.homeServer = state.serverSelectionState.userUrlInput.toReducedUrl()
+        policyController.homeServer = state.selectedHomeserver.sourceUrl.toReducedUrl()
         renderState()
     }
 
diff --git a/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt b/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
index a682d025b8..eee1a71d7e 100644
--- a/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
+++ b/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
@@ -392,6 +392,7 @@ class OnboardingViewModelTest {
                 fakeUriFilenameResolver.instance,
                 fakeRegisterActionHandler.instance,
                 fakeDirectLoginUseCase.instance,
+                StartAuthenticationFlowUseCase(fakeAuthenticationService, FakeStringProvider().instance),
                 FakeVectorOverrides()
         )
     }

From 1e520121cef55c56e10cc93d65bd4a1549573d63 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Fri, 1 Apr 2022 16:13:33 +0100
Subject: [PATCH 06/20] renaming update homeserver to select homeserver -
 should better reflect this steps mvoes the onboarding process forwards

---
 .../features/onboarding/OnboardingAction.kt   |  2 +-
 .../onboarding/OnboardingViewModel.kt         | 60 ++++++++++---------
 .../onboarding/OnboardingViewState.kt         |  2 +-
 .../StartAuthenticationFlowUseCase.kt         | 49 ++++++++-------
 ...FtueAuthCombinedServerSelectionFragment.kt |  2 +-
 .../ftueauth/FtueAuthServerUrlFormFragment.kt |  2 +-
 .../onboarding/ftueauth/FtueAuthVariant.kt    |  6 +-
 7 files changed, 66 insertions(+), 57 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingAction.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingAction.kt
index 7510f23584..8ae41adb22 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingAction.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingAction.kt
@@ -29,7 +29,7 @@ sealed interface OnboardingAction : VectorViewModelAction {
     data class OnIAlreadyHaveAnAccount(val resetLoginConfig: Boolean, val onboardingFlow: OnboardingFlow) : OnboardingAction
 
     data class UpdateServerType(val serverType: ServerType) : OnboardingAction
-    data class UpdateHomeServer(val homeServerUrl: String) : OnboardingAction
+    data class SelectHomeServer(val homeServerUrl: String) : OnboardingAction
     data class UpdateUseCase(val useCase: FtueUseCase) : OnboardingAction
     object ResetUseCase : OnboardingAction
     data class UpdateSignMode(val signMode: SignMode) : OnboardingAction
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
index b3bf87bab8..a4c3db671c 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
@@ -107,6 +107,7 @@ class OnboardingViewModel @AssistedInject constructor(
     private var currentHomeServerConnectionConfig: HomeServerConnectionConfig? = null
 
     private val matrixOrgUrl = stringProvider.getString(R.string.matrix_org_server_url).ensureTrailingSlash()
+    private val defaultHomeserverUrl = matrixOrgUrl
 
     private val registrationWizard: RegistrationWizard
         get() = authenticationService.getRegistrationWizard()
@@ -139,7 +140,7 @@ class OnboardingViewModel @AssistedInject constructor(
             is OnboardingAction.UpdateServerType           -> handleUpdateServerType(action)
             is OnboardingAction.UpdateSignMode             -> handleUpdateSignMode(action)
             is OnboardingAction.InitWith                   -> handleInitWith(action)
-            is OnboardingAction.UpdateHomeServer           -> handleUpdateHomeserver(action).also { lastAction = action }
+            is OnboardingAction.SelectHomeServer           -> handleSelectHomeserver(action).also { lastAction = action }
             is OnboardingAction.LoginOrRegister            -> handleLoginOrRegister(action).also { lastAction = action }
             is OnboardingAction.Register                   -> handleRegisterWith(action).also { lastAction = action }
             is OnboardingAction.LoginWithToken             -> handleLoginWithToken(action)
@@ -167,19 +168,19 @@ class OnboardingViewModel @AssistedInject constructor(
         }
         setState { copy(onboardingFlow = onboardingFlow) }
 
-        val configUrl = loginConfig?.homeServerUrl?.takeIf { it.isNotEmpty() }
-        if (configUrl != null) {
-            // Use config from uri
-            val homeServerConnectionConfig = homeServerConnectionConfigFactory.create(configUrl)
-            if (homeServerConnectionConfig == null) {
-                // Url is invalid, in this case, just use the regular flow
-                Timber.w("Url from config url was invalid: $configUrl")
-                continueToPageAfterSplash(onboardingFlow)
-            } else {
-                startAuthenticationFlow(homeServerConnectionConfig, ServerType.Other)
+        return when (val config = loginConfig.toHomeserverConfig()) {
+            null -> continueToPageAfterSplash(onboardingFlow)
+            else -> startAuthenticationFlow(config, ServerType.Other)
+        }
+    }
+
+    private fun LoginConfig?.toHomeserverConfig(): HomeServerConnectionConfig? {
+        return this?.homeServerUrl?.takeIf { it.isNotEmpty() }?.let { url ->
+            homeServerConnectionConfigFactory.create(url).also {
+                if (it == null) {
+                    Timber.w("Url from config url was invalid: $url")
+                }
             }
-        } else {
-            continueToPageAfterSplash(onboardingFlow)
         }
     }
 
@@ -200,7 +201,7 @@ class OnboardingViewModel @AssistedInject constructor(
         // It happens when we get the login flow, or during direct authentication.
         // So alter the homeserver config and retrieve again the login flow
         when (val finalLastAction = lastAction) {
-            is OnboardingAction.UpdateHomeServer -> {
+            is OnboardingAction.SelectHomeServer -> {
                 currentHomeServerConnectionConfig
                         ?.let { it.copy(allowedFingerprints = it.allowedFingerprints + action.fingerprint) }
                         ?.let { startAuthenticationFlow(it) }
@@ -348,10 +349,7 @@ class OnboardingViewModel @AssistedInject constructor(
     private fun handleUpdateUseCase(action: OnboardingAction.UpdateUseCase) {
         setState { copy(useCase = action.useCase) }
         when (vectorFeatures.isOnboardingCombinedRegisterEnabled()) {
-            true  -> {
-                handle(OnboardingAction.UpdateHomeServer(matrixOrgUrl))
-                OnboardingViewEvents.OpenCombinedRegister
-            }
+            true  -> handle(OnboardingAction.SelectHomeServer(defaultHomeserverUrl))
             false -> _viewEvents.post(OnboardingViewEvents.OpenServerSelection)
         }
     }
@@ -371,7 +369,7 @@ class OnboardingViewModel @AssistedInject constructor(
             ServerType.Unknown   -> Unit /* Should not happen */
             ServerType.MatrixOrg ->
                 // Request login flow here
-                handle(OnboardingAction.UpdateHomeServer(matrixOrgUrl))
+                handle(OnboardingAction.SelectHomeServer(matrixOrgUrl))
             ServerType.EMS,
             ServerType.Other     -> _viewEvents.post(OnboardingViewEvents.OnServerSelectionDone(action.serverType))
         }
@@ -578,7 +576,7 @@ class OnboardingViewModel @AssistedInject constructor(
         }
     }
 
-    private fun handleUpdateHomeserver(action: OnboardingAction.UpdateHomeServer) {
+    private fun handleSelectHomeserver(action: OnboardingAction.SelectHomeServer) {
         val homeServerConnectionConfig = homeServerConnectionConfigFactory.create(action.homeServerUrl)
         if (homeServerConnectionConfig == null) {
             // This is invalid
@@ -603,14 +601,8 @@ class OnboardingViewModel @AssistedInject constructor(
 
                         setState {
                             copy(
-                                    // If user has entered https://matrix.org, ensure that server type is ServerType.MatrixOrg
-                                    // It is also useful to set the value again in the case of a certificate error on matrix.org
-                                    serverType = if (homeServerConnectionConfig.homeServerUri.toString() == matrixOrgUrl) {
-                                        ServerType.MatrixOrg
-                                    } else {
-                                        serverTypeOverride ?: serverType
-                                    },
-                                    selectedHomeserver = it.serverSelectionState,
+                                    serverType = alignServerTypeAfterSubmission(homeServerConnectionConfig, serverTypeOverride),
+                                    selectedHomeserver = it.selectedHomeserverState,
                                     isLoading = false,
                             )
                         }
@@ -624,6 +616,18 @@ class OnboardingViewModel @AssistedInject constructor(
         }
     }
 
+    /**
+     * If user has entered https://matrix.org, ensure that server type is ServerType.MatrixOrg
+     * It is also useful to set the value again in the case of a certificate error on matrix.org
+     **/
+    private fun OnboardingViewState.alignServerTypeAfterSubmission(config: HomeServerConnectionConfig, serverTypeOverride: ServerType?): ServerType {
+        return if (config.homeServerUri.toString() == matrixOrgUrl) {
+            ServerType.MatrixOrg
+        } else {
+            serverTypeOverride ?: serverType
+        }
+    }
+
     private fun onAuthenticationStartedSuccess() {
         withState {
             if (it.selectedHomeserver.preferredLoginMode.supportsSignModeScreen()) {
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt
index c9c5e05d57..0605605a9d 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt
@@ -68,7 +68,7 @@ data class SelectedHomeserverState(
         val declaredUrl: String? = null,
         val preferredLoginMode: LoginMode = LoginMode.Unknown,
         // Supported types for the login. We cannot use a sealed class for LoginType because it is not serializable
-        val loginModeSupportedTypes: List<String> = emptyList(),
+        val supportedLoginTypes: List<String> = emptyList(),
 ) : Parcelable
 
 @Parcelize
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCase.kt b/vector/src/main/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCase.kt
index 9c773923b4..2f5f756891 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCase.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCase.kt
@@ -22,6 +22,7 @@ import im.vector.app.core.utils.ensureTrailingSlash
 import im.vector.app.features.login.LoginMode
 import org.matrix.android.sdk.api.auth.AuthenticationService
 import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
+import org.matrix.android.sdk.api.auth.data.LoginFlowResult
 import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
 import javax.inject.Inject
 
@@ -30,38 +31,42 @@ class StartAuthenticationFlowUseCase @Inject constructor(
         private val stringProvider: StringProvider
 ) {
 
-    data class Bar(
-            val isHomeserverOutdated: Boolean,
-            val serverSelectionState: SelectedHomeserverState,
-            val loginMode: LoginMode,
-            val supportedLoginTypes: List<String>,
-    )
-
-    suspend fun execute(config: HomeServerConnectionConfig): Bar {
+    suspend fun execute(config: HomeServerConnectionConfig): StartAuthenticationResult {
         authenticationService.cancelPendingLoginOrRegistration()
         val authFlow = authenticationService.getLoginFlow(config)
+        val preferredLoginMode = authFlow.findPreferredLoginMode()
+        val selection = createSelectedHomeserverState(authFlow, config, preferredLoginMode)
+        val isOutdated = (preferredLoginMode == LoginMode.Password && !authFlow.isLoginAndRegistrationSupported) || authFlow.isOutdatedHomeserver
+        return StartAuthenticationResult(isOutdated, selection, preferredLoginMode, authFlow.supportedLoginTypes.toList())
+    }
 
-        val loginMode = when {
-            // SSO login is taken first
-            authFlow.supportedLoginTypes.contains(LoginFlowTypes.SSO) &&
-                    authFlow.supportedLoginTypes.contains(LoginFlowTypes.PASSWORD) -> LoginMode.SsoAndPassword(authFlow.ssoIdentityProviders)
-            authFlow.supportedLoginTypes.contains(LoginFlowTypes.SSO)              -> LoginMode.Sso(authFlow.ssoIdentityProviders)
-            authFlow.supportedLoginTypes.contains(LoginFlowTypes.PASSWORD)         -> LoginMode.Password
-            else                                                                   -> LoginMode.Unsupported
-        }
-
+    private fun createSelectedHomeserverState(authFlow: LoginFlowResult, config: HomeServerConnectionConfig, preferredLoginMode: LoginMode): SelectedHomeserverState {
         val matrixOrgUrl = stringProvider.getString(R.string.matrix_org_server_url).ensureTrailingSlash()
-        val selection = SelectedHomeserverState(
+        return SelectedHomeserverState(
                 description = when (authFlow.homeServerUrl) {
                     matrixOrgUrl -> stringProvider.getString(R.string.ftue_auth_create_account_matrix_dot_org_server_description)
                     else         -> null
                 },
                 sourceUrl = config.homeServerUri.toString(),
                 declaredUrl = authFlow.homeServerUrl,
-                preferredLoginMode = loginMode,
-                loginModeSupportedTypes = authFlow.supportedLoginTypes
+                preferredLoginMode = preferredLoginMode,
+                supportedLoginTypes = authFlow.supportedLoginTypes
         )
-        val isOutdated = (loginMode == LoginMode.Password && !authFlow.isLoginAndRegistrationSupported) || authFlow.isOutdatedHomeserver
-        return Bar(isOutdated, selection, loginMode, authFlow.supportedLoginTypes.toList())
     }
+
+    private fun LoginFlowResult.findPreferredLoginMode() = when {
+        // SSO login is taken first
+        supportedLoginTypes.contains(LoginFlowTypes.SSO) &&
+                supportedLoginTypes.contains(LoginFlowTypes.PASSWORD) -> LoginMode.SsoAndPassword(ssoIdentityProviders)
+        supportedLoginTypes.contains(LoginFlowTypes.SSO)              -> LoginMode.Sso(ssoIdentityProviders)
+        supportedLoginTypes.contains(LoginFlowTypes.PASSWORD)         -> LoginMode.Password
+        else                                                          -> LoginMode.Unsupported
+    }
+
+    data class StartAuthenticationResult(
+            val isHomeserverOutdated: Boolean,
+            val selectedHomeserverState: SelectedHomeserverState,
+            val loginMode: LoginMode,
+            val supportedLoginTypes: List<String>,
+    )
 }
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
index f97470feb0..43cbb22d92 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
@@ -45,7 +45,7 @@ class FtueAuthCombinedServerSelectionFragment @Inject constructor() : AbstractFt
         }
 
         views.chooseServerSubmit.debouncedClicks {
-            viewModel.handle(OnboardingAction.UpdateHomeServer(views.chooseServerInput.content()))
+            viewModel.handle(OnboardingAction.SelectHomeServer(views.chooseServerInput.content()))
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthServerUrlFormFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthServerUrlFormFragment.kt
index 2cae9743a7..4549f11bf8 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthServerUrlFormFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthServerUrlFormFragment.kt
@@ -139,7 +139,7 @@ class FtueAuthServerUrlFormFragment @Inject constructor() : AbstractFtueAuthFrag
             }
             else                -> {
                 views.loginServerUrlFormHomeServerUrl.setText(serverUrl, false /* to avoid completion dialog flicker*/)
-                viewModel.handle(OnboardingAction.UpdateHomeServer(serverUrl))
+                viewModel.handle(OnboardingAction.SelectHomeServer(serverUrl))
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
index c46d0ed5ee..b96f44cc39 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
@@ -306,7 +306,7 @@ class FtueAuthVariant(
 
     private fun handleSignInSelected(state: OnboardingViewState) {
         if (isForceLoginFallbackEnabled) {
-            onLoginModeNotSupported(state.selectedHomeserver.loginModeSupportedTypes)
+            onLoginModeNotSupported(state.selectedHomeserver.supportedLoginTypes)
         } else {
             disambiguateLoginMode(state)
         }
@@ -317,7 +317,7 @@ class FtueAuthVariant(
         is LoginMode.Sso      -> error("Developer error")
         is LoginMode.SsoAndPassword,
         LoginMode.Password    -> openAuthLoginFragmentWithTag(FRAGMENT_LOGIN_TAG)
-        LoginMode.Unsupported -> onLoginModeNotSupported(state.selectedHomeserver.loginModeSupportedTypes)
+        LoginMode.Unsupported -> onLoginModeNotSupported(state.selectedHomeserver.supportedLoginTypes)
     }
 
     private fun openAuthLoginFragmentWithTag(tag: String) {
@@ -338,7 +338,7 @@ class FtueAuthVariant(
 
     private fun handleSignInWithMatrixId(state: OnboardingViewState) {
         if (isForceLoginFallbackEnabled) {
-            onLoginModeNotSupported(state.selectedHomeserver.loginModeSupportedTypes)
+            onLoginModeNotSupported(state.selectedHomeserver.supportedLoginTypes)
         } else {
             openAuthLoginFragmentWithTag(FRAGMENT_LOGIN_TAG)
         }

From e9f50038a49143c1a7edbf1dbcb9f1b805a74d1a Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Fri, 1 Apr 2022 16:53:54 +0100
Subject: [PATCH 07/20] splitting the homeserver edit from the selection so
 that we can handle the cases differently

---
 .../features/onboarding/OnboardingAction.kt   |  1 +
 .../onboarding/OnboardingViewEvents.kt        |  1 +
 .../onboarding/OnboardingViewModel.kt         | 29 ++++++++++++-------
 .../StartAuthenticationFlowUseCase.kt         |  2 +-
 ...FtueAuthCombinedServerSelectionFragment.kt | 11 +++++--
 .../onboarding/ftueauth/FtueAuthVariant.kt    |  1 +
 6 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingAction.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingAction.kt
index 8ae41adb22..e00976f8f6 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingAction.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingAction.kt
@@ -30,6 +30,7 @@ sealed interface OnboardingAction : VectorViewModelAction {
 
     data class UpdateServerType(val serverType: ServerType) : OnboardingAction
     data class SelectHomeServer(val homeServerUrl: String) : OnboardingAction
+    data class EditHomeServer(val homeServerUrl: String) : OnboardingAction
     data class UpdateUseCase(val useCase: FtueUseCase) : OnboardingAction
     object ResetUseCase : OnboardingAction
     data class UpdateSignMode(val signMode: SignMode) : OnboardingAction
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewEvents.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewEvents.kt
index dddf350542..ee406aff48 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewEvents.kt
@@ -40,6 +40,7 @@ sealed class OnboardingViewEvents : VectorViewEvents {
     object EditServerSelection : OnboardingViewEvents()
     data class OnServerSelectionDone(val serverType: ServerType) : OnboardingViewEvents()
     object OnLoginFlowRetrieved : OnboardingViewEvents()
+    object OnHomeserverEdited : OnboardingViewEvents()
     data class OnSignModeSelected(val signMode: SignMode) : OnboardingViewEvents()
     object OnForgetPasswordClicked : OnboardingViewEvents()
     object OnResetPasswordSendThreePidDone : OnboardingViewEvents()
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
index a4c3db671c..1a3a0074a6 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
@@ -140,7 +140,8 @@ class OnboardingViewModel @AssistedInject constructor(
             is OnboardingAction.UpdateServerType           -> handleUpdateServerType(action)
             is OnboardingAction.UpdateSignMode             -> handleUpdateSignMode(action)
             is OnboardingAction.InitWith                   -> handleInitWith(action)
-            is OnboardingAction.SelectHomeServer           -> handleSelectHomeserver(action).also { lastAction = action }
+            is OnboardingAction.SelectHomeServer           -> handleHomeserverChange(action.homeServerUrl).also { lastAction = action }
+            is OnboardingAction.EditHomeServer             -> handleHomeserverChange(action.homeServerUrl).also { lastAction = action }
             is OnboardingAction.LoginOrRegister            -> handleLoginOrRegister(action).also { lastAction = action }
             is OnboardingAction.Register                   -> handleRegisterWith(action).also { lastAction = action }
             is OnboardingAction.LoginWithToken             -> handleLoginWithToken(action)
@@ -576,8 +577,8 @@ class OnboardingViewModel @AssistedInject constructor(
         }
     }
 
-    private fun handleSelectHomeserver(action: OnboardingAction.SelectHomeServer) {
-        val homeServerConnectionConfig = homeServerConnectionConfigFactory.create(action.homeServerUrl)
+    private fun handleHomeserverChange(homeserverUrl: String) {
+        val homeServerConnectionConfig = homeServerConnectionConfigFactory.create(homeserverUrl)
         if (homeServerConnectionConfig == null) {
             // This is invalid
             _viewEvents.post(OnboardingViewEvents.Failure(Throwable("Unable to create a HomeServerConnectionConfig")))
@@ -630,17 +631,23 @@ class OnboardingViewModel @AssistedInject constructor(
 
     private fun onAuthenticationStartedSuccess() {
         withState {
-            if (it.selectedHomeserver.preferredLoginMode.supportsSignModeScreen()) {
-                when (it.onboardingFlow) {
-                    OnboardingFlow.SignIn -> handleUpdateSignMode(OnboardingAction.UpdateSignMode(SignMode.SignIn))
-                    OnboardingFlow.SignUp -> handleUpdateSignMode(OnboardingAction.UpdateSignMode(SignMode.SignUp))
-                    OnboardingFlow.SignInSignUp,
-                    null                  -> {
+            when (lastAction) {
+                is OnboardingAction.EditHomeServer   -> _viewEvents.post(OnboardingViewEvents.OnHomeserverEdited)
+                is OnboardingAction.SelectHomeServer -> {
+                    if (it.selectedHomeserver.preferredLoginMode.supportsSignModeScreen()) {
+                        when (it.onboardingFlow) {
+                            OnboardingFlow.SignIn -> handleUpdateSignMode(OnboardingAction.UpdateSignMode(SignMode.SignIn))
+                            OnboardingFlow.SignUp -> handleUpdateSignMode(OnboardingAction.UpdateSignMode(SignMode.SignUp))
+                            OnboardingFlow.SignInSignUp,
+                            null                  -> {
+                                _viewEvents.post(OnboardingViewEvents.OnLoginFlowRetrieved)
+                            }
+                        }
+                    } else {
                         _viewEvents.post(OnboardingViewEvents.OnLoginFlowRetrieved)
                     }
                 }
-            } else {
-                _viewEvents.post(OnboardingViewEvents.OnLoginFlowRetrieved)
+                else                                 -> _viewEvents.post(OnboardingViewEvents.OnLoginFlowRetrieved)
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCase.kt b/vector/src/main/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCase.kt
index 2f5f756891..186cd2bd82 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCase.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCase.kt
@@ -43,7 +43,7 @@ class StartAuthenticationFlowUseCase @Inject constructor(
     private fun createSelectedHomeserverState(authFlow: LoginFlowResult, config: HomeServerConnectionConfig, preferredLoginMode: LoginMode): SelectedHomeserverState {
         val matrixOrgUrl = stringProvider.getString(R.string.matrix_org_server_url).ensureTrailingSlash()
         return SelectedHomeserverState(
-                description = when (authFlow.homeServerUrl) {
+                description = when (config.homeServerUri.toString()) {
                     matrixOrgUrl -> stringProvider.getString(R.string.ftue_auth_create_account_matrix_dot_org_server_description)
                     else         -> null
                 },
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
index 43cbb22d92..284bca3ed6 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
@@ -20,10 +20,13 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.isEmpty
 import im.vector.app.core.extensions.content
 import im.vector.app.core.extensions.editText
 import im.vector.app.core.extensions.realignPercentagesToParent
 import im.vector.app.core.extensions.toReducedUrl
+import im.vector.app.core.utils.ensureProtocol
+import im.vector.app.core.utils.ensureTrailingSlash
 import im.vector.app.databinding.FragmentFtueServerSelectionCombinedBinding
 import im.vector.app.features.onboarding.OnboardingAction
 import im.vector.app.features.onboarding.OnboardingViewEvents
@@ -45,7 +48,7 @@ class FtueAuthCombinedServerSelectionFragment @Inject constructor() : AbstractFt
         }
 
         views.chooseServerSubmit.debouncedClicks {
-            viewModel.handle(OnboardingAction.SelectHomeServer(views.chooseServerInput.content()))
+            viewModel.handle(OnboardingAction.EditHomeServer(views.chooseServerInput.content().ensureProtocol().ensureTrailingSlash()))
         }
     }
 
@@ -54,8 +57,10 @@ class FtueAuthCombinedServerSelectionFragment @Inject constructor() : AbstractFt
     }
 
     override fun updateWithState(state: OnboardingViewState) {
-        val userUrlInput = state.selectedHomeserver.sourceUrl?.toReducedUrlKeepingSchemaIfInsecure()
-        views.chooseServerInput.editText().setText(userUrlInput)
+        if (views.chooseServerInput.isEmpty()) {
+            val userUrlInput = state.selectedHomeserver.sourceUrl?.toReducedUrlKeepingSchemaIfInsecure()
+            views.chooseServerInput.editText().setText(userUrlInput)
+        }
     }
 
     private fun String.toReducedUrlKeepingSchemaIfInsecure() = toReducedUrl(keepSchema = this.startsWith("http://"))
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
index b96f44cc39..ea479b1cdc 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
@@ -240,6 +240,7 @@ class FtueAuthVariant(
                         option = commonOption
                 )
             }
+            OnboardingViewEvents.OnHomeserverEdited                            -> activity.popBackstack()
         }
     }
 

From 8b2e2a16e25c522efc47242b90fd0478db4ba6af Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Mon, 4 Apr 2022 14:26:55 +0100
Subject: [PATCH 08/20] adding tests around the editing of the homeserver url

---
 .../vector/app/core/extensions/Collections.kt |   2 +
 .../onboarding/OnboardingViewModel.kt         |   4 +-
 .../onboarding/OnboardingViewState.kt         |   1 -
 .../StartAuthenticationFlowUseCase.kt         |  17 +-
 .../onboarding/OnboardingViewModelTest.kt     |  35 +++-
 .../StartAuthenticationFlowUseCaseTest.kt     | 157 ++++++++++++++++++
 .../test/fakes/FakeAuthenticationService.kt   |  11 +-
 .../FakeHomeServerConnectionConfigFactory.kt  |   7 +-
 .../fakes/FakeHomeServerHistoryService.kt     |   4 +
 .../FakeStartAuthenticationFlowUseCase.kt     |  32 ++++
 .../app/test/fakes/FakeStringProvider.kt      |   5 +-
 .../java/im/vector/app/test/fakes/FakeUri.kt  |   5 +-
 12 files changed, 260 insertions(+), 20 deletions(-)
 create mode 100644 vector/src/test/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCaseTest.kt
 create mode 100644 vector/src/test/java/im/vector/app/test/fakes/FakeStartAuthenticationFlowUseCase.kt

diff --git a/vector/src/main/java/im/vector/app/core/extensions/Collections.kt b/vector/src/main/java/im/vector/app/core/extensions/Collections.kt
index 5168915c9c..3a998abd59 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/Collections.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/Collections.kt
@@ -18,3 +18,5 @@ package im.vector.app.core.extensions
 
 inline fun <reified T> List<T>.nextOrNull(index: Int) = getOrNull(index + 1)
 inline fun <reified T> List<T>.prevOrNull(index: Int) = getOrNull(index - 1)
+
+fun <T> List<T>.containsAll(vararg items: T) = this.containsAll(items.toList())
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
index 1a3a0074a6..f1571698d2 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
@@ -140,8 +140,8 @@ class OnboardingViewModel @AssistedInject constructor(
             is OnboardingAction.UpdateServerType           -> handleUpdateServerType(action)
             is OnboardingAction.UpdateSignMode             -> handleUpdateSignMode(action)
             is OnboardingAction.InitWith                   -> handleInitWith(action)
-            is OnboardingAction.SelectHomeServer           -> handleHomeserverChange(action.homeServerUrl).also { lastAction = action }
-            is OnboardingAction.EditHomeServer             -> handleHomeserverChange(action.homeServerUrl).also { lastAction = action }
+            is OnboardingAction.SelectHomeServer           -> run { lastAction = action }.also { handleHomeserverChange(action.homeServerUrl) }
+            is OnboardingAction.EditHomeServer             -> run { lastAction = action }.also { handleHomeserverChange(action.homeServerUrl) }
             is OnboardingAction.LoginOrRegister            -> handleLoginOrRegister(action).also { lastAction = action }
             is OnboardingAction.Register                   -> handleRegisterWith(action).also { lastAction = action }
             is OnboardingAction.LoginWithToken             -> handleLoginWithToken(action)
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt
index 0605605a9d..9fe1e5020a 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt
@@ -67,7 +67,6 @@ data class SelectedHomeserverState(
         val sourceUrl: String? = null,
         val declaredUrl: String? = null,
         val preferredLoginMode: LoginMode = LoginMode.Unknown,
-        // Supported types for the login. We cannot use a sealed class for LoginType because it is not serializable
         val supportedLoginTypes: List<String> = emptyList(),
 ) : Parcelable
 
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCase.kt b/vector/src/main/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCase.kt
index 186cd2bd82..6202458b21 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCase.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCase.kt
@@ -17,6 +17,7 @@
 package im.vector.app.features.onboarding
 
 import im.vector.app.R
+import im.vector.app.core.extensions.containsAll
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.utils.ensureTrailingSlash
 import im.vector.app.features.login.LoginMode
@@ -37,7 +38,7 @@ class StartAuthenticationFlowUseCase @Inject constructor(
         val preferredLoginMode = authFlow.findPreferredLoginMode()
         val selection = createSelectedHomeserverState(authFlow, config, preferredLoginMode)
         val isOutdated = (preferredLoginMode == LoginMode.Password && !authFlow.isLoginAndRegistrationSupported) || authFlow.isOutdatedHomeserver
-        return StartAuthenticationResult(isOutdated, selection, preferredLoginMode, authFlow.supportedLoginTypes.toList())
+        return StartAuthenticationResult(isOutdated, selection)
     }
 
     private fun createSelectedHomeserverState(authFlow: LoginFlowResult, config: HomeServerConnectionConfig, preferredLoginMode: LoginMode): SelectedHomeserverState {
@@ -55,18 +56,14 @@ class StartAuthenticationFlowUseCase @Inject constructor(
     }
 
     private fun LoginFlowResult.findPreferredLoginMode() = when {
-        // SSO login is taken first
-        supportedLoginTypes.contains(LoginFlowTypes.SSO) &&
-                supportedLoginTypes.contains(LoginFlowTypes.PASSWORD) -> LoginMode.SsoAndPassword(ssoIdentityProviders)
-        supportedLoginTypes.contains(LoginFlowTypes.SSO)              -> LoginMode.Sso(ssoIdentityProviders)
-        supportedLoginTypes.contains(LoginFlowTypes.PASSWORD)         -> LoginMode.Password
-        else                                                          -> LoginMode.Unsupported
+        supportedLoginTypes.containsAll(LoginFlowTypes.SSO, LoginFlowTypes.PASSWORD) -> LoginMode.SsoAndPassword(ssoIdentityProviders)
+        supportedLoginTypes.contains(LoginFlowTypes.SSO)                             -> LoginMode.Sso(ssoIdentityProviders)
+        supportedLoginTypes.contains(LoginFlowTypes.PASSWORD)                        -> LoginMode.Password
+        else                                                                         -> LoginMode.Unsupported
     }
 
     data class StartAuthenticationResult(
             val isHomeserverOutdated: Boolean,
-            val selectedHomeserverState: SelectedHomeserverState,
-            val loginMode: LoginMode,
-            val supportedLoginTypes: List<String>,
+            val selectedHomeserverState: SelectedHomeserverState
     )
 }
diff --git a/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt b/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
index eee1a71d7e..bc77755810 100644
--- a/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
+++ b/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
@@ -18,8 +18,10 @@ package im.vector.app.features.onboarding
 
 import android.net.Uri
 import com.airbnb.mvrx.test.MvRxTestRule
+import im.vector.app.features.login.LoginMode
 import im.vector.app.features.login.ReAuthHelper
 import im.vector.app.features.login.SignMode
+import im.vector.app.features.onboarding.StartAuthenticationFlowUseCase.StartAuthenticationResult
 import im.vector.app.test.fakes.FakeActiveSessionHolder
 import im.vector.app.test.fakes.FakeAnalyticsTracker
 import im.vector.app.test.fakes.FakeAuthenticationService
@@ -30,6 +32,7 @@ import im.vector.app.test.fakes.FakeHomeServerHistoryService
 import im.vector.app.test.fakes.FakeRegisterActionHandler
 import im.vector.app.test.fakes.FakeRegistrationWizard
 import im.vector.app.test.fakes.FakeSession
+import im.vector.app.test.fakes.FakeStartAuthenticationFlowUseCase
 import im.vector.app.test.fakes.FakeStringProvider
 import im.vector.app.test.fakes.FakeUri
 import im.vector.app.test.fakes.FakeUriFilenameResolver
@@ -41,6 +44,7 @@ import kotlinx.coroutines.test.runTest
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
+import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
 import org.matrix.android.sdk.api.auth.registration.FlowResult
 import org.matrix.android.sdk.api.auth.registration.RegisterThreePid
 import org.matrix.android.sdk.api.auth.registration.RegistrationResult
@@ -58,6 +62,9 @@ private val A_HOMESERVER_CAPABILITIES = aHomeServerCapabilities(canChangeDisplay
 private val AN_IGNORED_FLOW_RESULT = FlowResult(missingStages = emptyList(), completedStages = emptyList())
 private val ANY_CONTINUING_REGISTRATION_RESULT = RegistrationResult.FlowResponse(AN_IGNORED_FLOW_RESULT)
 private val A_LOGIN_OR_REGISTER_ACTION = OnboardingAction.LoginOrRegister("@a-user:id.org", "a-password", "a-device-name")
+private const val A_HOMESERVER_URL = "https://edited-homeserver.org"
+private val A_HOMESERVER_CONFIG = HomeServerConnectionConfig(FakeUri().instance)
+private val SELECTED_HOMESERVER_STATE = SelectedHomeserverState(preferredLoginMode = LoginMode.Password)
 
 class OnboardingViewModelTest {
 
@@ -74,6 +81,9 @@ class OnboardingViewModelTest {
     private val fakeRegisterActionHandler = FakeRegisterActionHandler()
     private val fakeDirectLoginUseCase = FakeDirectLoginUseCase()
     private val fakeVectorFeatures = FakeVectorFeatures()
+    private val fakeHomeServerConnectionConfigFactory = FakeHomeServerConnectionConfigFactory()
+    private val fakeStartAuthenticationFlowUseCase = FakeStartAuthenticationFlowUseCase()
+    private val fakeHomeServerHistoryService = FakeHomeServerHistoryService()
 
     lateinit var viewModel: OnboardingViewModel
 
@@ -224,6 +234,25 @@ class OnboardingViewModelTest {
                 .finish()
     }
 
+    @Test
+    fun `given when editing homeserver, then updates selected homeserver state and emits edited event`() = runTest {
+        val test = viewModel.test()
+        fakeHomeServerConnectionConfigFactory.givenConfigFor(A_HOMESERVER_URL, A_HOMESERVER_CONFIG)
+        fakeStartAuthenticationFlowUseCase.givenResult(A_HOMESERVER_CONFIG, StartAuthenticationResult(false, SELECTED_HOMESERVER_STATE))
+        fakeHomeServerHistoryService.expectUrlToBeAdded(A_HOMESERVER_CONFIG.homeServerUri.toString())
+
+        viewModel.handle(OnboardingAction.EditHomeServer(A_HOMESERVER_URL))
+
+        test
+                .assertStatesChanges(
+                        initialState,
+                        { copy(isLoading = true) },
+                        { copy(isLoading = false, selectedHomeserver = SELECTED_HOMESERVER_STATE) },
+                )
+                .assertEvents(OnboardingViewEvents.OnHomeserverEdited)
+                .finish()
+    }
+
     @Test
     fun `given personalisation enabled, when registering account, then updates state and emits account created event`() = runTest {
         fakeVectorFeatures.givenPersonalisationEnabled()
@@ -383,16 +412,16 @@ class OnboardingViewModelTest {
                 fakeContext.instance,
                 fakeAuthenticationService,
                 fakeActiveSessionHolder.instance,
-                FakeHomeServerConnectionConfigFactory().instance,
+                fakeHomeServerConnectionConfigFactory.instance,
                 ReAuthHelper(),
                 FakeStringProvider().instance,
-                FakeHomeServerHistoryService(),
+                fakeHomeServerHistoryService,
                 fakeVectorFeatures,
                 FakeAnalyticsTracker(),
                 fakeUriFilenameResolver.instance,
                 fakeRegisterActionHandler.instance,
                 fakeDirectLoginUseCase.instance,
-                StartAuthenticationFlowUseCase(fakeAuthenticationService, FakeStringProvider().instance),
+                fakeStartAuthenticationFlowUseCase.instance,
                 FakeVectorOverrides()
         )
     }
diff --git a/vector/src/test/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCaseTest.kt
new file mode 100644
index 0000000000..117f3f307b
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCaseTest.kt
@@ -0,0 +1,157 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.onboarding
+
+import im.vector.app.R
+import im.vector.app.features.login.LoginMode
+import im.vector.app.features.onboarding.StartAuthenticationFlowUseCase.StartAuthenticationResult
+import im.vector.app.test.fakes.FakeAuthenticationService
+import im.vector.app.test.fakes.FakeStringProvider
+import im.vector.app.test.fakes.FakeUri
+import im.vector.app.test.fakes.toTestString
+import io.mockk.coVerifyOrder
+import kotlinx.coroutines.test.runTest
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.Before
+import org.junit.Test
+import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
+import org.matrix.android.sdk.api.auth.data.LoginFlowResult
+import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
+import org.matrix.android.sdk.api.auth.data.SsoIdentityProvider
+
+private const val MATRIX_ORG_URL = "https://any-value.org/"
+private const val A_DECLARED_HOMESERVER_URL = "https://foo.bar"
+private val A_HOMESERVER_CONFIG = HomeServerConnectionConfig(homeServerUri = FakeUri().instance)
+private val SSO_IDENTITY_PROVIDERS = emptyList<SsoIdentityProvider>()
+
+class StartAuthenticationFlowUseCaseTest {
+
+    private val fakeAuthenticationService = FakeAuthenticationService()
+    private val fakeStringProvider = FakeStringProvider()
+
+    private val useCase = StartAuthenticationFlowUseCase(fakeAuthenticationService, fakeStringProvider.instance)
+
+    @Before
+    fun setUp() {
+        fakeAuthenticationService.expectedCancelsPendingLogin()
+    }
+
+    @Test
+    fun `given empty login result when starting authentication flow then returns empty result`() = runTest {
+        val loginResult = aLoginResult()
+        fakeAuthenticationService.givenLoginFlow(A_HOMESERVER_CONFIG, loginResult)
+
+        val result = useCase.execute(A_HOMESERVER_CONFIG)
+
+        result shouldBeEqualTo expectedResult()
+        verifyClearsAndThenStartsLogin(A_HOMESERVER_CONFIG)
+    }
+
+    @Test
+    fun `given login supports SSO and Password when starting authentication flow then prefers SsoAndPassword`() = runTest {
+        val supportedLoginTypes = listOf(LoginFlowTypes.SSO, LoginFlowTypes.PASSWORD)
+        val loginResult = aLoginResult(supportedLoginTypes = supportedLoginTypes)
+        fakeAuthenticationService.givenLoginFlow(A_HOMESERVER_CONFIG, loginResult)
+
+        val result = useCase.execute(A_HOMESERVER_CONFIG)
+
+        result shouldBeEqualTo expectedResult(
+                supportedLoginTypes = supportedLoginTypes,
+                preferredLoginMode = LoginMode.SsoAndPassword(SSO_IDENTITY_PROVIDERS),
+        )
+        verifyClearsAndThenStartsLogin(A_HOMESERVER_CONFIG)
+    }
+
+    @Test
+    fun `given login supports SSO when starting authentication flow then prefers Sso`() = runTest {
+        val supportedLoginTypes = listOf(LoginFlowTypes.SSO)
+        val loginResult = aLoginResult(supportedLoginTypes = supportedLoginTypes)
+        fakeAuthenticationService.givenLoginFlow(A_HOMESERVER_CONFIG, loginResult)
+
+        val result = useCase.execute(A_HOMESERVER_CONFIG)
+
+        result shouldBeEqualTo expectedResult(
+                supportedLoginTypes = supportedLoginTypes,
+                preferredLoginMode = LoginMode.Sso(SSO_IDENTITY_PROVIDERS),
+        )
+        verifyClearsAndThenStartsLogin(A_HOMESERVER_CONFIG)
+    }
+
+    @Test
+    fun `given login supports Password when starting authentication flow then prefers Password`() = runTest {
+        val supportedLoginTypes = listOf(LoginFlowTypes.PASSWORD)
+        val loginResult = aLoginResult(supportedLoginTypes = supportedLoginTypes)
+        fakeAuthenticationService.givenLoginFlow(A_HOMESERVER_CONFIG, loginResult)
+
+        val result = useCase.execute(A_HOMESERVER_CONFIG)
+
+        result shouldBeEqualTo expectedResult(
+                supportedLoginTypes = supportedLoginTypes,
+                preferredLoginMode = LoginMode.Password,
+        )
+        verifyClearsAndThenStartsLogin(A_HOMESERVER_CONFIG)
+    }
+
+    @Test
+    fun `given matrix dot org url when starting authentication flow then provides description`() = runTest {
+        val matrixOrgConfig = HomeServerConnectionConfig(homeServerUri = FakeUri(MATRIX_ORG_URL).instance)
+        fakeStringProvider.given(R.string.matrix_org_server_url, result = MATRIX_ORG_URL)
+        fakeAuthenticationService.givenLoginFlow(matrixOrgConfig, aLoginResult())
+
+        val result = useCase.execute(matrixOrgConfig)
+
+        result shouldBeEqualTo expectedResult(
+                description = R.string.ftue_auth_create_account_matrix_dot_org_server_description.toTestString(),
+                homeserverSourceUrl = MATRIX_ORG_URL
+        )
+        verifyClearsAndThenStartsLogin(matrixOrgConfig)
+    }
+
+    private fun aLoginResult(
+            supportedLoginTypes: List<String> = emptyList()
+    ) = LoginFlowResult(
+            supportedLoginTypes = supportedLoginTypes,
+            ssoIdentityProviders = SSO_IDENTITY_PROVIDERS,
+            isLoginAndRegistrationSupported = true,
+            homeServerUrl = A_DECLARED_HOMESERVER_URL,
+            isOutdatedHomeserver = false
+    )
+
+    private fun expectedResult(
+            isHomeserverOutdated: Boolean = false,
+            description: String? = null,
+            preferredLoginMode: LoginMode = LoginMode.Unsupported,
+            supportedLoginTypes: List<String> = emptyList(),
+            homeserverSourceUrl: String = A_HOMESERVER_CONFIG.homeServerUri.toString()
+    ) = StartAuthenticationResult(
+            isHomeserverOutdated,
+            SelectedHomeserverState(
+                    description = description,
+                    sourceUrl = homeserverSourceUrl,
+                    declaredUrl = A_DECLARED_HOMESERVER_URL,
+                    preferredLoginMode = preferredLoginMode,
+                    supportedLoginTypes = supportedLoginTypes
+            )
+    )
+
+    private fun verifyClearsAndThenStartsLogin(homeServerConnectionConfig: HomeServerConnectionConfig) {
+        coVerifyOrder {
+            fakeAuthenticationService.cancelPendingLoginOrRegistration()
+            fakeAuthenticationService.getLoginFlow(homeServerConnectionConfig)
+        }
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeAuthenticationService.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeAuthenticationService.kt
index 9175fd3750..fedda18aeb 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeAuthenticationService.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeAuthenticationService.kt
@@ -22,6 +22,7 @@ import io.mockk.every
 import io.mockk.mockk
 import org.matrix.android.sdk.api.auth.AuthenticationService
 import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
+import org.matrix.android.sdk.api.auth.data.LoginFlowResult
 import org.matrix.android.sdk.api.auth.registration.RegistrationWizard
 import org.matrix.android.sdk.api.auth.wellknown.WellknownResult
 
@@ -35,10 +36,18 @@ class FakeAuthenticationService : AuthenticationService by mockk() {
         every { isRegistrationStarted } returns started
     }
 
+    fun givenLoginFlow(config: HomeServerConnectionConfig, result: LoginFlowResult) {
+        coEvery { getLoginFlow(config) } returns result
+    }
+
     fun expectReset() {
         coJustRun { reset() }
     }
 
+    fun expectedCancelsPendingLogin() {
+        coJustRun { cancelPendingLoginOrRegistration() }
+    }
+
     fun givenWellKnown(matrixId: String, config: HomeServerConnectionConfig?, result: WellknownResult) {
         coEvery { getWellKnownData(matrixId, config) } returns result
     }
@@ -52,6 +61,6 @@ class FakeAuthenticationService : AuthenticationService by mockk() {
     }
 
     fun givenDirectAuthenticationThrows(config: HomeServerConnectionConfig, matrixId: String, password: String, deviceName: String, cause: Throwable) {
-        coEvery { directAuthentication(config, matrixId, password, deviceName) } throws  cause
+        coEvery { directAuthentication(config, matrixId, password, deviceName) } throws cause
     }
 }
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeHomeServerConnectionConfigFactory.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeHomeServerConnectionConfigFactory.kt
index a0e60e5a18..553a35ad8c 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeHomeServerConnectionConfigFactory.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeHomeServerConnectionConfigFactory.kt
@@ -17,9 +17,14 @@
 package im.vector.app.test.fakes
 
 import im.vector.app.features.login.HomeServerConnectionConfigFactory
+import io.mockk.every
 import io.mockk.mockk
+import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
 
 class FakeHomeServerConnectionConfigFactory {
-
     val instance: HomeServerConnectionConfigFactory = mockk()
+
+    fun givenConfigFor(url: String, config: HomeServerConnectionConfig) {
+        every { instance.create(url) } returns config
+    }
 }
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeHomeServerHistoryService.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeHomeServerHistoryService.kt
index 6cdcb02156..4d9960991f 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeHomeServerHistoryService.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeHomeServerHistoryService.kt
@@ -16,9 +16,13 @@
 
 package im.vector.app.test.fakes
 
+import io.mockk.justRun
 import io.mockk.mockk
 import org.matrix.android.sdk.api.auth.HomeServerHistoryService
 
 class FakeHomeServerHistoryService : HomeServerHistoryService by mockk() {
     override fun getKnownServersUrls() = emptyList<String>()
+    fun expectUrlToBeAdded(url: String) {
+        justRun { addHomeServerToHistory(url) }
+    }
 }
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeStartAuthenticationFlowUseCase.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeStartAuthenticationFlowUseCase.kt
new file mode 100644
index 0000000000..697de6bf25
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeStartAuthenticationFlowUseCase.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.test.fakes
+
+import im.vector.app.features.onboarding.StartAuthenticationFlowUseCase
+import im.vector.app.features.onboarding.StartAuthenticationFlowUseCase.StartAuthenticationResult
+import io.mockk.coEvery
+import io.mockk.mockk
+import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
+
+class FakeStartAuthenticationFlowUseCase {
+
+    val instance = mockk<StartAuthenticationFlowUseCase>()
+
+    fun givenResult(config: HomeServerConnectionConfig, result: StartAuthenticationResult) {
+        coEvery { instance.execute(config) } returns result
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeStringProvider.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeStringProvider.kt
index 1a4f5cb85b..e63550abe0 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeStringProvider.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeStringProvider.kt
@@ -21,7 +21,6 @@ import io.mockk.every
 import io.mockk.mockk
 
 class FakeStringProvider {
-
     val instance = mockk<StringProvider>()
 
     init {
@@ -29,6 +28,10 @@ class FakeStringProvider {
             "test-${args[0]}"
         }
     }
+
+    fun given(id: Int, result: String) {
+        every { instance.getString(id) } returns result
+    }
 }
 
 fun Int.toTestString() = "test-$this"
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeUri.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeUri.kt
index 675401d72f..08bfac8db1 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeUri.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeUri.kt
@@ -25,7 +25,10 @@ class FakeUri(contentEquals: String? = null) {
     val instance = mockk<Uri>()
 
     init {
-        contentEquals?.let { givenEquals(it) }
+        contentEquals?.let {
+            givenEquals(it)
+            every { instance.toString() } returns it
+        }
     }
 
     fun givenNonHierarchical() {

From c022a38dd44248bc1f3222eb59597badb62bc0a3 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Mon, 4 Apr 2022 16:25:00 +0100
Subject: [PATCH 09/20] checking the input field content for emptyness rather
 than its child count, fixes flaky initial value setting

---
 .../ftueauth/FtueAuthCombinedServerSelectionFragment.kt         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
index 284bca3ed6..4603ecb0dc 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
@@ -57,7 +57,7 @@ class FtueAuthCombinedServerSelectionFragment @Inject constructor() : AbstractFt
     }
 
     override fun updateWithState(state: OnboardingViewState) {
-        if (views.chooseServerInput.isEmpty()) {
+        if (views.chooseServerInput.content().isEmpty()) {
             val userUrlInput = state.selectedHomeserver.sourceUrl?.toReducedUrlKeepingSchemaIfInsecure()
             views.chooseServerInput.editText().setText(userUrlInput)
         }

From 89f182ac3529b4a8371215ba1a3e8df136489c57 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Mon, 4 Apr 2022 17:00:38 +0100
Subject: [PATCH 10/20] adding missing IME handling for the register next focus
 and server selection submit

---
 ...FtueAuthCombinedServerSelectionFragment.kt | 19 ++++++++++++++++---
 ...ragment_ftue_server_selection_combined.xml |  2 +-
 .../layout/fragment_ftue_sign_up_combined.xml |  1 +
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
index 4603ecb0dc..9390c3938d 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
@@ -20,7 +20,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.view.isEmpty
+import android.view.inputmethod.EditorInfo
 import im.vector.app.core.extensions.content
 import im.vector.app.core.extensions.editText
 import im.vector.app.core.extensions.realignPercentagesToParent
@@ -47,9 +47,22 @@ class FtueAuthCombinedServerSelectionFragment @Inject constructor() : AbstractFt
             viewModel.handle(OnboardingAction.PostViewEvent(OnboardingViewEvents.OnBack))
         }
 
-        views.chooseServerSubmit.debouncedClicks {
-            viewModel.handle(OnboardingAction.EditHomeServer(views.chooseServerInput.content().ensureProtocol().ensureTrailingSlash()))
+        views.chooseServerInput.editText?.setOnEditorActionListener { _, actionId, _ ->
+            when (actionId) {
+                EditorInfo.IME_ACTION_DONE -> {
+                    updateServerUrl()
+                }
+            }
+            false
         }
+
+        views.chooseServerSubmit.debouncedClicks {
+            updateServerUrl()
+        }
+    }
+
+    private fun updateServerUrl() {
+        viewModel.handle(OnboardingAction.EditHomeServer(views.chooseServerInput.content().ensureProtocol().ensureTrailingSlash()))
     }
 
     override fun resetViewModel() {
diff --git a/vector/src/main/res/layout/fragment_ftue_server_selection_combined.xml b/vector/src/main/res/layout/fragment_ftue_server_selection_combined.xml
index 8da4958007..454a73fbe7 100644
--- a/vector/src/main/res/layout/fragment_ftue_server_selection_combined.xml
+++ b/vector/src/main/res/layout/fragment_ftue_server_selection_combined.xml
@@ -105,7 +105,7 @@
             <com.google.android.material.textfield.TextInputEditText
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:imeOptions="actionNext"
+                android:imeOptions="actionDone"
                 android:inputType="text"
                 android:maxLines="1" />
 
diff --git a/vector/src/main/res/layout/fragment_ftue_sign_up_combined.xml b/vector/src/main/res/layout/fragment_ftue_sign_up_combined.xml
index 5c3fa9cf8f..9d61780ad0 100644
--- a/vector/src/main/res/layout/fragment_ftue_sign_up_combined.xml
+++ b/vector/src/main/res/layout/fragment_ftue_sign_up_combined.xml
@@ -173,6 +173,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:imeOptions="actionNext"
+                android:nextFocusForward="@id/createAccountPasswordInput"
                 android:inputType="text"
                 android:maxLines="1" />
 

From 1d92b4293b4c222cd23823f3b4e96fcf90a9c2e5 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Mon, 4 Apr 2022 17:31:50 +0100
Subject: [PATCH 11/20] launching the ems site when tapping get in touch

---
 .../ftueauth/FtueAuthCombinedServerSelectionFragment.kt       | 4 ++++
 vector/src/main/res/values/donottranslate.xml                 | 1 +
 2 files changed, 5 insertions(+)

diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
index 9390c3938d..ccc89eb111 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
@@ -21,12 +21,14 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
+import im.vector.app.R
 import im.vector.app.core.extensions.content
 import im.vector.app.core.extensions.editText
 import im.vector.app.core.extensions.realignPercentagesToParent
 import im.vector.app.core.extensions.toReducedUrl
 import im.vector.app.core.utils.ensureProtocol
 import im.vector.app.core.utils.ensureTrailingSlash
+import im.vector.app.core.utils.openUrlInExternalBrowser
 import im.vector.app.databinding.FragmentFtueServerSelectionCombinedBinding
 import im.vector.app.features.onboarding.OnboardingAction
 import im.vector.app.features.onboarding.OnboardingViewEvents
@@ -56,6 +58,8 @@ class FtueAuthCombinedServerSelectionFragment @Inject constructor() : AbstractFt
             false
         }
 
+        views.chooseServerGetInTouch.debouncedClicks { openUrlInExternalBrowser(requireContext(), getString(R.string.ftue_ems_url)) }
+
         views.chooseServerSubmit.debouncedClicks {
             updateServerUrl()
         }
diff --git a/vector/src/main/res/values/donottranslate.xml b/vector/src/main/res/values/donottranslate.xml
index c0ac6a4989..2ccc34bf4c 100755
--- a/vector/src/main/res/values/donottranslate.xml
+++ b/vector/src/main/res/values/donottranslate.xml
@@ -26,5 +26,6 @@
     <string name="ftue_auth_choose_server_ems_title">Want to host your own server?</string>
     <string name="ftue_auth_choose_server_ems_subtitle">Element Matrix Services (EMS) is a robust and reliable hosting service for fast, secure and real time communication. Find out how on element.io.ems</string>
     <string name="ftue_auth_choose_server_ems_cta">Get in touch</string>
+    <string name="ftue_ems_url">https://element.io/ems</string>
 
 </resources>

From 2ba3bd3375f4f897b8b8e0e8aaace0f6afda6f65 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Mon, 4 Apr 2022 17:33:59 +0100
Subject: [PATCH 12/20] addressing line length

---
 .../features/onboarding/StartAuthenticationFlowUseCase.kt   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCase.kt b/vector/src/main/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCase.kt
index 6202458b21..3c5eb2d1e4 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCase.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCase.kt
@@ -41,7 +41,11 @@ class StartAuthenticationFlowUseCase @Inject constructor(
         return StartAuthenticationResult(isOutdated, selection)
     }
 
-    private fun createSelectedHomeserverState(authFlow: LoginFlowResult, config: HomeServerConnectionConfig, preferredLoginMode: LoginMode): SelectedHomeserverState {
+    private fun createSelectedHomeserverState(
+            authFlow: LoginFlowResult,
+            config: HomeServerConnectionConfig,
+            preferredLoginMode: LoginMode
+    ): SelectedHomeserverState {
         val matrixOrgUrl = stringProvider.getString(R.string.matrix_org_server_url).ensureTrailingSlash()
         return SelectedHomeserverState(
                 description = when (config.homeServerUri.toString()) {

From 0ce2012b838a180e1617b100ce2200422060bdc6 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Tue, 5 Apr 2022 12:03:00 +0100
Subject: [PATCH 13/20] adding link to ems copy

---
 .../res/layout/fragment_ftue_server_selection_combined.xml   | 1 +
 vector/src/main/res/values/donottranslate.xml                | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/layout/fragment_ftue_server_selection_combined.xml b/vector/src/main/res/layout/fragment_ftue_server_selection_combined.xml
index 454a73fbe7..8f4902a577 100644
--- a/vector/src/main/res/layout/fragment_ftue_server_selection_combined.xml
+++ b/vector/src/main/res/layout/fragment_ftue_server_selection_combined.xml
@@ -214,6 +214,7 @@
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
             android:layout_marginBottom="16dp"
+            android:autoLink="web"
             android:gravity="center"
             android:text="@string/ftue_auth_choose_server_ems_subtitle"
             app:layout_constraintBottom_toTopOf="@id/chooseServerGetInTouch"
diff --git a/vector/src/main/res/values/donottranslate.xml b/vector/src/main/res/values/donottranslate.xml
index 2ccc34bf4c..cf924d429a 100755
--- a/vector/src/main/res/values/donottranslate.xml
+++ b/vector/src/main/res/values/donottranslate.xml
@@ -24,8 +24,9 @@
     <string name="ftue_auth_choose_server_entry_hint">Server URL</string>
     <string name="ftue_auth_choose_server_entry_footer">You can only connect to a server that has already been set up</string>
     <string name="ftue_auth_choose_server_ems_title">Want to host your own server?</string>
-    <string name="ftue_auth_choose_server_ems_subtitle">Element Matrix Services (EMS) is a robust and reliable hosting service for fast, secure and real time communication. Find out how on element.io.ems</string>
-    <string name="ftue_auth_choose_server_ems_cta">Get in touch</string>
+
     <string name="ftue_ems_url">https://element.io/ems</string>
+    <string name="ftue_auth_choose_server_ems_subtitle">Element Matrix Services (EMS) is a robust and reliable hosting service for fast, secure and real time communication. Find out how on <a href="${ftue_ems_url}">element.io/ems</a></string>
+    <string name="ftue_auth_choose_server_ems_cta">Get in touch</string>
 
 </resources>

From 21102a2f9fc1307c063982ac689f39ca9167efa0 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Tue, 5 Apr 2022 12:52:45 +0100
Subject: [PATCH 14/20] renaming homeserver url properties to better define
 their content

---
 .../onboarding/OnboardingViewModel.kt         |  4 +--
 .../onboarding/OnboardingViewState.kt         |  4 +--
 .../StartAuthenticationFlowUseCase.kt         | 31 +++++++++----------
 .../ftueauth/FtueAuthCaptchaFragment.kt       |  2 +-
 .../FtueAuthCombinedRegisterFragment.kt       |  4 +--
 ...FtueAuthCombinedServerSelectionFragment.kt |  2 +-
 .../ftueauth/FtueAuthLoginFragment.kt         |  4 +--
 .../ftueauth/FtueAuthResetPasswordFragment.kt |  2 +-
 .../FtueAuthSignUpSignInSelectionFragment.kt  |  6 ++--
 .../ftueauth/terms/FtueAuthTermsFragment.kt   |  2 +-
 .../StartAuthenticationFlowUseCaseTest.kt     |  4 +--
 11 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
index f1571698d2..28b6288d72 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
@@ -560,7 +560,7 @@ class OnboardingViewModel @AssistedInject constructor(
     }
 
     private fun handleWebLoginSuccess(action: OnboardingAction.WebLoginSuccess) = withState { state ->
-        val homeServerConnectionConfigFinal = homeServerConnectionConfigFactory.create(state.selectedHomeserver.declaredUrl)
+        val homeServerConnectionConfigFinal = homeServerConnectionConfigFactory.create(state.selectedHomeserver.upstreamUrl)
 
         if (homeServerConnectionConfigFinal == null) {
             // Should not happen
@@ -603,7 +603,7 @@ class OnboardingViewModel @AssistedInject constructor(
                         setState {
                             copy(
                                     serverType = alignServerTypeAfterSubmission(homeServerConnectionConfig, serverTypeOverride),
-                                    selectedHomeserver = it.selectedHomeserverState,
+                                    selectedHomeserver = it.selectedHomeserver,
                                     isLoading = false,
                             )
                         }
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt
index 9fe1e5020a..442a0a7df1 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt
@@ -64,8 +64,8 @@ enum class OnboardingFlow {
 @Parcelize
 data class SelectedHomeserverState(
         val description: String? = null,
-        val sourceUrl: String? = null,
-        val declaredUrl: String? = null,
+        val userFacingUrl: String? = null,
+        val upstreamUrl: String? = null,
         val preferredLoginMode: LoginMode = LoginMode.Unknown,
         val supportedLoginTypes: List<String> = emptyList(),
 ) : Parcelable
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCase.kt b/vector/src/main/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCase.kt
index 3c5eb2d1e4..b09be227bb 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCase.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCase.kt
@@ -36,28 +36,27 @@ class StartAuthenticationFlowUseCase @Inject constructor(
         authenticationService.cancelPendingLoginOrRegistration()
         val authFlow = authenticationService.getLoginFlow(config)
         val preferredLoginMode = authFlow.findPreferredLoginMode()
-        val selection = createSelectedHomeserverState(authFlow, config, preferredLoginMode)
+        val selection = createSelectedHomeserver(authFlow, config, preferredLoginMode)
         val isOutdated = (preferredLoginMode == LoginMode.Password && !authFlow.isLoginAndRegistrationSupported) || authFlow.isOutdatedHomeserver
         return StartAuthenticationResult(isOutdated, selection)
     }
 
-    private fun createSelectedHomeserverState(
+    private fun createSelectedHomeserver(
             authFlow: LoginFlowResult,
             config: HomeServerConnectionConfig,
             preferredLoginMode: LoginMode
-    ): SelectedHomeserverState {
-        val matrixOrgUrl = stringProvider.getString(R.string.matrix_org_server_url).ensureTrailingSlash()
-        return SelectedHomeserverState(
-                description = when (config.homeServerUri.toString()) {
-                    matrixOrgUrl -> stringProvider.getString(R.string.ftue_auth_create_account_matrix_dot_org_server_description)
-                    else         -> null
-                },
-                sourceUrl = config.homeServerUri.toString(),
-                declaredUrl = authFlow.homeServerUrl,
-                preferredLoginMode = preferredLoginMode,
-                supportedLoginTypes = authFlow.supportedLoginTypes
-        )
-    }
+    ) = SelectedHomeserverState(
+            description = when (config.homeServerUri.toString()) {
+                matrixOrgUrl() -> stringProvider.getString(R.string.ftue_auth_create_account_matrix_dot_org_server_description)
+                else           -> null
+            },
+            userFacingUrl = config.homeServerUri.toString(),
+            upstreamUrl = authFlow.homeServerUrl,
+            preferredLoginMode = preferredLoginMode,
+            supportedLoginTypes = authFlow.supportedLoginTypes
+    )
+
+    private fun matrixOrgUrl() = stringProvider.getString(R.string.matrix_org_server_url).ensureTrailingSlash()
 
     private fun LoginFlowResult.findPreferredLoginMode() = when {
         supportedLoginTypes.containsAll(LoginFlowTypes.SSO, LoginFlowTypes.PASSWORD) -> LoginMode.SsoAndPassword(ssoIdentityProviders)
@@ -68,6 +67,6 @@ class StartAuthenticationFlowUseCase @Inject constructor(
 
     data class StartAuthenticationResult(
             val isHomeserverOutdated: Boolean,
-            val selectedHomeserverState: SelectedHomeserverState
+            val selectedHomeserver: SelectedHomeserverState
     )
 }
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCaptchaFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCaptchaFragment.kt
index 74c020223a..0631149bcd 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCaptchaFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCaptchaFragment.kt
@@ -77,7 +77,7 @@ class FtueAuthCaptchaFragment @Inject constructor(
         val mime = "text/html"
         val encoding = "utf-8"
 
-        val homeServerUrl = state.selectedHomeserver.declaredUrl ?: error("missing url of homeserver")
+        val homeServerUrl = state.selectedHomeserver.upstreamUrl ?: error("missing url of homeserver")
         views.loginCaptchaWevView.loadDataWithBaseURL(homeServerUrl, html, mime, encoding, null)
         views.loginCaptchaWevView.requestLayout()
 
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt
index 1f57c55206..441fd64b0b 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt
@@ -167,7 +167,7 @@ class FtueAuthCombinedRegisterFragment @Inject constructor() : AbstractSSOFtueAu
         setupUi(state)
         setupAutoFill()
 
-        views.selectedServerName.text = state.selectedHomeserver.sourceUrl.toReducedUrl()
+        views.selectedServerName.text = state.selectedHomeserver.userFacingUrl.toReducedUrl()
         views.selectedServerDescription.text = state.selectedHomeserver.description
 
         if (state.isLoading) {
@@ -208,5 +208,5 @@ class FtueAuthCombinedRegisterFragment @Inject constructor() : AbstractSSOFtueAu
         }
     }
 
-    private fun OnboardingViewState.isNumericOnlyUserIdForbidden() = selectedHomeserver.sourceUrl == getString(R.string.matrix_org_server_url)
+    private fun OnboardingViewState.isNumericOnlyUserIdForbidden() = selectedHomeserver.userFacingUrl == getString(R.string.matrix_org_server_url)
 }
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
index ccc89eb111..667f4b9f5f 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
@@ -75,7 +75,7 @@ class FtueAuthCombinedServerSelectionFragment @Inject constructor() : AbstractFt
 
     override fun updateWithState(state: OnboardingViewState) {
         if (views.chooseServerInput.content().isEmpty()) {
-            val userUrlInput = state.selectedHomeserver.sourceUrl?.toReducedUrlKeepingSchemaIfInsecure()
+            val userUrlInput = state.selectedHomeserver.userFacingUrl?.toReducedUrlKeepingSchemaIfInsecure()
             views.chooseServerInput.editText().setText(userUrlInput)
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt
index a0b844f918..4888b43946 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt
@@ -184,7 +184,7 @@ class FtueAuthLoginFragment @Inject constructor() : AbstractSSOFtueAuthFragment<
                 ServerType.MatrixOrg -> {
                     views.loginServerIcon.isVisible = true
                     views.loginServerIcon.setImageResource(R.drawable.ic_logo_matrix_org)
-                    views.loginTitle.text = getString(resId, state.selectedHomeserver.sourceUrl.toReducedUrl())
+                    views.loginTitle.text = getString(resId, state.selectedHomeserver.userFacingUrl.toReducedUrl())
                     views.loginNotice.text = getString(R.string.login_server_matrix_org_text)
                 }
                 ServerType.EMS       -> {
@@ -195,7 +195,7 @@ class FtueAuthLoginFragment @Inject constructor() : AbstractSSOFtueAuthFragment<
                 }
                 ServerType.Other     -> {
                     views.loginServerIcon.isVisible = false
-                    views.loginTitle.text = getString(resId, state.selectedHomeserver.sourceUrl.toReducedUrl())
+                    views.loginTitle.text = getString(resId, state.selectedHomeserver.userFacingUrl.toReducedUrl())
                     views.loginNotice.text = getString(R.string.login_server_other_text)
                 }
                 ServerType.Unknown   -> Unit /* Should not happen */
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordFragment.kt
index 521dfe65cf..4ec02f677a 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordFragment.kt
@@ -59,7 +59,7 @@ class FtueAuthResetPasswordFragment @Inject constructor() : AbstractFtueAuthFrag
     }
 
     private fun setupUi(state: OnboardingViewState) {
-        views.resetPasswordTitle.text = getString(R.string.login_reset_password_on, state.selectedHomeserver.sourceUrl.toReducedUrl())
+        views.resetPasswordTitle.text = getString(R.string.login_reset_password_on, state.selectedHomeserver.userFacingUrl.toReducedUrl())
     }
 
     private fun setupSubmitButton() {
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSignUpSignInSelectionFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSignUpSignInSelectionFragment.kt
index 946f16a2e8..121c0870c3 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSignUpSignInSelectionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSignUpSignInSelectionFragment.kt
@@ -60,19 +60,19 @@ class FtueAuthSignUpSignInSelectionFragment @Inject constructor() : AbstractSSOF
             ServerType.MatrixOrg -> {
                 views.loginSignupSigninServerIcon.setImageResource(R.drawable.ic_logo_matrix_org)
                 views.loginSignupSigninServerIcon.isVisible = true
-                views.loginSignupSigninTitle.text = getString(R.string.login_connect_to, state.selectedHomeserver.sourceUrl.toReducedUrl())
+                views.loginSignupSigninTitle.text = getString(R.string.login_connect_to, state.selectedHomeserver.userFacingUrl.toReducedUrl())
                 views.loginSignupSigninText.text = getString(R.string.login_server_matrix_org_text)
             }
             ServerType.EMS       -> {
                 views.loginSignupSigninServerIcon.setImageResource(R.drawable.ic_logo_element_matrix_services)
                 views.loginSignupSigninServerIcon.isVisible = true
                 views.loginSignupSigninTitle.text = getString(R.string.login_connect_to_modular)
-                views.loginSignupSigninText.text = state.selectedHomeserver.sourceUrl.toReducedUrl()
+                views.loginSignupSigninText.text = state.selectedHomeserver.userFacingUrl.toReducedUrl()
             }
             ServerType.Other     -> {
                 views.loginSignupSigninServerIcon.isVisible = false
                 views.loginSignupSigninTitle.text = getString(R.string.login_server_other_title)
-                views.loginSignupSigninText.text = getString(R.string.login_connect_to, state.selectedHomeserver.sourceUrl.toReducedUrl())
+                views.loginSignupSigninText.text = getString(R.string.login_connect_to, state.selectedHomeserver.userFacingUrl.toReducedUrl())
             }
             ServerType.Unknown   -> Unit /* Should not happen */
         }
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/terms/FtueAuthTermsFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/terms/FtueAuthTermsFragment.kt
index 853225b452..aa626c6318 100755
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/terms/FtueAuthTermsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/terms/FtueAuthTermsFragment.kt
@@ -116,7 +116,7 @@ class FtueAuthTermsFragment @Inject constructor(
     }
 
     override fun updateWithState(state: OnboardingViewState) {
-        policyController.homeServer = state.selectedHomeserver.sourceUrl.toReducedUrl()
+        policyController.homeServer = state.selectedHomeserver.userFacingUrl.toReducedUrl()
         renderState()
     }
 
diff --git a/vector/src/test/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCaseTest.kt
index 117f3f307b..b75ec231fd 100644
--- a/vector/src/test/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCaseTest.kt
+++ b/vector/src/test/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCaseTest.kt
@@ -141,8 +141,8 @@ class StartAuthenticationFlowUseCaseTest {
             isHomeserverOutdated,
             SelectedHomeserverState(
                     description = description,
-                    sourceUrl = homeserverSourceUrl,
-                    declaredUrl = A_DECLARED_HOMESERVER_URL,
+                    userFacingUrl = homeserverSourceUrl,
+                    upstreamUrl = A_DECLARED_HOMESERVER_URL,
                     preferredLoginMode = preferredLoginMode,
                     supportedLoginTypes = supportedLoginTypes
             )

From db502255387dbf586cdb4d047bc342ef0221ba19 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Tue, 5 Apr 2022 16:16:00 +0100
Subject: [PATCH 15/20] adding changelog entry

---
 changelog.d/2396.wip | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2396.wip

diff --git a/changelog.d/2396.wip b/changelog.d/2396.wip
new file mode 100644
index 0000000000..9af8fa16c0
--- /dev/null
+++ b/changelog.d/2396.wip
@@ -0,0 +1 @@
+Adds a new homeserver selection screen when creating an account
\ No newline at end of file

From f70d61321ca867f7247080e5a2061b1c69e050d7 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Fri, 8 Apr 2022 11:32:24 +0100
Subject: [PATCH 16/20] renaming extension to help with discoverability

---
 .../java/im/vector/app/core/extensions/Collections.kt  |  2 +-
 .../onboarding/StartAuthenticationFlowUseCase.kt       | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/extensions/Collections.kt b/vector/src/main/java/im/vector/app/core/extensions/Collections.kt
index 3a998abd59..d48875983d 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/Collections.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/Collections.kt
@@ -19,4 +19,4 @@ package im.vector.app.core.extensions
 inline fun <reified T> List<T>.nextOrNull(index: Int) = getOrNull(index + 1)
 inline fun <reified T> List<T>.prevOrNull(index: Int) = getOrNull(index - 1)
 
-fun <T> List<T>.containsAll(vararg items: T) = this.containsAll(items.toList())
+fun <T> List<T>.containsAllItems(vararg items: T) = this.containsAll(items.toList())
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCase.kt b/vector/src/main/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCase.kt
index b09be227bb..53e1c47fa1 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCase.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCase.kt
@@ -17,7 +17,7 @@
 package im.vector.app.features.onboarding
 
 import im.vector.app.R
-import im.vector.app.core.extensions.containsAll
+import im.vector.app.core.extensions.containsAllItems
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.utils.ensureTrailingSlash
 import im.vector.app.features.login.LoginMode
@@ -59,10 +59,10 @@ class StartAuthenticationFlowUseCase @Inject constructor(
     private fun matrixOrgUrl() = stringProvider.getString(R.string.matrix_org_server_url).ensureTrailingSlash()
 
     private fun LoginFlowResult.findPreferredLoginMode() = when {
-        supportedLoginTypes.containsAll(LoginFlowTypes.SSO, LoginFlowTypes.PASSWORD) -> LoginMode.SsoAndPassword(ssoIdentityProviders)
-        supportedLoginTypes.contains(LoginFlowTypes.SSO)                             -> LoginMode.Sso(ssoIdentityProviders)
-        supportedLoginTypes.contains(LoginFlowTypes.PASSWORD)                        -> LoginMode.Password
-        else                                                                         -> LoginMode.Unsupported
+        supportedLoginTypes.containsAllItems(LoginFlowTypes.SSO, LoginFlowTypes.PASSWORD) -> LoginMode.SsoAndPassword(ssoIdentityProviders)
+        supportedLoginTypes.contains(LoginFlowTypes.SSO)                                  -> LoginMode.Sso(ssoIdentityProviders)
+        supportedLoginTypes.contains(LoginFlowTypes.PASSWORD)                             -> LoginMode.Password
+        else                                                                              -> LoginMode.Unsupported
     }
 
     data class StartAuthenticationResult(

From 6304d5dc939704ec775c338e6afc9fef94a192b7 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Fri, 8 Apr 2022 11:54:57 +0100
Subject: [PATCH 17/20] creating a common type for the edit/selecting of
 homeserver urls to avoid duplication in the model

---
 .../features/onboarding/OnboardingAction.kt    | 10 ++++++++--
 .../features/onboarding/OnboardingViewModel.kt | 18 +++++++++++-------
 .../FtueAuthCombinedServerSelectionFragment.kt |  2 +-
 .../ftueauth/FtueAuthServerUrlFormFragment.kt  |  2 +-
 .../onboarding/OnboardingViewModelTest.kt      |  2 +-
 5 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingAction.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingAction.kt
index e00976f8f6..59c3d10a5e 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingAction.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingAction.kt
@@ -29,8 +29,14 @@ sealed interface OnboardingAction : VectorViewModelAction {
     data class OnIAlreadyHaveAnAccount(val resetLoginConfig: Boolean, val onboardingFlow: OnboardingFlow) : OnboardingAction
 
     data class UpdateServerType(val serverType: ServerType) : OnboardingAction
-    data class SelectHomeServer(val homeServerUrl: String) : OnboardingAction
-    data class EditHomeServer(val homeServerUrl: String) : OnboardingAction
+
+    sealed interface HomeServerChange : OnboardingAction {
+        val homeServerUrl: String
+
+        data class SelectHomeServer(override val homeServerUrl: String) : HomeServerChange
+        data class EditHomeServer(override val homeServerUrl: String) : HomeServerChange
+    }
+
     data class UpdateUseCase(val useCase: FtueUseCase) : OnboardingAction
     object ResetUseCase : OnboardingAction
     data class UpdateSignMode(val signMode: SignMode) : OnboardingAction
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
index 28b6288d72..54aea0185c 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
@@ -140,8 +140,7 @@ class OnboardingViewModel @AssistedInject constructor(
             is OnboardingAction.UpdateServerType           -> handleUpdateServerType(action)
             is OnboardingAction.UpdateSignMode             -> handleUpdateSignMode(action)
             is OnboardingAction.InitWith                   -> handleInitWith(action)
-            is OnboardingAction.SelectHomeServer           -> run { lastAction = action }.also { handleHomeserverChange(action.homeServerUrl) }
-            is OnboardingAction.EditHomeServer             -> run { lastAction = action }.also { handleHomeserverChange(action.homeServerUrl) }
+            is OnboardingAction.HomeServerChange           -> withAction(action) { handleHomeserverChange(action.homeServerUrl) }
             is OnboardingAction.LoginOrRegister            -> handleLoginOrRegister(action).also { lastAction = action }
             is OnboardingAction.Register                   -> handleRegisterWith(action).also { lastAction = action }
             is OnboardingAction.LoginWithToken             -> handleLoginWithToken(action)
@@ -163,6 +162,11 @@ class OnboardingViewModel @AssistedInject constructor(
         }
     }
 
+    private fun withAction(action: OnboardingAction, block: (OnboardingAction) -> Unit) {
+        lastAction = action
+        block(action)
+    }
+
     private fun handleSplashAction(resetConfig: Boolean, onboardingFlow: OnboardingFlow) {
         if (resetConfig) {
             loginConfig = null
@@ -202,7 +206,7 @@ class OnboardingViewModel @AssistedInject constructor(
         // It happens when we get the login flow, or during direct authentication.
         // So alter the homeserver config and retrieve again the login flow
         when (val finalLastAction = lastAction) {
-            is OnboardingAction.SelectHomeServer -> {
+            is OnboardingAction.HomeServerChange.SelectHomeServer -> {
                 currentHomeServerConnectionConfig
                         ?.let { it.copy(allowedFingerprints = it.allowedFingerprints + action.fingerprint) }
                         ?.let { startAuthenticationFlow(it) }
@@ -350,7 +354,7 @@ class OnboardingViewModel @AssistedInject constructor(
     private fun handleUpdateUseCase(action: OnboardingAction.UpdateUseCase) {
         setState { copy(useCase = action.useCase) }
         when (vectorFeatures.isOnboardingCombinedRegisterEnabled()) {
-            true  -> handle(OnboardingAction.SelectHomeServer(defaultHomeserverUrl))
+            true  -> handle(OnboardingAction.HomeServerChange.SelectHomeServer(defaultHomeserverUrl))
             false -> _viewEvents.post(OnboardingViewEvents.OpenServerSelection)
         }
     }
@@ -370,7 +374,7 @@ class OnboardingViewModel @AssistedInject constructor(
             ServerType.Unknown   -> Unit /* Should not happen */
             ServerType.MatrixOrg ->
                 // Request login flow here
-                handle(OnboardingAction.SelectHomeServer(matrixOrgUrl))
+                handle(OnboardingAction.HomeServerChange.SelectHomeServer(matrixOrgUrl))
             ServerType.EMS,
             ServerType.Other     -> _viewEvents.post(OnboardingViewEvents.OnServerSelectionDone(action.serverType))
         }
@@ -632,8 +636,8 @@ class OnboardingViewModel @AssistedInject constructor(
     private fun onAuthenticationStartedSuccess() {
         withState {
             when (lastAction) {
-                is OnboardingAction.EditHomeServer   -> _viewEvents.post(OnboardingViewEvents.OnHomeserverEdited)
-                is OnboardingAction.SelectHomeServer -> {
+                is OnboardingAction.HomeServerChange.EditHomeServer   -> _viewEvents.post(OnboardingViewEvents.OnHomeserverEdited)
+                is OnboardingAction.HomeServerChange.SelectHomeServer -> {
                     if (it.selectedHomeserver.preferredLoginMode.supportsSignModeScreen()) {
                         when (it.onboardingFlow) {
                             OnboardingFlow.SignIn -> handleUpdateSignMode(OnboardingAction.UpdateSignMode(SignMode.SignIn))
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
index 667f4b9f5f..3a717f0e51 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
@@ -66,7 +66,7 @@ class FtueAuthCombinedServerSelectionFragment @Inject constructor() : AbstractFt
     }
 
     private fun updateServerUrl() {
-        viewModel.handle(OnboardingAction.EditHomeServer(views.chooseServerInput.content().ensureProtocol().ensureTrailingSlash()))
+        viewModel.handle(OnboardingAction.HomeServerChange.EditHomeServer(views.chooseServerInput.content().ensureProtocol().ensureTrailingSlash()))
     }
 
     override fun resetViewModel() {
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthServerUrlFormFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthServerUrlFormFragment.kt
index 4549f11bf8..df304d028d 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthServerUrlFormFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthServerUrlFormFragment.kt
@@ -139,7 +139,7 @@ class FtueAuthServerUrlFormFragment @Inject constructor() : AbstractFtueAuthFrag
             }
             else                -> {
                 views.loginServerUrlFormHomeServerUrl.setText(serverUrl, false /* to avoid completion dialog flicker*/)
-                viewModel.handle(OnboardingAction.SelectHomeServer(serverUrl))
+                viewModel.handle(OnboardingAction.HomeServerChange.SelectHomeServer(serverUrl))
             }
         }
     }
diff --git a/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt b/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
index bc77755810..77b3f495f0 100644
--- a/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
+++ b/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
@@ -241,7 +241,7 @@ class OnboardingViewModelTest {
         fakeStartAuthenticationFlowUseCase.givenResult(A_HOMESERVER_CONFIG, StartAuthenticationResult(false, SELECTED_HOMESERVER_STATE))
         fakeHomeServerHistoryService.expectUrlToBeAdded(A_HOMESERVER_CONFIG.homeServerUri.toString())
 
-        viewModel.handle(OnboardingAction.EditHomeServer(A_HOMESERVER_URL))
+        viewModel.handle(OnboardingAction.HomeServerChange.EditHomeServer(A_HOMESERVER_URL))
 
         test
                 .assertStatesChanges(

From 05a7d40950d15c701d22ae5685025f2a8993021a Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Fri, 8 Apr 2022 12:11:07 +0100
Subject: [PATCH 18/20] extracting view setup to its own method - follows other
 ftue fragment conventions

---
 .../FtueAuthCombinedServerSelectionFragment.kt       | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
index 3a717f0e51..d1560d7be0 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
@@ -43,12 +43,14 @@ class FtueAuthCombinedServerSelectionFragment @Inject constructor() : AbstractFt
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        views.chooseServerRoot.realignPercentagesToParent()
+        setupViews()
+    }
 
+    private fun setupViews() {
+        views.chooseServerRoot.realignPercentagesToParent()
         views.chooseServerToolbar.setNavigationOnClickListener {
             viewModel.handle(OnboardingAction.PostViewEvent(OnboardingViewEvents.OnBack))
         }
-
         views.chooseServerInput.editText?.setOnEditorActionListener { _, actionId, _ ->
             when (actionId) {
                 EditorInfo.IME_ACTION_DONE -> {
@@ -57,12 +59,8 @@ class FtueAuthCombinedServerSelectionFragment @Inject constructor() : AbstractFt
             }
             false
         }
-
         views.chooseServerGetInTouch.debouncedClicks { openUrlInExternalBrowser(requireContext(), getString(R.string.ftue_ems_url)) }
-
-        views.chooseServerSubmit.debouncedClicks {
-            updateServerUrl()
-        }
+        views.chooseServerSubmit.debouncedClicks { updateServerUrl() }
     }
 
     private fun updateServerUrl() {

From a2bcbfb7c730517a71cc1e1b3a183de646a37521 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Fri, 8 Apr 2022 13:12:42 +0100
Subject: [PATCH 19/20] extracting server information rendering to a reusable
 method to reduce duplication and better enforce consistency

---
 .../FtueAuthSignUpSignInSelectionFragment.kt  | 45 +++++++++++--------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSignUpSignInSelectionFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSignUpSignInSelectionFragment.kt
index 121c0870c3..dda5e0c36a 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSignUpSignInSelectionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSignUpSignInSelectionFragment.kt
@@ -20,6 +20,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.annotation.DrawableRes
 import androidx.core.view.isVisible
 import com.airbnb.mvrx.withState
 import im.vector.app.R
@@ -55,25 +56,23 @@ class FtueAuthSignUpSignInSelectionFragment @Inject constructor() : AbstractSSOF
         views.loginSignupSigninSignIn.setOnClickListener { signIn() }
     }
 
-    private fun setupUi(state: OnboardingViewState) {
+    private fun render(state: OnboardingViewState) {
         when (state.serverType) {
-            ServerType.MatrixOrg -> {
-                views.loginSignupSigninServerIcon.setImageResource(R.drawable.ic_logo_matrix_org)
-                views.loginSignupSigninServerIcon.isVisible = true
-                views.loginSignupSigninTitle.text = getString(R.string.login_connect_to, state.selectedHomeserver.userFacingUrl.toReducedUrl())
-                views.loginSignupSigninText.text = getString(R.string.login_server_matrix_org_text)
-            }
-            ServerType.EMS       -> {
-                views.loginSignupSigninServerIcon.setImageResource(R.drawable.ic_logo_element_matrix_services)
-                views.loginSignupSigninServerIcon.isVisible = true
-                views.loginSignupSigninTitle.text = getString(R.string.login_connect_to_modular)
-                views.loginSignupSigninText.text = state.selectedHomeserver.userFacingUrl.toReducedUrl()
-            }
-            ServerType.Other     -> {
-                views.loginSignupSigninServerIcon.isVisible = false
-                views.loginSignupSigninTitle.text = getString(R.string.login_server_other_title)
-                views.loginSignupSigninText.text = getString(R.string.login_connect_to, state.selectedHomeserver.userFacingUrl.toReducedUrl())
-            }
+            ServerType.MatrixOrg -> renderServerInformation(
+                    icon = R.drawable.ic_logo_matrix_org,
+                    title = getString(R.string.login_connect_to, state.selectedHomeserver.userFacingUrl.toReducedUrl()),
+                    subtitle = getString(R.string.login_server_matrix_org_text)
+            )
+            ServerType.EMS       -> renderServerInformation(
+                    icon = R.drawable.ic_logo_element_matrix_services,
+                    title = getString(R.string.login_connect_to_modular),
+                    subtitle = state.selectedHomeserver.userFacingUrl.toReducedUrl()
+            )
+            ServerType.Other     -> renderServerInformation(
+                    icon = null,
+                    title = getString(R.string.login_server_other_title),
+                    subtitle = getString(R.string.login_connect_to, state.selectedHomeserver.userFacingUrl.toReducedUrl())
+            )
             ServerType.Unknown   -> Unit /* Should not happen */
         }
 
@@ -100,6 +99,14 @@ class FtueAuthSignUpSignInSelectionFragment @Inject constructor() : AbstractSSOF
         }
     }
 
+    private fun renderServerInformation(@DrawableRes icon: Int?, title: String, subtitle: String) {
+        icon?.let { views.loginSignupSigninServerIcon.setImageResource(it) }
+        views.loginSignupSigninServerIcon.isVisible = icon != null
+        views.loginSignupSigninServerIcon.setImageResource(R.drawable.ic_logo_matrix_org)
+        views.loginSignupSigninTitle.text = title
+        views.loginSignupSigninText.text = subtitle
+    }
+
     private fun setupButtons(state: OnboardingViewState) {
         when (state.selectedHomeserver.preferredLoginMode) {
             is LoginMode.Sso -> {
@@ -136,7 +143,7 @@ class FtueAuthSignUpSignInSelectionFragment @Inject constructor() : AbstractSSOF
     }
 
     override fun updateWithState(state: OnboardingViewState) {
-        setupUi(state)
+        render(state)
         setupButtons(state)
     }
 }

From 5f9d3e107deef76692aaaa73b5daf01ff453ab5b Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Fri, 8 Apr 2022 13:17:56 +0100
Subject: [PATCH 20/20] moving ftue ems url to the urls config file

---
 vector-config/src/main/res/values/urls.xml    | 1 +
 vector/src/main/res/values/donottranslate.xml | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector-config/src/main/res/values/urls.xml b/vector-config/src/main/res/values/urls.xml
index 22e3a9ac72..70f5227f5f 100644
--- a/vector-config/src/main/res/values/urls.xml
+++ b/vector-config/src/main/res/values/urls.xml
@@ -3,4 +3,5 @@
     <!-- This file contains url values-->
 
     <string name="threads_learn_more_url" translatable="false">https://element.io/help#threads</string>
+    <string name="ftue_ems_url">https://element.io/ems</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/donottranslate.xml b/vector/src/main/res/values/donottranslate.xml
index cf924d429a..889fcaaefe 100755
--- a/vector/src/main/res/values/donottranslate.xml
+++ b/vector/src/main/res/values/donottranslate.xml
@@ -25,7 +25,6 @@
     <string name="ftue_auth_choose_server_entry_footer">You can only connect to a server that has already been set up</string>
     <string name="ftue_auth_choose_server_ems_title">Want to host your own server?</string>
 
-    <string name="ftue_ems_url">https://element.io/ems</string>
     <string name="ftue_auth_choose_server_ems_subtitle">Element Matrix Services (EMS) is a robust and reliable hosting service for fast, secure and real time communication. Find out how on <a href="${ftue_ems_url}">element.io/ems</a></string>
     <string name="ftue_auth_choose_server_ems_cta">Get in touch</string>