From d1d5036915aea502d9db6c16ac44d77c62d55b93 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 6 Aug 2018 11:29:28 +0000
Subject: [PATCH] Fixed focus and freezes

---
 .../eu/faircode/email/FragmentCompose.java    | 25 +++++++++++++------
 app/src/main/res/layout/fragment_compose.xml  |  2 +-
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index a488b7b4..39572d60 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -36,7 +36,6 @@ import android.support.v4.content.AsyncTaskLoader;
 import android.support.v4.content.Loader;
 import android.text.Html;
 import android.text.TextUtils;
-import android.text.method.LinkMovementMethod;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -113,7 +112,6 @@ public class FragmentCompose extends FragmentEx {
         grpReady = view.findViewById(R.id.grpReady);
 
         grpCc.setVisibility("reply_all".equals(action) ? View.VISIBLE : View.GONE);
-        etBody.setMovementMethod(LinkMovementMethod.getInstance());
 
         // Wire controls
 
@@ -182,6 +180,8 @@ public class FragmentCompose extends FragmentEx {
         pbWait.setVisibility(View.VISIBLE);
         bottom_navigation.getMenu().setGroupEnabled(0, false);
 
+        final Handler handler = new Handler();
+
         DB.getInstance(getContext()).identity().liveIdentities(true).observe(FragmentCompose.this, new Observer<List<EntityIdentity>>() {
             @Override
             public void onChanged(@Nullable final List<EntityIdentity> identities) {
@@ -203,8 +203,14 @@ public class FragmentCompose extends FragmentEx {
                         break;
                     }
 
-                // Get might select another identity
-                getLoaderManager().restartLoader(ActivityCompose.LOADER_COMPOSE_GET, getArguments(), getLoaderCallbacks).forceLoad();
+                // This seems to be necessary to prevent layout freezes
+                handler.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        // Get might select another identity
+                        getLoaderManager().restartLoader(ActivityCompose.LOADER_COMPOSE_GET, getArguments(), getLoaderCallbacks).forceLoad();
+                    }
+                });
             }
         });
 
@@ -460,12 +466,12 @@ public class FragmentCompose extends FragmentEx {
                             HtmlHelper.sanitize(getContext(), body, true));
                     etSubject.setText(getContext().getString(R.string.title_subject_reply, subject));
                     etBody.setText(Html.fromHtml(text));
-                    handler.postDelayed(new Runnable() {
+                    handler.post(new Runnable() {
                         @Override
                         public void run() {
                             etBody.requestFocus();
                         }
-                    }, 500);
+                    });
                 } else if ("forward".equals(action)) {
                     String text = String.format("<br><br>%s %s:<br><br>%s",
                             Html.escapeHtml(new Date().toString()),
@@ -473,7 +479,12 @@ public class FragmentCompose extends FragmentEx {
                             HtmlHelper.sanitize(getContext(), body, true));
                     etSubject.setText(getContext().getString(R.string.title_subject_forward, subject));
                     etBody.setText(Html.fromHtml(text));
-                    etTo.requestFocus();
+                    handler.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            etTo.requestFocus();
+                        }
+                    });
                 }
             }
 
diff --git a/app/src/main/res/layout/fragment_compose.xml b/app/src/main/res/layout/fragment_compose.xml
index 9a8ae135..1d3e6132 100644
--- a/app/src/main/res/layout/fragment_compose.xml
+++ b/app/src/main/res/layout/fragment_compose.xml
@@ -142,7 +142,7 @@
             android:fontFamily="monospace"
             android:gravity="top"
             android:hint="@string/title_body_hint"
-            android:inputType="textMultiLine|textCapSentences"
+            android:inputType="textCapSentences|textMultiLine"
             android:textAppearance="@style/TextAppearance.AppCompat.Small" />
     </ScrollView>