ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make login more robust

Browse Source
This commit is contained in:
Tobias Fella
2021-07-28 00:21:33 +02:00
parent 00494f8f88
commit 4b75e7d588
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/login.cpp
View File

@@ -29,18 +29,15 @@ void Login::init()
connect(this, &Login::matrixIdChanged, this, [=]() { connect(this, &Login::matrixIdChanged, this, [=]() {
setHomeserverReachable(false); setHomeserverReachable(false);
if (m_connection) {
delete m_connection;
m_connection = nullptr;
}
if (m_matrixId == "@") { if (m_matrixId == "@") {
return; return;
} }
m_testing = true; m_testing = true;
Q_EMIT testingChanged(); Q_EMIT testingChanged();
m_connection = new Connection(this); if(!m_connection) {
m_connection = new Connection(this);
}
m_connection->resolveServer(m_matrixId); m_connection->resolveServer(m_matrixId);
connect(m_connection, &Connection::loginFlowsChanged, this, [=]() { connect(m_connection, &Connection::loginFlowsChanged, this, [=]() {
setHomeserverReachable(true); setHomeserverReachable(true);
@@ -108,7 +105,6 @@ void Login::login()
setDeviceName("NeoChat " + QSysInfo::machineHostName() + " " + QSysInfo::productType() + " " + QSysInfo::productVersion() + " " setDeviceName("NeoChat " + QSysInfo::machineHostName() + " " + QSysInfo::productType() + " " + QSysInfo::productVersion() + " "
+ QSysInfo::currentCpuArchitecture()); + QSysInfo::currentCpuArchitecture());
m_connection = new Connection(this);
m_connection->resolveServer(m_matrixId); m_connection->resolveServer(m_matrixId);
connect(m_connection, &Connection::loginFlowsChanged, this, [=]() { connect(m_connection, &Connection::loginFlowsChanged, this, [=]() {
@@ -129,6 +125,7 @@ void Login::login()
account.sync(); account.sync();
Controller::instance().addConnection(m_connection); Controller::instance().addConnection(m_connection);
Controller::instance().setActiveConnection(m_connection); Controller::instance().setActiveConnection(m_connection);
m_connection = nullptr;
}); });
connect(m_connection, &Connection::networkError, [=](QString error, const QString &, int, int) { connect(m_connection, &Connection::networkError, [=](QString error, const QString &, int, int) {
Q_EMIT Controller::instance().globalErrorOccured(i18n("Network Error"), std::move(error)); Q_EMIT Controller::instance().globalErrorOccured(i18n("Network Error"), std::move(error));
@@ -169,6 +166,8 @@ QUrl Login::ssoUrl() const
void Login::loginWithSso() void Login::loginWithSso()
{ {
m_connection->resolveServer(m_matrixId);
SsoSession *session = m_connection->prepareForSso("NeoChat " + QSysInfo::machineHostName() + " " + QSysInfo::productType() + " " SsoSession *session = m_connection->prepareForSso("NeoChat " + QSysInfo::machineHostName() + " " + QSysInfo::productType() + " "
+ QSysInfo::productVersion() + " " + QSysInfo::currentCpuArchitecture()); + QSysInfo::productVersion() + " " + QSysInfo::currentCpuArchitecture());
m_ssoUrl = session->ssoUrl(); m_ssoUrl = session->ssoUrl();
@@ -187,6 +186,7 @@ void Login::loginWithSso()
account.sync(); account.sync();
Controller::instance().addConnection(m_connection); Controller::instance().addConnection(m_connection);
Controller::instance().setActiveConnection(m_connection); Controller::instance().setActiveConnection(m_connection);
m_connection = nullptr;
}); });
connect(m_connection, &Connection::syncDone, this, [=]() { connect(m_connection, &Connection::syncDone, this, [=]() {
Q_EMIT initialSyncFinished(); Q_EMIT initialSyncFinished();