From 388829e32d0df4dfef1dce155322c4efd64f051f Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Tue, 26 Jan 2021 10:51:26 +0100 Subject: [PATCH] rename _manuallyClosed to _manuallyDisconnected --- packages/dart_client/lib/src/api/websocket.dart | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/dart_client/lib/src/api/websocket.dart b/packages/dart_client/lib/src/api/websocket.dart index 48e7b0ee..bdd14a1e 100644 --- a/packages/dart_client/lib/src/api/websocket.dart +++ b/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 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; } @@ -290,14 +292,14 @@ class WebSocket { /// Disconnects the WS and releases eventual resources Future disconnect() async { - if (_manuallyClosed) { + if (_manuallyDisconnected) { return; } logger.info('disconnecting'); _connectionCompleter = Completer(); _cancelTimers(); _reconnecting = false; - _manuallyClosed = true; + _manuallyDisconnected = true; connectionStatus.value = ConnectionStatus.disconnected; connectionStatus.dispose(); return _channel.sink.close();