thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Port the reCAPTCHA dialog to QML

Browse source
This commit is contained in:
Loren Burkholder 2023-06-28 17:00:34 -04:00
parent ff4c16c34f
commit fedc178827
9 changed files with 153 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/ui/UIA.cpp
View file

@ -14,12 +14,12 @@
#include "Logging.h"
#include "MatrixClient.h"
#include "dialogs/FallbackAuth.h"
#include "dialogs/ReCaptcha.h"
#include "ReCaptcha.h"
UIA *
UIA::instance()
{
static UIA uia;
static UIA uia{nullptr};
return &uia;
}
@ -99,24 +99,16 @@ UIA::genericHandler(QString context)
} else if (current_stage == mtx::user_interactive::auth_types::msisdn) {
emit phoneNumber();
} else if (current_stage == mtx::user_interactive::auth_types::recaptcha) {
auto captchaDialog =
new dialogs::ReCaptcha(QString::fromStdString(u.session), nullptr);
captchaDialog->setWindowTitle(context);
connect(
captchaDialog, &dialogs::ReCaptcha::confirmation, this, [captchaDialog, h, u]() {
captchaDialog->close();
captchaDialog->deleteLater();
h.next(mtx::user_interactive::Auth{u.session,
mtx::user_interactive::auth::Fallback{}});
});
connect(captchaDialog, &dialogs::ReCaptcha::cancel, this, [this]() {
auto captcha = new ReCaptcha(QString::fromStdString(u.session), context, nullptr);
QQmlEngine::setObjectOwnership(captcha, QQmlEngine::JavaScriptOwnership);
connect(captcha, &ReCaptcha::confirmation, this, [h, u]() {
h.next(mtx::user_interactive::Auth{u.session,
mtx::user_interactive::auth::Fallback{}});
});
connect(captcha, &ReCaptcha::cancelled, this, [this]() {
emit error(tr("Registration aborted"));
});
QTimer::singleShot(0, this, [captchaDialog]() { captchaDialog->show(); });
emit reCaptcha(captcha);
} else if (current_stage == mtx::user_interactive::auth_types::dummy) {
h.next(
mtx::user_interactive::Auth{u.session, mtx::user_interactive::auth::Dummy{}});