diff --git a/src/Cache.cpp b/src/Cache.cpp index c15d2f4b15ff58a035454350bb83d2652bc1f39f..b55d53a6aab3c0dafb5654d44bbecb1c5bcf6f9a 100644 --- a/src/Cache.cpp +++ b/src/Cache.cpp @@ -391,6 +391,7 @@ Cache::loadSecrets(std::vector<std::pair<std::string, bool>> toLoad) &QKeychain::ReadPasswordJob::finished, this, [this, name, toLoad, job](QKeychain::Job *) mutable { + nhlog::db()->debug("Finished reading '{}'", toLoad.begin()->first); const QString secret = job->textData(); if (job->error() && job->error() != QKeychain::Error::EntryNotFound) { 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. QTimer::singleShot(0, this, [this, toLoad] { loadSecrets(toLoad); }); }); + nhlog::db()->debug("Reading '{}'", name_); job->start(); } diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp index f94e141240911d3b4d76e8501b62e306fe4df95b..5b2ebc78b8d41920117ed63cdd8bc6c20ffe0d83 100644 --- a/src/RegisterPage.cpp +++ b/src/RegisterPage.cpp @@ -19,7 +19,9 @@ RegisterPage::RegisterPage(QObject *parent) : QObject(parent) -{} +{ + connect(this, &RegisterPage::registerOk, this, [] { MainWindow::instance()->showChatPage(); }); +} void RegisterPage::setError(QString err) @@ -199,7 +201,7 @@ RegisterPage::startRegistration(QString username, QString password, QString devi if (!err) { http::client()->set_user(res.user_id); http::client()->set_access_token(res.access_token); - MainWindow::instance()->showChatPage(); + emit registerOk(); disconnect(UIA::instance(), &UIA::error, this, nullptr); return; } diff --git a/src/RegisterPage.h b/src/RegisterPage.h index 9f32e820de79a6dac7a71c640ece734c7c2332e1..67e2a22e5bf78db90659473bbb8d6cf8b920efd2 100644 --- a/src/RegisterPage.h +++ b/src/RegisterPage.h @@ -53,6 +53,8 @@ signals: void lookingUpHsChanged(); void lookingUpUsernameChanged(); + void registerOk(); + private: void versionsCheck();