implemented chat long-polling and optimistic updates, centralized notification management, optimized avatar caching

lib/view/pages/talk/chat_list.dart

@@ -7,7 +7,6 @@ import '../../../notification/notify_updater.dart';
 import '../../../routing/app_routes.dart';
 import '../../../state/app/infrastructure/loadable_state/loadable_state.dart';
 import '../../../state/app/infrastructure/loadable_state/view/loadable_state_consumer.dart';
-import '../../../state/app/infrastructure/utility_widgets/bloc_module.dart';
 import '../../../state/app/modules/chat_list/bloc/chat_list_bloc.dart';
 import '../../../state/app/modules/chat_list/bloc/chat_list_state.dart';
 import '../../../state/app/modules/settings/bloc/settings_cubit.dart';
@@ -19,15 +18,13 @@ import 'search_chat.dart';
 import 'widgets/chat_tile.dart';
 import 'widgets/split_view_placeholder.dart';
 
+// Reads from the global ChatListBloc in main.dart — re-providing a local
+// one here would shadow it and split the state in two.
 class ChatList extends StatelessWidget {
   const ChatList({super.key});
 
   @override
-  Widget build(BuildContext context) =>
-      BlocModule<ChatListBloc, LoadableState<ChatListState>>(
-        create: (_) => ChatListBloc(),
-        child: (context, bloc, _) => const _ChatListView(),
-      );
+  Widget build(BuildContext context) => const _ChatListView();
 }
 
 class _ChatListView extends StatefulWidget {
@@ -65,14 +62,6 @@ class _ChatListViewState extends State<_ChatListView> {
     final resolved = AppRoutes.resolvePendingChat(context);
     if (resolved == null) return;
     AppRoutes.pendingChatToken.value = null;
-
-    // Replace any chat already pushed on top of the chat list so a freshly
-    // tapped notification doesn't stack indefinitely on previous chats.
-    final navigator = Navigator.of(context);
-    if (navigator.canPop()) {
-      navigator.popUntil((route) => route.isFirst);
-    }
-
     AppRoutes.openChatView(
       context,
       room: resolved.room,
@@ -193,7 +182,14 @@ class _ChatListViewState extends State<_ChatListView> {
                       .talkSettings
                       .drafts
                       .containsKey(room.token);
-                  return ChatTile(data: room, hasDraft: hasDraft);
+                  // Stable key keeps element identity across re-sorts so the
+                  // inner UserAvatar reuses its cached bytes instead of
+                  // flashing on every list update.
+                  return ChatTile(
+                    key: ValueKey(room.token),
+                    data: room,
+                    hasDraft: hasDraft,
+                  );
                 }).toList(),
               );
             },

lib/view/pages/talk/chat_view.dart

@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:math' as math;
 
 import 'package:flutter/material.dart';
@@ -7,9 +8,12 @@ import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
 import '../../../api/marianumcloud/talk/chat/get_chat_response.dart';
 import '../../../api/marianumcloud/talk/room/get_room_response.dart';
 import '../../../extensions/date_time.dart';
+import '../../../notification/notification_tasks.dart';
+import '../../../routing/app_routes.dart';
 import '../../../state/app/infrastructure/loadable_state/view/loadable_state_consumer.dart';
 import '../../../state/app/modules/chat/bloc/chat_bloc.dart';
 import '../../../state/app/modules/chat/bloc/chat_state.dart';
+import '../../../state/app/modules/chat_list/bloc/chat_list_bloc.dart';
 import '../../../theming/app_theme.dart';
 import '../../../widget/clickable_app_bar.dart';
 import '../../../widget/user_avatar.dart';
@@ -36,7 +40,7 @@ class ChatView extends StatefulWidget {
   State<ChatView> createState() => _ChatViewState();
 }
 
