wip

ConversationsClassic/AppData/Store/AttachmentsStore.swift

@@ -12,6 +12,8 @@ final class AttachmentsStore: ObservableObject {
     private let client: Client
     private let roster: Roster
 
+    private var processing: Set<String> = []
+
     init(roster: Roster, client: Client) {
         self.client = client
         self.roster = roster
@@ -37,9 +39,12 @@ extension AttachmentsStore {
             isAuthorized = (req == .authorized) || (req == .limited)
         }
         galleryAccessGranted = isAuthorized
+        if isAuthorized {
+            await fetchGalleryItems()
+        }
     }
 
-    func fetchGalleryItems() async {
+    private func fetchGalleryItems() async {
         guard galleryAccessGranted else { return }
         galleryItems = await GalleryItem.fetchAll()
     }
@@ -47,8 +52,8 @@ extension AttachmentsStore {
 
 // MARK: - Save outgoing attachments for future uploadings
 extension AttachmentsStore {
-    func sendMedia(_ items: [GalleryItem]) async {
+    func sendMedia(_ items: [GalleryItem]) {
-        galleryItems = []
+        Task {
             for item in items {
                 Task {
                     var message = Message.blank
@@ -95,10 +100,10 @@ extension AttachmentsStore {
                 }
             }
         }
+    }
 
-    func sendCaptured(_ data: Data, _ type: GalleryMediaType) async {
+    func sendCaptured(_ data: Data, _ type: GalleryMediaType) {
-        galleryItems = []
+        Task {
-        // save locally and make message
             var message = Message.blank
             message.from = roster.bareJid
             message.to = roster.contactBareJid
@@ -147,9 +152,10 @@ extension AttachmentsStore {
                 return
             }
         }
+    }
 
-    func sendDocuments(_ data: [Data], _ extensions: [String]) async {
+    func sendDocuments(_ data: [Data], _ extensions: [String]) {
-        galleryItems = []
+        Task {
             for (index, data) in data.enumerated() {
                 Task {
                     let newMessageId = UUID().uuidString
@@ -182,4 +188,142 @@ extension AttachmentsStore {
                 }
             }
         }
+    }
+}
+
+// MARK: - Uploadings/Downloadings
+extension AttachmentsStore {
+    func processAttachment(_ message: Message) {
+        // Prevent multiple processing
+        if processing.contains(message.id) {
+            return
+        }
+
+        // Process in background
+        Task(priority: .background) {
+            // Do needed processing
+            if case .attachment(let attachment) = message.contentType {
+                if attachment.localPath != nil, attachment.remotePath == nil {
+                    // Uploading
+                    processing.insert(message.id)
+                    await uploadAttachment(message)
+                    processing.remove(message.id)
+                } else if attachment.localPath == nil, attachment.remotePath != nil {
+                    // Downloading
+                    processing.insert(message.id)
+                    await downloadAttachment(message)
+                    processing.remove(message.id)
+                } else if attachment.localPath != nil, attachment.remotePath != nil, attachment.thumbnailName == nil, attachment.type == .image {
+                    // Generate thumbnail
+                    processing.insert(message.id)
+                    await generateThumbnail(message)
+                    processing.remove(message.id)
+                }
+            }
+        }
+    }
+
+    private func uploadAttachment(_ message: Message) async {
+        do {
+            try await message.setStatus(.pending)
+            var message = message
+            guard case .attachment(let attachment) = message.contentType else {
+                throw ClientStoreError.invalidContentType
+            }
+            guard let localName = attachment.localPath else {
+                throw ClientStoreError.invalidLocalName
+            }
+            let remotePath = try await client.uploadFile(localName)
+            message.contentType = .attachment(
+                Attachment(
+                    type: attachment.type,
+                    localName: attachment.localName,
+                    thumbnailName: nil,
+                    remotePath: remotePath
+                )
+            )
+            message.body = remotePath
+            message.oobUrl = remotePath
+            try await message.save()
+            try await client.sendMessage(message)
+            try await message.setStatus(.sent)
+        } catch {
+            try? await message.setStatus(.error)
+        }
+    }
+
+    private func downloadAttachment(_ message: Message) async {
+        guard case .attachment(let attachment) = message.contentType else {
+            return
+        }
+        guard let remotePath = attachment.remotePath, let remoteUrl = URL(string: remotePath) else {
+            return
+        }
+        do {
+            let localName = "\(message.id)_\(UUID().uuidString).\(remoteUrl.lastPathComponent)"
+            let localUrl = Const.fileFolder.appendingPathComponent(localName)
+
+            // Download the file
+            let (tempUrl, _) = try await URLSession.shared.download(from: remoteUrl)
+            try FileManager.default.moveItem(at: tempUrl, to: localUrl)
+
+            var message = message
+            message.contentType = .attachment(
+                Attachment(
+                    type: attachment.type,
+                    localName: localName,
+                    thumbnailName: attachment.thumbnailName,
+                    remotePath: remotePath
+                )
+            )
+            try await message.save()
+        } catch {
+            logIt(.error, "Can't download attachment: \(error)")
+        }
+    }
+
+    private func generateThumbnail(_ message: Message) async {
+        guard case .attachment(let attachment) = message.contentType else {
+            return
+        }
+        guard attachment.type == .image else {
+            return
+        }
+        guard let localName = attachment.localName, let localPath = attachment.localPath else {
+            return
+        }
+        let thumbnailFileName = "thumb_\(localName)"
+        let thumbnailUrl = Const.fileFolder.appendingPathComponent(thumbnailFileName)
+
+        //
+        if !FileManager.default.fileExists(atPath: thumbnailUrl.path) {
+            guard let image = UIImage(contentsOfFile: localPath.path) else {
+                return
+            }
+            let targetSize = CGSize(width: Const.attachmentPreviewSize, height: Const.attachmentPreviewSize)
+            guard let thumbnail = try? await image.scaleAndCropImage(targetSize) else {
+                return
+            }
+            guard let data = thumbnail.jpegData(compressionQuality: 0.5) else {
+                return
+            }
+            do {
+                try data.write(to: thumbnailUrl)
+            } catch {
+                return
+            }
+        }
+
+        //
+        var message = message
+        message.contentType = .attachment(
+            Attachment(
+                type: attachment.type,
+                localName: attachment.localName,
+                thumbnailName: thumbnailFileName,
+                remotePath: attachment.remotePath
+            )
+        )
+        try? await message.save()
+    }
 }

ConversationsClassic/AppData/Store/ConversationStore.swift

@@ -22,7 +22,8 @@ final class ConversationStore: ObservableObject {
 }
 
 extension ConversationStore {
-    func sendMessage(_ message: String) async {
+    func sendMessage(_ message: String) {
+        Task {
             var msg = Message.blank
             msg.from = roster.bareJid
             msg.to = roster.contactBareJid
@@ -37,72 +38,14 @@ extension ConversationStore {
                 try? await msg.setStatus(.error)
             }
         }
-
-    func sendContact(_ jidStr: String) async {
-        await sendMessage("contact:\(jidStr)")
     }
 
-    func sendLocation(_ lat: Double, _ lon: Double) async {
+    func sendContact(_ jidStr: String) {
-        await sendMessage("geo:\(lat),\(lon)")
+        sendMessage("contact:\(jidStr)")
     }
 
-    private func upload(_ message: Message) async {
+    func sendLocation(_ lat: Double, _ lon: Double) {
-        do {
+        sendMessage("geo:\(lat),\(lon)")
-            try await message.setStatus(.pending)
-            var message = message
-            guard case .attachment(let attachment) = message.contentType else {
-                throw ClientStoreError.invalidContentType
-            }
-            guard let localName = attachment.localPath else {
-                throw ClientStoreError.invalidLocalName
-            }
-            let remotePath = try await client.uploadFile(localName)
-            message.contentType = .attachment(
-                Attachment(
-                    type: attachment.type,
-                    localName: attachment.localName,
-                    thumbnailName: nil,
-                    remotePath: remotePath
-                )
-            )
-            message.body = remotePath
-            message.oobUrl = remotePath
-            try await message.save()
-            try await client.sendMessage(message)
-            try await message.setStatus(.sent)
-        } catch {
-            try? await message.setStatus(.error)
-        }
-    }
-
-    func downloadAttachment(_ message: Message) async {
-        guard case .attachment(let attachment) = message.contentType else {
-            return
-        }
-        guard let remotePath = attachment.remotePath, let remoteUrl = URL(string: remotePath) else {
-            return
-        }
-        do {
-            let localName = "\(message.id)_\(UUID().uuidString).\(remoteUrl.lastPathComponent)"
-            let localUrl = Const.fileFolder.appendingPathComponent(localName)
-
-            // Download the file
-            let (tempUrl, _) = try await URLSession.shared.download(from: remoteUrl)
-            try FileManager.default.moveItem(at: tempUrl, to: localUrl)
-
-            var message = message
-            message.contentType = .attachment(
-                Attachment(
-                    type: attachment.type,
-                    localName: localName,
-                    thumbnailName: attachment.thumbnailName,
-                    remotePath: remotePath
-                )
-            )
-            try await message.save()
-        } catch {
-            logIt(.error, "Can't download attachment: \(error)")
-        }
     }
 }
 

ConversationsClassic/View/Main/Conversation/Attachments/MediaPicker/CameraCellPreview.swift

@@ -26,9 +26,7 @@ struct CameraCellPreview: View {
                 .onTapGesture {
                     router.showScreen(.fullScreenCover) { _ in
                         CameraPicker { data, type in
-                            Task {
+                            attachments.sendCaptured(data, type)
-                                await attachments.sendCaptured(data, type)
-                            }
                             router.dismissEnvironment()
                         }
                         .ignoresSafeArea(.all)

ConversationsClassic/View/Main/Conversation/Attachments/MediaPicker/GalleryView.swift

@@ -35,13 +35,6 @@ struct GalleryView: View {
         .task {
             await attachments.checkGalleryAuthorization()
         }
-        .onChange(of: attachments.galleryAccessGranted) { flag in
-            if flag {
-                Task {
-                    await attachments.fetchGalleryItems()
-                }
-            }
-        }
     }
 }
 

ConversationsClassic/View/Main/Conversation/Attachments/MediaPicker/MediaPickerView.swift

@@ -44,10 +44,8 @@ struct MediaPickerView: View {
                 }
                 .clipped()
                 .onTapGesture {
-                    Task {
                     let items = attachments.galleryItems.filter { selectedItems.contains($0.id) }
-                        await attachments.sendMedia(items)
+                    attachments.sendMedia(items)
-                    }
                     router.dismissEnvironment()
                 }
         }

ConversationsClassic/View/Main/Conversation/ConversationMessageContainer.swift

@@ -99,6 +99,8 @@ private struct ContactView: View {
 }
 
 private struct AttachmentView: View {
+    @EnvironmentObject var attachments: AttachmentsStore
+
     let message: Message
     let attachment: Attachment
 
@@ -154,6 +156,9 @@ private struct AttachmentView: View {
                         .foregroundColor(.Material.Elements.active)
                 }
             }
+            .onAppear {
+                attachments.processAttachment(message)
+            }
     }
 
     @ViewBuilder private var failed: some View {
@@ -173,11 +178,7 @@ private struct AttachmentView: View {
                 }
             }
             .onTapGesture {
-                // if let url = message.attachmentRemotePath {
+                attachments.processAttachment(message)
-                //     store.dispatch(.fileAction(.downloadAttachmentFile(messageId: message.id, attachmentRemotePath: url)))
-                // } else if message.attachmentLocalName != nil && message.sentError {
-                //     store.dispatch(.sharingAction(.retrySharing(messageId: message.id)))
-                // }
             }
     }
 

ConversationsClassic/View/Main/Conversation/ConversationTextInput.swift

@@ -74,15 +74,13 @@ struct ConversationTextInput: View {
                     .padding(.trailing, 8)
                     .tappablePadding(.symmetric(8)) {
                         if !messageStr.isEmpty {
-                            Task(priority: .userInitiated) {
+                            conversation.sendMessage(composedMessage)
-                                await conversation.sendMessage(composedMessage)
                             messageStr = ""
                             autoScroll = true
                         }
                     }
             }
         }
-        }
         .padding(.bottom, 8)
         .background(Color.Material.Background.dark)
         .onChange(of: conversation.replyText) { new in