From 5f0de5c36d0a6c87c05d21e27769ef592bce9b98 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Thu, 21 Feb 2019 15:21:00 -0500
Subject: [PATCH] Respond to CR.

---
 .../src/Messages/Interactions/TSOutgoingMessage.m     |  3 ++-
 SignalServiceKit/src/Messages/OWSMessageSender.m      | 11 ++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
index 355a05b71..2fa564da7 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
@@ -804,7 +804,8 @@ NSString *NSStringForOutgoingMessageRecipientState(OWSOutgoingMessageRecipientSt
                                        // b) "Sent updates" should never downgrade the "recipient state" for any
                                        //    recipients.  Prefer existing "recipient state"; "sent updates" only
                                        //    add new recipients at the "sent" state.
-                                       [recipientStateMap removeObjectsForKeys:self.recipientStateMap.allKeys];
+                                       //
+                                       // Therefore we retain all existing entries in the recipient state map.
                                        [recipientStateMap addEntriesFromDictionary:self.recipientStateMap];
                                    }
 
diff --git a/SignalServiceKit/src/Messages/OWSMessageSender.m b/SignalServiceKit/src/Messages/OWSMessageSender.m
index 57654f78f..87e14a868 100644
--- a/SignalServiceKit/src/Messages/OWSMessageSender.m
+++ b/SignalServiceKit/src/Messages/OWSMessageSender.m
@@ -1391,19 +1391,12 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
         return success();
     }
 
-    BOOL shouldSendTranscript = NO;
-    BOOL isRecipientUpdate = NO;
-    if (message.hasSyncedTranscript) {
-        shouldSendTranscript = YES;
-    } else if (AreRecipientUpdatesEnabled()) {
-        shouldSendTranscript = YES;
-        isRecipientUpdate = YES;
-    }
-
+    BOOL shouldSendTranscript = (AreRecipientUpdatesEnabled() || !message.hasSyncedTranscript);
     if (!shouldSendTranscript) {
         return success();
     }
 
+    BOOL isRecipientUpdate = message.hasSyncedTranscript;
     [self
         sendSyncTranscriptForMessage:message
                    isRecipientUpdate:isRecipientUpdate