Merge pull request #74 from RyanRory/message-ordering

Message ordering by sender's timestamp
6 years ago · 2945356222
parent 8209fa1383 8d770833ad
commit 2945356222
1 changed files with 6 additions and 2 deletions
--- a/SignalServiceKit/src/Messages/Interactions/TSInteraction.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSInteraction.m
@ -188,8 +188,12 @@ NSString *NSStringFromOWSInteractionType(OWSInteractionType value)
 {
    OWSAssertDebug(other);

-    uint64_t sortId1 = self.sortId;
-    uint64_t sortId2 = other.sortId;
+//    uint64_t sortId1 = self.sortId;
+//    uint64_t sortId2 = other.sortId;
+    
+    //Loki - Sort the messages by sender's timestamp
+    uint64_t sortId1 = self.timestamp;
+    uint64_t sortId2 = other.timestamp;

    if (sortId1 > sortId2) {
        return NSOrderedDescending;