From 4a028d32b1419e7b5de9d7e5ed2d07c66a2bc4a2 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 12 Jun 2017 13:33:12 -0400 Subject: [PATCH] Filter messages shown in the home view. // FREEBIE --- src/Contacts/TSThread.m | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/src/Contacts/TSThread.m b/src/Contacts/TSThread.m index fa1aebcb3..643dfd203 100644 --- a/src/Contacts/TSThread.m +++ b/src/Contacts/TSThread.m @@ -240,7 +240,7 @@ NS_ASSUME_NONNULL_BEGIN [TSStorageManager.sharedManager.dbConnection readWithBlock:^(YapDatabaseReadTransaction *transaction){ last = [[transaction ext:TSMessageDatabaseViewExtensionName] lastObjectInGroup:self.uniqueId]; }]; - return (TSInteraction *)last; + return last; } - (TSInteraction *)lastInteractionForInbox @@ -249,7 +249,7 @@ NS_ASSUME_NONNULL_BEGIN [TSStorageManager.sharedManager.dbConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) { last = [[transaction ext:TSThreadInboxMessagesDatabaseViewExtensionName] lastObjectInGroup:self.uniqueId]; }]; - return (TSInteraction *)last; + return last; } - (NSDate *)lastMessageDate { @@ -278,7 +278,6 @@ NS_ASSUME_NONNULL_BEGIN return NO; } - if ([interaction isKindOfClass:[TSErrorMessage class]]) { TSErrorMessage *errorMessage = (TSErrorMessage *)interaction; if (errorMessage.errorType == TSErrorMessageNonBlockingIdentityChange) { @@ -309,29 +308,6 @@ NS_ASSUME_NONNULL_BEGIN } NSDate *lastMessageDate = [lastMessage dateForSorting]; - - if ([lastMessage isKindOfClass:[TSErrorMessage class]]) { - TSErrorMessage *errorMessage = (TSErrorMessage *)lastMessage; - if (errorMessage.errorType == TSErrorMessageNonBlockingIdentityChange) { - // Otherwise all group threads with the recipient will percolate to the top of the inbox, even though - // there was no meaningful interaction. - DDLogDebug(@"%@ not updating lastMessage for thread: %@ nonblocking identity change: %@", - self.tag, - self, - errorMessage.debugDescription); - return; - } - } else if ([lastMessage isKindOfClass:[TSInfoMessage class]]) { - TSInfoMessage *infoMessage = (TSInfoMessage *)lastMessage; - if (infoMessage.messageType == TSInfoMessageVerificationStateChange) { - DDLogDebug(@"%@ not updating lastMessage for thread: %@ verification state change: %@", - self.tag, - self, - infoMessage.debugDescription); - return; - } - } - if (!_lastMessageDate || [lastMessageDate timeIntervalSinceDate:self.lastMessageDate] > 0) { _lastMessageDate = lastMessageDate;