From 7ce49d7d68f19fb49a33e907485d83da2c9131a3 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Tue, 23 Mar 2021 13:45:52 +0100 Subject: Fix regression in FileItem generation fixes #1019 --- libdino/src/service/content_item_store.vala | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'libdino/src/service/content_item_store.vala') diff --git a/libdino/src/service/content_item_store.vala b/libdino/src/service/content_item_store.vala index 2de804a1..632918f2 100644 --- a/libdino/src/service/content_item_store.vala +++ b/libdino/src/service/content_item_store.vala @@ -56,9 +56,13 @@ public class ContentItemStore : StreamInteractionModule, Object { } break; case 2: - FileTransfer? file_transfer = stream_interactor.get_module(FileTransferStorage.IDENTITY).get_call_by_id(foreign_id); + FileTransfer? file_transfer = stream_interactor.get_module(FileTransferStorage.IDENTITY).get_file_by_id(foreign_id, conversation); if (file_transfer != null) { - var file_item = new FileItem(file_transfer, conversation, row[db.content_item.id]); + Message? message = null; + if (file_transfer.provider == 0 && file_transfer.info != null) { + message = stream_interactor.get_module(MessageStorage.IDENTITY).get_message_by_id(int.parse(file_transfer.info), conversation); + } + var file_item = new FileItem(file_transfer, conversation, row[db.content_item.id], message); items.add(file_item); } break; -- cgit v1.2.3-54-g00ecf