Backport block based handler for UIBarButtonItem

1 files changed, 9 insertions, 17 deletions

diff --git a/ios/MullvadVPN/View controllers/ProblemReport/ProblemReportReviewViewController.swift b/ios/MullvadVPN/View controllers/ProblemReport/ProblemReportReviewViewController.swift
index 4effda0bc5..f796259d21 100644
--- a/ios/MullvadVPN/View controllers/ProblemReport/ProblemReportReviewViewController.swift
+++ b/ios/MullvadVPN/View controllers/ProblemReport/ProblemReportReviewViewController.swift
@@ -31,18 +31,14 @@ class ProblemReportReviewViewController: UIViewController {
             comment: ""
         )
 
-        navigationItem.rightBarButtonItem = UIBarButtonItem(
-            barButtonSystemItem: .done,
-            target: self,
-            action: #selector(handleDismissButton(_:))
-        )
+        navigationItem.rightBarButtonItem = UIBarButtonItem(systemItem: .done, actionHandler: { [weak self] in
+            self?.dismiss(animated: true)
+        })
 
         #if DEBUG
-        navigationItem.leftBarButtonItem = UIBarButtonItem(
-            barButtonSystemItem: .action,
-            target: self,
-            action: #selector(share(_:))
-        )
+        navigationItem.leftBarButtonItem = UIBarButtonItem(systemItem: .action, actionHandler: { [weak self] in
+            self?.share()
+        })
         #endif
 
         textView.translatesAutoresizingMaskIntoConstraints = false
@@ -71,19 +67,15 @@ class ProblemReportReviewViewController: UIViewController {
         textView.selectAll(sender)
     }
 
-    // MARK: - Actions
-
-    @objc func handleDismissButton(_ sender: Any) {
-        dismiss(animated: true)
-    }
-
     #if DEBUG
-    @objc func share(_ sender: Any) {
+    private func share() {
         let activityController = UIActivityViewController(
             activityItems: [reportString],
             applicationActivities: nil
         )
 
+        activityController.popoverPresentationController?.barButtonItem = navigationItem.leftBarButtonItem
+
         present(activityController, animated: true)
     }
     #endif