isLoading was never set correctly (loading took place mostly async af…

…terwards)
deltachat · Dec 15, 2023 · 159d7dd · 159d7dd
1 parent f1107f8
commit 159d7dd
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 15 deletions.
diff --git a/DcShare/Controller/ShareViewController.swift b/DcShare/Controller/ShareViewController.swift
@@ -19,7 +19,6 @@ class ShareViewController: SLComposeServiceViewController {
     var selectedChat: DcChat?
     var shareAttachment: ShareAttachment?
     var isAccountConfigured: Bool = true
-    var isLoading: Bool = false
 
     var previewImageHeightConstraint: NSLayoutConstraint?
     var previewImageWidthConstraint: NSLayoutConstraint?
@@ -135,7 +134,7 @@ class ShareViewController: SLComposeServiceViewController {
 
     override func isContentValid() -> Bool {
         // Do validation of contentText and/or NSExtensionContext attachments here
-        return  isAccountConfigured && !isLoading && (!(contentText?.isEmpty ?? true) || !(self.shareAttachment?.isEmpty ?? true))
+        return  isAccountConfigured && (!(contentText?.isEmpty ?? true) || !(self.shareAttachment?.isEmpty ?? true))
     }
 
     private func setupNavigationBar() {
@@ -267,13 +266,4 @@ extension ShareViewController: ShareAttachmentDelegate {
             }
         }
     }
-
-    func onLoadingStarted() {
-        isLoading = true
-    }
-
-    func onLoadingFinished() {
-        isLoading = false
-        self.validateContent()
-    }
 }
diff --git a/DcShare/Helper/ShareAttachment.swift b/DcShare/Helper/ShareAttachment.swift
@@ -13,8 +13,6 @@ protocol ShareAttachmentDelegate: class {
     func onAttachmentChanged()
     func onThumbnailChanged()
     func onUrlShared(url: URL)
-    func onLoadingStarted()
-    func onLoadingFinished()
 }
 
 class ShareAttachment {
@@ -48,13 +46,11 @@ class ShareAttachment {
 
     private func createMessages() {
         guard let items = inputItems as? [NSExtensionItem] else { return }
-        delegate?.onLoadingStarted()
         for item in items {
             if let attachments = item.attachments {
                 createMessageFromDataRepresentation(attachments)
             }
         }
-        delegate?.onLoadingFinished()
     }
 
     private func createMessageFromDataRepresentation(_ attachments: [NSItemProvider]) {