From 8ea6a184b2c02c5d8b6f375b97b067f70f8a44c8 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 21 Mar 2020 15:27:28 +0100
Subject: [PATCH] Simplification/fix

---
 .../main/java/eu/faircode/email/AdapterMessage.java    |  8 +++-----
 .../main/java/eu/faircode/email/FragmentMessages.java  | 10 ----------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index a57e8abcfc..b499a5aba8 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -3008,7 +3008,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 boolean expanded = !properties.getValue("expanded", message.id);
                 properties.setExpanded(message, expanded);
                 bindTo(message, getAdapterPosition());
-                properties.scrollTo(getAdapterPosition());
+                properties.scrollTo(getAdapterPosition(), 0);
             }
         }
 
@@ -4722,7 +4722,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             public void onCurrentListChanged(@Nullable PagedList<TupleMessageEx> previousList, @Nullable PagedList<TupleMessageEx> currentList) {
                 if (gotoTop) {
                     gotoTop = false;
-                    properties.scrollTo(0);
+                    properties.scrollTo(0, 0);
                 }
             }
         });
@@ -4761,7 +4761,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
     }
 
     void gotoTop() {
-        properties.scrollTo(0);
+        properties.scrollTo(0, 0);
         this.gotoTop = true;
     }
 
@@ -4978,8 +4978,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
         List<EntityAttachment> getAttachments(long id);
 
-        void scrollTo(int pos);
-
         void scrollTo(int pos, int y);
 
         void move(long id, String type);
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index f47990715a..6dac1a1d8f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1487,16 +1487,6 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
             return attachments.get(id);
         }
 
-        @Override
-        public void scrollTo(final int pos) {
-            new Handler().post(new Runnable() {
-                @Override
-                public void run() {
-                    rvMessage.scrollToPosition(pos);
-                }
-            });
-        }
-
         public void scrollTo(final int pos, final int y) {
             new Handler().post(new Runnable() {
                 @Override