Feature/issue 783 unlimited attachment size

FlowCrypt/Controllers/Compose/ComposeViewController.swift

@@ -425,7 +425,7 @@ extension ComposeViewController {
  message: sendableMsg,
  threadId: input.threadId,
  progressHandler: { [weak self] progress in
- self?.updateSpinner(progress: progress)
+ self?.updateSpinner(progress: progress, systemImageName: "checkmark.circle")
  }
  )
  handleSuccessfullySentMessage()

FlowCrypt/Controllers/Inbox/InboxViewController.swift

@@ -5,7 +5,6 @@
 import AsyncDisplayKit
 import FlowCryptCommon
 import FlowCryptUI
-import Promises
 
 /**
  * View controller which shows message list of selected folder or inbox
@@ -369,7 +368,7 @@ extension InboxViewController: ASTableDataSource, ASTableDelegate {
  func tableNode(_ tableNode: ASTableNode, didSelectRowAt indexPath: IndexPath) {
  tableNode.deselectRow(at: indexPath, animated: true)
  guard let message = messages[safe: indexPath.row] else { return }
-msgListOpenMsgElseShowToast(with: message, path: viewModel.path)
+msgListOpenMsg(with: message, path: viewModel.path)
 
  // TODO: uncomment in "sent message from draft" feature
 // if viewModel.isDrafts {

FlowCrypt/Controllers/MessageList Extension/MsgListViewConroller.swift

@@ -9,27 +9,23 @@
 import UIKit
 
 protocol MsgListViewConroller {
- func msgListOpenMsgElseShowToast(with message: Message, path: String)
+ func msgListOpenMsg(with message: Message, path: String)
  func msgListGetIndex(message: Message) -> Array<Message>.Index?
  func msgListUpdateReadFlag(message: Message, at index: Int)
  func msgListRenderAsRemoved(message _: Message, at index: Int)
 }
 
 extension MsgListViewConroller where Self: UIViewController {
- func msgListOpenMsgElseShowToast(with message: Message, path: String) {
- if message.size ?? 0 > GeneralConstants.Global.messageSizeLimit {
- showToast("Messages larger than 5MB are not supported yet")
- } else {
- let messageInput = MessageViewController.Input(
- objMessage: message,
- bodyMessage: nil,
- path: path
- )
- let msgVc = MessageViewController(input: messageInput) { [weak self] operation, message in
- self?.msgListHandleOperation(message: message, operation: operation)
- }
- navigationController?.pushViewController(msgVc, animated: true)
+ func msgListOpenMsg(with message: Message, path: String) {
+ let messageInput = MessageViewController.Input(
+ objMessage: message,
+ bodyMessage: nil,
+ path: path
+ )
+ let msgVc = MessageViewController(input: messageInput) { [weak self] operation, message in
+ self?.msgListHandleOperation(message: message, operation: operation)
  }
+ navigationController?.pushViewController(msgVc, animated: true)
  }
 
  private func msgListHandleOperation(message: Message, operation: MessageViewController.MessageAction) {

FlowCrypt/Controllers/Msg/MessageViewController.swift

@@ -148,13 +148,17 @@ final class MessageViewController: TableNodeViewController {
 }
 
 // MARK: - Message
-
 extension MessageViewController {
  private func fetchDecryptAndRenderMsg() {
- showSpinner("loading_title".localized, isUserInteractionEnabled: true)
+ handleFetchProgress(state: .fetch)
+
  Task {
  do {
- processedMessage = try await serviceActor.fetchDecryptAndRenderMsg(message: input.objMessage, path: input.path)
+ processedMessage = try await serviceActor.fetchDecryptAndRenderMsg(message: input.objMessage,
+ path: input.path,
+ progressHandler: { [weak self] state in
+ self?.handleFetchProgress(state: state)
+ })
  handleReceivedMessage()
  } catch {
  handleError(error)
@@ -179,6 +183,17 @@ extension MessageViewController {
  }
  }
 
+ private func handleFetchProgress(state: MessageFetchState) {
+ switch state {
+ case .fetch:
+ showSpinner("loading_title".localized, isUserInteractionEnabled: true)
+ case .download(let progress):
+ updateSpinner(label: "downloading_title".localized, progress: progress)
+ case .decrypt:
+ updateSpinner(label: "decrypting_title".localized)
+ }
+ }
+
  private func handleReceivedMessage() {
  hideSpinner()
  node.reloadData()
@@ -539,16 +554,20 @@ private actor ServiceActor {
  self.messageProvider = messageProvider
  }
 
- func fetchDecryptAndRenderMsg(message: Message, path: String) async throws -> ProcessedMessage {
- let rawMimeData = try awaitPromise(messageProvider.fetchMsg(message: message, folder: path))
+ func fetchDecryptAndRenderMsg(message: Message, path: String,
+ progressHandler: ((MessageFetchState) -> Void)?) async throws -> ProcessedMessage {
+ let rawMimeData = try await messageProvider.fetchMsg(message: message,
+ folder: path,
+ progressHandler: progressHandler)
+ progressHandler?(.decrypt)
  return try await messageService.decryptAndProcessMessage(mime: rawMimeData)
  }
 
  func checkAndPotentiallySaveEnteredPassPhrase(_ passPhrase: String) async throws -> Bool {
-return try await messageService.checkAndPotentiallySaveEnteredPassPhrase(passPhrase)
+ try await messageService.checkAndPotentiallySaveEnteredPassPhrase(passPhrase)
  }
 
  func decryptAndProcessMessage(mime: Data) async throws -> ProcessedMessage {
-return try await messageService.decryptAndProcessMessage(mime: mime)
+ try await messageService.decryptAndProcessMessage(mime: mime)
  }
 }

FlowCrypt/Controllers/Search/SearchViewController.swift

@@ -196,7 +196,7 @@ extension SearchViewController: ASTableDataSource, ASTableDelegate {
  tableNode.deselectRow(at: indexPath, animated: false)
  guard let message = state.messages[safe: indexPath.row] else { return }
 
-msgListOpenMsgElseShowToast(with: message, path: folderPath)
+msgListOpenMsg(with: message, path: folderPath)
  }
 }
 

FlowCrypt/Controllers/Setup/SetupBackupsViewController.swift

@@ -5,7 +5,6 @@
 import AsyncDisplayKit
 import FlowCryptCommon
 import FlowCryptUI
-import Promises
 
 /**
  * Scene which is responsible for recovering user account with backups from inbox and entered pass phrase

FlowCrypt/Controllers/Setup/SetupCreatePassphraseAbstractViewController.swift

@@ -9,7 +9,6 @@
 import AsyncDisplayKit
 import FlowCryptCommon
 import FlowCryptUI
-import Promises
 
 /**
  * Controller which decalres a base logic for passphrase setup

FlowCrypt/Controllers/Setup/SetupEKMKeyViewController.swift

@@ -9,7 +9,6 @@
 import AsyncDisplayKit
 import FlowCryptCommon
 import FlowCryptUI
-import Promises
 
 enum CreatePassphraseWithExistingKeyError: Error {
  // No private key was found

FlowCrypt/Controllers/SideMenu/Menu/MyMenuViewController.swift

@@ -5,7 +5,6 @@
 import AsyncDisplayKit
 import ENSwiftSideMenu
 import FlowCryptUI
-import Promises
 
 /**
  * Menu view controller

FlowCrypt/Extensions/UIViewController+Spinner.swift

@@ -10,6 +10,10 @@ import MBProgressHUD
 import UIKit
 
 extension UIViewController {
+ var currentProgressHUD: MBProgressHUD {
+ MBProgressHUD.forView(view) ?? MBProgressHUD.showAdded(to: view, animated: true)
+ }
+
  func showSpinner(_ message: String = "loading_title".localized, isUserInteractionEnabled: Bool = false) {
  DispatchQueue.main.async {
  guard self.view.subviews.first(where: { $0 is MBProgressHUD }) == nil else {
@@ -29,16 +33,18 @@ extension UIViewController {
  systemImageName: String? = nil) {
  DispatchQueue.main.async {
  if let progress = progress {
- if progress >= 1 {
+ if progress >= 1, let imageName = systemImageName {
  self.updateSpinner(label: "compose_sent".localized,
- systemImageName: "checkmark.circle")
+ systemImageName: imageName)
  } else {
  self.showProgressHUD(progress: progress, label: label)
  }
  } else if let imageName = systemImageName {
  self.showProgressHUDWithCustomImage(imageName: imageName, label: label)
+ } else {
+ self.currentProgressHUD.mode = .indeterminate
+ self.currentProgressHUD.label.text = label
  }
-
  }
  }
 
@@ -54,22 +60,18 @@ extension UIViewController {
 
 extension UIViewController {
  private func showProgressHUD(progress: Float, label: String) {
- guard let hud = MBProgressHUD.forView(view) else { return }
-
  let percent = Int(progress * 100)
-hud.label.text = "\(label) \(percent)%"
-hud.progress = progress
-hud.mode = .annularDeterminate
+currentProgressHUD.label.text = "\(label) \(percent)%"
+currentProgressHUD.progress = progress
+currentProgressHUD.mode = .annularDeterminate
  }
 
  private func showProgressHUDWithCustomImage(imageName: String, label: String) {
- guard let hud = MBProgressHUD.forView(view) else { return }
-
  let configuration = UIImage.SymbolConfiguration(pointSize: 36)
  let imageView = UIImageView(image: .init(systemName: imageName, withConfiguration: configuration))
-hud.minSize = CGSize(width: 150, height: 90)
-hud.customView = imageView
-hud.mode = .customView
-hud.label.text = label
+currentProgressHUD.minSize = CGSize(width: 150, height: 90)
+currentProgressHUD.customView = imageView
+currentProgressHUD.mode = .customView
+currentProgressHUD.label.text = label
  }
 }

FlowCrypt/Functionality/DataManager/Encrypted Storage/EncryptedStorage.swift

@@ -8,7 +8,6 @@
 
 import FlowCryptCommon
 import Foundation
-import Promises
 import RealmSwift
 
 // swiftlint:disable force_try

FlowCrypt/Functionality/DataManager/UserAccountService.swift

@@ -8,7 +8,6 @@
 
 import FlowCryptCommon
 import Foundation
-import Promises
 
 protocol UserAccountServiceType {
  func startSessionFor(user type: SessionType)

FlowCrypt/Functionality/Mail Provider/Message Provider/Gmail+Message.swift

@@ -7,35 +7,86 @@
 //
 
 import GoogleAPIClientForREST_Gmail
-import Promises
+import GTMSessionFetcherCore
 
 extension GmailService: MessageProvider {
- func fetchMsg(message: Message, folder: String) -> Promise<Data> {
- Promise { resolve, reject in
+ func fetchMsg(message: Message,
+ folder: String,
+ progressHandler: ((MessageFetchState) -> Void)?) async throws -> Data {
+ try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<Data, Error>) in
  guard let identifier = message.identifier.stringId else {
- return reject(GmailServiceError.missedMessageInfo("id"))
+ continuation.resume(throwing: GmailServiceError.missedMessageInfo("id"))
+ return
  }
 
-let query = GTLRGmailQuery_UsersMessagesGet.query(withUserId: .me, identifier: identifier)
-query.format = kGTLRGmailFormatRaw
+Task {
+ let messageSize = try await self.fetchMessageSize(identifier: identifier)
 
+ let fetcher = self.createMessageFetcher(identifier: identifier)
+ fetcher.receivedProgressBlock = { _, received in
+ let progress = min(Float(received)/messageSize, 1)
+ progressHandler?(.download(progress))
+ }
+ fetcher.beginFetch { data, error in
+ if let error = error {
+ continuation.resume(throwing: GmailServiceError.providerError(error))
+ return
+ }
+
+ guard let data = data,
+ let dictionary = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+ let raw = dictionary["raw"] as? String
+ else {
+ continuation.resume(throwing: GmailServiceError.missedMessageInfo("raw"))
+ return
+ }
+
+ guard let data = GTLRDecodeWebSafeBase64(raw) else {
+ continuation.resume(throwing: GmailServiceError.missedMessageInfo("data"))
+ return
+ }
+
+ continuation.resume(returning: data)
+ }
+ }
+ }
+ }
+
+ private func fetchMessageSize(identifier: String) async throws -> Float {
+ try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<Float, Error>) in
+ let query = createMessageQuery(identifier: identifier, format: kGTLRGmailFormatMetadata)
  self.gmailService.executeQuery(query) { _, data, error in
  if let error = error {
-reject(GmailServiceError.providerError(error))
+continuation.resume(throwing: GmailServiceError.providerError(error))
  return
  }
+
  guard let gmailMessage = data as? GTLRGmail_Message else {
- return reject(AppErr.cast("GTLRGmail_Message"))
- }
- guard let raw = gmailMessage.raw else {
- return reject(GmailServiceError.missedMessageInfo("raw"))
+ continuation.resume(throwing: AppErr.cast("GTLRGmail_Message"))
+ return
  }
 
- guard let data = GTLRDecodeWebSafeBase64(raw) else {
- return reject(GmailServiceError.missedMessageInfo("data"))
+ guard let sizeEstimate = gmailMessage.sizeEstimate?.floatValue else {
+ continuation.resume(throwing: GmailServiceError.missedMessageInfo("sizeEstimate"))
+ return
  }
- resolve(data)
+
+ // google returns smaller estimated size
+ let totalSize = sizeEstimate * Float(1.3)
+ continuation.resume(with: .success(totalSize))
  }
  }
  }
+
+ private func createMessageFetcher(identifier: String) -> GTMSessionFetcher {
+ let query = createMessageQuery(identifier: identifier, format: kGTLRGmailFormatRaw)
+ let request = gmailService.request(for: query) as URLRequest
+ return gmailService.fetcherService.fetcher(with: request)
+ }
+
+ private func createMessageQuery(identifier: String, format: String) -> GTLRGmailQuery_UsersMessagesGet {
+ let query = GTLRGmailQuery_UsersMessagesGet.query(withUserId: .me, identifier: identifier)
+ query.format = format
+ return query
+ }
 }

FlowCrypt/Functionality/Mail Provider/Message Provider/Imap+Message.swift

@@ -10,18 +10,29 @@ import Foundation
 import Promises
 
 extension Imap: MessageProvider {
- func fetchMsg(message: Message, folder: String) -> Promise<Data> {
- Promise { [weak self] resolve, reject in
- guard let self = self else {
- return reject(AppErr.nilSelf)
- }
-
+ func fetchMsg(message: Message,
+ folder: String,
+ progressHandler: ((MessageFetchState) -> Void)?) async throws -> Data {
+ try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<Data, Error>) in
  guard let identifier = message.identifier.intId else {
  assertionFailure()
- return reject(AppErr.unexpected("Missed message identifier"))
+ continuation.resume(throwing: AppErr.unexpected("Missed message identifier"))
+ return
  }
 
- let retry = { self.fetchMsg(message: message, folder: folder) }
+ let resolve = { continuation.resume(returning: $0) }
+ let reject = { continuation.resume(throwing: $0) }
+ let retry = { Promise<Data> { resolve, reject in
+ Task {
+ do {
+ let data = try await self.fetchMsg(message: message, folder: folder, progressHandler: progressHandler)
+ resolve(data)
+ } catch {
+ reject(error)
+ }
+ }
+ }}
+
  self.imapSess?
  .fetchMessageOperation(withFolder: folder, uid: UInt32(identifier))
  .start(self.finalize("fetchMsg", resolve, reject, retry: retry))