d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-26 04:58:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix secrets not loading after registration

Browse source
This commit is contained in:
Nicolas Werner 2022-01-29 17:27:28 +01:00
parent 6a3d55b47f
commit 2e7d26bcc0
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Cache.cpp
View file

@ -391,6 +391,7 @@ Cache::loadSecrets(std::vector<std::pair<std::string, bool>> toLoad)
&QKeychain::ReadPasswordJob::finished, &QKeychain::ReadPasswordJob::finished,
this, this,
[this, name, toLoad, job](QKeychain::Job *) mutable { [this, name, toLoad, job](QKeychain::Job *) mutable {
nhlog::db()->debug("Finished reading '{}'", toLoad.begin()->first);
const QString secret = job->textData(); const QString secret = job->textData();
if (job->error() && job->error() != QKeychain::Error::EntryNotFound) { if (job->error() && job->error() != QKeychain::Error::EntryNotFound) {
nhlog::db()->error("Restoring secret '{}' failed ({}): {}", nhlog::db()->error("Restoring secret '{}' failed ({}): {}",
@ -413,6 +414,7 @@ Cache::loadSecrets(std::vector<std::pair<std::string, bool>> toLoad)
// You can't start a job from the finish signal of a job. // You can't start a job from the finish signal of a job.
QTimer::singleShot(0, this, [this, toLoad] { loadSecrets(toLoad); }); QTimer::singleShot(0, this, [this, toLoad] { loadSecrets(toLoad); });
}); });
nhlog::db()->debug("Reading '{}'", name_);
job->start(); job->start();
} }

6
src/RegisterPage.cpp
View file

@ -19,7 +19,9 @@
RegisterPage::RegisterPage(QObject *parent) RegisterPage::RegisterPage(QObject *parent)
: QObject(parent) : QObject(parent)
{} {
connect(this, &RegisterPage::registerOk, this, [] { MainWindow::instance()->showChatPage(); });
}
void void
RegisterPage::setError(QString err) RegisterPage::setError(QString err)
@ -199,7 +201,7 @@ RegisterPage::startRegistration(QString username, QString password, QString devi
if (!err) { if (!err) {
http::client()->set_user(res.user_id); http::client()->set_user(res.user_id);
http::client()->set_access_token(res.access_token); http::client()->set_access_token(res.access_token);
MainWindow::instance()->showChatPage(); emit registerOk();
disconnect(UIA::instance(), &UIA::error, this, nullptr); disconnect(UIA::instance(), &UIA::error, this, nullptr);
return; return;
} }

2
src/RegisterPage.h
View file

@ -53,6 +53,8 @@ signals:
void lookingUpHsChanged(); void lookingUpHsChanged();
void lookingUpUsernameChanged(); void lookingUpUsernameChanged();
void registerOk();
private: private:
void versionsCheck(); void versionsCheck();