|
|
|
@ -48,14 +48,17 @@ extension ConversationVC : InputViewDelegate, MessageCellDelegate, ContextMenuAc
|
|
|
|
self.blockedBanner.alpha = 0
|
|
|
|
self.blockedBanner.alpha = 0
|
|
|
|
}, completion: { _ in
|
|
|
|
}, completion: { _ in
|
|
|
|
if let contact: Contact = Storage.shared.getContact(with: publicKey) {
|
|
|
|
if let contact: Contact = Storage.shared.getContact(with: publicKey) {
|
|
|
|
Storage.shared.write { transaction in
|
|
|
|
Storage.shared.write(
|
|
|
|
guard let transaction = transaction as? YapDatabaseReadWriteTransaction else { return }
|
|
|
|
with: { transaction in
|
|
|
|
|
|
|
|
guard let transaction = transaction as? YapDatabaseReadWriteTransaction else { return }
|
|
|
|
contact.isBlocked = false
|
|
|
|
|
|
|
|
Storage.shared.setContact(contact, using: transaction)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
MessageSender.syncConfiguration(forceSyncNow: true, with: transaction).retainUntilComplete()
|
|
|
|
contact.isBlocked = false
|
|
|
|
}
|
|
|
|
Storage.shared.setContact(contact, using: transaction)
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
completion: {
|
|
|
|
|
|
|
|
MessageSender.syncConfiguration(forceSyncNow: true).retainUntilComplete()
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -264,49 +267,46 @@ extension ConversationVC : InputViewDelegate, MessageCellDelegate, ContextMenuAc
|
|
|
|
let linkPreviewDraft = snInputView.linkPreviewInfo?.draft
|
|
|
|
let linkPreviewDraft = snInputView.linkPreviewInfo?.draft
|
|
|
|
let tsMessage = TSOutgoingMessage.from(message, associatedWith: thread)
|
|
|
|
let tsMessage = TSOutgoingMessage.from(message, associatedWith: thread)
|
|
|
|
|
|
|
|
|
|
|
|
Storage.write(with: { transaction in
|
|
|
|
let promise: Promise<Void> = self.approveMessageRequestIfNeeded(
|
|
|
|
let promise: Promise<Void> = self.approveMessageRequestIfNeeded(
|
|
|
|
for: self.thread,
|
|
|
|
for: self.thread,
|
|
|
|
isNewThread: !oldThreadShouldBeVisible,
|
|
|
|
with: transaction,
|
|
|
|
timestamp: (sentTimestamp - 1) // Set 1ms earlier as this is used for sorting
|
|
|
|
isNewThread: !oldThreadShouldBeVisible,
|
|
|
|
)
|
|
|
|
timestamp: (sentTimestamp - 1) // Set 1ms earlier as this is used for sorting
|
|
|
|
.map { [weak self] _ in
|
|
|
|
)
|
|
|
|
self?.viewModel.appendUnsavedOutgoingTextMessage(tsMessage)
|
|
|
|
.map { [weak self] _ in
|
|
|
|
|
|
|
|
self?.viewModel.appendUnsavedOutgoingTextMessage(tsMessage)
|
|
|
|
Storage.write(with: { transaction in
|
|
|
|
|
|
|
|
message.linkPreview = VisibleMessage.LinkPreview.from(linkPreviewDraft, using: transaction)
|
|
|
|
Storage.write(with: { transaction in
|
|
|
|
}, completion: { [weak self] in
|
|
|
|
message.linkPreview = VisibleMessage.LinkPreview.from(linkPreviewDraft, using: transaction)
|
|
|
|
tsMessage.linkPreview = OWSLinkPreview.from(message.linkPreview)
|
|
|
|
}, completion: { [weak self] in
|
|
|
|
|
|
|
|
tsMessage.linkPreview = OWSLinkPreview.from(message.linkPreview)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Storage.shared.write(
|
|
|
|
|
|
|
|
with: { transaction in
|
|
|
|
|
|
|
|
tsMessage.save(with: transaction as! YapDatabaseReadWriteTransaction)
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
completion: { [weak self] in
|
|
|
|
|
|
|
|
// At this point the TSOutgoingMessage should have its link preview set, so we can scroll to the bottom knowing
|
|
|
|
|
|
|
|
// the height of the new message cell
|
|
|
|
|
|
|
|
self?.scrollToBottom(isAnimated: false)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Storage.shared.write { transaction in
|
|
|
|
Storage.shared.write(
|
|
|
|
MessageSender.send(message, with: [], in: thread, using: transaction as! YapDatabaseReadWriteTransaction)
|
|
|
|
with: { transaction in
|
|
|
|
|
|
|
|
tsMessage.save(with: transaction as! YapDatabaseReadWriteTransaction)
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
completion: { [weak self] in
|
|
|
|
|
|
|
|
// At this point the TSOutgoingMessage should have its link preview set, so we can scroll to the bottom knowing
|
|
|
|
|
|
|
|
// the height of the new message cell
|
|
|
|
|
|
|
|
self?.scrollToBottom(isAnimated: false)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
self?.handleMessageSent()
|
|
|
|
Storage.shared.write { transaction in
|
|
|
|
})
|
|
|
|
MessageSender.send(message, with: [], in: thread, using: transaction as! YapDatabaseReadWriteTransaction)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Show an error indicating that approving the thread failed
|
|
|
|
self?.handleMessageSent()
|
|
|
|
promise.catch(on: DispatchQueue.main) { [weak self] _ in
|
|
|
|
})
|
|
|
|
let alert = UIAlertController(title: "Session", message: "An error occurred when trying to accept this message request", preferredStyle: .alert)
|
|
|
|
}
|
|
|
|
alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))
|
|
|
|
|
|
|
|
self?.present(alert, animated: true, completion: nil)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
promise.retainUntilComplete()
|
|
|
|
// Show an error indicating that approving the thread failed
|
|
|
|
})
|
|
|
|
promise.catch(on: DispatchQueue.main) { [weak self] _ in
|
|
|
|
|
|
|
|
let alert = UIAlertController(title: "Session", message: "An error occurred when trying to accept this message request", preferredStyle: .alert)
|
|
|
|
|
|
|
|
alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))
|
|
|
|
|
|
|
|
self?.present(alert, animated: true, completion: nil)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
promise.retainUntilComplete()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
func sendAttachments(_ attachments: [SignalAttachment], with text: String, onComplete: (() -> ())? = nil) {
|
|
|
|
func sendAttachments(_ attachments: [SignalAttachment], with text: String, onComplete: (() -> ())? = nil) {
|
|
|
|
@ -330,44 +330,41 @@ extension ConversationVC : InputViewDelegate, MessageCellDelegate, ContextMenuAc
|
|
|
|
let oldThreadShouldBeVisible: Bool = thread.shouldBeVisible
|
|
|
|
let oldThreadShouldBeVisible: Bool = thread.shouldBeVisible
|
|
|
|
let tsMessage = TSOutgoingMessage.from(message, associatedWith: thread)
|
|
|
|
let tsMessage = TSOutgoingMessage.from(message, associatedWith: thread)
|
|
|
|
|
|
|
|
|
|
|
|
Storage.write(with: { transaction in
|
|
|
|
let promise: Promise<Void> = self.approveMessageRequestIfNeeded(
|
|
|
|
let promise: Promise<Void> = self.approveMessageRequestIfNeeded(
|
|
|
|
for: self.thread,
|
|
|
|
for: self.thread,
|
|
|
|
isNewThread: !oldThreadShouldBeVisible,
|
|
|
|
with: transaction,
|
|
|
|
timestamp: (sentTimestamp - 1) // Set 1ms earlier as this is used for sorting
|
|
|
|
isNewThread: !oldThreadShouldBeVisible,
|
|
|
|
)
|
|
|
|
timestamp: (sentTimestamp - 1) // Set 1ms earlier as this is used for sorting
|
|
|
|
.map { [weak self] _ in
|
|
|
|
|
|
|
|
Storage.write(
|
|
|
|
|
|
|
|
with: { transaction in
|
|
|
|
|
|
|
|
tsMessage.save(with: transaction)
|
|
|
|
|
|
|
|
// The new message cell is inserted at this point, but the TSOutgoingMessage doesn't have its attachment yet
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
completion: { [weak self] in
|
|
|
|
|
|
|
|
Storage.write(with: { transaction in
|
|
|
|
|
|
|
|
MessageSender.send(message, with: attachments, in: thread, using: transaction)
|
|
|
|
|
|
|
|
}, completion: { [weak self] in
|
|
|
|
|
|
|
|
// At this point the TSOutgoingMessage should have its attachments set, so we can scroll to the bottom knowing
|
|
|
|
|
|
|
|
// the height of the new message cell
|
|
|
|
|
|
|
|
self?.scrollToBottom(isAnimated: false)
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
self?.handleMessageSent()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Attachment successfully sent - dismiss the screen
|
|
|
|
|
|
|
|
onComplete?()
|
|
|
|
|
|
|
|
}
|
|
|
|
)
|
|
|
|
)
|
|
|
|
.map { [weak self] _ in
|
|
|
|
}
|
|
|
|
Storage.write(
|
|
|
|
|
|
|
|
with: { transaction in
|
|
|
|
|
|
|
|
tsMessage.save(with: transaction)
|
|
|
|
|
|
|
|
// The new message cell is inserted at this point, but the TSOutgoingMessage doesn't have its attachment yet
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
completion: { [weak self] in
|
|
|
|
|
|
|
|
Storage.write(with: { transaction in
|
|
|
|
|
|
|
|
MessageSender.send(message, with: attachments, in: thread, using: transaction)
|
|
|
|
|
|
|
|
}, completion: { [weak self] in
|
|
|
|
|
|
|
|
// At this point the TSOutgoingMessage should have its attachments set, so we can scroll to the bottom knowing
|
|
|
|
|
|
|
|
// the height of the new message cell
|
|
|
|
|
|
|
|
self?.scrollToBottom(isAnimated: false)
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
self?.handleMessageSent()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Attachment successfully sent - dismiss the screen
|
|
|
|
|
|
|
|
onComplete?()
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Show an error indicating that approving the thread failed
|
|
|
|
// Show an error indicating that approving the thread failed
|
|
|
|
promise.catch(on: DispatchQueue.main) { [weak self] _ in
|
|
|
|
promise.catch(on: DispatchQueue.main) { [weak self] _ in
|
|
|
|
let alert = UIAlertController(title: "Session", message: "An error occurred when trying to accept this message request", preferredStyle: .alert)
|
|
|
|
let alert = UIAlertController(title: "Session", message: "An error occurred when trying to accept this message request", preferredStyle: .alert)
|
|
|
|
alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))
|
|
|
|
alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))
|
|
|
|
self?.present(alert, animated: true, completion: nil)
|
|
|
|
self?.present(alert, animated: true, completion: nil)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
promise.retainUntilComplete()
|
|
|
|
promise.retainUntilComplete()
|
|
|
|
})
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
func handleMessageSent() {
|
|
|
|
func handleMessageSent() {
|
|
|
|
@ -1104,7 +1101,7 @@ extension ConversationVC: UIDocumentInteractionControllerDelegate {
|
|
|
|
|
|
|
|
|
|
|
|
extension ConversationVC {
|
|
|
|
extension ConversationVC {
|
|
|
|
|
|
|
|
|
|
|
|
fileprivate func approveMessageRequestIfNeeded(for thread: TSThread?, with transaction: YapDatabaseReadWriteTransaction, isNewThread: Bool, timestamp: UInt64) -> Promise<Void> {
|
|
|
|
fileprivate func approveMessageRequestIfNeeded(for thread: TSThread?, isNewThread: Bool, timestamp: UInt64) -> Promise<Void> {
|
|
|
|
guard let contactThread: TSContactThread = thread as? TSContactThread else { return Promise.value(()) }
|
|
|
|
guard let contactThread: TSContactThread = thread as? TSContactThread else { return Promise.value(()) }
|
|
|
|
|
|
|
|
|
|
|
|
// If the contact doesn't exist then we should create it so we can store the 'isApproved' state
|
|
|
|
// If the contact doesn't exist then we should create it so we can store the 'isApproved' state
|
|
|
|
@ -1135,7 +1132,17 @@ extension ConversationVC {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return promise
|
|
|
|
return promise
|
|
|
|
.then { MessageSender.sendNonDurably(messageRequestResponse, in: contactThread, using: transaction) }
|
|
|
|
.then { _ -> Promise<Void> in
|
|
|
|
|
|
|
|
let (promise, seal) = Promise<Void>.pending()
|
|
|
|
|
|
|
|
Storage.writeSync { transaction in
|
|
|
|
|
|
|
|
MessageSender.sendNonDurably(messageRequestResponse, in: contactThread, using: transaction)
|
|
|
|
|
|
|
|
.done { seal.fulfill(()) }
|
|
|
|
|
|
|
|
.catch { _ in seal.fulfill(()) } // Fulfill even if this failed; the configuration in the swarm should be at most 2 days old
|
|
|
|
|
|
|
|
.retainUntilComplete()
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return promise
|
|
|
|
|
|
|
|
}
|
|
|
|
.map { _ in
|
|
|
|
.map { _ in
|
|
|
|
if self?.presentedViewController is ModalActivityIndicatorViewController {
|
|
|
|
if self?.presentedViewController is ModalActivityIndicatorViewController {
|
|
|
|
self?.dismiss(animated: true, completion: nil) // Dismiss the loader
|
|
|
|
self?.dismiss(animated: true, completion: nil) // Dismiss the loader
|
|
|
|
@ -1144,9 +1151,11 @@ extension ConversationVC {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
.map { _ in
|
|
|
|
.map { _ in
|
|
|
|
// Default 'didApproveMe' to true for the person approving the message request
|
|
|
|
// Default 'didApproveMe' to true for the person approving the message request
|
|
|
|
contact.isApproved = true
|
|
|
|
Storage.write { transaction in
|
|
|
|
contact.didApproveMe = (contact.didApproveMe || !isNewThread)
|
|
|
|
contact.isApproved = true
|
|
|
|
Storage.shared.setContact(contact, using: transaction)
|
|
|
|
contact.didApproveMe = (contact.didApproveMe || !isNewThread)
|
|
|
|
|
|
|
|
Storage.shared.setContact(contact, using: transaction)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Send a sync message with the details of the contact
|
|
|
|
// Send a sync message with the details of the contact
|
|
|
|
MessageSender.syncConfiguration(forceSyncNow: true).retainUntilComplete()
|
|
|
|
MessageSender.syncConfiguration(forceSyncNow: true).retainUntilComplete()
|
|
|
|
@ -1189,23 +1198,20 @@ extension ConversationVC {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@objc func acceptMessageRequest() {
|
|
|
|
@objc func acceptMessageRequest() {
|
|
|
|
Storage.write { transaction in
|
|
|
|
let promise: Promise<Void> = self.approveMessageRequestIfNeeded(
|
|
|
|
let promise: Promise<Void> = self.approveMessageRequestIfNeeded(
|
|
|
|
for: self.thread,
|
|
|
|
for: self.thread,
|
|
|
|
isNewThread: false,
|
|
|
|
with: transaction,
|
|
|
|
timestamp: NSDate.millisecondTimestamp()
|
|
|
|
isNewThread: false,
|
|
|
|
)
|
|
|
|
timestamp: NSDate.millisecondTimestamp()
|
|
|
|
|
|
|
|
)
|
|
|
|
// Show an error indicating that approving the thread failed
|
|
|
|
|
|
|
|
promise.catch(on: DispatchQueue.main) { [weak self] _ in
|
|
|
|
// Show an error indicating that approving the thread failed
|
|
|
|
let alert = UIAlertController(title: "Session", message: NSLocalizedString("MESSAGE_REQUESTS_APPROVAL_ERROR_MESSAGE", comment: ""), preferredStyle: .alert)
|
|
|
|
promise.catch(on: DispatchQueue.main) { [weak self] _ in
|
|
|
|
alert.addAction(UIAlertAction(title: NSLocalizedString("BUTTON_OK", comment: ""), style: .default, handler: nil))
|
|
|
|
let alert = UIAlertController(title: "Session", message: NSLocalizedString("MESSAGE_REQUESTS_APPROVAL_ERROR_MESSAGE", comment: ""), preferredStyle: .alert)
|
|
|
|
self?.present(alert, animated: true, completion: nil)
|
|
|
|
alert.addAction(UIAlertAction(title: NSLocalizedString("BUTTON_OK", comment: ""), style: .default, handler: nil))
|
|
|
|
|
|
|
|
self?.present(alert, animated: true, completion: nil)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
promise.retainUntilComplete()
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
promise.retainUntilComplete()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@objc func deleteMessageRequest() {
|
|
|
|
@objc func deleteMessageRequest() {
|
|
|
|
@ -1244,11 +1250,11 @@ extension ConversationVC {
|
|
|
|
// Delete all thread content
|
|
|
|
// Delete all thread content
|
|
|
|
self?.thread.removeAllThreadInteractions(with: transaction)
|
|
|
|
self?.thread.removeAllThreadInteractions(with: transaction)
|
|
|
|
self?.thread.remove(with: transaction)
|
|
|
|
self?.thread.remove(with: transaction)
|
|
|
|
|
|
|
|
|
|
|
|
// Force a config sync and pop to the previous screen (both must run on the main thread)
|
|
|
|
|
|
|
|
MessageSender.syncConfiguration(forceSyncNow: true, with: transaction).retainUntilComplete()
|
|
|
|
|
|
|
|
},
|
|
|
|
},
|
|
|
|
completion: { [weak self] in
|
|
|
|
completion: { [weak self] in
|
|
|
|
|
|
|
|
// Force a config sync and pop to the previous screen
|
|
|
|
|
|
|
|
MessageSender.syncConfiguration(forceSyncNow: true).retainUntilComplete()
|
|
|
|
|
|
|
|
|
|
|
|
DispatchQueue.main.async {
|
|
|
|
DispatchQueue.main.async {
|
|
|
|
self?.navigationController?.popViewController(animated: true)
|
|
|
|
self?.navigationController?.popViewController(animated: true)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Morgan Pretty
3 years ago