Fixes nodejs#131: Messages order same as web UI

Author: kunall17

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

@@ -343,7 +343,7 @@ public void onMessages(Message[] messages, LoadPosition pos,
         int topPosBefore = linearLayoutManager.findFirstVisibleItemPosition();
         int addedCount = 0;
         int headerParents = 0;
-
+        StringBuilder stringBuilder = new StringBuilder ();
         if (pos == LoadPosition.NEW && !loadedToBottom) {
             // If we don't have intermediate messages loaded, don't add new
             // messages -- they'll be loaded when we scroll down.
@@ -383,7 +383,7 @@ public void onMessages(Message[] messages, LoadPosition pos,
                 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;
+                headerParents = (this.adapter.addOldMessage(message, addedCount + headerParents, stringBuilder)) ? headerParents + 1 : headerParents;
                 messageList.add(addedCount, message);
                 addedCount++;
             }

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

@@ -10,26 +10,25 @@
 import android.support.v4.view.ViewCompat;
 import android.support.v7.app.AppCompatDelegate;
 import android.support.v7.widget.RecyclerView;
-import android.util.Log;
 import android.text.format.DateUtils;
+import android.util.Log;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.zulip.android.models.Person;
-import com.zulip.android.models.Stream;
-import com.zulip.android.networking.AsyncPointerUpdate;
-
 import com.squareup.picasso.Picasso;
-import com.zulip.android.util.OnItemClickListener;
 import com.zulip.android.R;
 import com.zulip.android.ZulipApp;
 import com.zulip.android.filters.NarrowFilterPM;
 import com.zulip.android.filters.NarrowFilterStream;
 import com.zulip.android.filters.NarrowListener;
 import com.zulip.android.models.Message;
 import com.zulip.android.models.MessageType;
+import com.zulip.android.models.Person;
+import com.zulip.android.models.Stream;
+import com.zulip.android.networking.AsyncPointerUpdate;
+import com.zulip.android.util.OnItemClickListener;
 import com.zulip.android.util.ZLog;
 import com.zulip.android.viewholders.LoadingHolder;
 import com.zulip.android.viewholders.MessageHeaderParent;
@@ -204,8 +203,10 @@ private int[] getHeaderAndNextIndex(String id) {
 
     private void setupLists(List<Message> messageList) {
         int headerParents = 0;
+        StringBuilder stringBuilder = new StringBuilder();
         for (int i = 0; i < messageList.size() - 1; i++) {
-            headerParents = (addMessage(messageList.get(i), i + headerParents)) ? headerParents + 1 : headerParents;
+            Message message = messageList.get(i);
+            headerParents = (addOldMessage(message, i + headerParents, stringBuilder)) ? headerParents + 1 : headerParents;
         }
         setFooterShowing(false);
         setHeaderShowing(false);
@@ -234,11 +235,8 @@ else if (getItem(position) instanceof Integer && (Integer) getItem(position) ==
      * @param messageAndHeadersCount Count of the (messages + messageHeaderParent) added in the loop from where this function is being called
      * @return returns true if a new messageHeaderParent is created for this message so as to increment the count by where this function is being called.
      */
-    public boolean addMessage(Message message, int messageAndHeadersCount) {
-
-        int[] index = getHeaderAndNextIndex(message.getIdForHolder());
-
-        if (index[0] < 0) { //No messageParent for this one
+    public boolean addOldMessage(Message message, int messageAndHeadersCount, StringBuilder lastHolderId) {
+        if (!lastHolderId.toString().equals(message.getIdForHolder()) || lastHolderId.toString().equals("")) {
             MessageHeaderParent messageHeaderParent = new MessageHeaderParent((message.getStream() == null) ? null : message.getStream().getName(), message.getSubject(), message.getIdForHolder());
             messageHeaderParent.setMessageType(message.getType());
             messageHeaderParent.setDisplayRecipent(message.getDisplayRecipient(zulipApp));
@@ -250,11 +248,12 @@ public boolean addMessage(Message message, int messageAndHeadersCount) {
             notifyItemInserted(messageAndHeadersCount + 1);
             items.add(messageAndHeadersCount + 2, message);
             notifyItemInserted(messageAndHeadersCount + 2);
+            lastHolderId.setLength(0);
+            lastHolderId.append(messageHeaderParent.getId());
             return true;
         } else {
-            int nextHeader = (index[1] != -1) ? index[1] : getItemCount(false);
-            items.add(nextHeader, message);
-            notifyItemInserted(nextHeader);
+            items.add(messageAndHeadersCount + 1, message);
+            notifyItemInserted(messageAndHeadersCount + 1);
             return false;
         }
     }