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

feat(core): Use _testAndSetIsConnectionRunning

Browse Source
This commit is contained in:
PapaTutuWawa 2023-03-18 18:41:58 +01:00
parent e1e492832e
commit 70d4d6c56f
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/moxxmpp/lib/src/connection.dart
View File

@ -1140,7 +1140,17 @@ class XmppConnection {
bool waitUntilLogin = false, bool waitUntilLogin = false,
bool enableReconnectOnSuccess = true, bool enableReconnectOnSuccess = true,
}) async { }) async {
_runPreConnectionAssertions(); if (await _testAndSetIsConnectionRunning()) {
_log.fine(
'Cancelling this connection attempt as one appears to be already running.',
);
return Future.value(
Result(
ConnectionAlreadyRunningError(),
),
);
}
await _resetIsConnectionRunning(); await _resetIsConnectionRunning();
if (waitUntilLogin) { if (waitUntilLogin) {
@ -1230,17 +1240,7 @@ class XmppConnection {
bool waitUntilLogin = false, bool waitUntilLogin = false,
bool enableReconnectOnSuccess = true, bool enableReconnectOnSuccess = true,
}) async { }) async {
if (_connectionState != XmppConnectionState.notConnected && _runPreConnectionAssertions();
_connectionState != XmppConnectionState.error) {
_log.fine(
'Cancelling this connection attempt as one appears to be already running.',
);
return Future.value(
Result(
ConnectionAlreadyRunningError(),
),
);
}
final result = _connectImpl( final result = _connectImpl(
lastResource: lastResource, lastResource: lastResource,