From 86698614f6cc915b64e0a8e2ad00214554dfaca2 Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Wed, 5 May 2021 12:52:05 +0200 Subject: [PATCH 1/3] fixes #413: channels bloc does not perform the call if pagination is ended --- .../lib/src/channels_bloc.dart | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/packages/stream_chat_flutter_core/lib/src/channels_bloc.dart b/packages/stream_chat_flutter_core/lib/src/channels_bloc.dart index 2b4968eb..68691e7d 100644 --- a/packages/stream_chat_flutter_core/lib/src/channels_bloc.dart +++ b/packages/stream_chat_flutter_core/lib/src/channels_bloc.dart @@ -95,7 +95,12 @@ class ChannelsBlocState extends State }) async { final client = StreamChatCore.of(context).client; - if (_paginationEnded || _queryChannelsLoadingController.value == true) { + final clear = paginationParams == null || + paginationParams.offset == null || + paginationParams.offset == 0; + + if ((!clear && _paginationEnded) || + _queryChannelsLoadingController.value == true) { return; } @@ -104,9 +109,6 @@ class ChannelsBlocState extends State } try { - final clear = paginationParams == null || - paginationParams.offset == null || - paginationParams.offset == 0; final oldChannels = List.from(channels ?? []); var newChannels = []; await for (final channels in client.queryChannels( @@ -148,7 +150,13 @@ class ChannelsBlocState extends State final client = StreamChatCore.of(context).client; if (!widget.lockChannelsOrder) { - _subscriptions.add(client.on(EventType.messageNew).listen((e) { + _subscriptions.add(client + .on( + EventType.messageNew, + EventType.notificationAddedToChannel, + EventType.notificationMessageNew, + ) + .listen((e) { final newChannels = List.from(channels ?? []); final index = newChannels.indexWhere((c) => c.cid == e.cid); if (index != -1) { From bf2412342269f5c9024c67cb6524d56be63f7f3b Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Wed, 5 May 2021 12:53:56 +0200 Subject: [PATCH 2/3] bump version and chanelogs --- packages/stream_chat_flutter/CHANGELOG.md | 4 ++++ packages/stream_chat_flutter/pubspec.yaml | 4 ++-- packages/stream_chat_flutter_core/CHANGELOG.md | 4 ++++ packages/stream_chat_flutter_core/pubspec.yaml | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md index efbdfccc..989c2c2b 100644 --- a/packages/stream_chat_flutter/CHANGELOG.md +++ b/packages/stream_chat_flutter/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.5.4 + +- Updated `stream_chat_core` dependency + ## 1.5.3 - Updated `stream_chat_core` dependency diff --git a/packages/stream_chat_flutter/pubspec.yaml b/packages/stream_chat_flutter/pubspec.yaml index d2cfce2e..7328865d 100644 --- a/packages/stream_chat_flutter/pubspec.yaml +++ b/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: 1.5.3 +version: 1.5.4 repository: https://github.com/GetStream/stream-chat-flutter issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues @@ -11,7 +11,7 @@ environment: dependencies: flutter: sdk: flutter - stream_chat_flutter_core: ^1.5.2 + stream_chat_flutter_core: ^1.5.3 photo_view: ^0.11.0 rxdart: ^0.25.0 scrollable_positioned_list: ^0.1.8 diff --git a/packages/stream_chat_flutter_core/CHANGELOG.md b/packages/stream_chat_flutter_core/CHANGELOG.md index 68d01d52..d976c039 100644 --- a/packages/stream_chat_flutter_core/CHANGELOG.md +++ b/packages/stream_chat_flutter_core/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.5.3 + +* Fix ChannelsBloc not performing calls if pagination ended + ## 1.5.2 * Update llc dependency diff --git a/packages/stream_chat_flutter_core/pubspec.yaml b/packages/stream_chat_flutter_core/pubspec.yaml index 9827c869..011e1cb2 100644 --- a/packages/stream_chat_flutter_core/pubspec.yaml +++ b/packages/stream_chat_flutter_core/pubspec.yaml @@ -1,7 +1,7 @@ name: stream_chat_flutter_core homepage: https://github.com/GetStream/stream-chat-flutter description: Stream Chat official Flutter SDK Core. Build your own chat experience using Dart and Flutter. -version: 1.5.2 +version: 1.5.3 repository: https://github.com/GetStream/stream-chat-flutter issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues From b75ca8d9a95f89a21b9c80ddbbd56d038d56da57 Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Wed, 5 May 2021 15:34:46 +0200 Subject: [PATCH 3/3] remove events --- packages/stream_chat_flutter_core/lib/src/channels_bloc.dart | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/stream_chat_flutter_core/lib/src/channels_bloc.dart b/packages/stream_chat_flutter_core/lib/src/channels_bloc.dart index 68691e7d..f3ac1223 100644 --- a/packages/stream_chat_flutter_core/lib/src/channels_bloc.dart +++ b/packages/stream_chat_flutter_core/lib/src/channels_bloc.dart @@ -153,8 +153,6 @@ class ChannelsBlocState extends State _subscriptions.add(client .on( EventType.messageNew, - EventType.notificationAddedToChannel, - EventType.notificationMessageNew, ) .listen((e) { final newChannels = List.from(channels ?? []);