From 7d354d92dd16d1f49578787f75b6eb77b48503c3 Mon Sep 17 00:00:00 2001 From: Adam Demasi Date: Wed, 23 Mar 2022 00:00:12 +1030 Subject: [PATCH] [app] Fix ActivityView being presented twice --- App/UI/SwiftUI Helpers/ActivityView.swift | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/App/UI/SwiftUI Helpers/ActivityView.swift b/App/UI/SwiftUI Helpers/ActivityView.swift index 7990dc9..2eaf9f6 100644 --- a/App/UI/SwiftUI Helpers/ActivityView.swift +++ b/App/UI/SwiftUI Helpers/ActivityView.swift @@ -30,7 +30,7 @@ class ActivityWrapperViewController: UIViewController { } func update() { - if isPresented && activityViewController?.isBeingPresented != true { + if isPresented && activityViewController == nil { // We have to create a new instance every time, otherwise the completion never gets called for // subsequent presentations on macOS… activityViewController = UIActivityViewController(activityItems: activityItems, applicationActivities: nil) @@ -43,8 +43,9 @@ class ActivityWrapperViewController: UIViewController { self.completion() } present(activityViewController!, animated: true, completion: nil) - } else if !isPresented && activityViewController?.isBeingPresented == true { + } else if !isPresented && activityViewController != nil { activityViewController?.dismiss(animated: true, completion: nil) + activityViewController = nil } }