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

Ensure that last set value of ignore_sensitive_content_restrictions is set. 

GitOrigin-RevId: 266ac32fac8906b852a9e47561f5f83be74885bc
This commit is contained in:
levlam 2019-12-20 04:06:38 +03:00
parent b49d4076c8
commit 761a3dab9e
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
td/telegram/ConfigManager.cpp
View File

@ -956,6 +956,7 @@ void ConfigManager::set_content_settings(bool ignore_sensitive_content_restricti
return promise.set_error(Status::Error(500, "Request aborted"));
}
last_set_content_settings_ = ignore_sensitive_content_restrictions;
auto &queries = set_content_settings_queries_[ignore_sensitive_content_restrictions];
queries.push_back(std::move(promise));
if (!is_set_content_settings_request_sent_) {
@ -1005,7 +1006,8 @@ void ConfigManager::on_result(NetQueryPtr res) {
}
} else {
ConfigShared &shared_config = G()->shared_config();
if (shared_config.get_option_boolean("can_ignore_sensitive_content_restrictions")) {
if (shared_config.get_option_boolean("can_ignore_sensitive_content_restrictions") &&
last_set_content_settings_ == ignore_sensitive_content_restrictions) {
shared_config.set_option_boolean("ignore_sensitive_content_restrictions",
ignore_sensitive_content_restrictions);
}
@ -1016,7 +1018,15 @@ void ConfigManager::on_result(NetQueryPtr res) {
}
if (!set_content_settings_queries_[!ignore_sensitive_content_restrictions].empty()) {
set_content_settings(!ignore_sensitive_content_restrictions, Auto());
if (ignore_sensitive_content_restrictions == last_set_content_settings_) {
promises = std::move(set_content_settings_queries_[!ignore_sensitive_content_restrictions]);
set_content_settings_queries_[!ignore_sensitive_content_restrictions].clear();
for (auto &promise : promises) {
promise.set_value(Unit());
}
} else {
set_content_settings(!ignore_sensitive_content_restrictions, Auto());
}
}
return;
}

1
td/telegram/ConfigManager.h
View File

@ -102,6 +102,7 @@ class ConfigManager : public NetQueryCallback {
vector<Promise<Unit>> get_content_settings_queries_;
vector<Promise<Unit>> set_content_settings_queries_[2];
bool is_set_content_settings_request_sent_ = false;
bool last_set_content_settings_ = false;
void start_up() override;
void hangup_shared() override;