From d8872f9e6adee36ed859a91f57709fa00aabc6b2 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 26 Sep 2019 12:57:46 -0300 Subject: [PATCH] Respond to CR. --- .../ConversationView/ConversationViewController.m | 7 +++++-- SignalServiceKit/src/Messages/OWSMessageManager.m | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 846927a62d..142e35ee65 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -3534,12 +3534,15 @@ typedef enum : NSUInteger { groupAvatarData = UIImagePNGRepresentation(newGroupModel.groupImage); OWSAssertDebug(groupAvatarData.length > 0); } + _Nullable id groupAvatarDataSource; if (groupAvatarData.length > 0) { - _Nullable id dataSource = [DataSourceValue dataSourceWithData:groupAvatarData fileExtension:@"png"]; + groupAvatarDataSource = [DataSourceValue dataSourceWithData:groupAvatarData fileExtension:@"png"]; + } + if (groupAvatarDataSource != nil) { // DURABLE CLEANUP - currently one caller uses the completion handler to delete the tappable error message // which causes this code to be called. Once we're more aggressive about durable sending retry, // we could get rid of this "retryable tappable error message". - [self.messageSender sendTemporaryAttachment:dataSource + [self.messageSender sendTemporaryAttachment:groupAvatarDataSource contentType:OWSMimeTypeImagePng inMessage:message success:^{ diff --git a/SignalServiceKit/src/Messages/OWSMessageManager.m b/SignalServiceKit/src/Messages/OWSMessageManager.m index 48c6f93a22..fe364282c1 100644 --- a/SignalServiceKit/src/Messages/OWSMessageManager.m +++ b/SignalServiceKit/src/Messages/OWSMessageManager.m @@ -1228,10 +1228,13 @@ NS_ASSUME_NONNULL_BEGIN groupAvatarData = UIImagePNGRepresentation(gThread.groupModel.groupImage); OWSAssertDebug(groupAvatarData.length > 0); } + _Nullable id groupAvatarDataSource; if (groupAvatarData.length > 0) { - _Nullable id dataSource = [DataSourceValue dataSourceWithData:groupAvatarData fileExtension:@"png"]; + groupAvatarDataSource = [DataSourceValue dataSourceWithData:groupAvatarData fileExtension:@"png"]; + } + if (groupAvatarDataSource != nil) { [self.messageSenderJobQueue addMediaMessage:message - dataSource:dataSource + dataSource:groupAvatarDataSource contentType:OWSMimeTypeImagePng sourceFilename:nil caption:nil