From 4e4d2769e048a4285a5b78286bc88e2dbb8b4170 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 14 Sep 2020 10:41:13 -0300 Subject: [PATCH] Remove redundant variable. --- .../Database/Snapshots/UIDatabaseSnapshot.swift | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/SignalServiceKit/src/Storage/Database/Snapshots/UIDatabaseSnapshot.swift b/SignalServiceKit/src/Storage/Database/Snapshots/UIDatabaseSnapshot.swift index 63b2847c15..174eddb247 100644 --- a/SignalServiceKit/src/Storage/Database/Snapshots/UIDatabaseSnapshot.swift +++ b/SignalServiceKit/src/Storage/Database/Snapshots/UIDatabaseSnapshot.swift @@ -148,8 +148,6 @@ public class UIDatabaseObserver: NSObject { private let displayLinkPreferredFramesPerSecond: Int = 60 private var recentDisplayLinkDates = [Date]() - private var didDatabaseModifyInteractions = false - fileprivate var pendingChanges = ObservedDatabaseChanges(concurrencyMode: .uiDatabaseObserverSerialQueue) fileprivate var committedChanges = ObservedDatabaseChanges(concurrencyMode: .mainThread) @@ -318,10 +316,6 @@ extension UIDatabaseObserver: TransactionObserver { pendingChanges.append(deletedAttachmentRowId: event.rowID) } - if event.tableName == InteractionRecord.databaseTableName { - didDatabaseModifyInteractions = true - } - #if TESTABLE_BUILD for delegate in databaseWriteDelegates { delegate.databaseDidChange(with: event) @@ -362,10 +356,10 @@ extension UIDatabaseObserver: TransactionObserver { } } - if didDatabaseModifyInteractions { + let didModifyInteractions = pendingChangesToCommit.tableNames.contains(InteractionRecord.databaseTableName) + if didModifyInteractions { NotificationCenter.default.postNotificationNameAsync(Self.databaseDidCommitInteractionChangeNotification, object: nil) } - didDatabaseModifyInteractions = false #if TESTABLE_BUILD for delegate in databaseWriteDelegates {