From 44fa9c4ce0df6da99f71fc34e366444ffbdf6be6 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 1 Jul 2019 15:55:15 +0200
Subject: [PATCH] A matter of focus

---
 app/src/main/java/eu/faircode/email/FragmentCompose.java | 7 -------
 .../main/java/eu/faircode/email/FragmentIdentity.java    | 9 ---------
 app/src/main/res/layout/dialog_insert_link.xml           | 5 ++++-
 app/src/main/res/layout/dialog_keyword.xml               | 5 ++++-
 app/src/main/res/layout/dialog_open_link.xml             | 5 ++++-
 app/src/main/res/layout/dialog_password.xml              | 5 ++++-
 app/src/main/res/layout/fragment_quick_setup.xml         | 5 ++++-
 7 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index eec852c45b..0a29a2f2fe 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -3409,13 +3409,6 @@ public class FragmentCompose extends FragmentBase {
             else
                 etLink.setText(savedInstanceState.getString("fair:link"));
 
-            new Handler().post(new Runnable() {
-                @Override
-                public void run() {
-                    etLink.requestFocus();
-                }
-            });
-
             return new AlertDialog.Builder(getContext())
                     .setView(view)
                     .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index 308b75c8d2..16c64b7ed9 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -853,8 +853,6 @@ public class FragmentIdentity extends FragmentBase {
 
                     color = (identity == null || identity.color == null ? Color.TRANSPARENT : identity.color);
 
-                    etName.requestFocus();
-
                     if (identity == null)
                         new SimpleTask<Integer>() {
                             @Override
@@ -1110,13 +1108,6 @@ public class FragmentIdentity extends FragmentBase {
             etHtml = dview.findViewById(R.id.etHtml);
             etHtml.setText(html);
 
-            new Handler().post(new Runnable() {
-                @Override
-                public void run() {
-                    etHtml.requestFocus();
-                }
-            });
-
             return new AlertDialog.Builder(getContext())
                     .setTitle(R.string.title_edit_html)
                     .setView(dview)
diff --git a/app/src/main/res/layout/dialog_insert_link.xml b/app/src/main/res/layout/dialog_insert_link.xml
index 9e70186a1c..4f0b81a486 100644
--- a/app/src/main/res/layout/dialog_insert_link.xml
+++ b/app/src/main/res/layout/dialog_insert_link.xml
@@ -26,7 +26,10 @@
         android:text="https://email.faircode.eu/"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvOpenLink" />
+        app:layout_constraintTop_toBottomOf="@id/tvOpenLink">
+
+        <requestFocus />
+    </EditText>
 
     <TextView
         android:id="@+id/tvInsecure"
diff --git a/app/src/main/res/layout/dialog_keyword.xml b/app/src/main/res/layout/dialog_keyword.xml
index c74d6d21cd..78b2857a1c 100644
--- a/app/src/main/res/layout/dialog_keyword.xml
+++ b/app/src/main/res/layout/dialog_keyword.xml
@@ -24,5 +24,8 @@
         android:text="Keyword"
         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvKeyword" />
+        app:layout_constraintTop_toBottomOf="@id/tvKeyword">
+
+        <requestFocus />
+    </EditText>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_open_link.xml b/app/src/main/res/layout/dialog_open_link.xml
index dd4e19945d..722a5aceba 100644
--- a/app/src/main/res/layout/dialog_open_link.xml
+++ b/app/src/main/res/layout/dialog_open_link.xml
@@ -37,7 +37,10 @@
         android:text="https://email.faircode.eu/"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvTitle" />
+        app:layout_constraintTop_toBottomOf="@id/tvTitle">
+
+        <requestFocus />
+    </EditText>
 
     <CheckBox
         android:id="@+id/cbSecure"
diff --git a/app/src/main/res/layout/dialog_password.xml b/app/src/main/res/layout/dialog_password.xml
index e8bac31038..2974a6be20 100644
--- a/app/src/main/res/layout/dialog_password.xml
+++ b/app/src/main/res/layout/dialog_password.xml
@@ -20,7 +20,10 @@
             android:hint="@string/title_setup_password"
             android:imeOptions="actionNext"
             android:inputType="textPassword"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium">
+
+            <requestFocus />
+        </com.google.android.material.textfield.TextInputEditText>
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
diff --git a/app/src/main/res/layout/fragment_quick_setup.xml b/app/src/main/res/layout/fragment_quick_setup.xml
index 8045535388..f6c980cd94 100644
--- a/app/src/main/res/layout/fragment_quick_setup.xml
+++ b/app/src/main/res/layout/fragment_quick_setup.xml
@@ -28,7 +28,10 @@
                 android:inputType="textPersonName|textCapWords"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent">
+
+                <requestFocus />
+            </EditText>
 
             <EditText
                 android:id="@+id/etEmail"