From 622c0c3f5f47628cfe1597f84a5045ceb2f7d9b6 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 16 Aug 2017 15:33:46 -0400 Subject: [PATCH] =?UTF-8?q?*=20Add=20debug=20UI=20tools=20for=20clearing?= =?UTF-8?q?=20and=20logging=20the=20profile=20whitelist.=20*=20Auto-add=20?= =?UTF-8?q?new=20contact=20threads=20to=20profile=20whitelist=20when=20loc?= =?UTF-8?q?al=20user=20sends=20first=20message=20to=20that=20thread.=20*?= =?UTF-8?q?=20Ensure=20dynamic=20interactions=20have=20a=20non-negative=20?= =?UTF-8?q?timestamp=20even=20if=20the=20conversation=20was=20empty.=20*?= =?UTF-8?q?=20Only=20call=20updateMessageMappingRangeOptions=20=5Fafter=5F?= =?UTF-8?q?=20beginLongLivedReadTransaction=20and=20updating=20messageMapp?= =?UTF-8?q?ings.=20*=20Improve=20documentation=20around=20how=20to=20avoid?= =?UTF-8?q?=20corrupt=20mappings=20in=20conversation=20view.=20*=20Fix=20e?= =?UTF-8?q?dge=20cases=20around=20large=20initial=20range=20sizes.=20*=20A?= =?UTF-8?q?lways=20treat=20dynamic=20interactions=20as=20read.=20*=20Rebui?= =?UTF-8?q?ld=20the=20=E2=80=9Cunseen=E2=80=9D=20database=20views=20to=20r?= =?UTF-8?q?emove=20dynamic=20interactions=20(see=20above).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit // FREEBIE --- SignalServiceKit/src/Messages/TSMessagesManager.m | 6 +++--- SignalServiceKit/src/Storage/TSDatabaseView.m | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SignalServiceKit/src/Messages/TSMessagesManager.m b/SignalServiceKit/src/Messages/TSMessagesManager.m index 272940895..d0a001ac7 100644 --- a/SignalServiceKit/src/Messages/TSMessagesManager.m +++ b/SignalServiceKit/src/Messages/TSMessagesManager.m @@ -1141,9 +1141,9 @@ NS_ASSUME_NONNULL_BEGIN - (NSUInteger)unreadMessagesCountExcept:(TSThread *)thread { __block NSUInteger numberOfItems; [self.dbConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) { - numberOfItems = [[transaction ext:TSUnreadDatabaseViewExtensionName] numberOfItemsInAllGroups]; - numberOfItems = - numberOfItems - [[transaction ext:TSUnreadDatabaseViewExtensionName] numberOfItemsInGroup:thread.uniqueId]; + id databaseView = [transaction ext:TSUnreadDatabaseViewExtensionName]; + OWSAssert(databaseView); + numberOfItems = ([databaseView numberOfItemsInAllGroups] - [databaseView numberOfItemsInGroup:thread.uniqueId]); }]; return numberOfItems; diff --git a/SignalServiceKit/src/Storage/TSDatabaseView.m b/SignalServiceKit/src/Storage/TSDatabaseView.m index 8334be2d5..5add51cf4 100644 --- a/SignalServiceKit/src/Storage/TSDatabaseView.m +++ b/SignalServiceKit/src/Storage/TSDatabaseView.m @@ -125,7 +125,7 @@ NSString *const TSSecondaryDevicesDatabaseViewExtensionName = @"TSSecondaryDevic [self registerMessageDatabaseViewWithName:TSUnreadDatabaseViewExtensionName viewGrouping:viewGrouping - version:@"2" + version:@"1" async:NO]; }