Skip to content
Snippets Groups Projects
Commit f55a9adb authored by Bruno Muniz's avatar Bruno Muniz :apple:
Browse files

Fixed incoming FT

parent a305f0a2
No related branches found
No related tags found
2 merge requests!40v1.1.2b166,!39Fixing QA bugs before releasing
......@@ -124,7 +124,7 @@ extension Session {
message.date = Date()
if let message = try? dbManager.saveMessage(message) {
if let recipientId = message.recipientId {
if let _ = message.recipientId {
send(message: message)
} else {
send(groupMessage: message)
......@@ -229,24 +229,27 @@ extension Session {
let content = transfer.type == "m4a" ? "a voice message" : "an image"
var message = Message(
networkId: nil,
senderId: transfer.contactId,
recipientId: myId,
groupId: nil,
date: transfer.createdAt,
status: .receiving,
isUnread: true,
text: "Sent you \(content)",
replyMessageId: nil,
roundURL: nil,
fileTransferId: transfer.id
var message = try! dbManager.saveMessage(
Message(
networkId: nil,
senderId: transfer.contactId,
recipientId: myId,
groupId: nil,
date: transfer.createdAt,
status: .receiving,
isUnread: true,
text: "Sent you \(content)",
replyMessageId: nil,
roundURL: nil,
fileTransferId: transfer.id
)
)
message = try! self.dbManager.saveMessage(message)
try! manager.listenDownloadFromTransfer(with: transfer.id) { completed, arrived, total, error in
if let error = error { fatalError(error.localizedDescription) }
if let error = error {
print(error.localizedDescription)
return
}
if completed {
guard let rawFile = try? manager.downloadFileFromTransfer(with: transfer.id) else { return }
......
......@@ -410,25 +410,8 @@ public final class Session: SessionType {
client.transfers
.sink { [unowned self] in
_ = try? dbManager.saveFileTransfer($0)
let content = $0.type == "m4a" ? "a voice message" : "an image"
let message = Message(
networkId: $0.id,
senderId: $0.contactId,
recipientId: myId,
groupId: nil,
date: $0.createdAt,
status: .receiving,
isUnread: true,
text: "Sent you \(content)",
replyMessageId: nil,
roundURL: nil,
fileTransferId: $0.id
)
_ = try? dbManager.saveMessage(message)
guard let transfer = try? dbManager.saveFileTransfer($0) else { return }
handle(incomingTransfer: transfer)
}
.store(in: &cancellables)
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment