Vector 443

MatrixSDK/Data/MXEventTimeline.m

@@ -47,6 +47,11 @@ @interface MXEventTimeline ()
     // past timelines is managed locally.
     NSString *forwardsPaginationToken;
     BOOL hasReachedHomeServerForwardsPaginationEnd;
+
+    /**
+     The current pending request.
+     */
+    MXHTTPOperation *httpOperation;
 }
 @end
 
@@ -102,6 +107,13 @@ - (void)initialiseState:(NSArray<MXEvent *> *)stateEvents
 
 - (void)destroy
 {
+    if (httpOperation)
+    {
+        // Cancel the current server request
+        [httpOperation cancel];
+        httpOperation = nil;
+    }
+
     if (!_isLiveTimeline)
     {
         // Release past timeline events stored in memory
@@ -409,7 +421,7 @@ - (void)handleJoinedRoomSync:(MXRoomSync *)roomSync
     else if (roomSync.timeline.limited)
     {
         // The room has been resync with a limited timeline - Post notification
-        [[NSNotificationCenter defaultCenter] postNotificationName:kMXRoomSyncWithLimitedTimelineNotification
+        [[NSNotificationCenter defaultCenter] postNotificationName:kMXRoomDidFlushDataNotification
                                                             object:room
                                                           userInfo:nil];
     }
@@ -537,23 +549,145 @@ - (void)addEvent:(MXEvent*)event direction:(MXTimelineDirection)direction fromSt
 #pragma mark - Specific events Handling
 - (void)handleRedaction:(MXEvent*)redactionEvent
 {
-    // Check whether the redacted event has been already processed
+    NSLog(@"[MXEventTimeline] handle an event redaction");
+
+    // Check whether the redacted event is stored in room messages
     MXEvent *redactedEvent = [store eventWithEventId:redactionEvent.redacts inRoom:_state.roomId];
     if (redactedEvent)
     {
         // Redact the stored event
         redactedEvent = [redactedEvent prune];
         redactedEvent.redactedBecause = redactionEvent.JSONDictionary;
 
-        if (redactedEvent.isState) {
-            // FIXME: The room state must be refreshed here since this redacted event.
-        }
-
-        // Store the event
+        // Store the updated event
         [store replaceEvent:redactedEvent inRoom:_state.roomId];
     }
+
+    // Check whether the current room state depends on this redacted event.
+    if (!redactedEvent || redactedEvent.isState)
+    {
+        NSMutableArray *stateEvents = [NSMutableArray arrayWithArray:_state.stateEvents];
+
+        for (NSInteger index = 0; index < stateEvents.count; index++)
+        {
+            MXEvent *stateEvent = stateEvents[index];
+
+            if ([stateEvent.eventId isEqualToString:redactionEvent.redacts])
+            {
+                NSLog(@"[MXEventTimeline] the current room state has been modified by the event redaction.");
+
+                // Redact the stored event
+                redactedEvent = [stateEvent prune];
+                redactedEvent.redactedBecause = redactionEvent.JSONDictionary;
+
+                [stateEvents replaceObjectAtIndex:index withObject:redactedEvent];
+
+                // Reset the room state.
+                _state = [[MXRoomState alloc] initWithRoomId:room.roomId andMatrixSession:room.mxSession andDirection:YES];
+                [self initialiseState:stateEvents];
+
+                // Update store with new room state when all state event have been processed
+                if ([store respondsToSelector:@selector(storeStateForRoom:stateEvents:)])
+                {
+                    [store storeStateForRoom:_state.roomId stateEvents:_state.stateEvents];
+                }
+
+                // Reset the current pagination
+                [self resetPagination];
+
+                // Notify that room history has been flushed
+                [[NSNotificationCenter defaultCenter] postNotificationName:kMXRoomDidFlushDataNotification
+                                                                    object:room
+                                                                  userInfo:nil];
+                return;
+            }
+        }
+    }
+
+    // Re-sync the room in case of redacted state event from the past.
+    // Indeed, redacted information shouldn't spontaneously appear when you backpaginate...
+    if (!redactedEvent)
+    {
+        // Use a /context request to check whether the redacted event is a state event or not.
+        httpOperation = [room.mxSession.matrixRestClient contextOfEvent:redactionEvent.redacts inRoom:room.roomId limit:1 success:^(MXEventContext *eventContext) {
+
+            if (!httpOperation)
+            {
+                return;
+            }
+            httpOperation = nil;
+
+            if (eventContext.event.isState)
+            {
+                NSLog(@"[MXEventTimeline] the redacted event is a state event from the past");
+                [self forceRoomServerSync];
+            }
+
+        } failure:^(NSError *error) {
+
+            if (!httpOperation)
+            {
+                return;
+            }
+            httpOperation = nil;
+
+            NSLog(@"[MXEventTimeline] handleRedaction: failed to retrieved the redacted event");
+            [self forceRoomServerSync];
+        }];
+    }
+    else if (redactedEvent.isState)
+    {
+        NSLog(@"[MXEventTimeline] the redacted event is a former state event");
+        [self forceRoomServerSync];
+    }
 }
 
+- (void)forceRoomServerSync
+{
+    // Reset the storage of this room. Re-sync it from the server
+    NSLog(@"[MXEventTimeline] re-sync room (%@) from the server.", room.roomId);
+    [store deleteRoom:room.roomId];
+
+    // Make an /initialSync request to get data
+    // Use a 0 messages limit for now because:
+    //    - /initialSync is marked as obsolete in the spec
+    //    - MXEventTimeline does not have methods to handle /initialSync responses
+    // So, avoid to write temparary code and let the user uses [MXEventTimeline paginate]
+    // to get room messages.
+    httpOperation = [room.mxSession.matrixRestClient initialSyncOfRoom:room.roomId withLimit:0 success:^(MXRoomInitialSync *roomInitialSync) {
+
+        if (!httpOperation)
+        {
+            return;
+        }
+        httpOperation = nil;
+
+        _state = [[MXRoomState alloc] initWithRoomId:room.roomId andMatrixSession:room.mxSession andDirection:YES];
+        [self initialiseState:roomInitialSync.state];
+
+        // Update store with new room state when all state event have been processed
+        if ([store respondsToSelector:@selector(storeStateForRoom:stateEvents:)])
+        {
+            [store storeStateForRoom:_state.roomId stateEvents:_state.stateEvents];
+        }
+
+        [self resetPagination];
+
+        // Notify that room history has been flushed
+        [[NSNotificationCenter defaultCenter] postNotificationName:kMXRoomDidFlushDataNotification
+                                                            object:room
+                                                          userInfo:nil];
+
+    } failure:^(NSError *error) {
+
+        NSLog(@"[MXEventTimeline] forceRoomServerSync failed.");
+
+        // Reload entirely the app
+        [[NSNotificationCenter defaultCenter] postNotificationName:kMXSessionDidCorruptDataNotification
+                                                            object:room.mxSession
+                                                          userInfo:nil];
+    }];
+}
 
 #pragma mark - State events handling
 - (void)cloneState:(MXTimelineDirection)direction
@@ -584,10 +718,10 @@ - (void)handleStateEvent:(MXEvent*)event direction:(MXTimelineDirection)directio
         // Forwards events update the current state of the room
         [_state handleStateEvent:event];
 
-        // Special handling for presence
-        if (_isLiveTimeline && MXEventTypeRoomMember == event.eventType)
+        // Special handling for presence: update MXUser data in case of membership event.
+        // CAUTION: ignore here redacted state event, the redaction concerns only the context of the event room.
+        if (_isLiveTimeline && MXEventTypeRoomMember == event.eventType && !event.isRedactedEvent)
         {
-            // Update MXUser data
             MXUser *user = [room.mxSession getOrCreateUser:event.sender];
 
             MXRoomMember *roomMember = [_state memberWithUserId:event.sender];

MatrixSDK/Data/MXRoom.h

@@ -39,13 +39,13 @@
 FOUNDATION_EXPORT NSString *const kMXRoomInitialSyncNotification;
 
 /**
- Posted when a limited timeline is observed for an existing room during server sync.
- All the existing messages have been removed from the room storage. Only the messages received during this sync are available.
+ Posted when the messages of an existing room has been flushed during server sync.
+ This flush may be due to a limited timeline in the room sync, or the redaction of a state event.
  The token where to start back pagination has been updated.
 
  The notification object is the concerned room (MXRoom instance).
  */
-FOUNDATION_EXPORT NSString *const kMXRoomSyncWithLimitedTimelineNotification;
+FOUNDATION_EXPORT NSString *const kMXRoomDidFlushDataNotification;
 
 /**
  Posted when the number of unread notifications ('notificationCount' and 'highlightCount' properties) are updated.

MatrixSDK/Data/MXRoom.m

@@ -21,7 +21,7 @@
 
 #import "MXError.h"
 
-NSString *const kMXRoomSyncWithLimitedTimelineNotification = @"kMXRoomSyncWithLimitedTimelineNotification";
+NSString *const kMXRoomDidFlushDataNotification = @"kMXRoomDidFlushDataNotification";
 NSString *const kMXRoomInitialSyncNotification = @"kMXRoomInitialSyncNotification";
 NSString *const kMXRoomDidUpdateUnreadNotification = @"kMXRoomDidUpdateUnreadNotification";
 

MatrixSDK/JSONModels/MXEvent.h

@@ -216,10 +216,20 @@ FOUNDATION_EXPORT uint64_t const kMXUndefinedTimestamp;
 - (MXEventType)eventType;
 
 /**
- Indicates if the event hosts state data
+ Indicates if the event hosts state data.
  */
 - (BOOL)isState;
 
+/**
+ Indicates if the event has been redacted.
+ */
+- (BOOL)isRedactedEvent;
+
+/**
+ Return YES if the event is an emote event
+ */
+- (BOOL)isEmote;
+
 /**
  Returns the event IDs for which a read receipt is defined in this event.
 

MatrixSDK/JSONModels/MXEvent.m

@@ -225,6 +225,25 @@ - (BOOL)isState
     return (nil != self.stateKey);
 }
 
+- (BOOL)isRedactedEvent
+{
+    // The event is redacted if its redactedBecause is filed (with a redaction event id)
+    return (self.redactedBecause != nil);
+}
+
+- (BOOL)isEmote
+{
+    if (self.eventType == MXEventTypeRoomMessage)
+    {
+        NSString *msgtype = self.content[@"msgtype"];
+        if ([msgtype isEqualToString:kMXMessageTypeEmote])
+        {
+            return YES;
+        }
+    }
+    return NO;
+}
+
 - (NSArray *)readReceiptEventIds
 {
     NSMutableArray* list = nil;

MatrixSDK/MXSession.h

@@ -161,9 +161,17 @@ FOUNDATION_EXPORT NSString *const kMXSessionNotificationEventKey;
 
 /**
  Posted when MXSession has detected a change in the `ignoredUsers` property.
+
+ The notification object is the concerned session (MXSession instance).
  */
 FOUNDATION_EXPORT NSString *const kMXSessionIgnoredUsersDidChangeNotification;
 
+/**
+ Posted when MXSession data have been corrupted. The listener must reload the session data with a full server sync.
+
+ The notification object is the concerned session (MXSession instance).
+ */
+FOUNDATION_EXPORT NSString *const kMXSessionDidCorruptDataNotification;
 
 #pragma mark - Other constants
 /**

MatrixSDK/MXSession.m

@@ -40,6 +40,7 @@
 NSString *const kMXSessionNotificationRoomIdKey = @"roomId";
 NSString *const kMXSessionNotificationEventKey = @"event";
 NSString *const kMXSessionIgnoredUsersDidChangeNotification = @"kMXSessionIgnoredUsersDidChangeNotification";
+NSString *const kMXSessionDidCorruptDataNotification = @"kMXSessionDidCorruptDataNotification";
 NSString *const kMXSessionNoRoomTag = @"m.recent";  // Use the same value as matrix-react-sdk
 
 /**