signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Ensure thread finder only deals with visible threads.

Browse Source
This commit is contained in:
Matthew Chen 2019-07-22 17:35:27 -03:00
parent a69c247b21
commit 8df19c2ed6
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
SignalServiceKit/src/Storage/Database/Records/ThreadFinder.swift
View File

@ -87,12 +87,13 @@ struct GRDBThreadFinder: ThreadFinder {
SELECT COUNT(*)
FROM (
SELECT
\( threadColumn: .shouldThreadBeVisible),
CASE maxInteractionId <= \(threadColumn: .archivedAsOfMessageSortId)
WHEN 1 THEN 1
ELSE 0
END isArchived
FROM \(ThreadRecord.databaseTableName)
INNER JOIN (
LEFT JOIN (
SELECT
MAX(\(interactionColumn: .id)) as maxInteractionId,
\(interactionColumn: .threadUniqueId)
@ -102,6 +103,7 @@ struct GRDBThreadFinder: ThreadFinder {
ON latestInteractions.\(interactionColumn: .threadUniqueId) = \(threadColumn: .uniqueId)
)
WHERE isArchived = ?
AND \(threadColumn: .shouldThreadBeVisible) = 1
""",
arguments: [isArchived]) else {
owsFailDebug("count was unexpectedly nil")
@ -122,7 +124,7 @@ struct GRDBThreadFinder: ThreadFinder {
ELSE 0
END isArchived
FROM \(ThreadRecord.databaseTableName)
INNER JOIN (
LEFT JOIN (
SELECT
MAX(\(interactionColumn: .id)) as maxInteractionId,
\(interactionColumn: .threadUniqueId)
@ -133,6 +135,7 @@ struct GRDBThreadFinder: ThreadFinder {
ORDER BY maxInteractionId DESC
)
WHERE isArchived = ?
AND \( threadColumn: .shouldThreadBeVisible) = 1
""",
arguments: [isArchived]).forEach { threadRecord in
block(try TSThread.fromRecord(threadRecord))

2
SignalServiceKit/src/Storage/TSDatabaseView.m
View File

@ -319,10 +319,12 @@ NSString *const TSLazyRestoreAttachmentsGroup = @"TSLazyRestoreAttachmentsGroup"
OWSAssertDebug(viewTransaction);
NSUInteger threadMessageCount = [viewTransaction numberOfItemsInGroup:thread.uniqueId];
if (threadMessageCount < 1) {
OWSAssertDebug(!thread.shouldThreadBeVisible);
return nil;
}
}
OWSAssertDebug(thread.shouldThreadBeVisible);
return [thread isArchivedWithTransaction:transaction.asAnyRead] ? TSArchiveGroup : TSInboxGroup;
}];