Merge pull request #233 from matrix-org/vector_970

Bug Fix - Duplicated msg when going into room details

MatrixKit/Models/Room/MXKRoomDataSource.m

@@ -1663,27 +1663,16 @@ - (void)didReceiveReceiptEvent:(MXEvent *)receiptEvent roomState:(MXRoomState *)
 
 - (void)handleUnsentMessages
 {
-    // Clean outgoing messages, and add unsent ones at the end of the conversation
+    // Add the unsent messages at the end of the conversation
     NSArray<MXEvent*>* outgoingMessages = _room.outgoingMessages;
     BOOL shouldProcessQueuedEvents = NO;
 
     for (NSInteger index = 0; index < outgoingMessages.count; index++)
     {
         MXEvent *outgoingMessage = [outgoingMessages objectAtIndex:index];
 
-        // Remove successfully sent messages
-        if (outgoingMessage.isLocalEvent == NO)
+        if (outgoingMessage.sentState != MXEventSentStateSent)
         {
-            [_room removeOutgoingMessage:outgoingMessage.eventId];
-        }
-        else
-        {
-            // Here the message sending has failed
-            outgoingMessage.sentState = MXEventSentStateFailed;
-
-            // Erase the timestamp
-            outgoingMessage.originServerTs = kMXUndefinedTimestamp;
-
             [self queueEventForProcessing:outgoingMessage withRoomState:_room.state direction:MXTimelineDirectionForwards];
             shouldProcessQueuedEvents = YES;
         }