From 2c3f7db4e455f5633539bdb210be816436998155 Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Mon, 16 Jul 2018 15:09:50 -0600
Subject: [PATCH] Only add one 'incoming message' unread indicator per
 foreground.

// FREEBIE
---
 .../ConversationView/ConversationViewController.m               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index fc3a0954f3..6f70d7cdb6 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -4922,7 +4922,7 @@ typedef enum : NSUInteger {
         // unread indicator exists yet on dynamicInteractions.
         BOOL isItemUnread = ([viewItem.interaction conformsToProtocol:@protocol(OWSReadTracking)]
             && !((id<OWSReadTracking>)viewItem.interaction).wasRead);
-        if (isItemUnread && !unreadIndicator && !hasPlacedUnreadIndicator) {
+        if (isItemUnread && !unreadIndicator && !hasPlacedUnreadIndicator && !self.hasClearedUnreadMessagesIndicator) {
 
             unreadIndicator =
                 [[OWSUnreadIndicator alloc] initUnreadIndicatorWithTimestamp:viewItem.interaction.timestamp