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

Rename RPCError to MTP::Error.

Browse Source
This commit is contained in:
John Preston
2021-03-12 16:48:00 +04:00
parent 5794679277
commit 68b0a85369
130 changed files with 609 additions and 594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
Telegram/SourceFiles/boxes/passcode_box.cpp
View File

@@ -360,8 +360,8 @@ void PasscodeBox::closeReplacedBy() {
}
}
void PasscodeBox::setPasswordFail(const RPCError &error) {
if (MTP::isFloodError(error)) {
void PasscodeBox::setPasswordFail(const MTP::Error &error) {
if (MTP::IsFloodError(error)) {
closeReplacedBy();
_setRequest = 0;
@@ -402,7 +402,7 @@ void PasscodeBox::setPasswordFail(const RPCError &error) {
void PasscodeBox::setPasswordFail(
const QByteArray &newPasswordBytes,
const QString &email,
const RPCError &error) {
const MTP::Error &error) {
const auto prefix = qstr("EMAIL_UNCONFIRMED_");
if (error.type().startsWith(prefix)) {
const auto codeLength = error.type().mid(prefix.size()).toInt();
@@ -432,9 +432,9 @@ void PasscodeBox::validateEmail(
)).done([=](const MTPBool &result) {
*set = true;
setPasswordDone(newPasswordBytes);
}).fail([=](const RPCError &error) {
}).fail([=](const MTP::Error &error) {
_setRequest = 0;
if (MTP::isFloodError(error)) {
if (MTP::IsFloodError(error)) {
errors->fire(tr::lng_flood_error(tr::now));
} else if (error.type() == qstr("CODE_INVALID")) {
errors->fire(tr::lng_signin_wrong_code(tr::now));
@@ -461,7 +461,7 @@ void PasscodeBox::validateEmail(
)).done([=](const MTPBool &result) {
_setRequest = 0;
resent->fire(tr::lng_cloud_password_resent(tr::now));
}).fail([=](const RPCError &error) {
}).fail([=](const MTP::Error &error) {
_setRequest = 0;
errors->fire(Lang::Hard::ServerError());
}).send();
@@ -681,9 +681,9 @@ void PasscodeBox::serverError() {
closeBox();
}
bool PasscodeBox::handleCustomCheckError(const RPCError &error) {
bool PasscodeBox::handleCustomCheckError(const MTP::Error &error) {
const auto &type = error.type();
if (MTP::isFloodError(error)
if (MTP::IsFloodError(error)
|| type == qstr("PASSWORD_HASH_INVALID")
|| type == qstr("SRP_PASSWORD_CHANGED")
|| type == qstr("SRP_ID_INVALID")) {
@@ -714,7 +714,7 @@ void PasscodeBox::sendClearCloudPassword(
MTPSecureSecretSettings())
)).done([=](const MTPBool &result) {
setPasswordDone({});
}).fail([=](const RPCError &error) mutable {
}).fail([=](const MTP::Error &error) mutable {
setPasswordFail({}, QString(), error);
}).handleFloodErrors().send();
}
@@ -745,7 +745,7 @@ void PasscodeBox::setNewCloudPassword(const QString &newPassword) {
MTPSecureSecretSettings())
)).done([=](const MTPBool &result) {
setPasswordDone(newPasswordBytes);
}).fail([=](const RPCError &error) {
}).fail([=](const MTP::Error &error) {
setPasswordFail(newPasswordBytes, email, error);
}).handleFloodErrors().send();
}
@@ -800,7 +800,7 @@ void PasscodeBox::changeCloudPassword(
sendChangeCloudPassword(check, newPassword, secureSecret);
});
}
}).fail([=](const RPCError &error) {
}).fail([=](const MTP::Error &error) {
setPasswordFail(error);
}).handleFloodErrors().send();
}
@@ -842,7 +842,7 @@ void PasscodeBox::resetSecret(
const auto empty = QByteArray();
sendChangeCloudPassword(check, newPassword, empty);
});
}).fail([=](const RPCError &error) {
}).fail([=](const MTP::Error &error) {
_setRequest = 0;
if (error.type() == qstr("SRP_ID_INVALID")) {
handleSrpIdInvalid();
@@ -891,7 +891,7 @@ void PasscodeBox::sendChangeCloudPassword(
MTP_long(newSecureSecretId)))
)).done([=](const MTPBool &result) {
setPasswordDone(newPasswordBytes);
}).fail([=](const RPCError &error) {
}).fail([=](const MTP::Error &error) {
setPasswordFail(newPasswordBytes, QString(), error);
}).handleFloodErrors().send();
}
@@ -939,7 +939,7 @@ void PasscodeBox::recoverByEmail() {
_api.request(MTPauth_RequestPasswordRecovery(
)).done([=](const MTPauth_PasswordRecovery &result) {
recoverStarted(result);
}).fail([=](const RPCError &error) {
}).fail([=](const MTP::Error &error) {
recoverStartFail(error);
}).send();
} else {
@@ -977,7 +977,7 @@ void PasscodeBox::recoverStarted(const MTPauth_PasswordRecovery &result) {
recover();
}
void PasscodeBox::recoverStartFail(const RPCError &error) {
void PasscodeBox::recoverStartFail(const MTP::Error &error) {
_pattern = QString();
closeBox();
}
@@ -1055,7 +1055,7 @@ void RecoverBox::submit() {
MTP_string(code)
)).done([=](const MTPauth_Authorization &result) {
codeSubmitDone(result);
}).fail([=](const RPCError &error) {
}).fail([=](const MTP::Error &error) {
codeSubmitFail(error);
}).handleFloodErrors().send();
});
@@ -1087,8 +1087,8 @@ void RecoverBox::codeSubmitDone(const MTPauth_Authorization &result) {
Ui::LayerOption::CloseOther);
}
void RecoverBox::codeSubmitFail(const RPCError &error) {
if (MTP::isFloodError(error)) {
void RecoverBox::codeSubmitFail(const MTP::Error &error) {
if (MTP::IsFloodError(error)) {
_submitRequest = 0;
_error = tr::lng_flood_error(tr::now);
update();
@@ -1149,9 +1149,9 @@ RecoveryEmailValidation ConfirmRecoveryEmail(
Box<InformBox>(tr::lng_cloud_password_was_set(tr::now)),
Ui::LayerOption::CloseOther);
}
}).fail([=](const RPCError &error) {
}).fail([=](const MTP::Error &error) {
*requestId = 0;
if (MTP::isFloodError(error)) {
if (MTP::IsFloodError(error)) {
errors->fire(tr::lng_flood_error(tr::now));
} else if (error.type() == qstr("CODE_INVALID")) {
errors->fire(tr::lng_signin_wrong_code(tr::now));
@@ -1177,7 +1177,7 @@ RecoveryEmailValidation ConfirmRecoveryEmail(
)).done([=](const MTPBool &result) {
*requestId = 0;
resent->fire(tr::lng_cloud_password_resent(tr::now));
}).fail([=](const RPCError &error) {
}).fail([=](const MTP::Error &error) {
*requestId = 0;
errors->fire(Lang::Hard::ServerError());
}).send();
@@ -1196,7 +1196,7 @@ RecoveryEmailValidation ConfirmRecoveryEmail(
}
[[nodiscard]] object_ptr<Ui::GenericBox> PrePasswordErrorBox(
const RPCError &error,
const MTP::Error &error,
not_null<Main::Session*> session,
TextWithEntities &&about) {
const auto type = [&] {