From 7cceec93253b4e7f26d346dfada61130cddc68dc Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 18 Jul 2019 17:36:06 -0300 Subject: [PATCH] Respond to CR. --- SignalServiceKit/src/Messages/TSCall.m | 2 +- .../Database/Records/InteractionFinder.swift | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/SignalServiceKit/src/Messages/TSCall.m b/SignalServiceKit/src/Messages/TSCall.m index a449ae04bb..10481836e1 100644 --- a/SignalServiceKit/src/Messages/TSCall.m +++ b/SignalServiceKit/src/Messages/TSCall.m @@ -208,7 +208,7 @@ NSUInteger TSCallCurrentSchemaVersion = 1; [self anyUpdateCallWithTransaction:transaction block:^(TSCall *call) { - self.callType = callType; + call.callType = callType; }]; } diff --git a/SignalServiceKit/src/Storage/Database/Records/InteractionFinder.swift b/SignalServiceKit/src/Storage/Database/Records/InteractionFinder.swift index 528d7f1f26..63b1b47635 100644 --- a/SignalServiceKit/src/Storage/Database/Records/InteractionFinder.swift +++ b/SignalServiceKit/src/Storage/Database/Records/InteractionFinder.swift @@ -622,8 +622,10 @@ struct GRDBInteractionFinderAdapter: InteractionFinderAdapter { SELECT \(interactionColumn: .uniqueId) FROM \(InteractionRecord.databaseTableName) WHERE \(interactionColumn: .recordType) = ? - AND ( \(interactionColumn: .callType) = ? - OR \(interactionColumn: .callType) = ? ) + AND ( + \(interactionColumn: .callType) = ? + OR \(interactionColumn: .callType) = ? + ) """ let statementArguments: StatementArguments = [ SDSRecordType.call.rawValue, @@ -632,12 +634,9 @@ struct GRDBInteractionFinderAdapter: InteractionFinderAdapter { ] var result = [String]() do { - let cursor = try String.fetchCursor(transaction.database, - sql: sql, - arguments: statementArguments) - while let uniqueId = try cursor.next() { - result.append(uniqueId) - } + result = try String.fetchAll(transaction.database, + sql: sql, + arguments: statementArguments) } catch { owsFailDebug("error: \(error)") }