Keep pass phrase only in memory

FlowCrypt.xcodeproj/xcshareddata/xcschemes/FlowCrypt.xcscheme

@@ -7,8 +7,8 @@
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
+            buildForTesting = "NO"
+            buildForRunning = "NO"
             buildForProfiling = "NO"
             buildForArchiving = "NO"
             buildForAnalyzing = "NO">
@@ -84,7 +84,8 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "NO"
       language = "en"
-      region = "GB">
+      region = "GB"
+      codeCoverageEnabled = "YES">
       <CommandLineArguments>
          <CommandLineArgument
             argument = "-AppleLanguages (en-US)"
@@ -96,21 +97,6 @@
          </CommandLineArgument>
       </CommandLineArguments>
       <Testables>
-         <TestableReference
-            skipped = "NO"
-            parallelizable = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "9FDF3640235A1B0100614596"
-               BuildableName = "FlowCryptUITests.xctest"
-               BlueprintName = "FlowCryptUITests"
-               ReferencedContainer = "container:FlowCrypt.xcodeproj">
-            </BuildableReference>
-            <LocationScenarioReference
-               identifier = "London, England"
-               referenceType = "1">
-            </LocationScenarioReference>
-         </TestableReference>
          <TestableReference
             skipped = "NO"
             parallelizable = "YES">

FlowCrypt/App/Logger.swift

