From 0f2162ff7d6ed9a306d8308cac3c2b9d2a80f6ff Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Mon, 7 Sep 2020 16:22:21 -0500 Subject: [PATCH] Change Account initializer so that it is no longer optional. Issue #2400 --- Frameworks/Account/Account.swift | 2 +- Frameworks/Account/AccountManager.swift | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Frameworks/Account/Account.swift b/Frameworks/Account/Account.swift index 3157fb699..92b8c5251 100644 --- a/Frameworks/Account/Account.swift +++ b/Frameworks/Account/Account.swift @@ -250,7 +250,7 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container, return delegate.refreshProgress } - init?(dataFolder: String, type: AccountType, accountID: String, transport: Transport? = nil) { + init(dataFolder: String, type: AccountType, accountID: String, transport: Transport? = nil) { switch type { case .onMyMac: self.delegate = LocalAccountDelegate() diff --git a/Frameworks/Account/AccountManager.swift b/Frameworks/Account/AccountManager.swift index b71e981be..7c6583c7b 100644 --- a/Frameworks/Account/AccountManager.swift +++ b/Frameworks/Account/AccountManager.swift @@ -103,7 +103,7 @@ public final class AccountManager: UnreadCountProvider { abort() } - defaultAccount = Account(dataFolder: localAccountFolder, type: .onMyMac, accountID: defaultAccountIdentifier)! + defaultAccount = Account(dataFolder: localAccountFolder, type: .onMyMac, accountID: defaultAccountIdentifier) accountsDictionary[defaultAccount.accountID] = defaultAccount readAccountsFromDisk() @@ -130,7 +130,7 @@ public final class AccountManager: UnreadCountProvider { abort() } - let account = Account(dataFolder: accountFolder, type: type, accountID: accountID)! + let account = Account(dataFolder: accountFolder, type: type, accountID: accountID) accountsDictionary[accountID] = account var userInfo = [String: Any]()