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

Remove activeConnection from Config

Browse Source 
It's not used anymore
This commit is contained in:
Tobias Fella
2024-01-07 21:25:55 +01:00
parent 69bd1202ba
commit b9ec33dd94
2 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/controller.cpp
View File

@@ -103,7 +103,7 @@ Controller::Controller(QObject *parent)
connect(&m_accountRegistry, &AccountRegistry::accountCountChanged, this, [this]() { connect(&m_accountRegistry, &AccountRegistry::accountCountChanged, this, [this]() {
if (m_accountRegistry.size() > oldAccountCount) { if (m_accountRegistry.size() > oldAccountCount) {
auto connection = dynamic_cast<NeoChatConnection *>(m_accountRegistry.accounts()[m_accountRegistry.size() - 1]); auto connection = dynamic_cast<NeoChatConnection *>(m_accountRegistry.accounts()[m_accountRegistry.size() - 1]);
connect(connection, &NeoChatConnection::syncDone, this, [this, connection]() { connect(connection, &NeoChatConnection::syncDone, this, [connection]() {
NotificationsManager::instance().handleNotifications(connection); NotificationsManager::instance().handleNotifications(connection);
}); });
connectSingleShot(connection, &NeoChatConnection::syncDone, this, [this, connection] { connectSingleShot(connection, &NeoChatConnection::syncDone, this, [this, connection] {
@@ -143,7 +143,7 @@ void Controller::addConnection(NeoChatConnection *c)
c->setLazyLoading(true); c->setLazyLoading(true);
connect(c, &NeoChatConnection::syncDone, this, [this, c] { connect(c, &NeoChatConnection::syncDone, this, [c] {
c->sync(30000); c->sync(30000);
c->saveState(); c->saveState();
}); });
@@ -167,18 +167,13 @@ void Controller::dropConnection(NeoChatConnection *c)
void Controller::invokeLogin() void Controller::invokeLogin()
{ {
const auto accounts = SettingsGroup("Accounts"_ls).childGroups(); const auto accounts = SettingsGroup("Accounts"_ls).childGroups();
QString id = NeoChatConfig::self()->activeConnection();
for (const auto &accountId : accounts) { for (const auto &accountId : accounts) {
AccountSettings account{accountId}; AccountSettings account{accountId};
m_accountsLoading += accountId; m_accountsLoading += accountId;
Q_EMIT accountsLoadingChanged(); Q_EMIT accountsLoadingChanged();
if (id.isEmpty()) {
// handle case where the account config is empty
id = accountId;
}
if (!account.homeserver().isEmpty()) { if (!account.homeserver().isEmpty()) {
auto accessTokenLoadingJob = loadAccessTokenFromKeyChain(account); auto accessTokenLoadingJob = loadAccessTokenFromKeyChain(account);
connect(accessTokenLoadingJob, &QKeychain::Job::finished, this, [accountId, id, this, accessTokenLoadingJob](QKeychain::Job *) { connect(accessTokenLoadingJob, &QKeychain::Job::finished, this, [accountId, this, accessTokenLoadingJob](QKeychain::Job *) {
AccountSettings account{accountId}; AccountSettings account{accountId};
QString accessToken; QString accessToken;
if (accessTokenLoadingJob->error() == QKeychain::Error::NoError) { if (accessTokenLoadingJob->error() == QKeychain::Error::NoError) {
@@ -188,14 +183,11 @@ void Controller::invokeLogin()
} }
auto connection = new NeoChatConnection(account.homeserver()); auto connection = new NeoChatConnection(account.homeserver());
connect(connection, &NeoChatConnection::connected, this, [this, connection, id] { connect(connection, &NeoChatConnection::connected, this, [this, connection] {
connection->loadState(); connection->loadState();
addConnection(connection); addConnection(connection);
m_accountsLoading.removeAll(connection->userId()); m_accountsLoading.removeAll(connection->userId());
Q_EMIT accountsLoadingChanged(); Q_EMIT accountsLoadingChanged();
if (connection->userId() == id) {
setActiveConnection(connection);
}
}); });
connect(connection, &NeoChatConnection::loginError, this, [this, connection](const QString &error, const QString &) { connect(connection, &NeoChatConnection::loginError, this, [this, connection](const QString &error, const QString &) {
if (error == "Unrecognised access token"_ls) { if (error == "Unrecognised access token"_ls) {
@@ -318,14 +310,11 @@ void Controller::setActiveConnection(NeoChatConnection *connection)
} }
m_connection = connection; m_connection = connection;
if (connection != nullptr) { if (connection != nullptr) {
NeoChatConfig::self()->setActiveConnection(connection->userId());
connect(connection, &NeoChatConnection::requestFailed, this, [](BaseJob *job) { connect(connection, &NeoChatConnection::requestFailed, this, [](BaseJob *job) {
if (dynamic_cast<DownloadFileJob *>(job) && job->jsonData()["errcode"_ls].toString() == "M_TOO_LARGE"_ls) { if (dynamic_cast<DownloadFileJob *>(job) && job->jsonData()["errcode"_ls].toString() == "M_TOO_LARGE"_ls) {
RoomManager::instance().warning(i18n("File too large to download."), i18n("Contact your matrix server administrator for support.")); RoomManager::instance().warning(i18n("File too large to download."), i18n("Contact your matrix server administrator for support."));
} }
}); });
} else {
NeoChatConfig::self()->setActiveConnection(QString());
} }
NeoChatConfig::self()->save(); NeoChatConfig::self()->save();
Q_EMIT activeConnectionChanged(); Q_EMIT activeConnectionChanged();

3
src/neochatconfig.kcfg
View File

@@ -11,9 +11,6 @@
<entry name="OpenRoom" type="String"> <entry name="OpenRoom" type="String">
<label>Latest opened room</label> <label>Latest opened room</label>
</entry> </entry>
<entry name="ActiveConnection" type="String">
<label>Latest active connection</label>
</entry>
<entry name="ColorScheme" type="String"> <entry name="ColorScheme" type="String">
<label>Color scheme</label> <label>Color scheme</label>
</entry> </entry>