share webxdc's (#2015)

* add 'Share' button to webxdc more-menu * make share() in FilesViewController reusable, call share() from WebxdcViewController
deltachat · Dec 11, 2023 · 6ecc434 · 6ecc434
1 parent a41923b
commit 6ecc434
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/deltachat-ios/Controller/FilesViewController.swift b/deltachat-ios/Controller/FilesViewController.swift
@@ -284,7 +284,10 @@ extension FilesViewController {
 
     func shareAttachment(of indexPath: IndexPath) {
         let msgId = fileMessageIds[indexPath.row]
-        let message = dcContext.getMessage(id: msgId)
+        FilesViewController.share(message: dcContext.getMessage(id: msgId), parentViewController: self, sourceView: self.view)
+    }
+
+    public static func share(message: DcMsg, parentViewController: UIViewController, sourceView: UIView) {
         let activityVC: UIActivityViewController
         guard let fileURL = message.fileURL else { return }
         let objectsToShare: [Any]
@@ -301,8 +304,8 @@ extension FilesViewController {
 
         activityVC = UIActivityViewController(activityItems: objectsToShare, applicationActivities: nil)
         activityVC.excludedActivityTypes = [.copyToPasteboard]
-        activityVC.popoverPresentationController?.sourceView = self.view
-        self.present(activityVC, animated: true, completion: nil)
+        activityVC.popoverPresentationController?.sourceView = sourceView
+        parentViewController.present(activityVC, animated: true, completion: nil)
     }
 }
 

diff --git a/deltachat-ios/Controller/WebxdcViewController.swift b/deltachat-ios/Controller/WebxdcViewController.swift
@@ -403,6 +403,10 @@ class WebxdcViewController: WebViewViewController {
             let sourceCodeAction = UIAlertAction(title: String.localized("source_code"), style: .default, handler: openUrl(_:))
             alert.addAction(sourceCodeAction)
         }
+
+        let shareAction = UIAlertAction(title: String.localized("menu_share"), style: .default, handler: shareWebxdc(_:))
+        alert.addAction(shareAction)
+
         let cancelAction = UIAlertAction(title: String.localized("cancel"), style: .cancel, handler: nil)
         alert.addAction(cancelAction)
         self.present(alert, animated: true, completion: nil)
@@ -418,6 +422,10 @@ class WebxdcViewController: WebViewViewController {
             UIApplication.shared.open(url)
         }
     }
+
+    private func shareWebxdc(_ action: UIAlertAction) {
+        FilesViewController.share(message: dcContext.getMessage(id: messageId), parentViewController: self, sourceView: self.view)
+    }
 }
 
 extension WebxdcViewController: WKScriptMessageHandler {