Fixed crash in WorkingSetObserver

tobihagemann · tobihagemann · commit 68fd066f388c · 2022-07-11T11:02:28.000+02:00
And reverted change in DatabaseManager that wasn't necessary
diff --git a/Cryptomator/Common/DatabaseManager.swift b/Cryptomator/Common/DatabaseManager.swift
@@ -50,7 +50,7 @@ class DatabaseManager {
 	func observeVaultAccounts(onError: @escaping (Error) -> Void, onChange: @escaping ([VaultAccount]) -> Void) -> DatabaseCancellable {
 		let observation = ValueObservation.tracking { db in
 			try VaultAccount.fetchAll(db)
-		}.removeDuplicates()
+		}
 		return observation.start(in: dbPool, scheduling: .immediate, onError: onError, onChange: onChange)
 	}
 
diff --git a/CryptomatorFileProvider/DB/WorkingSetObserver.swift b/CryptomatorFileProvider/DB/WorkingSetObserver.swift
@@ -37,7 +37,6 @@ class WorkingSetObserver: WorkingSetObserving {
 			try ItemMetadata.filterWorkingSet().fetchAll(db)
 		}.removeDuplicates()
 		observer = observation.start(in: database,
-		                             scheduling: .immediate,
 		                             onError: { error in
 		                             	DDLogError("Working set startObservation error: \(error)")
 		                             },

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ class DatabaseManager {`
`50`	`50`	`func observeVaultAccounts(onError: @escaping (Error) -> Void, onChange: @escaping ([VaultAccount]) -> Void) -> DatabaseCancellable {`
`51`	`51`	`let observation = ValueObservation.tracking { db in`
`52`	`52`	`try VaultAccount.fetchAll(db)`
`53`		`- }.removeDuplicates()`
	`53`	`+ }`
`54`	`54`	`return observation.start(in: dbPool, scheduling: .immediate, onError: onError, onChange: onChange)`
`55`	`55`	`}`
`56`	`56`