oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor refactoring

This commit is contained in:
Niels Andriesse 2021-05-06 11:36:13 +10:00
parent 54684ba565
commit 33a16df602
2 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
SessionShareExtension/ShareVC.swift
View File

@ -201,14 +201,15 @@ final class ShareVC : UINavigationController, ShareViewDelegate, AppModeManagerD
private func showMainContent() {
let threadPickerVC = ThreadPickerVC()
threadPickerVC.shareVC = self
threadPickerVC.shareDelegate = self
setViewControllers([ threadPickerVC ], animated: false)
showLoader()
let promise = buildAttachments()
promise.done { [weak self] _ in
self?.hideLoader()
}.catch { [weak self] _ in
self?.hideLoader()
ModalActivityIndicatorViewController.present(fromViewController: self, canCancel: false) { activityIndicator in
promise.done { _ in
activityIndicator.dismiss { }
}.catch { _ in
activityIndicator.dismiss { }
}
}
ShareVC.attachmentPrepPromise = promise
}
@ -229,14 +230,6 @@ final class ShareVC : UINavigationController, ShareViewDelegate, AppModeManagerD
extensionContext!.cancelRequest(withError: error)
}
func showLoader() {
}
func hideLoader() {
}
// MARK: Attachment Prep
private class func itemMatchesSpecificUtiType(itemProvider: NSItemProvider, utiType: String) -> Bool {
// URLs, contacts and other special items have to be detected separately.

29
SessionShareExtension/ThreadPickerVC.swift
View File

@ -4,7 +4,7 @@ final class ThreadPickerVC : UIViewController, UITableViewDataSource, UITableVie
private var threads: YapDatabaseViewMappings!
private var threadViewModelCache: [String:ThreadViewModel] = [:] // Thread ID to ThreadViewModel
private var selectedThread: TSThread?
var shareVC: ShareVC?
var shareDelegate: ShareViewDelegate?
private var threadCount: UInt {
threads.numberOfItems(inGroup: TSInboxGroup)
@ -100,7 +100,6 @@ final class ThreadPickerVC : UIViewController, UITableViewDataSource, UITableVie
}
func attachmentApproval(_ attachmentApproval: AttachmentApprovalViewController, didApproveAttachments attachments: [SignalAttachment], messageText: String?) {
shareVC?.showLoader()
let message = VisibleMessage()
message.sentTimestamp = NSDate.millisecondTimestamp()
message.text = messageText
@ -108,17 +107,21 @@ final class ThreadPickerVC : UIViewController, UITableViewDataSource, UITableVie
Storage.write { transaction in
tsMessage.save(with: transaction)
}
Storage.write { transaction in
MessageSender.sendNonDurably(message, with: attachments, in: self.selectedThread!, using: transaction).done { [weak self] _ in
guard let self = self else { return }
self.shareVC?.hideLoader()
self.shareVC?.shareViewWasCompleted()
}.catch { [weak self] error in
guard let self = self else { return }
self.shareVC?.hideLoader()
self.shareVC?.shareViewFailed(error: error)
}
}
// DispatchQueue.main.async {
// ModalActivityIndicatorViewController.present(fromViewController: self.navigationController!, canCancel: false) { activityIndicator in
Storage.write { transaction in
MessageSender.sendNonDurably(message, with: attachments, in: self.selectedThread!, using: transaction).done { [weak self] _ in
guard let self = self else { return }
// activityIndicator.dismiss { }
self.shareDelegate?.shareViewWasCompleted()
}.catch { [weak self] error in
guard let self = self else { return }
// activityIndicator.dismiss { }
self.shareDelegate?.shareViewFailed(error: error)
}
}
// }
// }
}
func attachmentApprovalDidCancel(_ attachmentApproval: AttachmentApprovalViewController) {