Compare commits
2 Commits
10b86812cd
...
ad2b10972c
Author | SHA1 | Date | |
---|---|---|---|
ad2b10972c | |||
e65e1f3ec4 |
@ -665,7 +665,9 @@ class XmppService {
|
||||
_log.finest('Received delivery receipt from ${event.from.toString()}');
|
||||
final db = GetIt.I.get<DatabaseService>();
|
||||
final ms = GetIt.I.get<MessageService>();
|
||||
final dbMsg = await db.getMessageByXmppId(event.id, event.from.toBare().toString());
|
||||
final cs = GetIt.I.get<ConversationService>();
|
||||
final sender = event.from.toBare().toString();
|
||||
final dbMsg = await db.getMessageByXmppId(event.id, sender);
|
||||
if (dbMsg == null) {
|
||||
_log.warning('Did not find the message with id ${event.id} in the database!');
|
||||
return;
|
||||
@ -675,8 +677,16 @@ class XmppService {
|
||||
dbMsg.id,
|
||||
received: true,
|
||||
);
|
||||
|
||||
sendEvent(MessageUpdatedEvent(message: msg));
|
||||
|
||||
// Update the conversation
|
||||
final conv = await cs.getConversationByJid(sender);
|
||||
if (conv != null && conv.lastMessage?.id == msg.id) {
|
||||
final newConv = conv.copyWith(lastMessage: msg);
|
||||
cs.setConversation(newConv);
|
||||
_log.finest('Updating conversation');
|
||||
sendEvent(ConversationUpdatedEvent(conversation: newConv));
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _onChatMarker(ChatMarkerEvent event, { dynamic extra }) async {
|
||||
@ -700,11 +710,13 @@ class XmppService {
|
||||
);
|
||||
sendEvent(MessageUpdatedEvent(message: msg));
|
||||
|
||||
|
||||
// Update the conversation
|
||||
final conv = await cs.getConversationByJid(sender);
|
||||
if (conv != null && conv.lastMessage?.id == msg.id) {
|
||||
final newConv = conv.copyWith(lastMessage: msg);
|
||||
cs.setConversation(newConv);
|
||||
_log.finest('Updating conversation');
|
||||
sendEvent(ConversationUpdatedEvent(conversation: newConv));
|
||||
}
|
||||
}
|
||||
|
@ -126,8 +126,6 @@ class ConversationsListRowState extends State<ConversationsListRow> {
|
||||
final badgeText = widget.conversation.unreadCounter > 99 ?
|
||||
'99+' :
|
||||
widget.conversation.unreadCounter.toString();
|
||||
// TODO(Unknown): Maybe turn this into an attribute of the widget to prevent calling this
|
||||
// for every conversation
|
||||
final screenWidth = MediaQuery.of(context).size.width;
|
||||
final width = screenWidth - 24 - 70;
|
||||
final textWidth = screenWidth * 0.6;
|
||||
|
Loading…
Reference in New Issue
Block a user