signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Merge branch 'charlesmchen/incompleteAsserts'

Browse Source
This commit is contained in:
Matthew Chen 2018-04-13 15:02:35 -04:00
commit f8b11c57cc
6 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
View File

@ -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;
}

2
Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
View File

@ -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);
}
}
}

2
Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
View File

@ -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;
}

5
SignalMessaging/attachments/SharingThreadPickerViewController.m
View File

@ -79,10 +79,9 @@ typedef void (^SendMessageBlock)(SendCompletionBlock completion);
- (nullable UIView *)createHeaderWithSearchBar:(UISearchBar *)searchBar
{
OWSAssert(searchBar)
OWSAssert(searchBar);
const CGFloat contentVMargin
= 0;
const CGFloat contentVMargin = 0;
UIView *header = [UIView new];
header.backgroundColor = [UIColor whiteColor];

4
SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m
View File

@ -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];
}

4
SignalServiceKit/src/Messages/OWSOutgoingNullMessage.m
View File

@ -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];