From 2467f3bcc8a0471dfe87f102b691ea56ca3abb64 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Fri, 12 Jun 2015 15:11:11 +0800
Subject: [PATCH] better update conversation UI logic for self message

---
 .../ConversationViewController.swift          | 43 +++++++++----------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/Yep/ViewControllers/Conversation/ConversationViewController.swift b/Yep/ViewControllers/Conversation/ConversationViewController.swift
index 617aeaa1..474d8d2a 100644
--- a/Yep/ViewControllers/Conversation/ConversationViewController.swift
+++ b/Yep/ViewControllers/Conversation/ConversationViewController.swift
@@ -934,36 +934,35 @@ class ConversationViewController: BaseViewController {
 
             if let messageIDs = messageIDs {
 
-                if messageIDs.filter({ $0.isEmpty }).count > 0 {
-                    println("have sectionDate")
-                    conversationCollectionView.reloadData()
+                var indexPaths = [NSIndexPath]()
 
-                } else {
+                for messageID in messageIDs {
+                    if let
+                        message = messageWithMessageID(messageID, inRealm: realm),
+                        index = messages.indexOf(message),
+                        indexPath = NSIndexPath(forItem: index - displayedMessagesRange.location, inSection: 0) {
+                            println("insert item: \(indexPath.item)")
 
-                    println("why?")
+                            indexPaths.append(indexPath)
 
-                    var indexPaths = [NSIndexPath]()
-
-                    for messageID in messageIDs {
-                        if let
-                            message = messageWithMessageID(messageID, inRealm: realm),
-                            index = messages.indexOf(message),
-                            indexPath = NSIndexPath(forItem: index - displayedMessagesRange.location, inSection: 0) {
-                                println("insert item: \(indexPath.item)")
-
-                                indexPaths.append(indexPath)
-
-                        } else {
-                            println("unknown message")
-                        }
+                    } else {
+                        println("unknown message")
                     }
-
-                    conversationCollectionView.insertItemsAtIndexPaths(indexPaths)
                 }
 
+                conversationCollectionView.insertItemsAtIndexPaths(indexPaths)
+
             } else {
                 println("self message")
-                conversationCollectionView.reloadData()
+
+                var indexPaths = [NSIndexPath]()
+
+                for i in 0..<newMessagesCount {
+                    let indexPath = NSIndexPath(forItem: lastDisplayedMessagesRange.length + i, inSection: 0)
+                    indexPaths.append(indexPath)
+                }
+
+                conversationCollectionView.insertItemsAtIndexPaths(indexPaths)
             }
         }