Respond to CR.

pull/1/head
Matthew Chen 7 years ago
parent fb1f3b5572
commit 4240b517d0

@ -430,11 +430,6 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType)
self.messageCellType = OWSMessageCellType_TextMessage; self.messageCellType = OWSMessageCellType_TextMessage;
self.displayableBodyText = [[DisplayableText alloc] initWithFullText:@"" displayText:@"" isTextTruncated:NO]; self.displayableBodyText = [[DisplayableText alloc] initWithFullText:@"" displayText:@"" isTextTruncated:NO];
} }
DDLogInfo(@"%@ --- %@ %@",
self.logTag,
self.interaction.uniqueId,
(self.hasBodyText ? self.displayableBodyText.displayText : @""));
} }
- (OWSMessageCellType)messageCellType - (OWSMessageCellType)messageCellType

@ -284,15 +284,6 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState };
} }
[self updateBarButtonItems]; [self updateBarButtonItems];
dispatch_async(dispatch_get_main_queue(), ^{
NSIndexPath *indexPath = [NSIndexPath indexPathForRow:0 inSection:0];
TSThread *thread = [self threadForIndexPath:indexPath];
if (!thread) {
return;
}
[self presentThread:thread keyboardOnViewAppearing:NO callOnViewAppearing:NO];
});
} }
- (void)viewDidAppear:(BOOL)animated - (void)viewDidAppear:(BOOL)animated

@ -87,7 +87,8 @@ NS_ASSUME_NONNULL_BEGIN
inThread:thread inThread:thread
messageBody:text messageBody:text
attachmentIds:[NSMutableArray new] attachmentIds:[NSMutableArray new]
expiresInSeconds:(configuration.isEnabled ? configuration.durationSeconds : 0)expireStartedAt:0 expiresInSeconds:(configuration.isEnabled ? configuration.durationSeconds : 0)
expireStartedAt:0
isVoiceMessage:NO isVoiceMessage:NO
groupMetaMessage:TSGroupMessageNone groupMetaMessage:TSGroupMessageNone
quotedMessage:nil]; quotedMessage:nil];
@ -129,7 +130,8 @@ NS_ASSUME_NONNULL_BEGIN
inThread:thread inThread:thread
messageBody:attachment.captionText messageBody:attachment.captionText
attachmentIds:[NSMutableArray new] attachmentIds:[NSMutableArray new]
expiresInSeconds:(configuration.isEnabled ? configuration.durationSeconds : 0)expireStartedAt:0 expiresInSeconds:(configuration.isEnabled ? configuration.durationSeconds : 0)
expireStartedAt:0
isVoiceMessage:[attachment isVoiceMessage] isVoiceMessage:[attachment isVoiceMessage]
groupMetaMessage:TSGroupMessageNone groupMetaMessage:TSGroupMessageNone
quotedMessage:nil]; quotedMessage:nil];

@ -10,12 +10,15 @@ NS_ASSUME_NONNULL_BEGIN
typedef NS_ENUM(int32_t, TSErrorMessageType) { typedef NS_ENUM(int32_t, TSErrorMessageType) {
TSErrorMessageNoSession, TSErrorMessageNoSession,
TSErrorMessageWrongTrustedIdentityKey, // DEPRECATED: We no longer create TSErrorMessageWrongTrustedIdentityKey, but // DEPRECATED: We no longer create TSErrorMessageWrongTrustedIdentityKey, but
// persisted legacy messages could exist indefinitly. // persisted legacy messages could exist indefinitly.
TSErrorMessageWrongTrustedIdentityKey,
TSErrorMessageInvalidKeyException, TSErrorMessageInvalidKeyException,
TSErrorMessageMissingKeyId, // unused // unused
TSErrorMessageMissingKeyId,
TSErrorMessageInvalidMessage, TSErrorMessageInvalidMessage,
TSErrorMessageDuplicateMessage, // unused // unused
TSErrorMessageDuplicateMessage,
TSErrorMessageInvalidVersion, TSErrorMessageInvalidVersion,
TSErrorMessageNonBlockingIdentityChange, TSErrorMessageNonBlockingIdentityChange,
TSErrorMessageUnknownContactBlockOffer, TSErrorMessageUnknownContactBlockOffer,

@ -194,6 +194,7 @@ NS_ASSUME_NONNULL_BEGIN
return nil; return nil;
} }
// TODO: Revisit this value.
const int kMaxThumbnailSizePx = 100; const int kMaxThumbnailSizePx = 100;
// Try to resize image to thumbnail if necessary. // Try to resize image to thumbnail if necessary.

Loading…
Cancel
Save