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

Fix initial loading of room

Browse Source
This commit is contained in:
Carl Schwan
2021-01-08 17:17:52 +00:00
parent 759244b5d2
commit 44d4269978
1 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/controller.cpp
View File

@@ -258,44 +258,39 @@ void Controller::dropConnection(Connection *c)
void Controller::invokeLogin() void Controller::invokeLogin()
{ {
const auto accounts = SettingsGroup("Accounts").childGroups(); const auto accounts = SettingsGroup("Accounts").childGroups();
const QString id = NeoChatConfig::self()->activeConnection();
for (const auto &accountId : accounts) { for (const auto &accountId : accounts) {
AccountSettings account {accountId}; AccountSettings account {accountId};
if (!account.homeserver().isEmpty()) { if (!account.homeserver().isEmpty()) {
auto accessToken = loadAccessTokenFromKeyChain(account); auto accessToken = loadAccessTokenFromKeyChain(account);
auto c = new Connection(account.homeserver(), this); auto connection = new Connection(account.homeserver(), this);
addConnection(c); addConnection(connection);
connect(c, &Connection::connected, this, [=] { connect(connection, &Connection::connected, this, [=] {
c->loadState(); connection->loadState();
}); if (connection->userId() == id) {
connect(c, &Connection::loginError, this, [=](const QString &error, const QString &) { setActiveConnection(connection);
if (error == "Unrecognised access token") { Q_EMIT initiated();
Q_EMIT errorOccured(i18n("Login Failed"), i18n("Access Token invalid or revoked"));
logout(c, false);
} else {
Q_EMIT errorOccured(i18n("Login Failed"), error);
logout(c, true);
} }
}); });
connect(c, &Connection::networkError, this, [=](const QString &error, const QString &, int, int) { connect(connection, &Connection::loginError, this, [=](const QString &error, const QString &) {
if (error == "Unrecognised access token") {
Q_EMIT errorOccured(i18n("Login Failed"), i18n("Access Token invalid or revoked"));
logout(connection, false);
} else {
Q_EMIT errorOccured(i18n("Login Failed"), error);
logout(connection, true);
}
});
connect(connection, &Connection::networkError, this, [=](const QString &error, const QString &, int, int) {
Q_EMIT errorOccured("Network Error", error); Q_EMIT errorOccured("Network Error", error);
}); });
c->connectWithToken(account.userId(), accessToken, account.deviceId()); connection->connectWithToken(account.userId(), accessToken, account.deviceId());
} }
} }
if (m_connections.isEmpty()) {
if (!m_connections.isEmpty()) { Q_EMIT initiated();
const QString id = NeoChatConfig::self()->activeConnection();
for (auto *connection : qAsConst(m_connections)) {
if (connection->userId() == id) {
setActiveConnection(connection);
Q_EMIT initiated();
return;
}
}
setActiveConnection(m_connections[0]);
} }
Q_EMIT initiated();
} }
QByteArray Controller::loadAccessTokenFromFile(const AccountSettings &account) QByteArray Controller::loadAccessTokenFromFile(const AccountSettings &account)