moxxy/moxxy
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(ui): Fix a sticker as the first message not appearing

Browse Source 
Fixes #274.
This commit is contained in:
PapaTutuWawa 2023-05-16 12:35:35 +02:00
parent 35658e611a
commit 0f138678ec
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/ui/controller/conversation_controller.dart
View File

@ -2,6 +2,7 @@ import 'dart:async';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.dart';
import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart'; import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
import 'package:logging/logging.dart';
import 'package:moxplatform/moxplatform.dart'; import 'package:moxplatform/moxplatform.dart';
import 'package:moxxmpp/moxxmpp.dart'; import 'package:moxxmpp/moxxmpp.dart';
import 'package:moxxyv2/shared/commands.dart'; import 'package:moxxyv2/shared/commands.dart';
@ -71,6 +72,9 @@ class BidirectionalConversationController
_updateChatState(ChatState.active); _updateChatState(ChatState.active);
} }
/// Logging.
final Logger _log = Logger('BidirectionalConversationController');
/// A singleton referring to the current instance as there can only be one /// A singleton referring to the current instance as there can only be one
/// BidirectionalConversationController at a time. /// BidirectionalConversationController at a time.
static BidirectionalConversationController? currentController; static BidirectionalConversationController? currentController;
@ -206,13 +210,28 @@ class BidirectionalConversationController
Future<void> onMessageReceived(Message message) async { Future<void> onMessageReceived(Message message) async {
// Drop the message if we don't really care about it // Drop the message if we don't really care about it
if (message.conversationJid != conversationJid) return; if (message.conversationJid != conversationJid) {
_log.finest(
"Not processing message as JIDs don't match: ${message.conversationJid} != $conversationJid",
);
return;
}
// TODO(Unknown): Guard against not being initialized yet, i.e. not having loaded the first // TODO(Unknown): This is probably not the best solution
// messages. if (isFetching) {
_log.finest('Not processing message as we are currently fetching');
return;
}
var shouldScrollToBottom = true; var shouldScrollToBottom = true;
if (message.timestamp < cache.last.timestamp) { if (cache.isEmpty && hasFetchedOnce) {
// We do this check here to prevent a StateException being thrown because
// the cache is empty. So just add the message.
addItem(message);
// As this is the first message, we don't have to scroll to the bottom.
shouldScrollToBottom = false;
} else if (message.timestamp < cache.last.timestamp) {
if (message.timestamp < cache.first.timestamp) { if (message.timestamp < cache.first.timestamp) {
// The message is older than the oldest message we know about. Drop it. // The message is older than the oldest message we know about. Drop it.
// It will be fetched when scrolling up. // It will be fetched when scrolling up.