From 9c93099515948506d88d9e456309ce5d8b76cb12 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 11 Apr 2018 18:06:29 -0400 Subject: [PATCH] Fix incomplete asserts. --- .../ConversationView/Cells/OWSMessageBubbleView.m | 2 +- .../ViewControllers/ConversationView/ConversationViewItem.m | 2 +- Signal/src/ViewControllers/DebugUI/DebugUIMessages.m | 2 +- .../src/Messages/Attachments/TSAttachmentStream.m | 4 ++-- SignalServiceKit/src/Messages/OWSOutgoingNullMessage.m | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m index 3d5fbc6fa..0fefa6f29 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m @@ -1103,7 +1103,7 @@ NS_ASSUME_NONNULL_BEGIN if (self.message.quotedMessage) { [self.delegate didTapQuotedMessage:self.viewItem quotedMessage:self.message.quotedMessage]; } else { - OWSFail(@"%@ Missing quoted message.", self.logTag) + OWSFail(@"%@ Missing quoted message.", self.logTag); } break; } diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m index f9d6077a0..2a50d9e2e 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m @@ -769,7 +769,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) break; } case OWSMessageCellType_Unknown: { - OWSFail(@"%@ No text to share", self.logTag) + OWSFail(@"%@ No text to share", self.logTag); } } } diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m index 1f30ccc46..e38bafbf9 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m @@ -3948,7 +3948,7 @@ NS_ASSUME_NONNULL_BEGIN [label appendString:@" (Sent)"]; } } else { - OWSFail(@"%@ unknown message state.", self.logTag) + OWSFail(@"%@ unknown message state.", self.logTag); } return label; } diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m index 6b48592bb..432189565 100644 --- a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m +++ b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m @@ -432,8 +432,8 @@ NS_ASSUME_NONNULL_BEGIN NSData *thumbnailData = UIImageJPEGRepresentation(result, 0.9); - OWSAssert(thumbnailData.length > 0) - DDLogDebug(@"%@ generated thumbnail with size: %lu", self.logTag, (unsigned long)thumbnailData.length); + OWSAssert(thumbnailData.length > 0); + DDLogDebug(@"%@ generated thumbnail with size: %lu", self.logTag, (unsigned long)thumbnailData.length); [thumbnailData writeToFile:thumbnailPath atomically:YES]; } diff --git a/SignalServiceKit/src/Messages/OWSOutgoingNullMessage.m b/SignalServiceKit/src/Messages/OWSOutgoingNullMessage.m index e12dcf791..f6a5683f9 100644 --- a/SignalServiceKit/src/Messages/OWSOutgoingNullMessage.m +++ b/SignalServiceKit/src/Messages/OWSOutgoingNullMessage.m @@ -60,8 +60,8 @@ NS_ASSUME_NONNULL_BEGIN // verification sync which is ~1-512 bytes larger then that. contentLength += self.verificationStateSyncMessage.paddingBytesLength; - OWSAssert(contentLength > 0) - + OWSAssert(contentLength > 0); + nullMessageBuilder.padding = [Cryptography generateRandomBytes:contentLength]; contentBuilder.nullMessage = [nullMessageBuilder build];