Merge branch 'master' into develop

packages/stream_chat/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.5.3
+
+- fix: `StreamChatClient.connect` returns quicker when you're using the persistence package
+
+## 1.5.2
+
+- fix: `queryChannels` should throw exceptions only if no data is present in cache.
+
 ## 1.5.1
 
 - Minor fixes and improvements

packages/stream_chat/lib/src/client.dart

@@ -546,10 +546,10 @@ class StreamChatClient {
 
     var event = await _chatPersistenceClient?.getConnectionInfo();
 
-    await _ws.connect().then((e) async {
-      await _chatPersistenceClient?.updateConnectionInfo(e);
+    await _ws.connect().then((e) {
+      _chatPersistenceClient?.updateConnectionInfo(e);
       event = e;
-      await resync();
+      resync();
     }).catchError((err, stacktrace) {
       logger.severe('error connecting ws', err, stacktrace);
       if (err is Map) {
@@ -633,7 +633,7 @@ class StreamChatClient {
       );
       if (channels.isNotEmpty) yield channels;
 
-      if (wsConnectionStatus == ConnectionStatus.connected) {
+      try {
         final newQueryChannelsFuture = queryChannelsOnline(
           filter: filter,
           sort: sort,
@@ -648,6 +648,8 @@ class StreamChatClient {
         _queryChannelsStreams[hash] = newQueryChannelsFuture;
 
         yield await newQueryChannelsFuture;
+      } catch (_) {
+        if (channels.isEmpty) rethrow;
       }
     }
   }

packages/stream_chat/lib/version.dart

@@ -3,4 +3,4 @@ import 'package:stream_chat/src/client.dart';
 /// Current package version
 /// Used in [StreamChatClient] to build the `x-stream-client` header
 // ignore: constant_identifier_names
-const PACKAGE_VERSION = '1.5.1';
+const PACKAGE_VERSION = '1.5.3';

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.5.1
+version: 1.5.3
 repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues