andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Rename get_photo to get_encrypted_file_photo.

Browse Source 
GitOrigin-RevId: 5a9d73b4d3202ed19b646c0bf3fd4ce4d85a9350
This commit is contained in:
levlam 2019-06-17 02:05:56 +03:00
parent bd13368fa8
commit e91da22a5b
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
td/telegram/MessageContent.cpp
View File

@ -3706,7 +3706,7 @@ unique_ptr<MessageContent> get_secret_message_content(
message_photo->caption_.clear();
}
return make_unique<MessagePhoto>(
get_photo(td->file_manager_.get(), std::move(file), std::move(message_photo), owner_dialog_id),
get_encrypted_file_photo(td->file_manager_.get(), std::move(file), std::move(message_photo), owner_dialog_id),
get_secret_media_caption(std::move(message_text), std::move(message_photo->caption_)));
}
case secret_api::decryptedMessageMediaDocument::ID: {

5
td/telegram/Photo.cpp
View File

@ -508,8 +508,9 @@ StringBuilder &operator<<(StringBuilder &string_builder, const PhotoSize &photo_
<< ", size = " << photo_size.size << ", file_id = " << photo_size.file_id << "}";
}
Photo get_photo(FileManager *file_manager, tl_object_ptr<telegram_api::encryptedFile> &&file,
tl_object_ptr<secret_api::decryptedMessageMediaPhoto> &&photo, DialogId owner_dialog_id) {
Photo get_encrypted_file_photo(FileManager *file_manager, tl_object_ptr<telegram_api::encryptedFile> &&file,
tl_object_ptr<secret_api::decryptedMessageMediaPhoto> &&photo,
DialogId owner_dialog_id) {
FileId file_id = file_manager->register_remote(
FullRemoteFileLocation(FileType::Encrypted, file->id_, file->access_hash_, DcId::create(file->dc_id_), string()),
FileLocationSource::FromServer, owner_dialog_id, photo->size_, 0,

4
td/telegram/Photo.h
View File

@ -212,8 +212,8 @@ StringBuilder &operator<<(StringBuilder &string_builder, const PhotoSize &photo_
Photo get_photo(FileManager *file_manager, tl_object_ptr<telegram_api::Photo> &&photo, DialogId owner_dialog_id);
Photo get_photo(FileManager *file_manager, tl_object_ptr<telegram_api::photo> &&photo, DialogId owner_dialog_id);
Photo get_photo(FileManager *file_manager, tl_object_ptr<telegram_api::encryptedFile> &&file,
tl_object_ptr<secret_api::decryptedMessageMediaPhoto> &&photo, DialogId owner_dialog_id);
Photo get_encrypted_file_photo(FileManager *file_manager, tl_object_ptr<telegram_api::encryptedFile> &&file,
tl_object_ptr<secret_api::decryptedMessageMediaPhoto> &&photo, DialogId owner_dialog_id);
Photo get_web_document_photo(FileManager *file_manager, tl_object_ptr<telegram_api::WebDocument> web_document,
DialogId owner_dialog_id);
tl_object_ptr<td_api::photo> get_photo_object(FileManager *file_manager, const Photo *photo);