Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions FlowCrypt/App/Logger.swift
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ struct Logger {
}
}

static var dateFormatter = DateFormatter().then {
static var dateFormatter = DateFormatter().then {
$0.dateFormat = "HH:mm:ss"
$0.locale = .current
$0.timeZone = .current
Expand Down Expand Up @@ -143,12 +143,12 @@ extension Logger {
}

static func nested<T>(_ type: T.Type) -> Logger {
Logger(config: .default, label: "[\(String.init(describing: type))]")
Logger(config: .default, label: "[\(String(describing: type))]")
}

static func nested<T>(in type: T.Type, with label: String) -> Logger {
var message = "[\(label)]"
message.append("[\(String.init(describing: type))]")
message.append("[\(String(describing: type))]")
return Logger(config: .default, label: message)
}
}
Expand Down
2 changes: 1 addition & 1 deletion FlowCrypt/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
// FlowCrypt
//

import UIKit
import AppAuth
import UIKit

class AppDelegate: UIResponder, UIApplicationDelegate {
var googleAuthSession: OIDExternalUserAgentSession?
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ final class SegmentedViewController: ASDKViewController<ASDisplayNode> {
super.init(node: ASDisplayNode())
}

@available(*, unavailable)
required init?(coder _: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ final class WebViewController: UIViewController {
super.init(nibName: nil, bundle: nil)
}

@available(*, unavailable)
required init?(coder _: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ final class ComposeViewController: TableNodeViewController {
super.init(node: TableNode())
}

@available(*, unavailable)
required init?(coder _: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ final class EnterPassPhraseViewController: TableNodeViewController {
super.init(node: TableNode())
}

@available(*, unavailable)
required init?(coder _: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ final class ImportKeyViewController: TableNodeViewController {
super.init(node: TableNode())
}

@available(*, unavailable)
required init?(coder _: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//

import AsyncDisplayKit
import FlowCryptUI
import FlowCryptCommon
import FlowCryptUI

// MARK: - InboxViewControllerContainer
// Used to fetch folders and get correct path for "inbox" folder
Expand Down Expand Up @@ -45,6 +45,7 @@ final class InboxViewControllerContainer: TableNodeViewController {
node.dataSource = self
}

@available(*, unavailable)
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
// Copyright © 2020 FlowCrypt Limited. All rights reserved.
//

import UIKit
import FlowCryptUI
import UIKit

struct InboxViewControllerContainerDecorator {
func emptyFoldersInput(with size: CGSize) -> TextCellNode.Input {
Expand Down
1 change: 1 addition & 0 deletions FlowCrypt/Controllers/Inbox/InboxViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ final class InboxViewController: ASDKViewController<ASDisplayNode> {
tableNode.leadingScreensForBatching = 1
}

@available(*, unavailable)
required init?(coder _: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
Expand Down
3 changes: 2 additions & 1 deletion FlowCrypt/Controllers/Msg/MessageViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ final class MessageViewController: TableNodeViewController {
super.init(node: TableNode())
}

@available(*, unavailable)
required init?(coder _: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
Expand Down Expand Up @@ -281,7 +282,7 @@ extension MessageViewController {
return true
}
.then(on: .main) { [weak self] didPerformOp in
guard didPerformOp else { self?.hideSpinner(); return }
guard didPerformOp else { self?.hideSpinner(); return }
self?.handleOpSuccess(operation: .permanentlyDelete)
}.catch(on: .main) { [weak self] _ in
self?.handleOpErr(operation: .permanentlyDelete)
Expand Down
1 change: 1 addition & 0 deletions FlowCrypt/Controllers/Search/SearchViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ final class SearchViewController: TableNodeViewController {
super.init(node: TableNode())
}

@available(*, unavailable)
required init?(coder _: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
// Copyright © 2020 FlowCrypt Limited. All rights reserved.
//

import FlowCryptUI
import AsyncDisplayKit
import FlowCryptUI

enum BackupOption: Int, CaseIterable, Equatable {
case email, download
Expand Down Expand Up @@ -47,6 +47,7 @@ final class BackupOptionsViewController: ASDKViewController<TableNode> {
super.init(node: TableNode())
}

@available(*, unavailable)
required init?(coder _: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
// Copyright © 2020 FlowCrypt Limited. All rights reserved.
//

import UIKit
import FlowCryptUI
import UIKit

protocol BackupOptionsViewDecoratorType {
var sceneTitle: String { get }
Expand Down Expand Up @@ -62,7 +62,7 @@ struct BackupOptionsViewDecorator: BackupOptionsViewDecoratorType {
? .main
: .lightGray

return CheckBoxTextNode.Input.init(
return CheckBoxTextNode.Input(
title: attributedTitle,
insets: .side(16),
preferredSize: CGSize(width: 30, height: 30),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
// Copyright © 2020 FlowCrypt Limited. All rights reserved.
//

import FlowCryptUI
import AsyncDisplayKit
import FlowCryptUI

final class BackupViewController: ASDKViewController<TableNode> {
private enum Parts: Int, CaseIterable {
Expand Down Expand Up @@ -50,6 +50,7 @@ final class BackupViewController: ASDKViewController<TableNode> {
super.init(node: TableNode())
}

@available(*, unavailable)
required init?(coder _: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
// Copyright © 2020 FlowCrypt Limited. All rights reserved.
//

import UIKit
import FlowCryptUI
import FlowCryptCommon
import FlowCryptUI
import UIKit

protocol BackupSelectKeyDecoratorType {
var sceneTitle: String { get }
Expand Down Expand Up @@ -37,7 +37,7 @@ struct BackupSelectKeyDecorator: BackupSelectKeyDecoratorType {
? .main
: .lightGray

return CheckBoxTextNode.Input.init(
return CheckBoxTextNode.Input(
title: title,
subtitle: subtitle,
insets: UIEdgeInsets(top: 8, left: 16, bottom: 8, right: 16),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
// Copyright © 2020 FlowCrypt Limited. All rights reserved.
//

import Foundation
import FlowCryptUI
import AsyncDisplayKit
import FlowCryptUI
import Foundation

final class BackupSelectKeyViewController: ASDKViewController<TableNode> {
private let backupService: BackupServiceType
Expand All @@ -34,6 +34,7 @@ final class BackupSelectKeyViewController: ASDKViewController<TableNode> {
super.init(node: TableNode())
}

@available(*, unavailable)
required init?(coder _: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
// Copyright © 2020 FlowCrypt Limited. All rights reserved.
//

import Foundation
import FlowCryptUI
import Foundation

protocol ContactDetailDecoratorType {
var title: String { get }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ final class ContactDetailViewController: TableNodeViewController {
super.init(node: TableNode())
}

@available(*, unavailable)
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
// Copyright © 2020 FlowCrypt Limited. All rights reserved.
//

import UIKit
import FlowCryptUI
import UIKit

protocol ContactsListDecoratorType {
var title: String { get }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
// Copyright © 2020 FlowCrypt Limited. All rights reserved.
//

import FlowCryptUI
import AsyncDisplayKit
import FlowCryptCommon
import FlowCryptUI

final class ContactsListViewController: TableNodeViewController {
private let decorator: ContactsListDecoratorType
Expand All @@ -24,6 +24,7 @@ final class ContactsListViewController: TableNodeViewController {
super.init(node: TableNode())
}

@available(*, unavailable)
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ final class LegalViewController: UIViewController {
super.init(nibName: nil, bundle: nil)
}

@available(*, unavailable)
required init?(coder _: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ final class KeyDetailInfoViewController: TableNodeViewController {
super.init(node: TableNode())
}

@available(*, unavailable)
required init?(coder _: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ final class KeyDetailViewController: TableNodeViewController {
super.init(node: TableNode())
}

@available(*, unavailable)
required init?(coder _: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ final class KeySettingsViewController: TableNodeViewController {
super.init(node: TableNode())
}

@available(*, unavailable)
required init?(coder _: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
// Copyright © 2019 FlowCrypt Limited. All rights reserved.
//

import Foundation
import FlowCryptCommon
import Foundation

protocol KeySettingsViewDecoratorType {
func attributedUsers(key: KeyDetails) -> NSAttributedString
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ final class PublicKeyDetailViewController: TableNodeViewController {
super.init(node: TableNode())
}

@available(*, unavailable)
required init?(coder _: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
Expand All @@ -38,7 +39,7 @@ extension PublicKeyDetailViewController: ASTableDelegate, ASTableDataSource {

func tableNode(_: ASTableNode, nodeBlockForRowAt _: IndexPath) -> ASCellNodeBlock {
return { [weak self] in
return SetupTitleNode(
SetupTitleNode(
SetupTitleNode.Input(
title: (self?.text ?? "").attributed(.regular(16)),
insets: .side(16),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ final class SettingsViewController: TableNodeViewController {
super.init(node: TableNode())
}

@available(*, unavailable)
required init?(coder _: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
Expand Down
1 change: 1 addition & 0 deletions FlowCrypt/Controllers/Setup/SetupViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ final class SetupViewController: TableNodeViewController {
super.init(node: TableNode())
}

@available(*, unavailable)
required init?(coder _: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ final class MyMenuViewController: ASDKViewController<ASDisplayNode> {
super.init(node: ASDisplayNode())
}

@available(*, unavailable)
required init?(coder _: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
Expand Down Expand Up @@ -275,7 +276,6 @@ extension MyMenuViewController {
divider.backgroundColor = decorator.dividerColor
}
}

}

// MARK: - Actions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
// Copyright © 2020 FlowCrypt Limited. All rights reserved.
//

import FlowCryptUI
import FlowCryptCommon
import FlowCryptUI
import UIKit

protocol MyMenuViewDecoratorType {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ final class EmailProviderViewController: TableNodeViewController {
node.dataSource = self
}

@available(*, unavailable)
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
Expand Down Expand Up @@ -511,7 +512,6 @@ extension EmailProviderViewController {

return .success(user)
}

}

// MARK: - Picker
Expand Down
Loading