/issues/5114 - Fixed poll timeline coordinator caching issues when us…

…ing threads.
element-hq · Dec 6, 2021 · 46ca843 · 46ca843
1 parent 1c919db
commit 46ca843
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 15 deletions.
diff --git a/Riot/Modules/Room/RoomCoordinator.swift b/Riot/Modules/Room/RoomCoordinator.swift
@@ -155,10 +155,6 @@ final class RoomCoordinator: NSObject, RoomCoordinatorProtocol {
             self.activityIndicatorPresenter.removeCurrentActivityIndicator(animated: true)
 
             if let roomDataSource = roomDataSource {
-                if #available(iOS 14, *) {
-                    PollTimelineProvider.shared.room = roomDataSource.room
-                }
-
                 self.roomViewController.displayRoom(roomDataSource)
             }
 
@@ -185,10 +181,6 @@ final class RoomCoordinator: NSObject, RoomCoordinatorProtocol {
             guard let roomDataSource = dataSource as? RoomDataSource else {
                 return
             }
-
-            if #available(iOS 14, *) {
-                PollTimelineProvider.shared.room = roomDataSource.room
-            }
 
             roomDataSource.markTimelineInitialEvent = true
             self.roomViewController.displayRoom(roomDataSource)

diff --git a/RiotSwiftUI/Modules/Room/PollTimeline/Coordinator/PollTimelineProvider.swift b/RiotSwiftUI/Modules/Room/PollTimeline/Coordinator/PollTimelineProvider.swift
@@ -21,12 +21,6 @@ class PollTimelineProvider {
     static let shared = PollTimelineProvider()
 
     var session: MXSession?
-    var room: MXRoom? {
-        didSet {
-            coordinatorsForEventIdentifiers.removeAll()
-        }
-    }
-
     var coordinatorsForEventIdentifiers = [String: PollTimelineCoordinator]()
 
     private init() {
@@ -36,7 +30,7 @@ class PollTimelineProvider {
     /// Create or retrieve the poll timeline coordinator for this event and return
     /// a view to be displayed in the timeline
     func buildPollTimelineViewForEvent(_ event: MXEvent) -> UIView? {
-        guard let session = session, let room = room else {
+        guard let session = session, let room = session.room(withRoomId: event.roomId) else {
             return nil
         }