From f0d797a91f2f7572687f90fe9400ecb69017ff76 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Fri, 20 Jul 2018 16:54:00 -0400
Subject: [PATCH] Always touch the thread when updating a message.

---
 SignalServiceKit/src/Messages/Interactions/TSMessage.m   | 9 +++++++++
 .../src/Messages/Interactions/TSOutgoingMessage.m        | 9 ---------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/SignalServiceKit/src/Messages/Interactions/TSMessage.m b/SignalServiceKit/src/Messages/Interactions/TSMessage.m
index 5e9c0ccf16..aadc7f2356 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSMessage.m
@@ -348,6 +348,15 @@ static const NSUInteger OWSMessageSchemaVersion = 4;
 
 #pragma mark - Update With... Methods
 
+- (void)applyChangeToSelfAndLatestCopy:(YapDatabaseReadWriteTransaction *)transaction
+                           changeBlock:(void (^)(id))changeBlock
+{
+    OWSAssert(transaction);
+
+    [super applyChangeToSelfAndLatestCopy:transaction changeBlock:changeBlock];
+    [self touchThreadWithTransaction:transaction];
+}
+
 - (void)updateWithExpireStartedAt:(uint64_t)expireStartedAt transaction:(YapDatabaseReadWriteTransaction *)transaction
 {
     OWSAssert(expireStartedAt > 0);
diff --git a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
index 73fdc5d25d..24259c7b7d 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
@@ -524,15 +524,6 @@ NSString *NSStringForOutgoingMessageRecipientState(OWSOutgoingMessageRecipientSt
 
 #pragma mark - Update With... Methods
 
-- (void)applyChangeToSelfAndLatestCopy:(YapDatabaseReadWriteTransaction *)transaction
-                           changeBlock:(void (^)(id))changeBlock
-{
-    OWSAssert(transaction);
-
-    [super applyChangeToSelfAndLatestCopy:transaction changeBlock:changeBlock];
-    [self touchThreadWithTransaction:transaction];
-}
-
 - (void)updateWithSendingError:(NSError *)error
 {
     OWSAssert(error);