From 5fb3de6443eaf0d94f1ccd07dee94b124708fe16 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Mon, 21 Apr 2025 12:53:34 +0200 Subject: Handle content type != mime type --- libdino/src/service/file_manager.vala | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libdino/src/service/file_manager.vala') diff --git a/libdino/src/service/file_manager.vala b/libdino/src/service/file_manager.vala index 434fd0e7..8c196dd7 100644 --- a/libdino/src/service/file_manager.vala +++ b/libdino/src/service/file_manager.vala @@ -110,7 +110,7 @@ public class FileManager : StreamInteractionModule, Object { try { var file_meta = new FileMeta(); file_meta.size = file_transfer.size; - file_meta.mime_type = file_transfer.mime_type; + file_meta.content_type = file_transfer.content_type; FileSender file_sender = null; FileEncryptor file_encryptor = null; @@ -244,7 +244,7 @@ public class FileManager : StreamInteractionModule, Object { file_transfer.size = (int)file_meta.size; file_transfer.file_name = file_meta.file_name; - file_transfer.mime_type = file_meta.mime_type; + file_transfer.content_type = file_meta.content_type; } return file_meta; } @@ -332,9 +332,9 @@ public class FileManager : StreamInteractionModule, Object { file_transfer.path = file.get_basename(); FileInfo file_info = file_transfer.get_file().query_info("*", FileQueryInfoFlags.NONE); - if (file_info.get_content_type() != "application/octet-stream" || file_transfer.mime_type == null) { + if (file_info.get_content_type() != "application/octet-stream" || file_transfer.content_type == null) { // Only overwrite mime_type if it's better than what we had before. - file_transfer.mime_type = file_info.get_content_type(); + file_transfer.content_type = new FileContentType.from_file_info(file_info); } file_transfer.state = FileTransfer.State.COMPLETE; @@ -436,7 +436,7 @@ public errordomain FileReceiveError { public class FileMeta { public int64 size = -1; - public string? mime_type = null; + public FileContentType? content_type = null; public string? file_name = null; public Encryption encryption = Encryption.NONE; } -- cgit v1.3