Revert "Remove SendMediaReady legacy helper."

This reverts commit 91f8989f70.

Telegram/SourceFiles/storage/localimageloader.cpp

@@ -222,6 +222,42 @@ int PhotoSideLimit() {
 	return PhotoSideLimit(SendLargePhotos.value());
 }
 
+SendMediaReady::SendMediaReady(
+	SendMediaType type,
+	const QString &file,
+	const QString &filename,
+	int64 filesize,
+	const QByteArray &data,
+	const uint64 &id,
+	const uint64 &thumbId,
+	const QString &thumbExt,
+	const PeerId &peer,
+	const MTPPhoto &photo,
+	const PreparedPhotoThumbs &photoThumbs,
+	const MTPDocument &document,
+	const QByteArray &jpeg)
+: type(type)
+, file(file)
+, filename(filename)
+, filesize(filesize)
+, data(data)
+, thumbExt(thumbExt)
+, id(id)
+, thumbId(thumbId)
+, peer(peer)
+, photo(photo)
+, document(document)
+, photoThumbs(photoThumbs) {
+	if (!jpeg.isEmpty()) {
+		int32 size = jpeg.size();
+		for (int32 i = 0, part = 0; i < size; i += kPhotoUploadPartSize, ++part) {
+			parts.insert(part, jpeg.mid(i, kPhotoUploadPartSize));
+		}
+		jpeg_md5.resize(32);
+		hashMd5Hex(jpeg.constData(), jpeg.size(), jpeg_md5.data());
+	}
+}
+
 TaskQueue::TaskQueue(crl::time stopTimeoutMs) {
 	if (stopTimeoutMs > 0) {
 		_stopTimer = new QTimer(this);
@@ -419,17 +455,22 @@ SendingAlbum::Item::Item(TaskId taskId)
 : taskId(taskId) {
 }
 
-FilePrepareResult::FilePrepareResult(FilePrepareDescriptor &&descriptor)
-: taskId(descriptor.taskId)
-, id(descriptor.id)
-, to(std::move(descriptor.to))
-, album(std::move(descriptor.album))
-, type(descriptor.type)
-, caption(std::move(descriptor.caption))
-, spoiler(descriptor.spoiler) {
+FileLoadResult::FileLoadResult(
+	TaskId taskId,
+	uint64 id,
+	const FileLoadTo &to,
+	const TextWithTags &caption,
+	bool spoiler,
+	std::shared_ptr<SendingAlbum> album)
+: taskId(taskId)
+, id(id)
+, to(to)
+, album(std::move(album))
+, caption(caption)
+, spoiler(spoiler) {
 }
 
-void FilePrepareResult::setFileData(const QByteArray &filedata) {
+void FileLoadResult::setFileData(const QByteArray &filedata) {
 	if (filedata.isEmpty()) {
 		partssize = 0;
 	} else {
@@ -442,7 +483,7 @@ void FilePrepareResult::setFileData(const QByteArray &filedata) {
 	}
 }
 
-void FilePrepareResult::setThumbData(const QByteArray &thumbdata) {
+void FileLoadResult::setThumbData(const QByteArray &thumbdata) {
 	if (!thumbdata.isEmpty()) {
 		thumbbytes = thumbdata;
 		int32 size = thumbdata.size();
@@ -454,11 +495,6 @@ void FilePrepareResult::setThumbData(const QByteArray &thumbdata) {
 	}
 }
 
-std::shared_ptr<FilePrepareResult> MakePreparedFile(
-		FilePrepareDescriptor &&descriptor) {
-	return std::make_shared<FilePrepareResult>(std::move(descriptor));
-}
-
 FileLoadTask::FileLoadTask(
 	not_null<Main::Session*> session,
 	const QString &filepath,
@@ -674,14 +710,13 @@ bool FileLoadTask::FillImageInformation(
 }
 
 void FileLoadTask::process(Args &&args) {
-	_result = MakePreparedFile({
-		.taskId = id(),
-		.id = _id,
-		.to = _to,
-		.caption = _caption,
-		.spoiler = _spoiler,
-		.album = _album,
-	});
+	_result = std::make_shared<FileLoadResult>(
+		id(),
+		_id,
+		_to,
+		_caption,
+		_spoiler,
+		_album);
 
 	QString filename, filemime;
 	qint64 filesize = 0;
@@ -1027,7 +1062,7 @@ void FileLoadTask::finish() {
 	}
 }
 
-FilePrepareResult *FileLoadTask::peekResult() const {
+FileLoadResult *FileLoadTask::peekResult() const {
 	return _result.get();
 }