Respond to CR.

// FREEBIE
pull/1/head
Matthew Chen 8 years ago
parent c92c6de7b9
commit f2d19ffe09

@ -464,7 +464,8 @@ NS_ASSUME_NONNULL_BEGIN
OWSAssert(thread); OWSAssert(thread);
OWSAssert(block); OWSAssert(block);
OWSDynamicOutgoingMessage *message = [[OWSDynamicOutgoingMessage alloc] initWithBlock:block thread:thread]; OWSDynamicOutgoingMessage *message =
[[OWSDynamicOutgoingMessage alloc] initWithPlainTextDataBlock:block thread:thread];
[self sendStressMessage:message]; [self sendStressMessage:message];
} }
@ -475,7 +476,7 @@ NS_ASSUME_NONNULL_BEGIN
OWSAssert(block); OWSAssert(block);
OWSDynamicOutgoingMessage *message = OWSDynamicOutgoingMessage *message =
[[OWSDynamicOutgoingMessage alloc] initWithBlock:block timestamp:timestamp thread:thread]; [[OWSDynamicOutgoingMessage alloc] initWithPlainTextDataBlock:block timestamp:timestamp thread:thread];
[self sendStressMessage:message]; [self sendStressMessage:message];
} }

@ -13,8 +13,8 @@ typedef NSData *_Nonnull (^DynamicOutgoingMessageBlock)(SignalRecipient *);
@interface OWSDynamicOutgoingMessage : TSOutgoingMessage @interface OWSDynamicOutgoingMessage : TSOutgoingMessage
- (instancetype)initWithBlock:(DynamicOutgoingMessageBlock)block thread:(nullable TSThread *)thread; - (instancetype)initWithPlainTextDataBlock:(DynamicOutgoingMessageBlock)block thread:(nullable TSThread *)thread;
- (instancetype)initWithBlock:(DynamicOutgoingMessageBlock)block - (instancetype)initWithPlainTextDataBlock:(DynamicOutgoingMessageBlock)block
timestamp:(uint64_t)timestamp timestamp:(uint64_t)timestamp
thread:(nullable TSThread *)thread; thread:(nullable TSThread *)thread;

@ -18,12 +18,12 @@ NS_ASSUME_NONNULL_BEGIN
@implementation OWSDynamicOutgoingMessage @implementation OWSDynamicOutgoingMessage
- (instancetype)initWithBlock:(DynamicOutgoingMessageBlock)block thread:(nullable TSThread *)thread - (instancetype)initWithPlainTextDataBlock:(DynamicOutgoingMessageBlock)block thread:(nullable TSThread *)thread
{ {
return [self initWithBlock:block timestamp:[NSDate ows_millisecondTimeStamp] thread:thread]; return [self initWithPlainTextDataBlock:block timestamp:[NSDate ows_millisecondTimeStamp] thread:thread];
} }
- (instancetype)initWithBlock:(DynamicOutgoingMessageBlock)block - (instancetype)initWithPlainTextDataBlock:(DynamicOutgoingMessageBlock)block
timestamp:(uint64_t)timestamp timestamp:(uint64_t)timestamp
thread:(nullable TSThread *)thread thread:(nullable TSThread *)thread
{ {
@ -43,23 +43,13 @@ NS_ASSUME_NONNULL_BEGIN
// There's no need to save this message, since it's not displayed to the user. // There's no need to save this message, since it's not displayed to the user.
} }
//- (OWSSignalServiceProtosDataMessageBuilder *)dataMessageBuilder
//{
// OWSSignalServiceProtosDataMessageBuilder *builder = [super dataMessageBuilder];
// [builder setFlags:OWSSignalServiceProtosDataMessageFlagsEndSession];
//
// return builder;
//}
- (NSData *)buildPlainTextData:(SignalRecipient *)recipient - (NSData *)buildPlainTextData:(SignalRecipient *)recipient
{ {
NSData *plainTextData = self.block(recipient); NSData *plainTextData = self.block(recipient);
OWSAssert(plainTextData); OWSAssert(plainTextData);
return plainTextData; return plainTextData;
// OWSSignalServiceProtosContentBuilder *contentBuilder = [OWSSignalServiceProtosContentBuilder new];
// contentBuilder.dataMessage = [self buildDataMessage:recipient.recipientId];
// return [[contentBuilder build] data];
} }
@end @end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END

Loading…
Cancel
Save