Fix thread root deletion, fixes element-hq/element-ios#5441

matrix-org · Jan 27, 2022 · 793c210 · 793c210
1 parent 1fe3312
commit 793c210
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/MatrixSDK/Data/MXEventListener.m b/MatrixSDK/Data/MXEventListener.m
@@ -43,9 +43,20 @@ - (void)notify:(MXEvent*)event direction:(MXTimelineDirection)direction andCusto
     BOOL match = NO;
     if (_eventTypes)
     {
-        if (NSNotFound != [_eventTypes indexOfObject:event.type])
+        if (event.type)
         {
-            match = YES;
+            if (NSNotFound != [_eventTypes indexOfObject:event.type])
+            {
+                match = YES;
+            }
+        }
+        else if (event.wireType)
+        {
+            //  no event type, this is probably a redacted event
+            if (NSNotFound != [_eventTypes indexOfObject:event.wireType])
+            {
+                match = YES;
+            }
         }
     }
     else

diff --git a/MatrixSDK/JSONModels/MXEvent.m b/MatrixSDK/JSONModels/MXEvent.m
@@ -262,6 +262,7 @@ + (id)modelFromJSON:(NSDictionary *)JSONDictionary
  */
 - (void)finalise
 {
+    _wireEventType = [MXTools eventType:_wireType];
     if (MXEventTypePresence == _wireEventType)
     {
         // Workaround: Presence events provided by the home server do not contain userId

diff --git a/MatrixSDK/Threads/MXThreadingService.swift b/MatrixSDK/Threads/MXThreadingService.swift
@@ -85,7 +85,9 @@ public class MXThreadingService: NSObject {
                 }
                 handled = thread.addEvent(event)
                 saveThread(thread)
-                NotificationCenter.default.post(name: Self.newThreadCreated, object: thread, userInfo: nil)
+                DispatchQueue.main.async {
+                    NotificationCenter.default.post(name: Self.newThreadCreated, object: thread, userInfo: nil)
+                }
             }
             notifyDidUpdateThreads()
             return handled
@@ -104,6 +106,15 @@ public class MXThreadingService: NSObject {
                 notifyDidUpdateThreads()
                 return handled
             }
+        } else if event.eventType == .roomRedaction && direction == .forwards {
+            if let redactedEventId = event.redacts,
+               let thread = thread(withId: redactedEventId),
+               let newEvent = session.store?.event(withEventId: redactedEventId,
+                                                   inRoom: event.roomId) {
+                let handled = thread.replaceEvent(withId: redactedEventId, with: newEvent)
+                notifyDidUpdateThreads()
+                return handled
+            }
         }
         return false
     }