Redacting membership events should immediately reset the displayname …

…& avatar of room members. element-hq/element-ios#443 - remove FIXME (the blocker issue SYN-724 has been fixed on server side).
matrix-org · Aug 11, 2016 · a8b97fb · a8b97fb
1 parent 145091c
commit a8b97fb
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 20 deletions.
diff --git a/MatrixSDK/Data/MXEventTimeline.m b/MatrixSDK/Data/MXEventTimeline.m
@@ -568,7 +568,6 @@ - (void)handleRedaction:(MXEvent*)redactionEvent
     // Check whether the current room state depends on this redacted event.
     if (!redactedEvent || redactedEvent.isState)
     {
-        // FIXME: Is @autoreleasepool block required or not here?
         NSMutableArray *stateEvents = [NSMutableArray arrayWithArray:_state.stateEvents];
 
         for (NSInteger index = 0; index < stateEvents.count; index++)
@@ -585,7 +584,7 @@ - (void)handleRedaction:(MXEvent*)redactionEvent
 
                 [stateEvents replaceObjectAtIndex:index withObject:redactedEvent];
 
-                // Reset the room state. //FIXME: is it possible to handle only the redacted event?
+                // Reset the room state.
                 _state = [[MXRoomState alloc] initWithRoomId:room.roomId andMatrixSession:room.mxSession andDirection:YES];
                 [self initialiseState:stateEvents];
 
@@ -596,7 +595,7 @@ - (void)handleRedaction:(MXEvent*)redactionEvent
                 }
 
                 // Reset the current pagination
-                // FIXME: Shall we let the kMXRoomStateHasBeenRedactedNotification listener trigger this reset? (like [MXKRoomDataSource reload] do)
+                // FIXME: Shall we let the kMXRoomDidFlushMessagesNotification listener trigger this reset? (like [MXKRoomDataSource reload] do)
                 [self resetPagination];
 
                 // Notify that room history has been flushed
@@ -686,10 +685,10 @@ - (void)forceRoomServerSync
 
         NSLog(@"[MXEventTimeline] forceRoomServerSync failed.");
 
-        // FIXME: Reload entirely the app?
-//        [[NSNotificationCenter defaultCenter] postNotificationName:kMXSessionIgnoredUsersDidChangeNotification
-//                                                            object:room.mxSession
-//                                                          userInfo:nil];
+        // Reload entirely the app
+        [[NSNotificationCenter defaultCenter] postNotificationName:kMXSessionDidCorruptDataNotification
+                                                            object:room.mxSession
+                                                          userInfo:nil];
     }];
 }
 

diff --git a/MatrixSDK/Data/MXRoomState.m b/MatrixSDK/Data/MXRoomState.m
@@ -462,8 +462,7 @@ - (void)handleStateEvent:(MXEvent*)event
                     membersWithThirdPartyInviteTokenCache[roomMember.thirdPartyInviteToken] = roomMember;
                 }
             }
-            else// FIXME: In case of redacted membership event (prev_content is missing see SYN-724),
-                // the room member is then nil: the client considers by mistake the user is no more part of the room...
+            else
             {
                 // The user is no more part of the room. Remove him.
                 // This case happens during back pagination: we remove here users when they are not in the room yet.
@@ -568,17 +567,13 @@ - (NSString*)memberName:(NSString*)userId
 
         if (!member)
         {
-            // FIXME: In case of redacted membership event (prev_content is missing see SYN-724),
-            // the client considers by mistake that some users are no more part of the room.
-            // PATCH: we comment the following, else some redacted information re-appear spontaneously.
-
-//            // The user may not have joined the room yet. So try to resolve display name from presence data
-//            // Note: This data may not be available
-//            MXUser* user = [mxSession userWithUserId:userId];
-//            if (user && user.displayname.length)
-//            {
-//                displayName = user.displayname;
-//            }
+            // The user may not have joined the room yet. So try to resolve display name from presence data
+            // Note: This data may not be available
+            MXUser* user = [mxSession userWithUserId:userId];
+            if (user && user.displayname.length)
+            {
+                displayName = user.displayname;
+            }
         }
         else if (member.displayname.length)
         {

diff --git a/MatrixSDK/MXSession.h b/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
 /**

diff --git a/MatrixSDK/MXSession.m b/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
 
 /**