Merge branch 'develop' into ismail/5845_thread_list_edits

Author: ismailgulek

MatrixSDK/Threads/MXThread.swift

@@ -62,6 +62,10 @@ public class MXThread: NSObject, MXThreadProtocol {
     /// - Returns: true if handled, false otherwise
     @discardableResult
     internal func addEvent(_ event: MXEvent, direction: MXTimelineDirection) -> Bool {
+        guard eventsMap[event.eventId] == nil else {
+            //  do not add the event if already exists
+            return false
+        }
         eventsMap[event.eventId] = event
         updateNotificationsCount()
         if let sender = event.sender,
@@ -88,6 +92,15 @@ public class MXThread: NSObject, MXThreadProtocol {
         liveTimeline?.notifyListeners(newEvent, direction: .forwards)
         return true
     }
+
+    @discardableResult
+    internal func redactEvent(withId eventId: String) -> Bool {
+        guard eventsMap[eventId] != nil else {
+            return false
+        }
+        eventsMap.removeValue(forKey: eventId)
+        return true
+    }
 
     /// Number of notifications in the thread
     public private(set) var notificationCount: UInt = 0

MatrixSDK/Threads/MXThreadingService.swift

@@ -390,19 +390,35 @@ public class MXThreadingService: NSObject {
             completion?(false)
             return
         }
-        if let redactedEventId = event.redacts,
-           let thread = thread(withId: redactedEventId),
-           let newEvent = session.store?.event(withEventId: redactedEventId,
-                                               inRoom: event.roomId) {
-            session.decryptEvents([newEvent], inTimeline: nil) { _ in
+        guard let redactedEventId = event.redacts,
+              let redactedEvent = session.store?.event(withEventId: redactedEventId,
+                                                       inRoom: event.roomId) else {
+                  completion?(false)
+                  return
+              }
+
+        session.decryptEvents([redactedEvent], inTimeline: nil) { _ in
+            if let thread = self.thread(withId: redactedEventId) {
                 //  event is a thread root
-                let handled = thread.replaceEvent(withId: redactedEventId, with: newEvent)
+                let handled = thread.replaceEvent(withId: redactedEventId, with: redactedEvent)
                 self.notifyDidUpdateThreads()
                 completion?(handled)
+            } else if let roomId = redactedEvent.roomId {
+                var handled = false
+                self.threads.filter { $1.roomId == roomId }.values.forEach {
+                    let handledForThread = $0.redactEvent(withId: redactedEventId)
+                    if handled == false {
+                        handled = handledForThread
+                    }
+                }
+                if handled {
+                    self.notifyDidUpdateThreads()
+                }
+                completion?(handled)
+            } else {
+                completion?(false)
             }
-            return
         }
-        completion?(false)
     }
 
     private func unsortedThreads(inRoom roomId: String) -> [MXThread] {

changelog.d/5877.bugfix

@@ -0,0 +1 @@
+MXThread: Fix redacted events & fix undecrypted events.