Added context menu entry in media view: Show in Chat

signalapp · Nov 19, 2024 · 542999f · 542999f
1 parent 5a62976
commit 542999f
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 5 deletions.
diff --git a/Signal/AppLaunch/SignalApp.swift b/Signal/AppLaunch/SignalApp.swift
@@ -158,7 +158,8 @@ extension SignalApp {
         _ thread: TSThread,
         action: ConversationViewAction = .none,
         focusMessageId: String? = nil,
-        animated: Bool
+        animated: Bool,
+        forceReload: Bool = false
     ) {
         AssertIsOnMainThread()
 
@@ -179,7 +180,7 @@ extension SignalApp {
                 }
                 return
             }
-            conversationSplitViewController.presentThread(thread, action: action, focusMessageId: focusMessageId, animated: animated)
+            conversationSplitViewController.presentThread(thread, action: action, focusMessageId: focusMessageId, animated: animated, forceReload: forceReload)
         }
     }
 

diff --git a/Signal/src/ViewControllers/HomeView/Chat List/ChatListViewController+Actions.swift b/Signal/src/ViewControllers/HomeView/Chat List/ChatListViewController+Actions.swift
@@ -54,7 +54,8 @@ extension ChatListViewController {
             thread,
             action: action,
             focusMessageId: focusMessageId,
-            animated: animated
+            animated: animated,
+            forceReload: false
         )
     }
 }
diff --git a/Signal/src/ViewControllers/MediaGallery/MediaPageViewController.swift b/Signal/src/ViewControllers/MediaGallery/MediaPageViewController.swift
@@ -13,6 +13,7 @@ class MediaPageViewController: UIPageViewController {
     private let isShowingSingleMessage: Bool
     let mediaGallery: MediaGallery
     let spoilerState: SpoilerRenderState
+    private var thread: TSThread
 
     private let initialGalleryItem: MediaGalleryItem
 
@@ -26,19 +27,22 @@ class MediaPageViewController: UIPageViewController {
             initialMediaAttachment: initialMediaAttachment,
             mediaGallery: MediaGallery(thread: thread, mediaCategory: .photoVideo, spoilerState: spoilerState),
             spoilerState: spoilerState,
-            showingSingleMessage: showingSingleMessage
+            showingSingleMessage: showingSingleMessage,
+            thread: thread
         )
     }
 
     init?(
         initialMediaAttachment: ReferencedTSResource,
         mediaGallery: MediaGallery,
         spoilerState: SpoilerRenderState,
-        showingSingleMessage: Bool = false
+        showingSingleMessage: Bool = false,
+        thread: TSThread
     ) {
         self.mediaGallery = mediaGallery
         self.spoilerState = spoilerState
         self.isShowingSingleMessage = showingSingleMessage
+        self.thread = thread
 
         Logger.info("will ensureLoadedForDetailView")
         guard let initialItem = mediaGallery.ensureLoadedForDetailView(focusedAttachment: initialMediaAttachment) else {
@@ -344,6 +348,17 @@ class MediaPageViewController: UIPageViewController {
                 self?.deleteCurrentMedia()
             }
         ))
+
+        contextMenuActions.append(UIAction(
+            title: OWSLocalizedString(
+                "MEDIA_VIEWER_JUMP_TO_CONVERSATION",
+                comment: "Context menu item in media viewer. Jumps to position in conversation."
+            ),
+            image: Theme.iconImage(.arrowUp),
+            handler: { [weak self] _ in
+                self?.jumpToConversation()
+            }
+        ))
         contextMenuButton.setActions(actions: contextMenuActions)
     }
 
@@ -492,6 +507,16 @@ class MediaPageViewController: UIPageViewController {
         let sender = fromNavigationBar ? barButtonShareMedia : bottomMediaPanel
         AttachmentSharing.showShareUI(for: attachmentStream, sender: sender)
     }
+
+    private func jumpToConversation() {
+        SignalApp.shared.presentConversationForThread(
+            thread,
+            focusMessageId: currentViewController?.galleryItem.message.uniqueId,
+            animated: true,
+            forceReload: true
+        )
+        self.dismiss(animated: false)
+    }
 
     private func deleteCurrentMedia() {
         guard let mediaItem = currentItem else { return }
@@ -870,3 +895,4 @@ extension MediaPageViewController: UINavigationBarDelegate {
         dismissSelf(animated: true)
     }
 }
+
diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings
@@ -4168,6 +4168,9 @@
 /* Context menu item in media viewer. Refers to deleting currently displayed photo/video. */
 "MEDIA_VIEWER_DELETE_MEDIA_ACTION" = "Delete";
 
+/* Context menu item in media viewer, Refers to jumping to position in conversation*/
+"MEDIA_VIEWER_JUMP_TO_CONVERSATION" = "Show in Chat";
+
 /* button title to snooze a megaphone */
 "MEGAPHONE_REMIND_LATER" = "Remind Me Later";