Add thread setting check to permalinks and search results

2026-04-22 01:22:46 +02:00 · 2022-02-03 01:40:52 +03:00
parent e84e78b1e7
commit fb4c013730
6 changed files with 91 additions and 53 deletions
@@ -152,12 +152,27 @@
            andEventId:(NSString*)eventId
       inMatrixSession:(MXSession*)session
 {
+    ThreadParameters *threadParameters = nil;
+    if (RiotSettings.shared.enableThreads)
+    {
+        if (event.threadId)
+        {
+            threadParameters = [[ThreadParameters alloc] initWithThreadId:event.threadId
+                                                          stackRoomScreen:NO];
+        }
+        else if ([self.mainSession.threadingService isEventThreadRoot:event])
+        {
+            threadParameters = [[ThreadParameters alloc] initWithThreadId:event.eventId
+                                                          stackRoomScreen:NO];
+        }
+    }
+
    ScreenPresentationParameters *presentationParameters = [[ScreenPresentationParameters alloc] initWithRestoreInitialDisplay:NO stackAboveVisibleViews:NO];
    
    RoomNavigationParameters *parameters = [[RoomNavigationParameters alloc] initWithRoomId:roomId
                                                                                    eventId:eventId
                                                                                  mxSession:session
-                                                                           threadParameters:nil
+                                                                           threadParameters:threadParameters
                                                                     presentationParameters:presentationParameters];
    
    [[AppDelegate theDelegate] showRoomWithParameters:parameters];