Fix conflicts.

2026-04-19 16:13:42 +02:00 · 2022-02-16 17:31:55 +01:00
parent 416d3dd002 80375f0893
commit cacce3e84b
143 changed files with 1894 additions and 732 deletions
@@ -466,7 +466,8 @@ const CGFloat kTypingCellHeight = 24;
                    //  display thread summary view if the component has a thread in the room timeline
                    if (RiotSettings.shared.enableThreads && component.thread && !self.threadId)
                    {
-                        threadSummaryView = [[ThreadSummaryView alloc] initWithThread:component.thread];
+                        threadSummaryView = [[ThreadSummaryView alloc] initWithThread:component.thread
+                                                                              session:self.mxSession];
                        threadSummaryView.delegate = self;
                        threadSummaryView.tag = index;