From fa7f3e596b3fb375dfbbde6ef7acd59c94895aba Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Wed, 2 May 2018 20:05:26 +0200
Subject: [PATCH] Fixes a crash noticed only through monkey testing
Signed-off-by: Janne Koschinski <janne@kuschku.de>
---
.../ui/setup/accounts/edit/AccountEditActivity.kt | 3 +--
app/src/main/res/layout/setup_account_edit.xml | 12 ++++++------
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/edit/AccountEditActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/edit/AccountEditActivity.kt
index e27139d4d..3d6364714 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/edit/AccountEditActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/edit/AccountEditActivity.kt
@@ -110,8 +110,7 @@ class AccountEditActivity : DaggerAppCompatActivity() {
hostValidator = object : TextValidator(
hostWrapper::setError, resources.getString(R.string.hint_invalid_host)
) {
- override fun validate(text: Editable) =
- text.toString().matches(Patterns.DOMAIN_NAME)
+ override fun validate(text: Editable) = text.toString().matches(Patterns.DOMAIN_NAME)
}
portValidator = object : TextValidator(
diff --git a/app/src/main/res/layout/setup_account_edit.xml b/app/src/main/res/layout/setup_account_edit.xml
index e68668c35..098530b96 100644
--- a/app/src/main/res/layout/setup_account_edit.xml
+++ b/app/src/main/res/layout/setup_account_edit.xml
@@ -56,14 +56,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/label_account_name"
- app:errorEnabled="true"
tools:ignore="LabelFor">
<EditText
android:id="@+id/name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:inputType="text" />
+ android:inputType="text"
+ app:errorEnabled="true" />
</android.support.design.widget.TextInputLayout>
</LinearLayout>
@@ -100,14 +100,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/label_connection_host"
- app:errorEnabled="true"
tools:ignore="LabelFor">
<EditText
android:id="@+id/host"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:inputType="textUri" />
+ android:inputType="textUri"
+ app:errorEnabled="true" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
@@ -115,7 +115,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/labelConnectionPort"
- app:errorEnabled="true"
tools:ignore="LabelFor">
<EditText
@@ -123,7 +122,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="number"
- android:text="@string/defaultConnectionPort" />
+ android:text="@string/defaultConnectionPort"
+ app:errorEnabled="true" />
</android.support.design.widget.TextInputLayout>
</LinearLayout>
</LinearLayout>
--
GitLab