Gmail conversation view

FlowCrypt/Common UI/CommonNodesInputs.swift

@@ -9,15 +9,15 @@
 import FlowCryptUI
 import UIKit
 
-extension TextCellNode.Input {
- static func loading(with size: CGSize) -> TextCellNode.Input {
- .init(
+extension TextCellNode {
+ static let loading: TextCellNode = .init(
+input: .init(
  backgroundColor: .backgroundColor,
  title: "loading_title".localized + "...",
  withSpinner: true,
- size: size
+ size: CGSize(width: 44, height: 44)
  )
-}
+)
 }
 
 extension ButtonCellNode.Input {

FlowCrypt/Controllers/Compose/ComposeViewController.swift

@@ -7,13 +7,6 @@ import Combine
 import FlowCryptCommon
 import FlowCryptUI
 import Foundation
-import UIKit
-
-/**
- * View controller to compose the message and send it
- * - User can be redirected here from *InboxViewController* by tapping on *+*
- * - Or from *MessageViewController* controller by tapping on *reply*
- **/
 
 // swiftlint:disable file_length
 private struct ComposedDraft: Equatable {
@@ -22,8 +15,15 @@ private struct ComposedDraft: Equatable {
  let contextToSend: ComposeMessageContext
 }
 
+/**
+ * View controller to compose the message and send it
+ * - User can be redirected here from *InboxViewController* by tapping on *+*
+ * - Or from *MessageViewController* controller by tapping on *reply*
+ **/
 @MainActor
 final class ComposeViewController: TableNodeViewController {
+ private lazy var logger = Logger.nested(Self.self)
+
  private enum Constants {
  static let endTypingCharacters = [",", " ", "\n", ";"]
  static let shouldShowScopeAlertIndex = "indexShould_ShowScope"
@@ -167,17 +167,17 @@ extension ComposeViewController {
  @objc private func stopTimer() {
  saveDraftTimer?.invalidate()
  saveDraftTimer = nil
-
  saveDraftIfNeeded()
  }
 
  private func shouldSaveDraft() -> Bool {
- // todo - that draft should only be saved when one of the fields are dirty (edited by user). Right now, a draft may get saved right after rendering compose (or reply), which is annoying.
  let newDraft = ComposedDraft(email: email, input: input, contextToSend: contextToSend)
+
  guard let oldDraft = composedLatestDraft else {
  composedLatestDraft = newDraft
  return true
  }
+
  let result = newDraft != oldDraft
  composedLatestDraft = newDraft
  return result
@@ -341,7 +341,7 @@ extension ComposeViewController {
 // MARK: - Message Sending
 
 extension ComposeViewController {
-@MainActor private func prepareSigningKey() async throws -> PrvKeyInfo {
+ private func prepareSigningKey() async throws -> PrvKeyInfo {
  guard let signingKey = try await keyService.getSigningKey() else {
  throw AppErr.general("None of your private keys have your user id \"\(email)\". Please import the appropriate key.")
  }

FlowCrypt/Controllers/Inbox/Container/InboxViewContainerController.swift

@@ -97,8 +97,8 @@ final class InboxViewContainerController: TableNodeViewController {
  state = .error(InboxViewControllerContainerError.internalError)
  return
  }
-
- let inboxViewController = InboxViewController(InboxViewModel(inbox))
+ let input = InboxViewModel(inbox)
+ let inboxViewController = InboxViewControllerFactory.make(with: input)
  navigationController?.setViewControllers([inboxViewController], animated: false)
  }
  }
@@ -150,9 +150,7 @@ extension InboxViewContainerController: ASTableDelegate, ASTableDataSource {
 
  switch self.state {
  case .loading:
- return TextCellNode(
- input: .loading(with: size)
- )
+ return TextCellNode.loading
  case .error(let error):
  return TextCellNode(
  input: self.decorator.errorInput(with: descriptionSize, error: error)

FlowCrypt/Controllers/Inbox/InboxProviders.swift

@@ -0,0 +1,57 @@
+//
+// InboxProviders.swift
+// FlowCrypt
+//
+// Created by Anton Kharchevskyi on 11.10.2021
+// Copyright © 2017-present FlowCrypt a. s. All rights reserved.
+//
+
+import Foundation
+import Promises
+
+struct InboxContext {
+ let data: [InboxRenderable]
+ let pagination: MessagesListPagination
+}
+
+class InboxDataProvider {
+ func fetchMessages(using context: FetchMessageContext) async throws -> InboxContext {
+ fatalError("Should be implemented")
+ }
+}
+
+class InboxMessageThreadsProvider: InboxDataProvider {
+ let provider: MessagesThreadProvider
+
+ init(provider: MessagesThreadProvider) {
+ self.provider = provider
+ }
+
+ override func fetchMessages(using context: FetchMessageContext) async throws -> InboxContext {
+ let result = try await provider.fetchThreads(using: context)
+ let inboxData = result.threads.map(InboxRenderable.init)
+ let inboxContext = InboxContext(
+ data: inboxData,
+ pagination: result.pagination
+ )
+ return inboxContext
+ }
+}
+
+class InboxMessageListProvider: InboxDataProvider {
+ let provider: MessagesListProvider
+
+ init(provider: MessagesListProvider = MailProvider.shared.messageListProvider) {
+ self.provider = provider
+ }
+
+ override func fetchMessages(using context: FetchMessageContext) async throws -> InboxContext {
+ let result = try await provider.fetchMessages(using: context)
+ let inboxData = result.messages.map(InboxRenderable.init)
+ let inboxContext = InboxContext(
+ data: inboxData,
+ pagination: result.pagination
+ )
+ return inboxContext
+ }
+}

FlowCrypt/Controllers/Inbox/InboxRenderable.swift

@@ -0,0 +1,80 @@
+//
+// InboxRenderable.swift
+// FlowCrypt
+//
+// Created by Anton Kharchevskyi on 11.10.2021
+// Copyright © 2017-present FlowCrypt a. s. All rights reserved.
+//
+
+
+import Foundation
+
+struct InboxRenderable {
+ enum WrappedType: Equatable {
+ case message(Message)
+ case thread(MessageThread)
+ }
+
+ let title: String
+ let subtitle: String
+ let dateString: String
+ var isRead: Bool
+
+ let date: Date
+
+ let wrappedType: WrappedType
+}
+
+extension InboxRenderable: Comparable {
+ static func < (lhs: InboxRenderable, rhs: InboxRenderable) -> Bool {
+ lhs.date > rhs.date
+ }
+}
+
+extension InboxRenderable {
+ var wrappedMessage: Message? {
+ guard case .message(let message) = wrappedType else {
+ return nil
+ }
+ return message
+ }
+}
+
+extension InboxRenderable {
+ init(message: Message) {
+ self.title = message.sender ?? "message_unknown_sender".localized
+ self.subtitle = message.subject ?? "message_missed_subject".localized
+ self.dateString = DateFormatter().formatDate(message.date)
+ self.isRead = message.isMessageRead
+ self.date = message.date
+ self.wrappedType = .message(message)
+ }
+
+ init(thread: MessageThread) {
+ let sender = thread.messages.compactMap(\.sender)
+ .compactMap { $0.components(separatedBy: "@").first ?? "" }
+ .unique()
+ .joined(separator: ",")
+ let messagesCount = thread.messages.count
+ let amount = messagesCount == 1
+ ? ""
+ : " (\(messagesCount))"
+
+ self.title = sender + amount
+ self.subtitle = thread.subject ?? "message_missed_subject".localized
+
+ if let date = thread.messages.first?.date {
+ self.dateString = DateFormatter().formatDate(date)
+ } else {
+ self.dateString = ""
+ }
+
+ self.isRead = !thread.messages
+ .map(\.isMessageRead)
+ .contains(false)
+
+ self.date = thread.messages.first?.date ?? Date()
+
+ self.wrappedType = .thread(thread)
+ }
+}

FlowCrypt/Controllers/Inbox/InboxViewController+Factory.swift

@@ -0,0 +1,39 @@
+//
+// InboxViewController+Factory.swift
+// FlowCrypt
+//
+// Created by Anton Kharchevskyi on 10.10.2021
+// Copyright © 2017-present FlowCrypt a. s. All rights reserved.
+//
+
+import Foundation
+import UIKit
+
+class InboxViewControllerFactory {
+ static func make(with viewModel: InboxViewModel) -> InboxViewController {
+ guard let currentAuthType = DataService.shared.currentAuthType else {
+ fatalError("Internal inconsistency")
+ }
+
+ switch currentAuthType {
+ case .oAuthGmail:
+ // Inject threads provide
+ guard let threadsProvider = MailProvider.shared.messagesThreadProvider else {
+ fatalError("Internal inconsistency")
+ }
+
+ return InboxViewController(
+ viewModel,
+ provider: InboxMessageThreadsProvider(provider: threadsProvider)
+ )
+ case .password:
+ // Inject message list provider
+ let provider = InboxMessageListProvider()
+
+ return InboxViewController(
+ viewModel,
+ provider: provider
+ )
+ }
+ }
+}

FlowCrypt/Controllers/Inbox/InboxViewController+State.swift

@@ -0,0 +1,47 @@
+//
+// InboxViewController+State.swift
+// FlowCrypt
+//
+// Created by Anton Kharchevskyi on 10.10.2021
+// Copyright © 2017-present FlowCrypt a. s. All rights reserved.
+//
+
+
+import Foundation
+
+extension InboxViewController {
+ enum State {
+ /// Just loaded scene
+ case idle
+ /// Fetched without any messages
+ case empty
+ /// Performing fetching of new messages
+ case fetching
+ /// Performing refreshing
+ case refresh
+ /// Fetched messages
+ case fetched(_ pagination: MessagesListPagination)
+ /// error state with description message
+ case error(_ message: String)
+
+ var canLoadMore: Bool {
+ switch self {
+ case let .fetched(.byNextPage(token)):
+ return token != nil
+ case let .fetched(.byNumber(total)):
+ return (total ?? 0) > 0
+ default:
+ return false
+ }
+ }
+
+ var token: String? {
+ switch self {
+ case let .fetched(.byNextPage(token)):
+ return token
+ default:
+ return nil
+ }
+ }
+ }
+}