narayana/conversations-classic-ios
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

mv-experiment #1

Merged
fmodf merged 88 commits from mv-experiment into develop 2024-09-03 15:13:59 +00:00
Conversation 0 Commits 88 Files changed 131 +287 -212
7 changed files with 287 additions and 212 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 0d569a44a5 - Show all commits

370
ConversationsClassic/AppData/Store/AttachmentsStore.swift
View file

@ -12,6 +12,8 @@ final class AttachmentsStore: ObservableObject {
private let client: Client private let client: Client
private let roster: Roster private let roster: Roster
private var processing: Set<String> = []
init(roster: Roster, client: Client) { init(roster: Roster, client: Client) {
self.client = client self.client = client
self.roster = roster self.roster = roster
@ -37,9 +39,12 @@ extension AttachmentsStore {
isAuthorized = (req == .authorized) || (req == .limited) isAuthorized = (req == .authorized) || (req == .limited)
} }
galleryAccessGranted = isAuthorized galleryAccessGranted = isAuthorized
if isAuthorized {
await fetchGalleryItems()
}
} }
func fetchGalleryItems() async { private func fetchGalleryItems() async {
guard galleryAccessGranted else { return } guard galleryAccessGranted else { return }
galleryItems = await GalleryItem.fetchAll() galleryItems = await GalleryItem.fetchAll()
} }
@ -47,139 +52,278 @@ extension AttachmentsStore {
// MARK: - Save outgoing attachments for future uploadings // MARK: - Save outgoing attachments for future uploadings
extension AttachmentsStore { extension AttachmentsStore {
func sendMedia(_ items: [GalleryItem]) async { func sendMedia(_ items: [GalleryItem]) {
galleryItems = [] Task {
for item in items { for item in items {
Task { Task {
var message = Message.blank var message = Message.blank
message.from = roster.bareJid message.from = roster.bareJid
message.to = roster.contactBareJid message.to = roster.contactBareJid
switch item.type { switch item.type {
case .photo: case .photo:
guard let asset = PHAsset.fetchAssets(withLocalIdentifiers: [item.id], options: nil).firstObject else { return } guard let asset = PHAsset.fetchAssets(withLocalIdentifiers: [item.id], options: nil).firstObject else { return }
guard let photo = try? await PHImageManager.default().getPhoto(for: asset) else { return } guard let photo = try? await PHImageManager.default().getPhoto(for: asset) else { return }
guard let data = photo.jpegData(compressionQuality: 1.0) else { return } guard let data = photo.jpegData(compressionQuality: 1.0) else { return }
let localName = "\(message.id)_\(UUID().uuidString).jpg" let localName = "\(message.id)_\(UUID().uuidString).jpg"
let localUrl = Const.fileFolder.appendingPathComponent(localName) let localUrl = Const.fileFolder.appendingPathComponent(localName)
try? data.write(to: localUrl) try? data.write(to: localUrl)
message.contentType = .attachment( message.contentType = .attachment(
Attachment( Attachment(
type: .image, type: .image,
localName: localName, localName: localName,
thumbnailName: nil, thumbnailName: nil,
remotePath: nil remotePath: nil
)
) )
) try? await message.save()
try? await message.save()
case .video: case .video:
guard let asset = PHAsset.fetchAssets(withLocalIdentifiers: [item.id], options: nil).firstObject else { return } guard let asset = PHAsset.fetchAssets(withLocalIdentifiers: [item.id], options: nil).firstObject else { return }
guard let video = try? await PHImageManager.default().getVideo(for: asset) else { return } guard let video = try? await PHImageManager.default().getVideo(for: asset) else { return }
// swiftlint:disable:next force_cast // swiftlint:disable:next force_cast
let assetURL = video as! AVURLAsset let assetURL = video as! AVURLAsset
let url = assetURL.url let url = assetURL.url
let localName = "\(message.id)_\(UUID().uuidString).mov" let localName = "\(message.id)_\(UUID().uuidString).mov"
let localUrl = Const.fileFolder.appendingPathComponent(localName) let localUrl = Const.fileFolder.appendingPathComponent(localName)
try? FileManager.default.copyItem(at: url, to: localUrl) try? FileManager.default.copyItem(at: url, to: localUrl)
message.contentType = .attachment( message.contentType = .attachment(
Attachment( Attachment(
type: .video, type: .video,
localName: localName, localName: localName,
thumbnailName: nil, thumbnailName: nil,
remotePath: nil remotePath: nil
)
) )
) try? await message.save()
try? await message.save() }
} }
} }
} }
} }
func sendCaptured(_ data: Data, _ type: GalleryMediaType) async { func sendCaptured(_ data: Data, _ type: GalleryMediaType) {
galleryItems = [] Task {
// save locally and make message var message = Message.blank
var message = Message.blank message.from = roster.bareJid
message.from = roster.bareJid message.to = roster.contactBareJid
message.to = roster.contactBareJid
let localName: String let localName: String
let msgType: AttachmentType let msgType: AttachmentType
do { do {
(localName, msgType) = try await Task { (localName, msgType) = try await Task {
// local name // local name
let fileId = UUID().uuidString let fileId = UUID().uuidString
let localName: String let localName: String
let msgType: AttachmentType let msgType: AttachmentType
switch type { switch type {
case .photo: case .photo:
localName = "\(message.id)_\(fileId).jpg" localName = "\(message.id)_\(fileId).jpg"
msgType = .image msgType = .image
case .video: case .video:
localName = "\(message.id)_\(fileId).mov" localName = "\(message.id)_\(fileId).mov"
msgType = .video msgType = .video
} }
// save // save
let localUrl = Const.fileFolder.appendingPathComponent(localName) let localUrl = Const.fileFolder.appendingPathComponent(localName)
try data.write(to: localUrl) try data.write(to: localUrl)
return (localName, msgType) return (localName, msgType)
}.value }.value
} catch { } catch {
logIt(.error, "Can't save file for uploading: \(error)") logIt(.error, "Can't save file for uploading: \(error)")
return return
} }
// save message // save message
message.contentType = .attachment( message.contentType = .attachment(
Attachment( Attachment(
type: msgType, type: msgType,
localName: localName, localName: localName,
thumbnailName: nil, thumbnailName: nil,
remotePath: nil remotePath: nil
)
) )
) do {
do { try await message.save()
try await message.save() } catch {
} catch { logIt(.error, "Can't save message: \(error)")
logIt(.error, "Can't save message: \(error)") return
return }
} }
} }
func sendDocuments(_ data: [Data], _ extensions: [String]) async { func sendDocuments(_ data: [Data], _ extensions: [String]) {
galleryItems = [] Task {
for (index, data) in data.enumerated() { for (index, data) in data.enumerated() {
Task { Task {
let newMessageId = UUID().uuidString let newMessageId = UUID().uuidString
let fileId = UUID().uuidString let fileId = UUID().uuidString
let localName = "\(newMessageId)_\(fileId).\(extensions[index])" let localName = "\(newMessageId)_\(fileId).\(extensions[index])"
let localUrl = Const.fileFolder.appendingPathComponent(localName) let localUrl = Const.fileFolder.appendingPathComponent(localName)
do { do {
try data.write(to: localUrl) try data.write(to: localUrl)
} catch { } catch {
print("FileProcessing: Error writing document: \(error)") print("FileProcessing: Error writing document: \(error)")
return return
} }
var message = Message.blank var message = Message.blank
message.from = roster.bareJid message.from = roster.bareJid
message.to = roster.contactBareJid message.to = roster.contactBareJid
message.contentType = .attachment( message.contentType = .attachment(
Attachment( Attachment(
type: localName.attachmentType, type: localName.attachmentType,
localName: localName, localName: localName,
thumbnailName: nil, thumbnailName: nil,
remotePath: nil remotePath: nil
)
) )
) do {
do { try await message.save()
try await message.save() } catch {
} catch { print("FileProcessing: Error saving document: \(error)")
print("FileProcessing: Error saving document: \(error)") }
} }
} }
} }
} }
} }
// 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()
}
}

