|
|
@ -1503,10 +1503,11 @@ static const int kYapDatabaseRangeMaxLength = 25000;
|
|
|
|
// the previous message has the same sender name and
|
|
|
|
// the previous message has the same sender name and
|
|
|
|
// no "date break" separates us.
|
|
|
|
// no "date break" separates us.
|
|
|
|
BOOL shouldShowSenderName = YES;
|
|
|
|
BOOL shouldShowSenderName = YES;
|
|
|
|
|
|
|
|
NSString *_Nullable previousIncomingSenderId = nil;
|
|
|
|
if (previousViewItem && previousViewItem.interaction.interactionType == interactionType) {
|
|
|
|
if (previousViewItem && previousViewItem.interaction.interactionType == interactionType) {
|
|
|
|
|
|
|
|
|
|
|
|
TSIncomingMessage *previousIncomingMessage = (TSIncomingMessage *)previousViewItem.interaction;
|
|
|
|
TSIncomingMessage *previousIncomingMessage = (TSIncomingMessage *)previousViewItem.interaction;
|
|
|
|
NSString *previousIncomingSenderId = previousIncomingMessage.authorId;
|
|
|
|
previousIncomingSenderId = previousIncomingMessage.authorId;
|
|
|
|
OWSAssertDebug(previousIncomingSenderId.length > 0);
|
|
|
|
OWSAssertDebug(previousIncomingSenderId.length > 0);
|
|
|
|
|
|
|
|
|
|
|
|
shouldShowSenderName
|
|
|
|
shouldShowSenderName
|
|
|
@ -1539,9 +1540,8 @@ static const int kYapDatabaseRangeMaxLength = 25000;
|
|
|
|
// the next message has the same sender avatar and
|
|
|
|
// the next message has the same sender avatar and
|
|
|
|
// no "date break" separates us.
|
|
|
|
// no "date break" separates us.
|
|
|
|
shouldShowSenderAvatar = YES;
|
|
|
|
shouldShowSenderAvatar = YES;
|
|
|
|
if (nextViewItem && nextViewItem.interaction.interactionType == interactionType) {
|
|
|
|
if (previousViewItem && previousViewItem.interaction.interactionType == interactionType) {
|
|
|
|
shouldShowSenderAvatar = (![NSObject isNullableObject:nextIncomingSenderId equalTo:incomingSenderId]
|
|
|
|
shouldShowSenderAvatar = (![NSObject isNullableObject:previousIncomingSenderId equalTo:incomingSenderId]);
|
|
|
|
|| nextViewItem.hasCellHeader);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|