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

Postpone some getOption requests until initialization.

Browse Source
This commit is contained in:
levlam 2022-08-18 19:54:04 +03:00
parent 266e5d4b16
commit 3de61c80f2
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
td/telegram/OptionManager.cpp
View File

@ -112,6 +112,11 @@ void OptionManager::on_td_inited() {
have_pending_is_location_visible_ = false; have_pending_is_location_visible_ = false;
td_->contacts_manager_->set_location_visibility(); td_->contacts_manager_->set_location_visibility();
} }
for (auto &request : pending_get_options_) {
get_option(request.first, std::move(request.second));
}
reset_to_empty(pending_get_options_);
} }
void OptionManager::set_option_boolean(Slice name, bool value) { void OptionManager::set_option_boolean(Slice name, bool value) {
@ -463,8 +468,13 @@ void OptionManager::get_option(const string &name, Promise<td_api::object_ptr<td
break; break;
case 'd': case 'd':
if (!is_bot && name == "disable_contact_registered_notifications") { if (!is_bot && name == "disable_contact_registered_notifications") {
return send_closure_later(td_->notification_manager_actor_, if (is_td_inited_) {
&NotificationManager::get_disable_contact_registered_notifications, wrap_promise()); send_closure_later(td_->notification_manager_actor_,
&NotificationManager::get_disable_contact_registered_notifications, wrap_promise());
} else {
pending_get_options_.emplace_back(name, std::move(promise));
}
return;
} }
break; break;
case 'i': case 'i':
@ -472,8 +482,12 @@ void OptionManager::get_option(const string &name, Promise<td_api::object_ptr<td
return send_closure_later(td_->config_manager_, &ConfigManager::get_content_settings, wrap_promise()); return send_closure_later(td_->config_manager_, &ConfigManager::get_content_settings, wrap_promise());
} }
if (!is_bot && name == "is_location_visible") { if (!is_bot && name == "is_location_visible") {
return send_closure_later(td_->contacts_manager_actor_, &ContactsManager::get_is_location_visible, if (is_td_inited_) {
wrap_promise()); send_closure_later(td_->contacts_manager_actor_, &ContactsManager::get_is_location_visible, wrap_promise());
} else {
pending_get_options_.emplace_back(name, std::move(promise));
}
return;
} }
break; break;
case 'o': case 'o':

2
td/telegram/OptionManager.h
View File

@ -14,6 +14,7 @@
#include <atomic> #include <atomic>
#include <memory> #include <memory>
#include <utility>
namespace td { namespace td {
@ -84,6 +85,7 @@ class OptionManager {
Td *td_; Td *td_;
bool is_td_inited_ = false; bool is_td_inited_ = false;
bool have_pending_is_location_visible_ = false; bool have_pending_is_location_visible_ = false;
vector<std::pair<string, Promise<td_api::object_ptr<td_api::OptionValue>>>> pending_get_options_;
unique_ptr<TsSeqKeyValue> options_; unique_ptr<TsSeqKeyValue> options_;
std::shared_ptr<KeyValueSyncInterface> option_pmc_; std::shared_ptr<KeyValueSyncInterface> option_pmc_;