From abf218595e3d31d8220d72784d43ddba0b26b27f Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Mon, 21 Dec 2020 11:43:15 +0100 Subject: [PATCH] update llc dependency --- example/ios/Flutter/.last_build_id | 2 +- example/lib/new_chat_screen.dart | 2 +- example/pubspec.yaml | 2 +- lib/src/channels_bloc.dart | 10 +++++----- lib/src/chat_info_screen.dart | 4 ++-- pubspec.yaml | 5 +---- 6 files changed, 11 insertions(+), 14 deletions(-) diff --git a/example/ios/Flutter/.last_build_id b/example/ios/Flutter/.last_build_id index f57e1e1f..e72273c3 100644 --- a/example/ios/Flutter/.last_build_id +++ b/example/ios/Flutter/.last_build_id @@ -1 +1 @@ -c770358a10272b4ee1cdc2eb432445f6 \ No newline at end of file +13a41b8138c4868054e44b5158f3bdd6 \ No newline at end of file diff --git a/example/lib/new_chat_screen.dart b/example/lib/new_chat_screen.dart index 54371c3b..f29b1483 100644 --- a/example/lib/new_chat_screen.dart +++ b/example/lib/new_chat_screen.dart @@ -84,7 +84,7 @@ class _NewChatScreenState extends State { paginationParams: PaginationParams( limit: 1, ), - ).first; + ); final _channelExisted = res.length == 1; if (_channelExisted) { diff --git a/example/pubspec.yaml b/example/pubspec.yaml index cec1b886..175cdaeb 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -1,6 +1,6 @@ name: example description: A new Flutter project. -version: 1.0.93+96 +version: 1.0.94+97 environment: sdk: ">=2.2.2 <3.0.0" diff --git a/lib/src/channels_bloc.dart b/lib/src/channels_bloc.dart index 474d9599..15167317 100644 --- a/lib/src/channels_bloc.dart +++ b/lib/src/channels_bloc.dart @@ -85,7 +85,7 @@ class ChannelsBlocState extends State paginationParams.offset == null || paginationParams.offset == 0; final oldChannels = List.from(channels ?? []); - client + await client .queryChannels( filter: filter, sort: sortOptions, @@ -93,19 +93,19 @@ class ChannelsBlocState extends State paginationParams: paginationParams, onlyOffline: onlyOffline, ) - .listen((channels) { + .then((channels) { if (clear) { _channelsController.add(channels); } else { final l = oldChannels + channels; _channelsController.add(l); } - }, onDone: () { - _queryChannelsLoadingController.sink.add(false); - }, onError: (err, stackTrace) { + }).catchError((err, stackTrace) { print(err); print(stackTrace); _queryChannelsLoadingController.addError(err, stackTrace); + }).whenComplete(() { + _queryChannelsLoadingController.sink.add(false); }); } catch (err, stackTrace) { _queryChannelsLoadingController.addError(err, stackTrace); diff --git a/lib/src/chat_info_screen.dart b/lib/src/chat_info_screen.dart index 0ec62c36..8d291f38 100644 --- a/lib/src/chat_info_screen.dart +++ b/lib/src/chat_info_screen.dart @@ -391,8 +391,8 @@ class __SharedGroupsScreenState extends State<_SharedGroupsScreen> { ), backgroundColor: StreamChatTheme.of(context).primaryColor, ), - body: StreamBuilder>( - stream: chat.client.queryChannels( + body: FutureBuilder>( + future: chat.client.queryChannels( filter: { r'$and': [ { diff --git a/pubspec.yaml b/pubspec.yaml index a226f9c3..12374291 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -28,10 +28,7 @@ dependencies: file_picker: ^2.0.12 image_picker: ^0.6.7+2 flutter_keyboard_visibility: ^3.3.0 - stream_chat: - git: - url: https://github.com/GetStream/stream-chat-dart - ref: two-way-pagination + stream_chat: ^0.2.20 mime: ^0.9.6+3 video_compress: ^2.1.1 visibility_detector: ^0.1.5