From f6106512dbe53f7c8e75df5cbbf0505f94437171 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Tue, 15 May 2018 10:06:23 -0400
Subject: [PATCH] Only mark messages read in conversation view if visible.

---
 .../ConversationView/ConversationViewController.m        | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index e20166a9f..a91cb5f9c 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -3798,6 +3798,15 @@ typedef enum : NSUInteger {
 
 - (void)markVisibleMessagesAsRead
 {
+    if (self.presentedViewController) {
+        OWSFail(@"%@ Not marking messages as read; another view is presented.", self.logTag);
+        return;
+    }
+    if (self.navigationController.topViewController != self) {
+        OWSFail(@"%@ Not marking messages as read; another view is pushed.", self.logTag);
+        return;
+    }
+
     [self updateLastVisibleTimestamp];
 
     uint64_t lastVisibleTimestamp = self.lastVisibleTimestamp;