fix sharing UI for iPad

Session/Conversations/ConversationVC+Interaction.swift

@@ -486,6 +486,12 @@ extension ConversationVC : InputViewDelegate, MessageCellDelegate, ContextMenuAc
                     // Open the document if possible
                     guard let url = viewItem.attachmentStream?.originalMediaURL else { return }
                     let shareVC = UIActivityViewController(activityItems: [ url ], applicationActivities: nil)
+                    if UIDevice.current.isIPad {
+                        shareVC.excludedActivityTypes = []
+                        shareVC.popoverPresentationController?.permittedArrowDirections = []
+                        shareVC.popoverPresentationController?.sourceView = self.view
+                        shareVC.popoverPresentationController?.sourceRect = self.view.bounds
+                    }
                     navigationController!.present(shareVC, animated: true, completion: nil)
                 }
             case .textOnlyMessage:

Session/Conversations/ConversationViewItem.h

@@ -131,7 +131,6 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType);
 
 - (void)copyMediaAction;
 - (void)copyTextAction;
-- (void)shareMediaAction;
 - (void)saveMediaAction;
 - (void)deleteLocallyAction;
 - (void)deleteRemotelyAction;

Session/Conversations/ConversationViewItem.m

@@ -798,42 +798,6 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType)
     [UIPasteboard.generalPasteboard setData:data forPasteboardType:utiType];
 }
 
