From 9d53e24e3e17ddf02b483658f28f1ceb3aeedd9f Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 5 May 2020 21:27:43 +0200
Subject: [PATCH] Fixed always scroll to headers

---
 .../eu/faircode/email/AdapterMessage.java     | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 96fe947473..8ba6404e5b 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1341,7 +1341,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             ensureExpanded();
 
             bindAddresses(message);
-            bindHeaders(message);
+            bindHeaders(message, false);
             bindAttachments(message, properties.getAttachments(message.id));
 
             // Actions
@@ -1611,7 +1611,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             }
         }
 
-        private void bindHeaders(TupleMessageEx message) {
+        private void bindHeaders(TupleMessageEx message, boolean scroll) {
             boolean show_headers = properties.getValue("headers", message.id);
 
             grpHeaders.setVisibility(show_headers ? View.VISIBLE : View.GONE);
@@ -1628,18 +1628,19 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             else
                 tvHeaders.setText(null);
 
-            new Handler().post(new Runnable() {
-                @Override
-                public void run() {
-                    View inHeaders = itemView.findViewById(R.id.inHeaders);
+            if (scroll)
+                new Handler().post(new Runnable() {
+                    @Override
+                    public void run() {
+                        View inHeaders = itemView.findViewById(R.id.inHeaders);
 
-                    Rect rect = new Rect();
-                    inHeaders.getDrawingRect(rect);
-                    ((ViewGroup) itemView).offsetDescendantRectToMyCoords(inHeaders, rect);
+                        Rect rect = new Rect();
+                        inHeaders.getDrawingRect(rect);
+                        ((ViewGroup) itemView).offsetDescendantRectToMyCoords(inHeaders, rect);
 
-                    properties.scrollTo(getAdapterPosition(), rect.top);
-                }
-            });
+                        properties.scrollTo(getAdapterPosition(), rect.top);
+                    }
+                });
         }
 
         private void bindBody(TupleMessageEx message, final boolean scroll) {
@@ -4223,7 +4224,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             boolean show_headers = !properties.getValue("headers", message.id);
             properties.setValue("headers", message.id, show_headers);
 
-            bindHeaders(message);
+            bindHeaders(message, true);
 
             if (show_headers && message.headers == null) {
                 Bundle args = new Bundle();