@@ -162,6 +162,12 @@ extension Logger {
 
         /// log all db migration events
         case migration = "Migration"
+
+        /// Core related logs
+        case core = "Core"
+
+        /// Setup Flow logs
+        case setup = "Setup"
     }
 
     static func nested<T>(in type: T.Type, with logLabel: LogLabels) -> Logger {

FlowCrypt/Common UI/CommonNodesInputs.swift

@@ -0,0 +1,75 @@
+//
+//  CommonNodes.swift
+//  FlowCrypt
+//
+//  Created by Anton Kharchevskyi on 31.05.2021.
+//  Copyright © 2021 FlowCrypt Limited. All rights reserved.
+//
+
+import FlowCryptUI
+import UIKit
+
+extension TextCellNode.Input {
+    static func loading(with size: CGSize) -> TextCellNode.Input {
+        .init(
+            backgroundColor: .backgroundColor,
+            title: "loading_title".localized + "...",
+            withSpinner: true,
+            size: size
+        )
+    }
+}
+
+extension ButtonCellNode.Input {
+    static let retry: ButtonCellNode.Input = .init(
+        title: "retry_title"
+            .localized
+            .attributed(.bold(16), color: .white, alignment: .center),
+        insets: UIEdgeInsets(top: 16, left: 24, bottom: 8, right: 24),
+        color: .main
+    )
+
+    static let chooseAnotherAccount: ButtonCellNode.Input = .init(
+        title: "setup_use_another"
+            .localized
+            .attributed(
+                .regular(15),
+                color: UIColor.colorFor(
+                    darkStyle: .white,
+                    lightStyle: .blueColor
+                ),
+                alignment: .center
+            ),
+        insets: .side(8),
+        color: .backgroundColor
+    )
+}
+
+extension CheckBoxTextNode.Input {
+    static func common(with text: String, isSelected: Bool) -> CheckBoxTextNode.Input {
+        let attributedTitle = text
+            .attributed(.bold(14), color: .mainTextColor, alignment: .center)
+
+        let checkboxColor: UIColor = isSelected
+            ? .main
+            : .lightGray
+
+        return CheckBoxTextNode.Input(
+            title: attributedTitle,
+            insets: .init(top: 8, left: 16, bottom: 8, right: 16),
+            preferredSize: CGSize(width: 30, height: 30),
+            checkBoxInput: CheckBoxNode.Input(
+                color: checkboxColor,
+                strokeWidth: 2
+            )
+        )
+    }
+
+    static func passPhraseLocally(isSelected: Bool) -> CheckBoxTextNode.Input {
+        Self.common(with: "setup_save_pass_locally".localized, isSelected: isSelected)
+    }
+
+    static func passPhraseMemory(isSelected: Bool) -> CheckBoxTextNode.Input {
+        Self.common(with: "setup_save_pass_in_memory".localized, isSelected: isSelected)
+    }
+}

FlowCrypt/Common UI/View Controllers/SegmentedViewController.swift

@@ -9,7 +9,7 @@
 import AsyncDisplayKit
 import FlowCryptUI
 
-// TODO: - ANTON - Move to FlowCryptUI
+// TODO: - Ticket - Move to FlowCryptUI
 struct Segment {
     let viewController: UIViewController
     let title: NSAttributedString

FlowCrypt/Controllers/Compose/ComposeViewController.swift

@@ -46,7 +46,7 @@ final class ComposeViewController: TableNodeViewController {
 
     private let messageSender: MessageGateway
     private let notificationCenter: NotificationCenter
-    private let dataService: DataServiceType & KeyDataServiceType
+    private let dataService: KeyStorageType
     private let decorator: ComposeViewDecoratorType
     private let core: Core
     private let contactsService: ContactsServiceType
@@ -59,18 +59,21 @@ final class ComposeViewController: TableNodeViewController {
     private var contextToSend = Context()
 
     private var state: State = .main
+    private let email: String
 
     init(
+        email: String,
         messageSender: MessageGateway = MailProvider.shared.messageSender,
         notificationCenter: NotificationCenter = .default,
-        dataService: DataServiceType & KeyDataServiceType = DataService.shared,
+        dataService: KeyStorageType = KeyDataStorage(),
         decorator: ComposeViewDecoratorType = ComposeViewDecorator(),
         input: ComposeViewController.Input = .empty,
         core: Core = Core.shared,
         cloudContactProvider: CloudContactsProvider = UserContactsProvider(),
         userDefaults: UserDefaults = .standard,
         contactsService: ContactsServiceType = ContactsService()
     ) {
+        self.email = email
         self.messageSender = messageSender
         self.notificationCenter = notificationCenter
         self.dataService = dataService
@@ -243,7 +246,7 @@ extension ComposeViewController {
                 ?? self.contextToSend.subject
                 ?? "(no subject)"
 
-            guard let myPubKey = self.dataService.publicKey else {
+            guard let myPubKey = self.dataService.publicKey() else {
                 self.showAlert(message: "compose_no_pub_sender".localized)
                 return false
             }
@@ -309,7 +312,7 @@ extension ComposeViewController {
             to: to,
             cc: cc,
             bcc: bcc,
-            from: dataService.email ?? "",
+            from: email,
             subject: subject,
             replyToMimeMsg: replyToMimeMsg,
             atts: atts

FlowCrypt/Controllers/Inbox/Container/InboxViewControllerContainer.swift

@@ -147,7 +147,7 @@ extension InboxViewControllerContainer: ASTableDelegate, ASTableDataSource {
             switch self.state {
             case .loading:
                 return TextCellNode(
-                    input: self.decorator.loadingInput(with: size)
+                    input: .loading(with: size)
                 )
             case .error(let error):
                 return TextCellNode(

FlowCrypt/Controllers/Inbox/Container/InboxViewControllerContainerDecorator.swift

@@ -31,13 +31,4 @@ struct InboxViewControllerContainerDecorator {
     func retryActionTitle() -> NSAttributedString {
         "retry_title".localized.attributed(color: .white)
     }
-
-    func loadingInput(with size: CGSize) -> TextCellNode.Input {
-        TextCellNode.Input(
-           backgroundColor: .backgroundColor,
-           title: "loading_title".localized,
-           withSpinner: true,
-           size: size
-       )
-    }
 }

FlowCrypt/Controllers/Inbox/InboxViewController.swift

@@ -50,7 +50,7 @@ final class InboxViewController: ASDKViewController<ASDisplayNode> {
     private var state: State = .idle
 
     private let messageProvider: MessagesListProvider
-    private let decorator: InboxViewDecoratorType
+    private let decorator: InboxViewDecorator
     private let enterpriseServerApi: EnterpriseServerApiType
     private let refreshControl = UIRefreshControl()
     private let tableNode: ASTableNode
@@ -64,7 +64,7 @@ final class InboxViewController: ASDKViewController<ASDisplayNode> {
     init(
         _ viewModel: InboxViewModel,
         messageProvider: MessagesListProvider = MailProvider.shared.messageListProvider,
-        decorator: InboxViewDecoratorType = InboxViewDecorator(),
+        decorator: InboxViewDecorator = InboxViewDecorator(),
         enterpriseServerApi: EnterpriseServerApiType = EnterpriseServerApi()
     ) {
         self.viewModel = viewModel
@@ -273,8 +273,11 @@ extension InboxViewController {
     }
 
     private func btnComposeTap() {
+        guard let email = DataService.shared.email else {
+            return
+        }
         TapTicFeedback.generate(.light)
-        let composeVc = ComposeViewController()
+        let composeVc = ComposeViewController(email: email)
         navigationController?.pushViewController(composeVc, animated: true)
     }
 }
@@ -330,17 +333,7 @@ extension InboxViewController: ASTableDataSource, ASTableDelegate {
     }
 
     func tableNode(_ tableNode: ASTableNode, nodeBlockForRowAt indexPath: IndexPath) -> ASCellNodeBlock {
-        let height = tableNode.frame.size.height
-            - (navigationController?.navigationBar.frame.size.height ?? 0.0)
-            - safeAreaWindowInsets.top
-            - safeAreaWindowInsets.bottom
-
-        let size = CGSize(
-            width: tableNode.frame.size.width,
-            height: max(height, 0)
-        )
-
-        return cellNode(for: indexPath, and: size)
+        cellNode(for: indexPath, and: visibleSize(for: tableNode))
     }
 
     func tableNode(_ tableNode: ASTableNode, didSelectRowAt indexPath: IndexPath) {
@@ -368,12 +361,7 @@ extension InboxViewController {
             case .fetching:
                 guard let message = self.messages[safe: indexPath.row] else {
                     return TextCellNode(
-                        input: TextCellNode.Input(
-                            backgroundColor: .backgroundColor,
-                            title: "Loading ...",
-                            withSpinner: true,
-                            size: CGSize(width: 44, height: 44)
-                        )
+                        input: .loading(with: CGSize(width: 44, height: 44))
                     )
                 }
                 return InboxCellNode(message: InboxCellNode.Input(message))

FlowCrypt/Controllers/Inbox/InboxViewDecorator.swift

@@ -36,13 +36,7 @@ extension InboxCellNode.Input {
     }
 }
 
-protocol InboxViewDecoratorType {
-    func initialNodeInput(for size: CGSize) -> TextCellNode.Input
-
-    func emptyStateNodeInput(for size: CGSize, title: String) -> TextCellNode.Input
-}
-
-struct InboxViewDecorator: InboxViewDecoratorType {
+struct InboxViewDecorator {
     func emptyStateNodeInput(for size: CGSize, title: String) -> TextCellNode.Input {
         TextCellNode.Input(
             backgroundColor: .backgroundColor,