diff --git a/td/telegram/PhoneNumberManager.cpp b/td/telegram/PhoneNumberManager.cpp index 7fe63b9e..d47ae6b6 100644 --- a/td/telegram/PhoneNumberManager.cpp +++ b/td/telegram/PhoneNumberManager.cpp @@ -37,14 +37,9 @@ PhoneNumberManager::PhoneNumberManager(PhoneNumberManager::Type type, ActorShare } template -void PhoneNumberManager::process_send_code_result(uint64 query_id, T r_send_code) { - if (r_send_code.is_error()) { - return on_query_error(query_id, r_send_code.move_as_error()); - } - +void PhoneNumberManager::process_send_code_result(uint64 query_id, const T &send_code) { on_new_query(query_id); - - start_net_query(NetQueryType::SendCode, G()->net_query_creator().create(create_storer(r_send_code.move_as_ok()))); + start_net_query(NetQueryType::SendCode, G()->net_query_creator().create(create_storer(send_code))); } void PhoneNumberManager::set_phone_number(uint64 query_id, string phone_number, Settings settings) { diff --git a/td/telegram/PhoneNumberManager.h b/td/telegram/PhoneNumberManager.h index 3bd4c7cd..49b37fcc 100644 --- a/td/telegram/PhoneNumberManager.h +++ b/td/telegram/PhoneNumberManager.h @@ -52,7 +52,7 @@ class PhoneNumberManager : public NetActor { void start_net_query(NetQueryType net_query_type, NetQueryPtr net_query); template - void process_send_code_result(uint64 query_id, T r_send_code); + void process_send_code_result(uint64 query_id, const T &send_code); template void send_new_check_code_query(const T &query); diff --git a/td/telegram/SendCodeHelper.cpp b/td/telegram/SendCodeHelper.cpp index 9721aeed..1f198f15 100644 --- a/td/telegram/SendCodeHelper.cpp +++ b/td/telegram/SendCodeHelper.cpp @@ -65,21 +65,21 @@ Result SendCodeHelper::send_code(Slice phone_number return telegram_api::auth_sendCode(phone_number_, api_id, api_hash, get_input_code_settings(settings)); } -Result SendCodeHelper::send_change_phone_code(Slice phone_number, - const Settings &settings) { +telegram_api::account_sendChangePhoneCode SendCodeHelper::send_change_phone_code(Slice phone_number, + const Settings &settings) { phone_number_ = phone_number.str(); return telegram_api::account_sendChangePhoneCode(phone_number_, get_input_code_settings(settings)); } -Result SendCodeHelper::send_verify_phone_code(Slice phone_number, - const Settings &settings) { +telegram_api::account_sendVerifyPhoneCode SendCodeHelper::send_verify_phone_code(Slice phone_number, + const Settings &settings) { phone_number_ = phone_number.str(); return telegram_api::account_sendVerifyPhoneCode(phone_number_, get_input_code_settings(settings)); } -Result SendCodeHelper::send_confirm_phone_code(const string &hash, - Slice phone_number, - const Settings &settings) { +telegram_api::account_sendConfirmPhoneCode SendCodeHelper::send_confirm_phone_code(const string &hash, + Slice phone_number, + const Settings &settings) { phone_number_ = phone_number.str(); return telegram_api::account_sendConfirmPhoneCode(hash, get_input_code_settings(settings)); } diff --git a/td/telegram/SendCodeHelper.h b/td/telegram/SendCodeHelper.h index 247c1b48..9a403572 100644 --- a/td/telegram/SendCodeHelper.h +++ b/td/telegram/SendCodeHelper.h @@ -28,14 +28,12 @@ class SendCodeHelper { Result send_code(Slice phone_number, const Settings &settings, int32 api_id, const string &api_hash); - Result send_change_phone_code(Slice phone_number, - const Settings &settings); + telegram_api::account_sendChangePhoneCode send_change_phone_code(Slice phone_number, const Settings &settings); - Result send_verify_phone_code(Slice phone_number, - const Settings &settings); + telegram_api::account_sendVerifyPhoneCode send_verify_phone_code(Slice phone_number, const Settings &settings); - Result send_confirm_phone_code(const string &hash, Slice phone_number, - const Settings &settings); + telegram_api::account_sendConfirmPhoneCode send_confirm_phone_code(const string &hash, Slice phone_number, + const Settings &settings); Slice phone_number() const { return phone_number_;