Fix async database transaction handling

5 years ago · 1b45a50fe2
parent f1ec7e67b1
commit 1b45a50fe2
1 changed files with 3 additions and 3 deletions
--- a/SignalServiceKit/src/Loki/Database/Storage.swift
+++ b/SignalServiceKit/src/Loki/Database/Storage.swift
@ -53,9 +53,9 @@ public final class Storage : NSObject {
    public static func write(with block: @escaping (YapDatabaseReadWriteTransaction) -> Void, completion: @escaping () -> Void) -> Promise<Void> {
        let (promise, seal) = Promise<Void>.pending()
        serialQueue.async {
-            owsStorage.dbReadWriteConnection.readWrite(block)
-            DispatchQueue.main.async {
-                completion()
+            owsStorage.dbReadWriteConnection.readWrite { transaction in
+                transaction.addCompletionQueue(DispatchQueue.main, completionBlock: completion)
+                block(transaction)
            }
            seal.fulfill(())
        }