From 0eebd4e07907f72b767cfe51e2b158203531d32b Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 22 Sep 2021 15:49:29 -0300 Subject: [PATCH] Handle certain call messages sync. --- Signal/src/Calls/CallService.swift | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/Signal/src/Calls/CallService.swift b/Signal/src/Calls/CallService.swift index 0ea8c7bd58..87edd94680 100644 --- a/Signal/src/Calls/CallService.swift +++ b/Signal/src/Calls/CallService.swift @@ -378,7 +378,16 @@ public final class CallService: NSObject { /** * Clean up any existing call state and get ready to receive a new call. */ - func terminate(call: SignalCall, transaction: SDSAnyReadTransaction? = nil) { + func terminate(call: SignalCall) { + databaseStorage.read { transaction in + self.terminate(call: call, transaction: transaction) + } + } + + /** + * Clean up any existing call state and get ready to receive a new call. + */ + func terminate(call: SignalCall, transaction: SDSAnyReadTransaction) { AssertIsOnMainThread() Logger.info("call: \(call as Optional)") @@ -403,13 +412,7 @@ public final class CallService: NSObject { // Kick off a peek now that we've disconnected to get an updated participant state. if let thread = call.thread as? TSGroupThread { - if let transaction = transaction { - peekCallAndUpdateThread(thread, transaction: transaction) - } else { - databaseStorage.read { transaction in - peekCallAndUpdateThread(thread, transaction: transaction) - } - } + peekCallAndUpdateThread(thread, transaction: transaction) } else { owsFailDebug("Invalid thread type") }