-- (void)shareMediaAction
-{
-    if (self.attachmentPointer != nil) {
-        OWSFailDebug(@"Can't share not-yet-downloaded attachment");
-        return;
-    }
-
-    switch (self.messageCellType) {
-        case OWSMessageCellType_Unknown:
-        case OWSMessageCellType_TextOnlyMessage:
-        case OWSMessageCellType_Audio:
-        case OWSMessageCellType_GenericAttachment:
-            [AttachmentSharing showShareUIForAttachment:self.attachmentStream];
-            break;
-        case OWSMessageCellType_MediaMessage: {
-            // TODO: We need a "canShareMediaAction" method.
-            OWSAssertDebug(self.mediaAlbumItems);
-            NSMutableArray<TSAttachmentStream *> *attachmentStreams = [NSMutableArray new];
-            for (ConversationMediaAlbumItem *mediaAlbumItem in self.mediaAlbumItems) {
-                if (mediaAlbumItem.attachmentStream && mediaAlbumItem.attachmentStream.isValidVisualMedia) {
-                    [attachmentStreams addObject:mediaAlbumItem.attachmentStream];
-                }
-            }
-            if (attachmentStreams.count < 1) {
-                OWSFailDebug(@"Can't share media album; no valid items.");
-                return;
-            }
-            [AttachmentSharing showShareUIForAttachments:attachmentStreams completion:nil];
-            break;
-        }
-        case OWSMessageCellType_OversizeTextDownloading:
-            OWSFailDebug(@"Can't share not-yet-downloaded attachment");
-            return;
-    }
-}
-
 - (BOOL)canCopyMedia
 {
     if (self.attachmentPointer != nil) {

Session/Conversations/LongTextViewController.swift

@@ -165,6 +165,13 @@ public class LongTextViewController: OWSViewController {
     // MARK: - Actions
 
     @objc func shareButtonPressed() {
-        AttachmentSharing.showShareUI(forText: fullText)
+        let shareVC = UIActivityViewController(activityItems: [ fullText ], applicationActivities: nil)
+        if UIDevice.current.isIPad {
+            shareVC.excludedActivityTypes = []
+            shareVC.popoverPresentationController?.permittedArrowDirections = []
+            shareVC.popoverPresentationController?.sourceView = self.view
+            shareVC.popoverPresentationController?.sourceRect = self.view.bounds
+        }
+        self.present(shareVC, animated: true, completion: nil)
     }
 }

Session/DMs/NewDMVC.swift

@@ -232,7 +232,7 @@ private final class EnterPublicKeyVC : UIViewController {
         // Share button
         let shareButton = Button(style: .unimportant, size: .medium)
         shareButton.setTitle(NSLocalizedString("share", comment: ""), for: UIControl.State.normal)
-        shareButton.addTarget(self, action: #selector(sharePublicKey(_:)), for: UIControl.Event.touchUpInside)
+        shareButton.addTarget(self, action: #selector(sharePublicKey), for: UIControl.Event.touchUpInside)
         // Button container
         buttonContainer.addArrangedSubview(copyButton)
         buttonContainer.addArrangedSubview(shareButton)
@@ -330,12 +330,13 @@ private final class EnterPublicKeyVC : UIViewController {
         Timer.scheduledTimer(timeInterval: 4, target: self, selector: #selector(enableCopyButton), userInfo: nil, repeats: false)
     }
     
-    @objc private func sharePublicKey(_ sender: UIButton) {
+    @objc private func sharePublicKey() {
         let shareVC = UIActivityViewController(activityItems: [ getUserHexEncodedPublicKey() ], applicationActivities: nil)
         if UIDevice.current.isIPad {
             shareVC.excludedActivityTypes = []
-            shareVC.popoverPresentationController?.sourceView = sender
-            shareVC.popoverPresentationController?.sourceRect = sender.bounds
+            shareVC.popoverPresentationController?.permittedArrowDirections = []
+            shareVC.popoverPresentationController?.sourceView = self.view
+            shareVC.popoverPresentationController?.sourceRect = self.view.bounds
         }
         NewDMVC.navigationController!.present(shareVC, animated: true, completion: nil)
     }

Session/Media Viewing & Editing/MediaPageViewController.swift

@@ -381,7 +381,19 @@ class MediaPageViewController: UIPageViewController, UIPageViewControllerDataSou
 
         let attachmentStream = currentViewController.galleryItem.attachmentStream
         
-        AttachmentSharing.showShareUI(forAttachment: attachmentStream) { activityType in
+        let shareVC = UIActivityViewController(activityItems: [ attachmentStream.originalMediaURL! ], applicationActivities: nil)
+        if UIDevice.current.isIPad {
+            shareVC.excludedActivityTypes = []
+            shareVC.popoverPresentationController?.permittedArrowDirections = []
+            shareVC.popoverPresentationController?.sourceView = self.view
+            shareVC.popoverPresentationController?.sourceRect = self.view.bounds
+        }
+        shareVC.completionWithItemsHandler = { activityType, completed, returnedItems, activityError in
+            if let activityError = activityError {
+                SNLog("Failed to share with activityError: \(activityError)")
+            } else if completed {
+                SNLog("Did share with activityType: \(activityType.debugDescription)")
+            }
             guard let activityType = activityType, activityType == .saveToCameraRoll,
                 let tsMessage = currentViewController.galleryItem.message as? TSIncomingMessage, let thread = tsMessage.thread as? TSContactThread else { return }
             let message = DataExtractionNotification()
@@ -389,8 +401,8 @@ class MediaPageViewController: UIPageViewController, UIPageViewControllerDataSou
             Storage.write { transaction in
                 MessageSender.send(message, in: thread, using: transaction)
             }
-            
         }
+        self.present(shareVC, animated: true, completion: nil)
     }
 
     @objc

Session/Settings/QRCodeVC.swift

@@ -210,6 +210,12 @@ private final class ViewMyQRCodeVC : UIViewController {
     @objc private func shareQRCode() {
         let qrCode = QRCode.generate(for: getUserHexEncodedPublicKey(), hasBackground: true)
         let shareVC = UIActivityViewController(activityItems: [ qrCode ], applicationActivities: nil)
+        if UIDevice.current.isIPad {
+            shareVC.excludedActivityTypes = []
+            shareVC.popoverPresentationController?.permittedArrowDirections = []
+            shareVC.popoverPresentationController?.sourceView = self.view
+            shareVC.popoverPresentationController?.sourceRect = self.view.bounds
+        }
         qrCodeVC.navigationController!.present(shareVC, animated: true, completion: nil)
     }
 }

Session/Settings/SettingsVC.swift

@@ -491,6 +491,12 @@ final class SettingsVC : BaseVC, AvatarViewHelperDelegate {
     
     @objc private func sharePublicKey() {
         let shareVC = UIActivityViewController(activityItems: [ getUserHexEncodedPublicKey() ], applicationActivities: nil)
+        if UIDevice.current.isIPad {
+            shareVC.excludedActivityTypes = []
+            shareVC.popoverPresentationController?.permittedArrowDirections = []
+            shareVC.popoverPresentationController?.sourceView = self.view
+            shareVC.popoverPresentationController?.sourceRect = self.view.bounds
+        }
         navigationController!.present(shareVC, animated: true, completion: nil)
     }
     
@@ -526,6 +532,12 @@ final class SettingsVC : BaseVC, AvatarViewHelperDelegate {
     @objc private func sendInvitation() {
         let invitation = "Hey, I've been using Session to chat with complete privacy and security. Come join me! Download it at https://getsession.org/. My Session ID is \(getUserHexEncodedPublicKey()) !"
         let shareVC = UIActivityViewController(activityItems: [ invitation ], applicationActivities: nil)
+        if UIDevice.current.isIPad {
+            shareVC.excludedActivityTypes = []
+            shareVC.popoverPresentationController?.permittedArrowDirections = []
+            shareVC.popoverPresentationController?.sourceView = self.view
+            shareVC.popoverPresentationController?.sourceRect = self.view.bounds
+        }
         navigationController!.present(shareVC, animated: true, completion: nil)
     }
     

Session/Settings/ShareLogsModal.swift

@@ -64,7 +64,16 @@ final class ShareLogsModal : Modal {
         if let latestLogFilePath = logFilePaths.first {
             let latestLogFileURL = URL(fileURLWithPath: latestLogFilePath)
             self.dismiss(animated: true, completion: {
-                AttachmentSharing.showShareUI(for: latestLogFileURL)
+                if let vc = CurrentAppContext().frontmostViewController() {
+                    let shareVC = UIActivityViewController(activityItems: [ latestLogFileURL ], applicationActivities: nil)
+                    if UIDevice.current.isIPad {
+                        shareVC.excludedActivityTypes = []
+                        shareVC.popoverPresentationController?.permittedArrowDirections = []
+                        shareVC.popoverPresentationController?.sourceView = vc.view
+                        shareVC.popoverPresentationController?.sourceRect = vc.view.bounds
+                    }
+                    vc.present(shareVC, animated: true, completion: nil)
+                }
             })
         }
     }