From 64afa7232b9209c5bccccea9dba2c5f7f79ba377 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Fri, 24 Feb 2017 20:06:30 +0100
Subject: some little chatlist optimizations

---
 src/main/java/de/pixart/messenger/ui/ConversationFragment.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/main/java/de/pixart/messenger/ui')

diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index 5f14187e7..01dbfb66e 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -137,7 +137,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 
         @Override
         public void onScroll(AbsListView view, int firstVisibleItem,
-                             int visibleItemCount, int totalItemCount) {
+                             int visibleItemCount, final int totalItemCount) {
             synchronized (ConversationFragment.this.messageList) {
                 if (firstVisibleItem < 5 && conversation != null && conversation.messagesLoaded.compareAndSet(true,false) && messageList.size() > 0) {
                     long timestamp;
@@ -175,6 +175,8 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
                                     }
                                     messageListAdapter.notifyDataSetChanged();
                                     int pos = Math.max(getIndexOf(uuid, messageList), 0);
+                                    messagesView.setSmoothScrollbarEnabled(true);
+                                    messagesView.setFastScrollEnabled(false);
                                     messagesView.setSelectionFromTop(pos, pxOffset);
                                     if (messageLoaderToast != null) {
                                         messageLoaderToast.cancel();
@@ -1295,8 +1297,8 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
                     }
                     first = last;
                 }
-                String date = first;
-                if (today.equals(first)) {
+                String date = sdf.format(this.messageList.get(max - 1).getTimeSent());
+                if (today.equals(date)) {
                     date = getString(R.string.today);
                 }
                 this.messageList.add(0, Message.createDateMessage(conversation, date));
-- 
cgit v1.2.3