Merge branch 'develop' into message-input-controller

packages/stream_chat/CHANGELOG.md

@@ -1,3 +1,10 @@
+## Upcoming
+
+🐞 Fixed
+
+- [[#799]](https://github.com/GetStream/stream-chat-flutter/issues/799) Fixed `totalUnreadCount` is not updating when
+  app is resumed from background mode
+
 ## 3.3.0
 
 ✅ Added

packages/stream_chat/lib/src/client/channel.dart

@@ -1466,8 +1466,6 @@ class ChannelClientState {
 
     _listenMemberRemoved();
 
-    _computeUnread();
-
     _startCleaning();
 
     _startCleaningPinnedMessages();
@@ -1490,15 +1488,6 @@ class ChannelClientState {
 
   final _subscriptions = <StreamSubscription>[];
 
-  void _computeUnread() {
-    final userRead = channelState.read.firstWhereOrNull(
-      (r) => r.user.id == _channel._client.state.currentUser?.id,
-    );
-    if (userRead != null && userRead.unreadMessages > 0) {
-      unreadCount = userRead.unreadMessages;
-    }
-  }
-
   void _checkExpiredAttachmentMessages(ChannelState channelState) async {
     final expiredAttachmentMessagesId = channelState.messages
         .where((m) =>
@@ -1850,15 +1839,34 @@ class ChannelClientState {
   /// Channel read list as a stream.
   Stream<List<Read>> get readStream => channelStateStream.map((cs) => cs.read);
 
-  final BehaviorSubject<int> _unreadCountController = BehaviorSubject.seeded(0);
+  bool _isCurrentUserRead(Read read) =>
+      read.user.id == _channel._client.state.currentUser!.id;
 
-  set unreadCount(int value) => _unreadCountController.add(value);
+  /// Channel read for the logged in user.
+  Read? get currentUserRead => read.firstWhereOrNull(_isCurrentUserRead);
+
+  /// Channel read for the logged in user as a stream.
+  Stream<Read?> get currentUserReadStream =>
+      readStream.map((read) => read.firstWhereOrNull(_isCurrentUserRead));
 
   /// Unread count getter as a stream.
-  Stream<int> get unreadCountStream => _unreadCountController.stream.distinct();
+  Stream<int> get unreadCountStream =>
+      currentUserReadStream.map((read) => read?.unreadMessages ?? 0);
 
   /// Unread count getter.
-  int get unreadCount => _unreadCountController.value;
+  int get unreadCount => currentUserRead?.unreadMessages ?? 0;
+
+  /// Setter for unread count.
+  set unreadCount(int count) {
+    final reads = [..._channelState.read];
+    final currentUserReadIndex = reads.indexWhere(_isCurrentUserRead);
+
+    if (currentUserReadIndex < 0) return;
+
+    reads[currentUserReadIndex] =
+        reads[currentUserReadIndex].copyWith(unreadMessages: count);
+    _channelState = _channelState.copyWith(read: reads);
+  }
 
   bool _countMessageAsUnread(Message message) {
     final userId = _channel.client.state.currentUser?.id;
@@ -2118,7 +2126,6 @@ class ChannelClientState {
   /// Call this method to dispose this object.
   void dispose() {
     _debouncedUpdatePersistenceChannelState.cancel();
-    _unreadCountController.close();
     _retryQueue.dispose();
     _subscriptions.forEach((s) => s.cancel());
     _channelStateController.close();

packages/stream_chat/lib/src/client/client.dart

@@ -395,6 +395,9 @@ class StreamChatClient {
   }
 
   void _handleHealthCheckEvent(Event event) {
+    final user = event.me;
+    if (user != null) state.currentUser = user;
+
     final connectionId = event.connectionId;
     if (connectionId != null) {
       _connectionIdManager.setConnectionId(connectionId);

packages/stream_chat_flutter/CHANGELOG.md

@@ -6,7 +6,7 @@
 
 - `MessageInput` now works with a `MessageInputController` instead of a `TextEditingController`
 
-## 3.3.0 
+## 3.3.1
 
 ✅ Added
 

packages/stream_chat_flutter/pubspec.yaml

@@ -1,7 +1,7 @@
 name: stream_chat_flutter
 homepage: https://github.com/GetStream/stream-chat-flutter
 description: Stream Chat official Flutter SDK. Build your own chat experience using Dart and Flutter.
-version: 3.3.0
+version: 3.3.1
 repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues
 
@@ -36,7 +36,7 @@ dependencies:
   rxdart: ^0.27.0
   share_plus: ^3.0.4
   shimmer: ^2.0.0
-  stream_chat_flutter_core: ^3.2.0
+  stream_chat_flutter_core: ^3.3.0
   substring_highlight: ^1.0.26
   synchronized: ^3.0.0
   url_launcher: ^6.0.3

packages/stream_chat_flutter_core/lib/src/channel_list_core.dart

@@ -157,10 +157,7 @@ class ChannelListCoreState extends State<ChannelListCore> {
         presence: widget.presence,
         memberLimit: widget.memberLimit,
         messageLimit: widget.messageLimit,
-        paginationParams: PaginationParams(
-          limit: widget.limit,
-          offset: 0,
-        ),
+        paginationParams: PaginationParams(limit: widget.limit, offset: 0),
       );
 
   /// Fetches more channels with updated pagination and updates the widget

packages/stream_chat_flutter_core/test/channel_list_core_test.dart

@@ -9,7 +9,7 @@ import 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart';
 import 'mocks.dart';
 
 void main() {
-  const pagination = PaginationParams(limit: 3);
+  const pagination = PaginationParams(limit: 3, offset: 0);
 
   List<Channel> _generateChannels(
     StreamChatClient client, {
@@ -476,7 +476,7 @@ void main() {
       _stateSetter?.call(() => limit = 6);
 
       final updatedChannels = _generateChannels(mockClient, count: limit);
-      final updatedPagination = PaginationParams(limit: limit);
+      final updatedPagination = PaginationParams(limit: limit, offset: 0);
       when(() => mockClient.queryChannels(
             filter: any(named: 'filter'),
             sort: any(named: 'sort'),