Merge branch 'mkirk/fix-sort'

SignalServiceKit/src/Contacts/TSThread.m

@@ -429,6 +429,8 @@ ConversationColorName const kConversationColorName_Default = ConversationColorNa
     if (!self.shouldThreadBeVisible) {
         self.shouldThreadBeVisible = YES;
         [self saveWithTransaction:transaction];
+    } else {
+        [self touchWithTransaction:transaction];
     }
 }
 

SignalServiceKit/src/Messages/Interactions/TSErrorMessage.m

@@ -218,7 +218,6 @@ NSUInteger TSErrorMessageSchemaVersion = 1;
     OWSLogDebug(@"marking as read uniqueId: %@ which has timestamp: %llu", self.uniqueId, self.timestamp);
     _read = YES;
     [self saveWithTransaction:transaction];
-    [self touchThreadWithTransaction:transaction];
 
     // Ignore sendReadReceipt - it doesn't apply to error messages.
 }

SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.m

@@ -158,7 +158,6 @@ NS_ASSUME_NONNULL_BEGIN
         secondsAgoRead);
     _read = YES;
     [self saveWithTransaction:transaction];
-    [self touchThreadWithTransaction:transaction];
     
     [transaction addCompletionQueue:nil
                     completionBlock:^{

SignalServiceKit/src/Messages/Interactions/TSInfoMessage.m

@@ -181,7 +181,6 @@ NSUInteger TSInfoMessageSchemaVersion = 1;
     OWSLogDebug(@"marking as read uniqueId: %@ which has timestamp: %llu", self.uniqueId, self.timestamp);
     _read = YES;
     [self saveWithTransaction:transaction];
-    [self touchThreadWithTransaction:transaction];
 
     // Ignore sendReadReceipt, it doesn't apply to info messages.
 }

SignalServiceKit/src/Messages/Interactions/TSInteraction.m

@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
 //
 
 #import "TSInteraction.h"
@@ -160,8 +160,16 @@ NSString *NSStringFromOWSInteractionType(OWSInteractionType value)
 
 - (void)touchThreadWithTransaction:(YapDatabaseReadWriteTransaction *)transaction
 {
-    TSThread *thread = [TSThread fetchObjectWithUniqueID:self.uniqueThreadId transaction:transaction];
-    [thread touchWithTransaction:transaction];
+    [transaction touchObjectForKey:self.uniqueThreadId inCollection:[TSThread collection]];
+}
+
+- (void)applyChangeToSelfAndLatestCopy:(YapDatabaseReadWriteTransaction *)transaction
+                           changeBlock:(void (^)(id))changeBlock
+{
+    OWSAssertDebug(transaction);
+
+    [super applyChangeToSelfAndLatestCopy:transaction changeBlock:changeBlock];
+    [self touchThreadWithTransaction:transaction];
 }
 
 #pragma mark Date operations

SignalServiceKit/src/Messages/Interactions/TSMessage.m

@@ -370,14 +370,6 @@ static const NSUInteger OWSMessageSchemaVersion = 4;
         }
         [attachment removeWithTransaction:transaction];
     };
-
-    // Updates inbox thread preview
-    [self touchThreadWithTransaction:transaction];
-}
-
-- (void)touchThreadWithTransaction:(YapDatabaseReadWriteTransaction *)transaction
-{
-    [transaction touchObjectForKey:self.uniqueThreadId inCollection:[TSThread collection]];
 }
 
 - (BOOL)isExpiringMessage
@@ -416,15 +408,6 @@ static const NSUInteger OWSMessageSchemaVersion = 4;
 
 #pragma mark - Update With... Methods
 
-- (void)applyChangeToSelfAndLatestCopy:(YapDatabaseReadWriteTransaction *)transaction
-                           changeBlock:(void (^)(id))changeBlock
-{
-    OWSAssertDebug(transaction);
-
-    [super applyChangeToSelfAndLatestCopy:transaction changeBlock:changeBlock];
-    [self touchThreadWithTransaction:transaction];
-}
-
 - (void)updateWithExpireStartedAt:(uint64_t)expireStartedAt transaction:(YapDatabaseReadWriteTransaction *)transaction
 {
     OWSAssertDebug(expireStartedAt > 0);

SignalServiceKit/src/Messages/TSCall.m

@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
 //
 
 #import "TSCall.h"
@@ -144,7 +144,6 @@ NSUInteger TSCallCurrentSchemaVersion = 1;
     OWSLogDebug(@"marking as read uniqueId: %@ which has timestamp: %llu", self.uniqueId, self.timestamp);
     _read = YES;
     [self saveWithTransaction:transaction];
-    [self touchThreadWithTransaction:transaction];
 
     // Ignore sendReadReceipt - it doesn't apply to calls.
 }
@@ -171,9 +170,6 @@ NSUInteger TSCallCurrentSchemaVersion = 1;
     _callType = callType;
 
     [self saveWithTransaction:transaction];
-
-    // redraw any thread-related unread count UI.
-    [self touchThreadWithTransaction:transaction];
 }
 
 @end