moxxy/moxxy
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xmpp: Remove _performingStartTLS

Browse Source
This commit is contained in:
PapaTutuWawa 2022-07-26 20:08:50 +02:00
parent 6b41a76e24
commit 5a7b5192b1
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/xmpp/connection.dart
View File

@ -88,7 +88,6 @@ class XmppConnection {
_eventStreamController = StreamController.broadcast(), _eventStreamController = StreamController.broadcast(),
_resource = '', _resource = '',
_streamBuffer = XmlStreamBuffer(), _streamBuffer = XmlStreamBuffer(),
_performingStartTLS = false,
_disconnecting = false, _disconnecting = false,
_uuid = const Uuid(), _uuid = const Uuid(),
_socket = socket ?? TCPSocketWrapper(), _socket = socket ?? TCPSocketWrapper(),
@ -146,8 +145,6 @@ class XmppConnection {
/// For indicating whether we expect the socket to close to prevent accidentally /// For indicating whether we expect the socket to close to prevent accidentally
/// triggering a reconnection attempt when we don't want to. /// triggering a reconnection attempt when we don't want to.
bool _disconnecting; bool _disconnecting;
/// For indicating whether we expect a socket closure due to StartTLS.
bool _performingStartTLS;
/// Timers for the keep-alive ping. /// Timers for the keep-alive ping.
Timer? _connectionPingTimer; Timer? _connectionPingTimer;
/// Completers for certain actions /// Completers for certain actions
@ -344,7 +341,7 @@ class XmppConnection {
handleError(event.error); handleError(event.error);
} else if (event is XmppSocketClosureEvent) { } else if (event is XmppSocketClosureEvent) {
// Only reconnect if we didn't expect this // Only reconnect if we didn't expect this
if (!_disconnecting && !_performingStartTLS) { if (!_disconnecting) {
_log.fine('Received XmppSocketClosureEvent, but _disconnecting is false. Reconnecting...'); _log.fine('Received XmppSocketClosureEvent, but _disconnecting is false. Reconnecting...');
_attemptReconnection(); _attemptReconnection();
} }
@ -923,7 +920,6 @@ class XmppConnection {
} else { } else {
_reconnectionPolicy.onSuccess(); _reconnectionPolicy.onSuccess();
_log.fine('Preparing the internal state for a connection attempt'); _log.fine('Preparing the internal state for a connection attempt');
_performingStartTLS = false;
_resetNegotiators(); _resetNegotiators();
_setConnectionState(XmppConnectionState.connecting); _setConnectionState(XmppConnectionState.connecting);
_updateRoutingState(RoutingState.negotiating); _updateRoutingState(RoutingState.negotiating);