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

Merge branch 'charlesmchen/wrongfulNoteToSelf'

Browse Source
This commit is contained in:
Matthew Chen 2019-07-24 12:39:48 -03:00
commit a42c92be19
5 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Signal/src/Models/ThreadMapping.swift
View File

@ -136,10 +136,10 @@ class ThreadMapping: NSObject {
}
func update(isViewingArchive: Bool, transaction: SDSAnyReadTransaction) throws {
archiveCount = try threadFinder.threadCount(isArchived: true, transaction: transaction)
inboxCount = try threadFinder.threadCount(isArchived: false, transaction: transaction)
archiveCount = try threadFinder.visibleThreadCount(isArchived: true, transaction: transaction)
inboxCount = try threadFinder.visibleThreadCount(isArchived: false, transaction: transaction)
var newThreads: [TSThread] = []
try threadFinder.enumerateThreads(isArchived: isViewingArchive, transaction: transaction) { thread in
try threadFinder.enumerateVisibleThreads(isArchived: isViewingArchive, transaction: transaction) { thread in
newThreads.append(thread)
}
threads = newThreads

9
SignalServiceKit/src/Contacts/TSThread.m
View File

@ -391,7 +391,16 @@ isArchivedByLegacyTimestampForSorting:(BOOL)isArchivedByLegacyTimestampForSortin
{
OWSAssertDebug(interaction);
if (!interaction.shouldBeSaved) {
OWSFailDebug(@"Unexpected interaction type: %@", interaction.class);
return NO;
}
if (interaction.isDynamicInteraction) {
OWSFailDebug(@"Unexpected interaction type: %@", interaction.class);
return NO;
}
if ([interaction isKindOfClass:[OWSOutgoingSyncMessage class]]) {
OWSFailDebug(@"Unexpected interaction type: %@", interaction.class);
return NO;
}

1
SignalServiceKit/src/SignalServiceKit.h
View File

@ -21,6 +21,7 @@
#import <SignalServiceKit/OWSLinkedDeviceReadReceipt.h>
#import <SignalServiceKit/OWSMessageReceiver.h>
#import <SignalServiceKit/OWSOperation.h>
#import <SignalServiceKit/OWSOutgoingSyncMessage.h>
#import <SignalServiceKit/OWSReadReceiptManager.h>
#import <SignalServiceKit/OWSRecipientIdentity.h>
#import <SignalServiceKit/OWSSessionResetJobRecord.h>

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

@ -8,8 +8,8 @@ import GRDBCipher
public protocol ThreadFinder {
associatedtype ReadTransaction
func threadCount(isArchived: Bool, transaction: ReadTransaction) throws -> UInt
func enumerateThreads(isArchived: Bool, transaction: ReadTransaction, block: @escaping (TSThread) -> Void) throws
func visibleThreadCount(isArchived: Bool, transaction: ReadTransaction) throws -> UInt
func enumerateVisibleThreads(isArchived: Bool, transaction: ReadTransaction, block: @escaping (TSThread) -> Void) throws
}
public class AnyThreadFinder: ThreadFinder {
@ -20,21 +20,21 @@ public class AnyThreadFinder: ThreadFinder {
public init() { }
public func threadCount(isArchived: Bool, transaction: SDSAnyReadTransaction) throws -> UInt {
public func visibleThreadCount(isArchived: Bool, transaction: SDSAnyReadTransaction) throws -> UInt {
switch transaction.readTransaction {
case .grdbRead(let grdb):
return try grdbAdapter.threadCount(isArchived: isArchived, transaction: grdb.database)
return try grdbAdapter.visibleThreadCount(isArchived: isArchived, transaction: grdb.database)
case .yapRead(let yap):
return yapAdapter.threadCount(isArchived: isArchived, transaction: yap)
return yapAdapter.visibleThreadCount(isArchived: isArchived, transaction: yap)
}
}
public func enumerateThreads(isArchived: Bool, transaction: SDSAnyReadTransaction, block: @escaping (TSThread) -> Void) throws {
public func enumerateVisibleThreads(isArchived: Bool, transaction: SDSAnyReadTransaction, block: @escaping (TSThread) -> Void) throws {
switch transaction.readTransaction {
case .grdbRead(let grdb):
try grdbAdapter.enumerateThreads(isArchived: isArchived, transaction: grdb.database, block: block)
try grdbAdapter.enumerateVisibleThreads(isArchived: isArchived, transaction: grdb.database, block: block)
case .yapRead(let yap):
yapAdapter.enumerateThreads(isArchived: isArchived, transaction: yap, block: block)
yapAdapter.enumerateVisibleThreads(isArchived: isArchived, transaction: yap, block: block)
}
}
}
@ -42,14 +42,14 @@ public class AnyThreadFinder: ThreadFinder {
struct YAPDBThreadFinder: ThreadFinder {
typealias ReadTransaction = YapDatabaseReadTransaction
func threadCount(isArchived: Bool, transaction: YapDatabaseReadTransaction) -> UInt {
func visibleThreadCount(isArchived: Bool, transaction: YapDatabaseReadTransaction) -> UInt {
guard let view = ext(transaction) else {
return 0
}
return view.numberOfItems(inGroup: group(isArchived: isArchived))
}
func enumerateThreads(isArchived: Bool, transaction: YapDatabaseReadTransaction, block: @escaping (TSThread) -> Void) {
func enumerateVisibleThreads(isArchived: Bool, transaction: YapDatabaseReadTransaction, block: @escaping (TSThread) -> Void) {
guard let view = ext(transaction) else {
return
}
@ -82,11 +82,12 @@ struct GRDBThreadFinder: ThreadFinder {
static let cn = ThreadRecord.columnName
func threadCount(isArchived: Bool, transaction: Database) throws -> UInt {
func visibleThreadCount(isArchived: Bool, transaction: Database) throws -> UInt {
guard let count = try UInt.fetchOne(transaction, sql: """
SELECT COUNT(*)
FROM (
SELECT
\( threadColumn: .shouldThreadBeVisible),
CASE maxInteractionId <= \(threadColumn: .archivedAsOfMessageSortId)
WHEN 1 THEN 1
ELSE 0
@ -102,16 +103,17 @@ struct GRDBThreadFinder: ThreadFinder {
ON latestInteractions.\(interactionColumn: .threadUniqueId) = \(threadColumn: .uniqueId)
)
WHERE isArchived = ?
""",
arguments: [isArchived]) else {
owsFailDebug("count was unexpectedly nil")
return 0
AND \(threadColumn: .shouldThreadBeVisible) = 1
""",
arguments: [isArchived]) else {
owsFailDebug("count was unexpectedly nil")
return 0
}
return count
}
func enumerateThreads(isArchived: Bool, transaction: Database, block: @escaping (TSThread) -> Void) throws {
func enumerateVisibleThreads(isArchived: Bool, transaction: Database, block: @escaping (TSThread) -> Void) throws {
try ThreadRecord.fetchCursor(transaction, sql: """
SELECT *
FROM (
@ -133,9 +135,10 @@ struct GRDBThreadFinder: ThreadFinder {
ORDER BY maxInteractionId DESC
)
WHERE isArchived = ?
""",
arguments: [isArchived]).forEach { threadRecord in
block(try TSThread.fromRecord(threadRecord))
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;
}];