Use unique location for outgoing photos.

GitOrigin-RevId: ac3a0eed1847ee7b96d463758ee33b85c6797ac5
This commit is contained in:
levlam 2020-10-22 02:11:32 +03:00
parent 0256a95f49
commit f59a11706c
2 changed files with 4 additions and 3 deletions

View File

@ -2890,10 +2890,11 @@ void merge_message_contents(Td *td, const MessageContent *old_content, MessageCo
new_file_view.remote_location().get_file_reference() ||
old_file_view.main_remote_location().get_access_hash() !=
new_file_view.remote_location().get_access_hash()) {
auto volume_id = -new_file_view.remote_location().get_id();
FileId file_id = td->file_manager_->register_remote(
FullRemoteFileLocation({FileType::Photo, 'i'}, new_file_view.remote_location().get_id(),
new_file_view.remote_location().get_access_hash(), 0, 0, DcId::invalid(),
new_file_view.remote_location().get_file_reference().str()),
new_file_view.remote_location().get_access_hash(), 0, volume_id,
DcId::invalid(), new_file_view.remote_location().get_file_reference().str()),
FileLocationSource::FromServer, dialog_id, old_photo->photos.back().size, 0, "");
LOG_STATUS(td->file_manager_->merge(file_id, old_file_id));
}

View File

@ -342,7 +342,7 @@ PhotoSize get_secret_thumbnail_photo_size(FileManager *file_manager, BufferSlice
// generate some random remote location to save
auto dc_id = DcId::invalid();
auto local_id = Random::secure_int32();
auto local_id = -(Random::secure_int32() & 0x7FFFFFFF);
auto volume_id = Random::secure_int64();
res.file_id = file_manager->register_remote(