@@ -3227,17 +3227,20 @@ void checkInvariants(MessageListView model) {
3227
3227
3228
3228
int i = 0 ;
3229
3229
for (int j = 0 ; j < allMessages.length; j++ ) {
3230
- bool forcedShowSender = false ;
3230
+ final bool showSender ;
3231
3231
if (j == 0
3232
3232
|| model.oneMessagePerBlock
3233
3233
|| ! haveSameRecipient (allMessages[j- 1 ], allMessages[j])) {
3234
3234
check (model.items[i++ ]).isA <MessageListRecipientHeaderItem >()
3235
3235
.message.identicalTo (allMessages[j]);
3236
- forcedShowSender = true ;
3236
+ showSender = true ;
3237
3237
} else if (! messagesSameDay (allMessages[j- 1 ], allMessages[j])) {
3238
3238
check (model.items[i++ ]).isA <MessageListDateSeparatorItem >()
3239
3239
.message.identicalTo (allMessages[j]);
3240
- forcedShowSender = true ;
3240
+ showSender = true ;
3241
+ } else {
3242
+ // TODO(#1825) adjust to reflect messagesCloseInTime
3243
+ showSender = allMessages[j].senderId != allMessages[j- 1 ].senderId;
3241
3244
}
3242
3245
if (j < model.messages.length) {
3243
3246
check (model.items[i]).isA <MessageListMessageItem >()
@@ -3248,8 +3251,7 @@ void checkInvariants(MessageListView model) {
3248
3251
.message.identicalTo (model.outboxMessages[j- model.messages.length]);
3249
3252
}
3250
3253
check (model.items[i++ ]).isA <MessageListMessageBaseItem >()
3251
- ..showSender.equals ( // TODO(#1825) adjust to reflect messagesCloseInTime
3252
- forcedShowSender || allMessages[j].senderId != allMessages[j- 1 ].senderId)
3254
+ ..showSender.equals (showSender)
3253
3255
..isLastInBlock.equals (
3254
3256
i == model.items.length || switch (model.items[i]) {
3255
3257
MessageListMessageItem ()
0 commit comments