Guard against scenario when an account has been deactivated and the o…

…utline tries to index itself
vincode-io · Mar 17, 2021 · dc971ce · dc971ce
1 parent 8bfe13d
commit dc971ce
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Templeton/Sources/Templeton/Outline.swift b/Templeton/Sources/Templeton/Outline.swift
@@ -1369,7 +1369,7 @@ public final class Outline: RowContainer, OPMLImporter, Identifiable, Equatable,
 	public func load() {
 		guard rowsFile == nil else { return }
 		rowsFile = RowsFile(outline: self)
-		rowsFile!.load()
+		rowsFile?.load()
 	}
 
 	public func save() {

diff --git a/Templeton/Sources/Templeton/RowsFile.swift b/Templeton/Sources/Templeton/RowsFile.swift
@@ -25,9 +25,12 @@ final class RowsFile {
 													   save: { [weak self] in self?.saveCallback() })
 	private var lastModificationDate: Date?
 
-	init(outline: Outline) {
+	init?(outline: Outline) {
+		guard let account = outline.account else {
+			return nil
+		}
 		self.outline = outline
-		let localAccountFolder = AccountManager.shared.accountsFolder.appendingPathComponent(outline.account!.type.folderName)
+		let localAccountFolder = AccountManager.shared.accountsFolder.appendingPathComponent(account.type.folderName)
 		fileURL = localAccountFolder.appendingPathComponent("\(outline.id.documentUUID).plist")
 	}