|
|
|
@ -81,6 +81,28 @@ void AssertIsOnSendingQueue()
|
|
|
|
|
|
|
|
|
|
|
|
#pragma mark -
|
|
|
|
#pragma mark -
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@implementation OWSOutgoingAttachmentInfo
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- (instancetype)initWithDataSource:(DataSource *)dataSource
|
|
|
|
|
|
|
|
contentType:(NSString *)contentType
|
|
|
|
|
|
|
|
sourceFilename:(nullable NSString *)sourceFilename
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
self = [super init];
|
|
|
|
|
|
|
|
if (!self) {
|
|
|
|
|
|
|
|
return self;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
_dataSource = dataSource;
|
|
|
|
|
|
|
|
_contentType = contentType;
|
|
|
|
|
|
|
|
_sourceFilename = sourceFilename;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return self;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@end
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#pragma mark -
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* OWSSendMessageOperation encapsulates all the work associated with sending a message, e.g. uploading attachments,
|
|
|
|
* OWSSendMessageOperation encapsulates all the work associated with sending a message, e.g. uploading attachments,
|
|
|
|
* getting proper keys, and retrying upon failure.
|
|
|
|
* getting proper keys, and retrying upon failure.
|
|
|
|
@ -156,13 +178,14 @@ void AssertIsOnSendingQueue()
|
|
|
|
|
|
|
|
|
|
|
|
// Sanity check preconditions
|
|
|
|
// Sanity check preconditions
|
|
|
|
if (self.message.hasAttachments) {
|
|
|
|
if (self.message.hasAttachments) {
|
|
|
|
[self.dbConnection readWithBlock:^(YapDatabaseReadTransaction * transaction) {
|
|
|
|
[self.dbConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
|
|
|
|
TSAttachmentStream *attachmentStream
|
|
|
|
for (TSAttachment *attachment in [self.message attachmentsWithTransaction:transaction]) {
|
|
|
|
= (TSAttachmentStream *)[self.message attachmentWithTransaction:transaction];
|
|
|
|
OWSAssertDebug([attachment isKindOfClass:[TSAttachmentStream class]]);
|
|
|
|
OWSAssertDebug(attachmentStream);
|
|
|
|
TSAttachmentStream *attachmentStream = (TSAttachmentStream *)attachment;
|
|
|
|
OWSAssertDebug([attachmentStream isKindOfClass:[TSAttachmentStream class]]);
|
|
|
|
OWSAssertDebug(attachmentStream);
|
|
|
|
OWSAssertDebug(attachmentStream.serverId);
|
|
|
|
OWSAssertDebug(attachmentStream.serverId);
|
|
|
|
OWSAssertDebug(attachmentStream.isUploaded);
|
|
|
|
OWSAssertDebug(attachmentStream.isUploaded);
|
|
|
|
|
|
|
|
}
|
|
|
|
}];
|
|
|
|
}];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -353,11 +376,10 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
|
|
|
|
success:successHandler
|
|
|
|
success:successHandler
|
|
|
|
failure:failureHandler];
|
|
|
|
failure:failureHandler];
|
|
|
|
|
|
|
|
|
|
|
|
// TODO de-dupe attachment enque logic.
|
|
|
|
// TODO: de-dupe attachment enqueue logic.
|
|
|
|
if (message.hasAttachments) {
|
|
|
|
for (NSString *attachmentId in message.attachmentIds) {
|
|
|
|
OWSUploadOperation *uploadAttachmentOperation =
|
|
|
|
OWSUploadOperation *uploadAttachmentOperation =
|
|
|
|
[[OWSUploadOperation alloc] initWithAttachmentId:message.attachmentIds.firstObject
|
|
|
|
[[OWSUploadOperation alloc] initWithAttachmentId:attachmentId dbConnection:self.dbConnection];
|
|
|
|
dbConnection:self.dbConnection];
|
|
|
|
|
|
|
|
[sendMessageOperation addDependency:uploadAttachmentOperation];
|
|
|
|
[sendMessageOperation addDependency:uploadAttachmentOperation];
|
|
|
|
[sendingQueue addOperation:uploadAttachmentOperation];
|
|
|
|
[sendingQueue addOperation:uploadAttachmentOperation];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -431,17 +453,18 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
|
|
|
|
failure:(void (^)(NSError *error))failureHandler
|
|
|
|
failure:(void (^)(NSError *error))failureHandler
|
|
|
|
{
|
|
|
|
{
|
|
|
|
OWSAssertDebug(dataSource);
|
|
|
|
OWSAssertDebug(dataSource);
|
|
|
|
[OutgoingMessagePreparer prepareAttachmentWithDataSource:dataSource
|
|
|
|
OWSOutgoingAttachmentInfo *attachmentInfo = [[OWSOutgoingAttachmentInfo alloc] initWithDataSource:dataSource
|
|
|
|
contentType:contentType
|
|
|
|
contentType:contentType
|
|
|
|
sourceFilename:sourceFilename
|
|
|
|
sourceFilename:sourceFilename];
|
|
|
|
inMessage:message
|
|
|
|
[OutgoingMessagePreparer prepareAttachments:@[ attachmentInfo ]
|
|
|
|
completionHandler:^(NSError *_Nullable error) {
|
|
|
|
inMessage:message
|
|
|
|
if (error) {
|
|
|
|
completionHandler:^(NSError *_Nullable error) {
|
|
|
|
failureHandler(error);
|
|
|
|
if (error) {
|
|
|
|
return;
|
|
|
|
failureHandler(error);
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
[self sendMessage:message success:successHandler failure:failureHandler];
|
|
|
|
}
|
|
|
|
}];
|
|
|
|
[self sendMessage:message success:successHandler failure:failureHandler];
|
|
|
|
|
|
|
|
}];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
- (void)sendMessageToService:(TSOutgoingMessage *)message
|
|
|
|
- (void)sendMessageToService:(TSOutgoingMessage *)message
|
|
|
|
@ -1768,35 +1791,42 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
|
|
|
|
[message updateWithMarkingAllUnsentRecipientsAsSendingWithTransaction:transaction];
|
|
|
|
[message updateWithMarkingAllUnsentRecipientsAsSendingWithTransaction:transaction];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
+ (void)prepareAttachmentWithDataSource:(DataSource *)dataSource
|
|
|
|
+ (void)prepareAttachments:(NSArray<OWSOutgoingAttachmentInfo *> *)attachmentInfos
|
|
|
|
contentType:(NSString *)contentType
|
|
|
|
inMessage:(TSOutgoingMessage *)outgoingMessage
|
|
|
|
sourceFilename:(nullable NSString *)sourceFilename
|
|
|
|
completionHandler:(void (^)(NSError *_Nullable error))completionHandler
|
|
|
|
inMessage:(TSOutgoingMessage *)outgoingMessage
|
|
|
|
|
|
|
|
completionHandler:(void (^)(NSError *_Nullable error))completionHandler
|
|
|
|
|
|
|
|
{
|
|
|
|
{
|
|
|
|
OWSAssertDebug(dataSource);
|
|
|
|
OWSAssertDebug(attachmentInfos.count > 0);
|
|
|
|
|
|
|
|
OWSAssertDebug(outgoingMessage);
|
|
|
|
|
|
|
|
|
|
|
|
dispatch_async([OWSDispatch attachmentsQueue], ^{
|
|
|
|
dispatch_async([OWSDispatch attachmentsQueue], ^{
|
|
|
|
TSAttachmentStream *attachmentStream =
|
|
|
|
NSMutableArray<TSAttachmentStream *> *attachmentStreams = [NSMutableArray new];
|
|
|
|
[[TSAttachmentStream alloc] initWithContentType:contentType
|
|
|
|
for (OWSOutgoingAttachmentInfo *attachmentInfo in attachmentInfos) {
|
|
|
|
byteCount:(UInt32)dataSource.dataLength
|
|
|
|
TSAttachmentStream *attachmentStream =
|
|
|
|
sourceFilename:sourceFilename];
|
|
|
|
[[TSAttachmentStream alloc] initWithContentType:attachmentInfo.contentType
|
|
|
|
if (outgoingMessage.isVoiceMessage) {
|
|
|
|
byteCount:(UInt32)attachmentInfo.dataSource.dataLength
|
|
|
|
attachmentStream.attachmentType = TSAttachmentTypeVoiceMessage;
|
|
|
|
sourceFilename:attachmentInfo.sourceFilename];
|
|
|
|
}
|
|
|
|
if (outgoingMessage.isVoiceMessage) {
|
|
|
|
|
|
|
|
attachmentStream.attachmentType = TSAttachmentTypeVoiceMessage;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (![attachmentStream writeDataSource:attachmentInfo.dataSource]) {
|
|
|
|
|
|
|
|
OWSProdError([OWSAnalyticsEvents messageSenderErrorCouldNotWriteAttachment]);
|
|
|
|
|
|
|
|
NSError *error = OWSErrorMakeWriteAttachmentDataError();
|
|
|
|
|
|
|
|
completionHandler(error);
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (![attachmentStream writeDataSource:dataSource]) {
|
|
|
|
[attachmentStreams addObject:attachmentStream];
|
|
|
|
OWSProdError([OWSAnalyticsEvents messageSenderErrorCouldNotWriteAttachment]);
|
|
|
|
|
|
|
|
NSError *error = OWSErrorMakeWriteAttachmentDataError();
|
|
|
|
|
|
|
|
completionHandler(error);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
[self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) {
|
|
|
|
[self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) {
|
|
|
|
[attachmentStream saveWithTransaction:transaction];
|
|
|
|
for (TSAttachmentStream *attachmentStream in attachmentStreams) {
|
|
|
|
|
|
|
|
[attachmentStream saveWithTransaction:transaction];
|
|
|
|
|
|
|
|
|
|
|
|
[outgoingMessage.attachmentIds addObject:attachmentStream.uniqueId];
|
|
|
|
[outgoingMessage.attachmentIds addObject:attachmentStream.uniqueId];
|
|
|
|
if (sourceFilename) {
|
|
|
|
if (attachmentStream.sourceFilename) {
|
|
|
|
outgoingMessage.attachmentFilenameMap[attachmentStream.uniqueId] = sourceFilename;
|
|
|
|
outgoingMessage.attachmentFilenameMap[attachmentStream.uniqueId] = attachmentStream.sourceFilename;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
[outgoingMessage saveWithTransaction:transaction];
|
|
|
|
[outgoingMessage saveWithTransaction:transaction];
|
|
|
|
}];
|
|
|
|
}];
|
|
|
|
|
Matthew Chen
7 years ago