From b3f51115d5e94d12f6f28b6af3515ea771b153ce Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Mon, 1 Mar 2021 12:51:19 +0100 Subject: [PATCH 1/2] remove future once it's completed --- packages/stream_chat/lib/src/client.dart | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/stream_chat/lib/src/client.dart b/packages/stream_chat/lib/src/client.dart index 2c36f4f61..c5d5322f9 100644 --- a/packages/stream_chat/lib/src/client.dart +++ b/packages/stream_chat/lib/src/client.dart @@ -611,7 +611,9 @@ class StreamChatClient { options: options, paginationParams: paginationParams, messageLimit: messageLimit, - ); + ).whenComplete(() { + _queryChannelsStreams.remove(hash); + }); _queryChannelsStreams[hash] = newQueryChannelsFuture; From c0271b2cb2833b7f1aa1f217197f7cc565dee4d1 Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Mon, 1 Mar 2021 12:56:27 +0100 Subject: [PATCH 2/2] bump version --- packages/stream_chat/CHANGELOG.md | 4 ++++ packages/stream_chat/lib/version.dart | 2 +- packages/stream_chat/pubspec.yaml | 2 +- packages/stream_chat_flutter/CHANGELOG.md | 5 +++++ packages/stream_chat_flutter/lib/src/channel_name.dart | 4 +++- packages/stream_chat_flutter/pubspec.yaml | 4 ++-- packages/stream_chat_flutter_core/CHANGELOG.md | 4 ++++ packages/stream_chat_flutter_core/pubspec.yaml | 4 ++-- 8 files changed, 22 insertions(+), 7 deletions(-) diff --git a/packages/stream_chat/CHANGELOG.md b/packages/stream_chat/CHANGELOG.md index 30ae46f7a..c688d4f6f 100644 --- a/packages/stream_chat/CHANGELOG.md +++ b/packages/stream_chat/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.3.2-beta + +- Fixed queryChannels bug + ## 1.3.1-beta - Debounced frequent db calls diff --git a/packages/stream_chat/lib/version.dart b/packages/stream_chat/lib/version.dart index 8af293af4..2c9c26394 100644 --- a/packages/stream_chat/lib/version.dart +++ b/packages/stream_chat/lib/version.dart @@ -2,4 +2,4 @@ import 'package:stream_chat/src/client.dart'; /// Current package version /// Used in [StreamChatClient] to build the `x-stream-client` header -const PACKAGE_VERSION = '1.3.1-beta'; +const PACKAGE_VERSION = '1.3.2-beta'; diff --git a/packages/stream_chat/pubspec.yaml b/packages/stream_chat/pubspec.yaml index 63d416154..197c3f54a 100644 --- a/packages/stream_chat/pubspec.yaml +++ b/packages/stream_chat/pubspec.yaml @@ -1,7 +1,7 @@ name: stream_chat homepage: https://getstream.io/ description: The official Dart client for Stream Chat, a service for building chat applications. -version: 1.3.1-beta +version: 1.3.2-beta repository: https://github.com/GetStream/stream-chat-flutter issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md index 967536ddc..73ac6d4bd 100644 --- a/packages/stream_chat_flutter/CHANGELOG.md +++ b/packages/stream_chat_flutter/CHANGELOG.md @@ -1,3 +1,8 @@ +## 1.3.2-beta + +- Updated `stream_chat_core` dependency +- Fixed minor bugs + ## 1.3.1-beta - Updated `stream_chat_core` dependency diff --git a/packages/stream_chat_flutter/lib/src/channel_name.dart b/packages/stream_chat_flutter/lib/src/channel_name.dart index 7907de9a2..53817563b 100644 --- a/packages/stream_chat_flutter/lib/src/channel_name.dart +++ b/packages/stream_chat_flutter/lib/src/channel_name.dart @@ -42,7 +42,9 @@ class ChannelName extends StatelessWidget { if (extraData['name'] == null) { final otherMembers = members.where((member) => member.userId != client.user.id); - if (otherMembers.isNotEmpty) { + if (otherMembers.length == 1) { + title = otherMembers.first.user.name; + } else if (otherMembers.isNotEmpty) { final maxWidth = constraints.maxWidth; final maxChars = maxWidth / textStyle.fontSize; var currentChars = 0; diff --git a/packages/stream_chat_flutter/pubspec.yaml b/packages/stream_chat_flutter/pubspec.yaml index b0192aa10..a18801630 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.3.1-beta +version: 1.3.2-beta 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.3.0-beta + stream_chat_flutter_core: ^1.3.2-beta flutter_app_badger: ^1.1.2 photo_view: ^0.10.3 rxdart: ^0.25.0 diff --git a/packages/stream_chat_flutter_core/CHANGELOG.md b/packages/stream_chat_flutter_core/CHANGELOG.md index bbf8b9f59..ff7160acb 100644 --- a/packages/stream_chat_flutter_core/CHANGELOG.md +++ b/packages/stream_chat_flutter_core/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.3.2-beta + +* Update llc dependency + ## 1.3.1-beta * Update llc dependency diff --git a/packages/stream_chat_flutter_core/pubspec.yaml b/packages/stream_chat_flutter_core/pubspec.yaml index bbb58a13f..b289193fb 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.3.1-beta +version: 1.3.2-beta repository: https://github.com/GetStream/stream-chat-flutter issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues @@ -10,7 +10,7 @@ environment: flutter: ">=1.17.0" dependencies: - stream_chat: ^1.3.1-beta + stream_chat: ^1.3.2-beta flutter: sdk: flutter rxdart: ^0.25.0