Redacting membership events should immediately reset the displayname …

…& avatar of room members. #443 Fix Manu's comments (matrix-org/matrix-ios-sdk#118)
element-hq · Aug 12, 2016 · e11b365 · e11b365
1 parent 5009263
commit e11b365
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/Vector/AppDelegate.m b/Vector/AppDelegate.m
@@ -1361,6 +1361,15 @@ - (void)initMatrixSessions
 
     }];
 
+    [[NSNotificationCenter defaultCenter] addObserverForName:kMXSessionDidCorruptDataNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification * _Nonnull notif) {
+
+        NSLog(@"[AppDelegate] kMXSessionDidCorruptDataNotification received. Reload the app");
+
+        // Reload entirely the app when a session has corrupted its data
+        [[AppDelegate theDelegate] reloadMatrixSessions:YES];
+
+    }];
+
     // Observe settings changes
     [[MXKAppSettings standardAppSettings]  addObserver:self forKeyPath:@"showAllEventsInRoomHistory" options:0 context:nil];
 

diff --git a/Vector/ViewController/RoomParticipantsViewController.m b/Vector/ViewController/RoomParticipantsViewController.m
@@ -59,8 +59,8 @@ @interface RoomParticipantsViewController ()
     // Observe kMXSessionWillLeaveRoomNotification to be notified if the user leaves the current room.
     id leaveRoomNotificationObserver;
 
-    // Observe kMXRoomDidFlushMessagesNotification to take into account the updated room members when the room history is flushed.
-    id roomDidFlushMessagesNotificationObserver;
+    // Observe kMXRoomDidFlushDataNotification to take into account the updated room members when the room history is flushed.
+    id roomDidFlushDataNotificationObserver;
 
     RoomMemberDetailsViewController *memberDetailsViewController;
 
@@ -154,10 +154,10 @@ - (void)destroy
         leaveRoomNotificationObserver = nil;
     }
 
-    if (roomDidFlushMessagesNotificationObserver)
+    if (roomDidFlushDataNotificationObserver)
     {
-        [[NSNotificationCenter defaultCenter] removeObserver:roomDidFlushMessagesNotificationObserver];
-        roomDidFlushMessagesNotificationObserver = nil;
+        [[NSNotificationCenter defaultCenter] removeObserver:roomDidFlushDataNotificationObserver];
+        roomDidFlushDataNotificationObserver = nil;
     }
 
     if (membersListener)
@@ -266,10 +266,10 @@ - (void)setMxRoom:(MXRoom *)mxRoom
         [[NSNotificationCenter defaultCenter] removeObserver:leaveRoomNotificationObserver];
         leaveRoomNotificationObserver = nil;
     }
-    if (roomDidFlushMessagesNotificationObserver)
+    if (roomDidFlushDataNotificationObserver)
     {
-        [[NSNotificationCenter defaultCenter] removeObserver:roomDidFlushMessagesNotificationObserver];
-        roomDidFlushMessagesNotificationObserver = nil;
+        [[NSNotificationCenter defaultCenter] removeObserver:roomDidFlushDataNotificationObserver];
+        roomDidFlushDataNotificationObserver = nil;
     }
     if (membersListener)
     {
@@ -300,7 +300,7 @@ - (void)setMxRoom:(MXRoom *)mxRoom
         }];
 
         // Observe room history flush (sync with limited timeline, or state event redaction)
-        roomDidFlushMessagesNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kMXRoomDidFlushMessagesNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
+        roomDidFlushDataNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kMXRoomDidFlushDataNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
 
             MXRoom *room = notif.object;
             if (_mxRoom.mxSession == room.mxSession && [_mxRoom.state.roomId isEqualToString:room.state.roomId])