signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Respond to CR.

Browse Source
This commit is contained in:
Matthew Chen 2019-09-26 12:57:46 -03:00
parent 3df2f56fc9
commit d8872f9e6a
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Signal/src/ViewControllers/ConversationView/ConversationViewController.m
View File

@ -3534,12 +3534,15 @@ typedef enum : NSUInteger {
groupAvatarData = UIImagePNGRepresentation(newGroupModel.groupImage);
OWSAssertDebug(groupAvatarData.length > 0);
}
_Nullable id<DataSource> groupAvatarDataSource;
if (groupAvatarData.length > 0) {
_Nullable id<DataSource> 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:^{

7
SignalServiceKit/src/Messages/OWSMessageManager.m
View File

@ -1228,10 +1228,13 @@ NS_ASSUME_NONNULL_BEGIN
groupAvatarData = UIImagePNGRepresentation(gThread.groupModel.groupImage);
OWSAssertDebug(groupAvatarData.length > 0);
}
_Nullable id<DataSource> groupAvatarDataSource;
if (groupAvatarData.length > 0) {
_Nullable id<DataSource> 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