From 7462bdab1acb0904678d0c8defdef0ab3a317c81 Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Tue, 15 Oct 2019 11:18:17 +1100
Subject: [PATCH] Fix regression
---
.../src/Messages/Interactions/TSOutgoingMessage.m | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
index 66162fae1..bc29fc647 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
@@ -1122,6 +1122,10 @@ NSString *NSStringForOutgoingMessageRecipientState(OWSOutgoingMessageRecipientSt
return dataProto;
}
+- (SSKProtoContentBuilder *)prepareCustomContentBuilder:(SignalRecipient *)recipient {
+ return SSKProtoContent.builder;
+}
+
- (nullable NSData *)buildPlainTextData:(SignalRecipient *)recipient
{
NSError *error;
@@ -1131,7 +1135,7 @@ NSString *NSStringForOutgoingMessageRecipientState(OWSOutgoingMessageRecipientSt
return nil;
}
- SSKProtoContentBuilder *contentBuilder = [self prepareCustomContentBuilder:recipient] ?: SSKProtoContent.builder;
+ SSKProtoContentBuilder *contentBuilder = [self prepareCustomContentBuilder:recipient];
[contentBuilder setDataMessage:dataMessage];
NSData *_Nullable contentData = [contentBuilder buildSerializedDataAndReturnError:&error];