From b986db808d0ef42b6ecb2a0d8558c00a6a1bdb9e Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 26 Apr 2017 11:07:42 -0400 Subject: [PATCH] Add filename to attachment streams. --- src/Messages/Attachments/TSAttachmentStream.h | 2 +- src/Messages/Attachments/TSAttachmentStream.m | 3 ++- src/Messages/OWSMessageSender.m | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Messages/Attachments/TSAttachmentStream.h b/src/Messages/Attachments/TSAttachmentStream.h index 42bb0fcbe..389d820e1 100644 --- a/src/Messages/Attachments/TSAttachmentStream.h +++ b/src/Messages/Attachments/TSAttachmentStream.h @@ -14,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN @interface TSAttachmentStream : TSAttachment - (instancetype)init NS_UNAVAILABLE; -- (instancetype)initWithContentType:(NSString *)contentType NS_DESIGNATED_INITIALIZER; +- (instancetype)initWithContentType:(NSString *)contentType filename:(NSString *)filename NS_DESIGNATED_INITIALIZER; - (instancetype)initWithPointer:(TSAttachmentPointer *)pointer NS_DESIGNATED_INITIALIZER; // Though now required, `digest` may be null for pre-existing records or from diff --git a/src/Messages/Attachments/TSAttachmentStream.m b/src/Messages/Attachments/TSAttachmentStream.m index 289549228..d29a83479 100644 --- a/src/Messages/Attachments/TSAttachmentStream.m +++ b/src/Messages/Attachments/TSAttachmentStream.m @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN @implementation TSAttachmentStream -- (instancetype)initWithContentType:(NSString *)contentType +- (instancetype)initWithContentType:(NSString *)contentType filename:(NSString *)filename { self = [super initWithContentType:contentType]; if (!self) { @@ -24,6 +24,7 @@ NS_ASSUME_NONNULL_BEGIN // state, but this constructor is used only for new outgoing // attachments which haven't been uploaded yet. _isUploaded = NO; + _filename = filename; return self; } diff --git a/src/Messages/OWSMessageSender.m b/src/Messages/OWSMessageSender.m index 68ae18954..bf6a66a2c 100644 --- a/src/Messages/OWSMessageSender.m +++ b/src/Messages/OWSMessageSender.m @@ -516,7 +516,8 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException"; NSData *dataCopy = (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(10, 0) ? data : [data copy]); dispatch_async([OWSDispatch attachmentsQueue], ^{ - TSAttachmentStream *attachmentStream = [[TSAttachmentStream alloc] initWithContentType:contentType]; + TSAttachmentStream *attachmentStream = + [[TSAttachmentStream alloc] initWithContentType:contentType filename:filename]; NSError *error; [attachmentStream writeData:dataCopy error:&error];