mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 22:46:10 +00:00
Code Issues Releases Wiki Activity

intro rewrite started, new code sending methods

Browse Source
This commit is contained in:
John Preston
2016-03-14 19:59:18 +03:00
parent 680ea9f616
commit 3a8824a9a6
25 changed files with 966 additions and 767 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
Telegram/SourceFiles/intro/introcode.cpp
View File

@@ -25,7 +25,8 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
#include "application.h"
#include "intro/introcode.h"
#include "intro/intro.h"
#include "intro/introsignup.h"
#include "intro/intropwdcheck.h"
CodeInput::CodeInput(QWidget *parent, const style::flatInput &st, const QString &ph) : FlatInput(parent, st, ph) {
}
@@ -72,7 +73,7 @@ void CodeInput::correctValue(const QString &was, QString &now) {
if (strict) emit codeEntered();
}
IntroCode::IntroCode(IntroWidget *parent) : IntroStage(parent)
IntroCode::IntroCode(IntroWidget *parent) : IntroStep(parent)
, a_errorAlpha(0)
, _a_error(animation(this, &IntroCode::step_error))
, next(this, lang(lng_intro_next), st::btnIntroNext)
@@ -80,11 +81,10 @@ IntroCode::IntroCode(IntroWidget *parent) : IntroStage(parent)
, _noTelegramCode(this, lang(lng_code_no_telegram), st::introLink)
, _noTelegramCodeRequestId(0)
, code(this, st::inpIntroCode, lang(lng_code_ph))
, sentRequest(0)
, waitTillCall(intro()->getCallTimeout()) {
setVisible(false);
setGeometry(parent->innerRect());
connect(&next, SIGNAL(stateChanged(int, ButtonStateChangeSource)), parent, SLOT(onDoneStateChanged(int, ButtonStateChangeSource)));
connect(&next, SIGNAL(clicked()), this, SLOT(onSubmitCode()));
connect(&code, SIGNAL(changed()), this, SLOT(onInputChange()));
connect(&callTimer, SIGNAL(timeout()), this, SLOT(onSendCall()));
@@ -92,6 +92,11 @@ IntroCode::IntroCode(IntroWidget *parent) : IntroStage(parent)
connect(&_noTelegramCode, SIGNAL(clicked()), this, SLOT(onNoTelegramCode()));
updateDescText();
waitTillCall = intro()->getCallTimeout();
if (!intro()->codeByTelegram()) {
callTimer.start(1000);
}
}
void IntroCode::updateDescText() {
@@ -172,7 +177,7 @@ void IntroCode::step_error(float64 ms, bool timer) {
_a_error.stop();
a_errorAlpha.finish();
if (!a_errorAlpha.current()) {
error = "";
error.clear();
}
} else {
a_errorAlpha.update(dt, st::introErrFunc);
@@ -181,30 +186,29 @@ void IntroCode::step_error(float64 ms, bool timer) {
}
void IntroCode::activate() {
waitTillCall = intro()->getCallTimeout();
if (!intro()->codeByTelegram()) {
callTimer.start(1000);
}
error = "";
a_errorAlpha = anim::fvalue(0);
sentCode = QString();
show();
code.setDisabled(false);
IntroStep::activate();
code.setFocus();
}
void IntroCode::prepareShow() {
void IntroCode::finished() {
IntroStep::finished();
error.clear();
a_errorAlpha = anim::fvalue(0);
sentCode.clear();
code.setDisabled(false);
callTimer.stop();
code.setText(QString());
rpcClear();
}
void IntroCode::cancelled() {
if (sentRequest) {
MTP::cancel(sentRequest);
sentRequest = 0;
}
}
void IntroCode::deactivate() {
callTimer.stop();
hide();
code.clearFocus();
MTP::send(MTPauth_CancelCode(MTP_string(intro()->getPhone()), MTP_string(intro()->getPhoneHash())));
}
void IntroCode::stopCheck() {
@@ -218,9 +222,9 @@ void IntroCode::onCheckRequest() {
if (leftms >= 1000) {
if (sentRequest) {
MTP::cancel(sentRequest);
sentCode = "";
sentRequest = 0;
sentCode.clear();
}
sentRequest = 0;
if (!code.isEnabled()) {
code.setDisabled(false);
code.setFocus();
@@ -234,6 +238,7 @@ void IntroCode::onCheckRequest() {
void IntroCode::codeSubmitDone(const MTPauth_Authorization &result) {
stopCheck();
sentRequest = 0;
code.setDisabled(false);
const MTPDauth_authorization &d(result.c_auth_authorization());
if (d.vuser.type() != mtpc_user || !d.vuser.c_user().is_self()) { // wtf?
@@ -246,10 +251,11 @@ void IntroCode::codeSubmitDone(const MTPauth_Authorization &result) {
bool IntroCode::codeSubmitFail(const RPCError &error) {
stopCheck();
sentRequest = 0;
code.setDisabled(false);
const QString &err = error.type();
if (err == "PHONE_NUMBER_INVALID" || err == "PHONE_CODE_EXPIRED") { // show error
onBack();
intro()->onBack();
return true;
} else if (err == "PHONE_CODE_EMPTY" || err == "PHONE_CODE_INVALID") {
showError(lang(lng_bad_code));
@@ -257,7 +263,7 @@ bool IntroCode::codeSubmitFail(const RPCError &error) {
return true;
} else if (err == "PHONE_NUMBER_UNOCCUPIED") { // success, need to signUp
intro()->setCode(sentCode);
intro()->onIntroNext();
intro()->nextStep(new IntroSignup(intro()));
return true;
} else if (err == "SESSION_PASSWORD_NEEDED") {
intro()->setCode(sentCode);
@@ -280,14 +286,14 @@ bool IntroCode::codeSubmitFail(const RPCError &error) {
}
void IntroCode::onInputChange() {
showError("");
showError(QString());
if (code.text().length() == 5) onSubmitCode();
}
void IntroCode::onSendCall() {
if (!--waitTillCall) {
callTimer.stop();
MTP::send(MTPauth_SendCall(MTP_string(intro()->getPhone()), MTP_string(intro()->getPhoneHash())), rpcDone(&IntroCode::callDone));
MTP::send(MTPauth_ResendCode(MTP_string(intro()->getPhone()), MTP_string(intro()->getPhoneHash())), rpcDone(&IntroCode::callDone));
}
update();
}
@@ -301,6 +307,7 @@ void IntroCode::callDone(const MTPBool &v) {
void IntroCode::gotPassword(const MTPaccount_Password &result) {
stopCheck();
sentRequest = 0;
code.setDisabled(false);
switch (result.type()) {
case mtpc_account_noPassword: // should not happen
@@ -312,18 +319,18 @@ void IntroCode::gotPassword(const MTPaccount_Password &result) {
intro()->setPwdSalt(qba(d.vcurrent_salt));
intro()->setHasRecovery(mtpIsTrue(d.vhas_recovery));
intro()->setPwdHint(qs(d.vhint));
intro()->onIntroNext();
intro()->nextStep(new IntroPwdCheck(intro()));
} break;
}
}
void IntroCode::onSubmitCode(bool force) {
if (!force && (code.text() == sentCode || !code.isEnabled())) return;
void IntroCode::onSubmitCode() {
if (sentRequest) return;
code.setDisabled(true);
setFocus();
showError("");
showError(QString());
checkRequest.start(1000);
@@ -336,7 +343,7 @@ void IntroCode::onSubmitCode(bool force) {
void IntroCode::onNoTelegramCode() {
if (_noTelegramCodeRequestId) return;
_noTelegramCodeRequestId = MTP::send(MTPauth_SendSms(MTP_string(intro()->getPhone()), MTP_string(intro()->getPhoneHash())), rpcDone(&IntroCode::noTelegramCodeDone), rpcFail(&IntroCode::noTelegramCodeFail));
_noTelegramCodeRequestId = MTP::send(MTPauth_ResendCode(MTP_string(intro()->getPhone()), MTP_string(intro()->getPhoneHash())), rpcDone(&IntroCode::noTelegramCodeDone), rpcFail(&IntroCode::noTelegramCodeFail));
}
void IntroCode::noTelegramCodeDone(const MTPBool &result) {
@@ -359,10 +366,6 @@ bool IntroCode::noTelegramCodeFail(const RPCError &error) {
return false;
}
void IntroCode::onNext() {
void IntroCode::onSubmit() {
onSubmitCode();
}
void IntroCode::onBack() {
intro()->onIntroBack();
}