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

SecretChats: better closing

Browse Source 
GitOrigin-RevId: b7112abe401a3375c9bbfc50969b606a4a65cec4
This commit is contained in:
Arseny Smirnov 2018-07-24 12:43:37 +03:00
parent bd726dd4a2
commit 45754209d8
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
td/telegram/SecretChatActor.cpp
View File

@ -125,9 +125,6 @@ void SecretChatActor::on_result_resendable(NetQueryPtr net_query, Promise<NetQue
} }
void SecretChatActor::replay_close_chat(std::unique_ptr<logevent::CloseSecretChat> event) { void SecretChatActor::replay_close_chat(std::unique_ptr<logevent::CloseSecretChat> event) {
if (close_flag_) {
return;
}
do_close_chat_impl(std::move(event)); do_close_chat_impl(std::move(event));
} }
@ -740,7 +737,8 @@ void SecretChatActor::do_close_chat_impl(std::unique_ptr<logevent::CloseSecretCh
close_flag_ = true; close_flag_ = true;
close_logevent_id_ = event->logevent_id(); close_logevent_id_ = event->logevent_id();
LOG(INFO) << "Send messages.discardEncryption"; LOG(INFO) << "Send messages.discardEncryption";
context_->secret_chat_db()->erase_value(auth_state_); auth_state_.state = State::Closed;
context_->secret_chat_db()->set_value(auth_state_);
context_->secret_chat_db()->erase_value(config_state_); context_->secret_chat_db()->erase_value(config_state_);
context_->secret_chat_db()->erase_value(pfs_state_); context_->secret_chat_db()->erase_value(pfs_state_);
context_->secret_chat_db()->erase_value(seq_no_state_); context_->secret_chat_db()->erase_value(seq_no_state_);
@ -749,7 +747,6 @@ void SecretChatActor::do_close_chat_impl(std::unique_ptr<logevent::CloseSecretCh
UniqueId::next(UniqueId::Type::Default, static_cast<uint8>(QueryType::DiscardEncryption)), UniqueId::next(UniqueId::Type::Default, static_cast<uint8>(QueryType::DiscardEncryption)),
create_storer(tl_query)); create_storer(tl_query));
auth_state_.state = State::Closed;
send_update_secret_chat(); send_update_secret_chat();
context_->send_net_query(std::move(query), actor_shared(this), true); context_->send_net_query(std::move(query), actor_shared(this), true);
@ -778,7 +775,11 @@ void SecretChatActor::do_create_chat_impl(std::unique_ptr<logevent::CreateSecret
void SecretChatActor::on_discard_encryption_result(NetQueryPtr result) { void SecretChatActor::on_discard_encryption_result(NetQueryPtr result) {
CHECK(close_flag_); CHECK(close_flag_);
CHECK(close_logevent_id_ != 0); CHECK(close_logevent_id_ != 0);
if (context_->close_flag()) {
return;
}
LOG(INFO) << "Got result for messages.discardEncryption"; LOG(INFO) << "Got result for messages.discardEncryption";
context_->secret_chat_db()->erase_value(auth_state_);
binlog_erase(context_->binlog(), close_logevent_id_); binlog_erase(context_->binlog(), close_logevent_id_);
// skip flush // skip flush
stop(); stop();
@ -1474,9 +1475,6 @@ NetQueryPtr SecretChatActor::create_net_query(const logevent::OutboundSecretMess
} }
void SecretChatActor::on_outbound_send_message_start(uint64 state_id) { void SecretChatActor::on_outbound_send_message_start(uint64 state_id) {
if (close_flag_) {
return;
}
auto *state = outbound_message_states_.get(state_id); auto *state = outbound_message_states_.get(state_id);
if (state == nullptr) { if (state == nullptr) {
LOG(INFO) << "Outbound message [send_message] start ignored (unknown state_id) " << tag("state_id", state_id); LOG(INFO) << "Outbound message [send_message] start ignored (unknown state_id) " << tag("state_id", state_id);
@ -1915,6 +1913,9 @@ void SecretChatActor::start_up() {
LOG(WARNING) << "Close Secret chat because it is empty"; LOG(WARNING) << "Close Secret chat because it is empty";
return stop(); return stop();
} }
if (auth_state_.state == State::Closed) {
close_flag_ = true;
}
auto r_seq_no_state = context_->secret_chat_db()->get_value<SeqNoState>(); auto r_seq_no_state = context_->secret_chat_db()->get_value<SeqNoState>();
if (r_seq_no_state.is_ok()) { if (r_seq_no_state.is_ok()) {
seq_no_state_ = r_seq_no_state.move_as_ok(); seq_no_state_ = r_seq_no_state.move_as_ok();