From 1dd8c4177036f10e66767cd5ed7321281833fa8c Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Thu, 3 May 2018 12:19:08 -0400
Subject: [PATCH] Only touch messages which have been read.

// FREEBIE
---
 .../src/Messages/OWSDisappearingMessagesFinder.m          | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/SignalServiceKit/src/Messages/OWSDisappearingMessagesFinder.m b/SignalServiceKit/src/Messages/OWSDisappearingMessagesFinder.m
index 55eda4110..23083d8a9 100644
--- a/SignalServiceKit/src/Messages/OWSDisappearingMessagesFinder.m
+++ b/SignalServiceKit/src/Messages/OWSDisappearingMessagesFinder.m
@@ -5,8 +5,8 @@
 #import "OWSDisappearingMessagesFinder.h"
 #import "NSDate+OWS.h"
 #import "OWSPrimaryStorage.h"
+#import "TSIncomingMessage.h"
 #import "TSMessage.h"
-#import "TSOutgoingMessage.h"
 #import "TSThread.h"
 #import <YapDatabase/YapDatabase.h>
 #import <YapDatabase/YapDatabaseQuery.h>
@@ -62,6 +62,12 @@ static NSString *const OWSDisappearingMessageFinderExpiresAtIndex = @"index_mess
                                       }
                                       TSMessage *message = (TSMessage *)object;
                                       if ([message shouldStartExpireTimerWithTransaction:transaction]) {
+                                          if ([message isKindOfClass:[TSIncomingMessage class]]) {
+                                              TSIncomingMessage *incomingMessage = (TSIncomingMessage *)message;
+                                              if (!incomingMessage.wasRead) {
+                                                  return;
+                                              }
+                                          }
                                           [messageIds addObject:key];
                                       }
                                   }];