93
ConversationsClassic/AppData/Store/ConversationStore.swift
View file

@ -22,87 +22,30 @@ final class ConversationStore: ObservableObject {
} }
extension ConversationStore { extension ConversationStore {
func sendMessage(_ message: String) async { func sendMessage(_ message: String) {
var msg = Message.blank Task {
msg.from = roster.bareJid var msg = Message.blank
msg.to = roster.contactBareJid msg.from = roster.bareJid
msg.body = message msg.to = roster.contactBareJid
msg.body = message
// store as pending on db, and send // store as pending on db, and send
do { do {
try await msg.save() try await msg.save()
try await client.sendMessage(msg) try await client.sendMessage(msg)
try await msg.setStatus(.sent) try await msg.setStatus(.sent)
} catch { } catch {
try? await msg.setStatus(.error) try? await msg.setStatus(.error)
}
}
func sendContact(_ jidStr: String) async {
await sendMessage("contact:\(jidStr)")
}
func sendLocation(_ lat: Double, _ lon: Double) async {
await sendMessage("geo:\(lat),\(lon)")
}
private func upload(_ 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)
} }
} }
func downloadAttachment(_ message: Message) async { func sendContact(_ jidStr: String) {
guard case .attachment(let attachment) = message.contentType else { sendMessage("contact:\(jidStr)")
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 func sendLocation(_ lat: Double, _ lon: Double) {
let (tempUrl, _) = try await URLSession.shared.download(from: remoteUrl) sendMessage("geo:\(lat),\(lon)")
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)")
}
} }
} }

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

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

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

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

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

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

11
ConversationsClassic/View/Main/Conversation/ConversationMessageContainer.swift
View file

@ -99,6 +99,8 @@ private struct ContactView: View {
} }
private struct AttachmentView: View { private struct AttachmentView: View {
@EnvironmentObject var attachments: AttachmentsStore
let message: Message let message: Message
let attachment: Attachment let attachment: Attachment
@ -154,6 +156,9 @@ private struct AttachmentView: View {
.foregroundColor(.Material.Elements.active) .foregroundColor(.Material.Elements.active)
} }
} }
.onAppear {
attachments.processAttachment(message)
}
} }
@ViewBuilder private var failed: some View { @ViewBuilder private var failed: some View {
@ -173,11 +178,7 @@ private struct AttachmentView: View {
} }
} }
.onTapGesture { .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)))
// }
} }
} }

8
ConversationsClassic/View/Main/Conversation/ConversationTextInput.swift
View file

@ -74,11 +74,9 @@ struct ConversationTextInput: View {
.padding(.trailing, 8) .padding(.trailing, 8)
.tappablePadding(.symmetric(8)) { .tappablePadding(.symmetric(8)) {
if !messageStr.isEmpty { if !messageStr.isEmpty {
Task(priority: .userInitiated) { conversation.sendMessage(composedMessage)
await conversation.sendMessage(composedMessage) messageStr = ""
messageStr = "" autoScroll = true
autoScroll = true
}
} }
} }
} }