Add new messages to new headers

Author: kunall17

app/src/main/java/com/zulip/android/activities/MessageListFragment.java

@@ -151,16 +151,18 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
             public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
                 mListener.recyclerViewScrolled();
                 final int near = 6;
-                if (!paused && !loadingMessages && firstMessageId > 0 && lastMessageId > 0) {
-                    int lastVisiblePosition = linearLayoutManager.findLastVisibleItemPosition();
-                    if (lastVisiblePosition > adapter.getItemCount(false) - near) { // At the bottom of the list
-                        Log.i("scroll", "Starting request below");
-                        loadMoreMessages(LoadPosition.BELOW);
-                    }
-                    if (linearLayoutManager.findFirstCompletelyVisibleItemPosition() < near && !loadedToTop) {
-                        // At the top of the list
-                        Log.i("scroll", "Starting request above");
-                        loadMoreMessages(LoadPosition.ABOVE);
+                if (newState == RecyclerView.SCROLL_STATE_IDLE) {
+                    if (!paused && !loadingMessages && firstMessageId > 0 && lastMessageId > 0) {
+                        int lastVisiblePosition = linearLayoutManager.findLastVisibleItemPosition();
+                        if (lastVisiblePosition > adapter.getItemCount(false) - near) { // At the bottom of the list
+                            Log.i("scroll", "Starting request below");
+                            loadMoreMessages(LoadPosition.BELOW);
+                        }
+                        if (linearLayoutManager.findFirstCompletelyVisibleItemPosition() < near && !loadedToTop) {
+                            // At the top of the list
+                            Log.i("scroll", "Starting request above");
+                            loadMoreMessages(LoadPosition.ABOVE);
+                        }
                     }
                 }
             }
@@ -360,7 +362,7 @@ public void onMessages(Message[] messages, LoadPosition pos,
             }
 
             if (pos == LoadPosition.NEW || pos == LoadPosition.BELOW) {
-                this.adapter.addMessage(message);
+                this.adapter.addNewMessage(message);
                 messageList.add(message);
             } else if (pos == LoadPosition.ABOVE || pos == LoadPosition.INITIAL) {
                 headerParents = (this.adapter.addMessage(message, addedCount + headerParents)) ? headerParents + 1 : headerParents;

app/src/main/java/com/zulip/android/activities/RecyclerMessageAdapter.java

@@ -214,6 +214,33 @@ public boolean addMessage(Message message, int messageAndHeadersCount) {
 
 
 
+    public void addNewMessage(Message message) {
+        MessageHeaderParent item = null;
+        for (int i = getItemCount(false) - 1; i > 1; i--) {
+            //Find the last header and check if it belongs to this message!
+            if (items.get(i) instanceof MessageHeaderParent) {
+                item = (MessageHeaderParent) items.get(i);
+                if (!item.getId().equals(message.getIdForHolder())) {
+                    item = null;
+                }
+                break;
+            }
+        }
+        if (item == null) {
+            item = new MessageHeaderParent((message.getStream() == null) ? null :
+                    message.getStream().getName(), message.getSubject(), message.getIdForHolder());
+            item.setMessageType(message.getType());
+            item.setDisplayRecipent(message.getDisplayRecipient(zulipApp));
+            if (message.getType() == MessageType.STREAM_MESSAGE)
+                item.setMute(zulipApp.isTopicMute(message));
+            item.setColor((message.getStream() == null) ? mDefaultStreamHeaderColor : message.getStream().getColor());
+            items.add(getItemCount(true) - 1, item);
+            notifyItemInserted(getItemCount(true) - 1);
+        }
+        items.add(getItemCount(true) - 1, message);
+        notifyItemInserted(getItemCount(true) - 1);
+    }
+
 
     public RecyclerView.ViewHolder onCreateViewHolder(final ViewGroup parent, int viewType) {
         switch (viewType) {