Merge branch 'feature/new-ui' into feature/ui-split

.github/workflows/scripts/install-tools.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-flutter pub global activate melos 0.4.0-dev.2
+flutter pub global activate melos 0.4.0+1
 echo "::add-path::$HOME/.pub-cache/bin"
 echo "::add-path::$GITHUB_WORKSPACE/_flutter/.pub-cache/bin"
 echo "::add-path::$GITHUB_WORKSPACE/_flutter/bin/cache/dart-sdk/bin"

packages/dart_client/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.24+1
+
+- Stop ws reconnection after calling disconnect
+
 ## 0.2.24
 
 - Create enum for push providers

packages/dart_client/lib/src/api/websocket.dart

@@ -108,7 +108,9 @@ class WebSocket {
   WebSocketChannel _channel;
   Timer _healthCheck, _reconnectionMonitor;
   DateTime _lastEventAt;
-  bool _manuallyClosed = false, _connecting = false, _reconnecting = false;
+  bool _manuallyDisconnected = false,
+      _connecting = false,
+      _reconnecting = false;
 
   Event _decodeEvent(String source) {
     return Event.fromJson(json.decode(source));
@@ -118,7 +120,7 @@ class WebSocket {
 
   /// Connect the WS using the parameters passed in the constructor
   Future<Event> connect() {
-    _manuallyClosed = false;
+    _manuallyDisconnected = false;
 
     if (_connecting) {
       logger.severe('already connecting');
@@ -151,7 +153,7 @@ class WebSocket {
 
   void _onDone() {
     _connecting = false;
-    if (_manuallyClosed) {
+    if (_manuallyDisconnected) {
       return;
     }
 
@@ -289,11 +291,15 @@ class WebSocket {
   }
 
   /// Disconnects the WS and releases eventual resources
-  Future<void> disconnect() {
+  Future<void> disconnect() async {
+    if (_manuallyDisconnected) {
+      return;
+    }
     logger.info('disconnecting');
     _connectionCompleter = Completer();
     _cancelTimers();
-    _manuallyClosed = true;
+    _reconnecting = false;
+    _manuallyDisconnected = true;
     connectionStatus.value = ConnectionStatus.disconnected;
     connectionStatus.dispose();
     return _channel.sink.close();

packages/dart_client/lib/version.dart

@@ -2,4 +2,4 @@ import 'package:stream_chat/src/client.dart';
 
 /// Current package version
 /// Used in [Client] to build the `x-stream-client` header
-const PACKAGE_VERSION = '0.2.24';
+const PACKAGE_VERSION = '0.2.24+1';

packages/dart_client/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: 0.2.24
+version: 0.2.24+1
 repository: https://github.com/GetStream/stream-chat-dart
 issue_tracker: https://github.com/GetStream/stream-chat-dart/issues
 

packages/flutter_widgets/example/ios/fastlane/report.xml

@@ -5,27 +5,27 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="0: Verifying fastlane version" time="0.000357">
+      <testcase classname="fastlane.lanes" name="0: Verifying fastlane version" time="0.000383">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="1: default_platform" time="0.000265">
+      <testcase classname="fastlane.lanes" name="1: default_platform" time="0.000196">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="2: is_ci" time="0.000184">
+      <testcase classname="fastlane.lanes" name="2: is_ci" time="0.000194">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="3: is_ci" time="0.000154">
+      <testcase classname="fastlane.lanes" name="3: is_ci" time="0.000177">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="4: match" time="49.725249">
+      <testcase classname="fastlane.lanes" name="4: match" time="36.832536">
         
       </testcase>
     

packages/flutter_widgets/example/lib/main.dart

@@ -29,7 +29,7 @@ void main() async {
     logLevel: Level.INFO,
     showLocalNotification:
         (!kIsWeb && Platform.isAndroid) ? showLocalNotification : null,
-    persistenceEnabled: false,
+    persistenceEnabled: true,
   );
 
   if (userId != null) {

packages/flutter_widgets/example/pubspec.yaml

@@ -1,7 +1,7 @@
 name: example
 description: A new Flutter project.
 publish_to: 'none'
-version: 1.1.3+3
+version: 1.1.3+6
 
 environment:
   sdk: ">=2.2.2 <3.0.0"