-class _ChatViewState extends State<ChatView> {
+class _ChatViewState extends State<ChatView> with RouteAware {
   final ItemScrollController _itemScrollController = ItemScrollController();
   final TextEditingController _searchTextController = TextEditingController();
   final Map<int, int> _matchIndices = {};
@@ -48,12 +52,73 @@ class _ChatViewState extends State<ChatView> {
   GetChatResponse? _matchesComputedFor;
   String? _matchesComputedQuery;
 
+  // Captured in initState because the framework has unmounted us by the
+  // time dispose runs.
+  ChatBloc? _chatBlocRef;
+  ChatListBloc? _chatListBlocRef;
+  PageRoute<dynamic>? _subscribedRoute;
+
+  @override
+  void initState() {
+    super.initState();
+    _chatBlocRef = context.read<ChatBloc>();
+    _chatListBlocRef = context.read<ChatListBloc>();
+    NotificationTasks.clearNotificationsForChat(widget.room.token);
+  }
+
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    final route = ModalRoute.of(context);
+    if (route is PageRoute && route != _subscribedRoute) {
+      if (_subscribedRoute != null) {
+        AppRoutes.chatRouteObserver.unsubscribe(this);
+      }
+      AppRoutes.chatRouteObserver.subscribe(this, route);
+      _subscribedRoute = route;
+    }
+  }
+
+  @override
+  void didPopNext() {
+    super.didPopNext();
+    // A stacked chat above us was just popped (typical: notification tap
+    // opened another chat). The global ChatBloc currently points at that
+    // other chat's token, so our isReady predicate fails until we re-claim.
+    _chatBlocRef?.setToken(widget.room.token);
+  }
+
   @override
   void dispose() {
+    if (_subscribedRoute != null) {
+      AppRoutes.chatRouteObserver.unsubscribe(this);
+    }
+    _markAsReadFinal();
+    _chatBlocRef?.leaveChat(widget.room.token);
     _searchTextController.dispose();
     super.dispose();
   }
 
+  /// Defensive final mark-as-read so a back-out before the long-poll
+  /// could fire doesn't leave the room as unread. Skipped when the bloc
+  /// has already moved on to another chat — the response data there
+  /// belongs to a different room, and writing its max-id as our marker
+  /// would regress our server cursor.
+  void _markAsReadFinal() {
+    final state = _chatBlocRef?.state.data;
+    if (state == null) return;
+    if (state.currentToken != widget.room.token) return;
+    final response = state.chatResponse;
+    if (response == null) return;
+    var maxId = 0;
+    for (final m in response.data) {
+      if (m.id > maxId) maxId = m.id;
+    }
+    if (maxId == 0) return;
+    _chatListBlocRef?.markRoomAsRead(widget.room.token, maxId);
+    unawaited(_chatBlocRef!.sendServerReadMarker(widget.room.token, maxId));
+  }
+
   @override
   void didUpdateWidget(covariant ChatView oldWidget) {
     super.didUpdateWidget(oldWidget);

lib/view/pages/talk/widgets/chat_tile.dart

@@ -7,9 +7,10 @@ import '../../../../api/marianumcloud/talk/actions/talk_actions.dart';
 import '../../../../api/marianumcloud/talk/chat/rich_object_string_processor.dart';
 import '../../../../api/marianumcloud/talk/room/get_room_response.dart';
 import '../../../../api/marianumcloud/talk/set_read_marker/set_read_marker.dart';
-import '../../../../api/marianumcloud/talk/set_read_marker/set_read_marker_params.dart';
 import '../../../../extensions/date_time.dart';
 import '../../../../model/account_data.dart';
+import '../../../../notification/notification_tasks.dart';
+import '../../../../routing/app_routes.dart';
 import '../../../../state/app/modules/chat/bloc/chat_bloc.dart';
 import '../../../../state/app/modules/chat_list/bloc/chat_list_bloc.dart';
 import '../../../../widget/async_action_button.dart';
@@ -17,7 +18,6 @@ import '../../../../widget/confirm_dialog.dart';
 import '../../../../widget/debug/debug_tile.dart';
 import '../../../../widget/details_bottom_sheet.dart';
 import '../../../../widget/user_avatar.dart';
-import '../chat_view.dart';
 import '../talk_navigator.dart';
 
 class ChatTile extends StatefulWidget {
@@ -61,13 +61,11 @@ class _ChatTileState extends State<ChatTile> {
   void _refreshList() => context.read<ChatListBloc>().refresh();
 
   Future<void> _setCurrentAsRead() async {
-    await SetReadMarker(
-      widget.data.token,
-      true,
-      setReadMarkerParams: SetReadMarkerParams(
-        lastReadMessage: widget.data.lastMessage.id,
-      ),
-    ).run();
+    final token = widget.data.token;
+    final lastId = widget.data.lastMessage.id;
+    context.read<ChatListBloc>().markRoomAsRead(token, lastId);
+    unawaited(NotificationTasks.clearNotificationsForChat(token));
+    await context.read<ChatBloc>().sendServerReadMarker(token, lastId);
     if (!mounted) return;
     _refreshList();
   }
@@ -154,18 +152,17 @@ class _ChatTileState extends State<ChatTile> {
           return;
         }
         if (selfUsername == null) return;
-        unawaited(_setCurrentAsRead());
-        final view = ChatView(
+        // openChatView is the single entry point for opening a chat —
+        // it handles optimistic mark-as-read, tray cleanup, push, and
+        // setToken in one place so the notification-tap path gets the
+        // same treatment as a tile tap.
+        AppRoutes.openChatView(
+          context,
           room: widget.data,
           selfId: selfUsername!,
           avatar: circleAvatar,
-        );
-        TalkNavigator.pushSplitView(
-          context,
-          view,
           overrideToSingleSubScreen: true,
         );
-        context.read<ChatBloc>().setToken(widget.data.token);
       },
       onLongPress: () {
         if (widget.disableContextActions) return;