From 096abd7ebf76b171d2be5fbdf8b30474894b1ae3 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Mon, 30 Nov 2020 13:33:29 +0100
Subject: [PATCH] Fix IllegalStateException: focus search returned a view that
 wasn't able to take focus!

And no multiline input for room alias
---
 .../app/features/roomprofile/alias/RoomAliasController.kt       | 2 ++
 vector/src/main/res/layout/item_form_text_input.xml             | 2 ++
 vector/src/main/res/layout/item_room_alias_text_input.xml       | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasController.kt
index 49bccd79db..0b695031c5 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasController.kt
@@ -16,6 +16,7 @@
 
 package im.vector.app.features.roomprofile.alias
 
+import android.text.InputType
 import com.airbnb.epoxy.TypedEpoxyController
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Loading
@@ -169,6 +170,7 @@ class RoomAliasController @Inject constructor(
                     value(data.publishManuallyState.value)
                     showBottomSeparator(false)
                     hint(stringProvider.getString(R.string.room_alias_address_hint))
+                    inputType(InputType.TYPE_CLASS_TEXT)
                     onTextChange { text ->
                         callback?.setNewAlias(text)
                     }
diff --git a/vector/src/main/res/layout/item_form_text_input.xml b/vector/src/main/res/layout/item_form_text_input.xml
index 594bfc1788..f7ce8e1c9f 100644
--- a/vector/src/main/res/layout/item_form_text_input.xml
+++ b/vector/src/main/res/layout/item_form_text_input.xml
@@ -20,10 +20,12 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
+        <!-- android:imeOptions="actionDone" to fix a crash -->
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/formTextInputTextInputEditText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:imeOptions="actionDone"
             tools:hint="@string/create_room_name_hint" />
 
     </com.google.android.material.textfield.TextInputLayout>
diff --git a/vector/src/main/res/layout/item_room_alias_text_input.xml b/vector/src/main/res/layout/item_room_alias_text_input.xml
index 9216fc6b7e..fd7a99f0f0 100644
--- a/vector/src/main/res/layout/item_room_alias_text_input.xml
+++ b/vector/src/main/res/layout/item_room_alias_text_input.xml
@@ -30,11 +30,13 @@
         app:layout_constraintStart_toEndOf="@+id/itemRoomAliasHash"
         app:layout_constraintTop_toTopOf="parent">
 
+        <!-- android:imeOptions="actionDone" to fix a crash -->
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/itemRoomAliasTextInputEditText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/create_room_alias_hint"
+            android:imeOptions="actionDone"
             android:inputType="text" />
 
     </com.google.android.material.textfield.TextInputLayout>