tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Repair action bar when user block/unblock fails.

Browse Source 
GitOrigin-RevId: 325052ffd27cf8206c743f503c242abe90949114
This commit is contained in:
levlam 2019-10-11 18:22:46 +03:00
parent a3126dcce5
commit ba2c88de53
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
td/telegram/ContactsManager.cpp
View File

@ -335,8 +335,11 @@ class ResetWebAuthorizationsQuery : public Td::ResultHandler {
}; };
class BlockUserQuery : public Td::ResultHandler { class BlockUserQuery : public Td::ResultHandler {
UserId user_id_;
public: public:
void send(tl_object_ptr<telegram_api::InputUser> &&user) { void send(UserId user_id, tl_object_ptr<telegram_api::InputUser> &&user) {
user_id_ = user_id;
send_query(G()->net_query_creator().create(create_storer(telegram_api::contacts_block(std::move(user))))); send_query(G()->net_query_creator().create(create_storer(telegram_api::contacts_block(std::move(user)))));
} }
@ -347,20 +350,24 @@ class BlockUserQuery : public Td::ResultHandler {
} }
bool result = result_ptr.ok(); bool result = result_ptr.ok();
LOG_IF(WARNING, !result) << "Block user has failed"; LOG_IF(WARNING, !result) << "Block " << user_id_ << " has failed";
} }
void on_error(uint64 id, Status status) override { void on_error(uint64 id, Status status) override {
if (!G()->close_flag()) { if (!G()->close_flag()) {
LOG(WARNING) << "Receive error for blockUser: " << status; LOG(WARNING) << "Receive error for blockUser: " << status;
td->messages_manager_->repair_dialog_action_bar(DialogId(user_id_));
} }
status.ignore(); status.ignore();
} }
}; };
class UnblockUserQuery : public Td::ResultHandler { class UnblockUserQuery : public Td::ResultHandler {
UserId user_id_;
public: public:
void send(tl_object_ptr<telegram_api::InputUser> &&user) { void send(UserId user_id, tl_object_ptr<telegram_api::InputUser> &&user) {
user_id_ = user_id;
send_query(G()->net_query_creator().create(create_storer(telegram_api::contacts_unblock(std::move(user))))); send_query(G()->net_query_creator().create(create_storer(telegram_api::contacts_unblock(std::move(user)))));
} }
@ -371,12 +378,13 @@ class UnblockUserQuery : public Td::ResultHandler {
} }
bool result = result_ptr.ok(); bool result = result_ptr.ok();
LOG_IF(WARNING, !result) << "Unblock user has failed"; LOG_IF(WARNING, !result) << "Unblock " << user_id_ << " has failed";
} }
void on_error(uint64 id, Status status) override { void on_error(uint64 id, Status status) override {
if (!G()->close_flag()) { if (!G()->close_flag()) {
LOG(WARNING) << "Receive error for unblockUser: " << status; LOG(WARNING) << "Receive error for unblockUser: " << status;
td->messages_manager_->repair_dialog_action_bar(DialogId(user_id_));
} }
status.ignore(); status.ignore();
} }
@ -3816,7 +3824,7 @@ Status ContactsManager::block_user(UserId user_id) {
return Status::Error(5, "User not found"); return Status::Error(5, "User not found");
} }
td_->create_handler<BlockUserQuery>()->send(std::move(user)); td_->create_handler<BlockUserQuery>()->send(user_id, std::move(user));
on_update_user_blocked(user_id, true); on_update_user_blocked(user_id, true);
return Status::OK(); return Status::OK();
@ -3832,7 +3840,7 @@ Status ContactsManager::unblock_user(UserId user_id) {
return Status::Error(5, "User not found"); return Status::Error(5, "User not found");
} }
td_->create_handler<UnblockUserQuery>()->send(std::move(user)); td_->create_handler<UnblockUserQuery>()->send(user_id, std::move(user));
on_update_user_blocked(user_id, false); on_update_user_blocked(user_id, false);
return Status::OK(); return Status::OK();