From b09a90b247fe80d1c54c6bd705fe94659c4fc6b6 Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 4 Oct 2021 07:37:45 +0200 Subject: [PATCH] Prevent crash --- app/src/main/java/eu/faircode/email/FixedEditText.java | 10 ++++++++++ app/src/main/res/layout/dialog_response.xml | 1 + app/src/main/res/layout/fragment_gmail.xml | 2 +- app/src/main/res/layout/fragment_options_behavior.xml | 1 + .../main/res/layout/fragment_options_connection.xml | 1 + app/src/main/res/layout/item_keyword.xml | 3 ++- 6 files changed, 16 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FixedEditText.java b/app/src/main/java/eu/faircode/email/FixedEditText.java index e9f0390e08..b941030b08 100644 --- a/app/src/main/java/eu/faircode/email/FixedEditText.java +++ b/app/src/main/java/eu/faircode/email/FixedEditText.java @@ -222,6 +222,16 @@ public class FixedEditText extends AppCompatEditText { } } + @Override + public boolean onKeyUp(int keyCode, KeyEvent event) { + try { + return super.onKeyUp(keyCode, event); + } catch (Throwable ex) { + Log.w(ex); + return true; + } + } + @Override public boolean performClick() { try { diff --git a/app/src/main/res/layout/dialog_response.xml b/app/src/main/res/layout/dialog_response.xml index 1307061db9..bcecc1a1a3 100644 --- a/app/src/main/res/layout/dialog_response.xml +++ b/app/src/main/res/layout/dialog_response.xml @@ -22,6 +22,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="24dp" + android:imeOptions="actionDone" android:inputType="text|textNoSuggestions" android:maxLines="1" android:textAppearance="@style/TextAppearance.AppCompat.Medium" diff --git a/app/src/main/res/layout/fragment_gmail.xml b/app/src/main/res/layout/fragment_gmail.xml index 1624643934..d6675ca8bc 100644 --- a/app/src/main/res/layout/fragment_gmail.xml +++ b/app/src/main/res/layout/fragment_gmail.xml @@ -81,7 +81,7 @@ android:layout_marginTop="12dp" android:autofillHints="name" android:hint="@string/title_identity_name" - android:imeOptions="actionNext" + android:imeOptions="actionDone" android:inputType="textPersonName|textCapWords" android:textAppearance="@style/TextAppearance.AppCompat.Medium" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/fragment_options_behavior.xml b/app/src/main/res/layout/fragment_options_behavior.xml index 8364e1ff37..7fb244bf52 100644 --- a/app/src/main/res/layout/fragment_options_behavior.xml +++ b/app/src/main/res/layout/fragment_options_behavior.xml @@ -164,6 +164,7 @@ android:layout_width="100dp" android:layout_height="wrap_content" android:hint="20" + android:imeOptions="actionDone" android:inputType="number" android:maxLength="4" android:textAppearance="@style/TextAppearance.AppCompat.Medium" diff --git a/app/src/main/res/layout/fragment_options_connection.xml b/app/src/main/res/layout/fragment_options_connection.xml index 93f50ea3a4..730ffa93ba 100644 --- a/app/src/main/res/layout/fragment_options_connection.xml +++ b/app/src/main/res/layout/fragment_options_connection.xml @@ -312,6 +312,7 @@ android:layout_width="100dp" android:layout_height="wrap_content" android:hint="20" + android:imeOptions="actionDone" android:inputType="number" android:maxLength="3" android:textAppearance="@style/TextAppearance.AppCompat.Medium" diff --git a/app/src/main/res/layout/item_keyword.xml b/app/src/main/res/layout/item_keyword.xml index ddf5790735..4e36379f8f 100644 --- a/app/src/main/res/layout/item_keyword.xml +++ b/app/src/main/res/layout/item_keyword.xml @@ -38,10 +38,11 @@ app:layout_constraintTop_toTopOf="@+id/btnColor" app:srcCompat="@drawable/twotone_edit_24" /> -