Clean up ahead of PR.

pull/1/head
Matthew Chen 8 years ago
parent 9c3415a914
commit b61c716ea7

@ -126,15 +126,16 @@ typedef void (^SendMessageBlock)(SendCompletionBlock completion);
// If the attachment is textual (e.g. text or URL), returns the message text // If the attachment is textual (e.g. text or URL), returns the message text
// for the attachment. Returns nil otherwise. // for the attachment. Returns nil otherwise.
- (nullable NSString *)messageTextForAttachment - (nullable NSString *)convertAttachmentToMessageTextIfPossible
{ {
if (!(self.attachment.isUrl || self.attachment.isText)) { if (!self.attachment.isConvertibleToTextMessage) {
return nil; return nil;
} }
if (!self.attachment.isConvertibleToTextMessage) { if (self.attachment.dataLength >= kOversizeTextMessageSizeThreshold) {
return nil; return nil;
} }
NSData *data = self.attachment.data; NSData *data = self.attachment.data;
OWSAssert(data.length < kOversizeTextMessageSizeThreshold);
NSString *_Nullable messageText = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]; NSString *_Nullable messageText = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
DDLogVerbose(@"%@ messageTextForAttachment: %@", self.logTag, messageText); DDLogVerbose(@"%@ messageTextForAttachment: %@", self.logTag, messageText);
return messageText; return messageText;
@ -146,7 +147,7 @@ typedef void (^SendMessageBlock)(SendCompletionBlock completion);
OWSAssert(thread); OWSAssert(thread);
self.thread = thread; self.thread = thread;
NSString *_Nullable messageText = [self messageTextForAttachment]; NSString *_Nullable messageText = [self convertAttachmentToMessageTextIfPossible];
if (messageText) { if (messageText) {
MessageApprovalViewController *approvalVC = MessageApprovalViewController *approvalVC =

Loading…
Cancel
Save