From d24bceeeff0cd8cd548d812b8dd067f4bf825a59 Mon Sep 17 00:00:00 2001
From: Ehren Kret <ehren@signal.org>
Date: Fri, 10 Apr 2020 19:01:35 -0700
Subject: [PATCH] Set the protocol version when sending a new style attachment

---
 .../src/Messages/Attachments/TSAttachmentStream.m          | 2 ++
 .../src/Messages/Interactions/TSOutgoingMessage.m          | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m
index 80a5d322be..b6cd59fff8 100644
--- a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m
+++ b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m
@@ -1155,6 +1155,8 @@ typedef void (^OWSLoadedThumbnailSuccess)(OWSLoadedThumbnail *loadedThumbnail);
 
     SSKProtoAttachmentPointerBuilder *builder = [SSKProtoAttachmentPointer builder];
     builder.cdnID = self.serverId;
+    builder.cdnKey = self.cdnKey;
+    builder.cdnNumber = self.cdnNumber;
 
     OWSAssertDebug(self.contentType.length > 0);
     builder.contentType = self.contentType;
diff --git a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
index ef2c0f8213..533419f8d8 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
@@ -1048,8 +1048,6 @@ NSUInteger const TSOutgoingMessageSchemaVersion = 1;
         requiredProtocolVersion = SSKProtoDataMessageProtocolVersionViewOnceVideo;
     }
 
-    [builder setRequiredProtocolVersion:(uint32_t)requiredProtocolVersion];
-
     if ([self.body lengthOfBytesUsingEncoding:NSUTF8StringEncoding] <= kOversizeTextMessageSizeThreshold) {
         [builder setBody:self.body];
     } else {
@@ -1099,6 +1097,10 @@ NSUInteger const TSOutgoingMessageSchemaVersion = 1;
                 return nil;
             }
             [attachments addObject:attachmentProto];
+            if (requiredProtocolVersion < SSKProtoDataMessageProtocolVersionCdnSelectorAttachments
+                && (attachmentProto.cdnKey.length > 0 || attachmentProto.cdnNumber > 0)) {
+                requiredProtocolVersion = SSKProtoDataMessageProtocolVersionCdnSelectorAttachments;
+            }
         }
         [builder setAttachments:attachments];
     }
@@ -1177,6 +1179,7 @@ NSUInteger const TSOutgoingMessageSchemaVersion = 1;
         }
     }
 
+    [builder setRequiredProtocolVersion:(uint32_t)requiredProtocolVersion];
     return builder;
 }