mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-28 07:54:49 +03:00
This commit is contained in:
parent
d6dbabfbc4
commit
06c889630c
2 changed files with 10 additions and 2 deletions
|
@ -114,9 +114,10 @@ void AccountState::setState(State state)
|
||||||
} else if (oldState == SignedOut && _state == Disconnected) {
|
} else if (oldState == SignedOut && _state == Disconnected) {
|
||||||
checkConnectivity();
|
checkConnectivity();
|
||||||
}
|
}
|
||||||
|
|
||||||
emit stateChanged(_state);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// might not have changed but the underlying _connectionErrors might have
|
||||||
|
emit stateChanged(_state);
|
||||||
}
|
}
|
||||||
|
|
||||||
QString AccountState::stateString(State state)
|
QString AccountState::stateString(State state)
|
||||||
|
@ -174,7 +175,12 @@ void AccountState::checkConnectivity()
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (_connectionValidator) {
|
||||||
|
qDebug() << "ConnectionValidator already running, ignoring";
|
||||||
|
return;
|
||||||
|
}
|
||||||
ConnectionValidator * conValidator = new ConnectionValidator(account());
|
ConnectionValidator * conValidator = new ConnectionValidator(account());
|
||||||
|
_connectionValidator = conValidator;
|
||||||
connect(conValidator, SIGNAL(connectionResult(ConnectionValidator::Status,QStringList)),
|
connect(conValidator, SIGNAL(connectionResult(ConnectionValidator::Status,QStringList)),
|
||||||
SLOT(slotConnectionValidatorResult(ConnectionValidator::Status,QStringList)));
|
SLOT(slotConnectionValidatorResult(ConnectionValidator::Status,QStringList)));
|
||||||
if (isConnected()) {
|
if (isConnected()) {
|
||||||
|
|
|
@ -16,6 +16,7 @@
|
||||||
#define ACCOUNTINFO_H
|
#define ACCOUNTINFO_H
|
||||||
|
|
||||||
#include <QByteArray>
|
#include <QByteArray>
|
||||||
|
#include <QPointer>
|
||||||
#include "utility.h"
|
#include "utility.h"
|
||||||
#include "connectionvalidator.h"
|
#include "connectionvalidator.h"
|
||||||
|
|
||||||
|
@ -128,6 +129,7 @@ private:
|
||||||
ConnectionStatus _connectionStatus;
|
ConnectionStatus _connectionStatus;
|
||||||
QStringList _connectionErrors;
|
QStringList _connectionErrors;
|
||||||
bool _waitingForNewCredentials;
|
bool _waitingForNewCredentials;
|
||||||
|
QPointer<ConnectionValidator> _connectionValidator;
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue