Handle content type != mime type

2 files changed, 9 insertions, 9 deletions

diff --git a/xmpp-vala/src/module/xep/0363_http_file_upload.vala b/xmpp-vala/src/module/xep/0363_http_file_upload.vala
index c7b8fb59..cba422ba 100644
--- a/xmpp-vala/src/module/xep/0363_http_file_upload.vala
+++ b/xmpp-vala/src/module/xep/0363_http_file_upload.vala
@@ -24,7 +24,7 @@ public class Module : XmppStreamModule {
         public string url_put { get; set; }
         public HashMap<string, string> headers { get; set; }
     }
-    public async SlotResult request_slot(XmppStream stream, string filename, int64 file_size, string? content_type) throws HttpFileTransferError {
+    public async SlotResult request_slot(XmppStream stream, string filename, int64 file_size, FileContentType? content_type) throws HttpFileTransferError {
         Flag? flag = stream.get_flag(Flag.IDENTITY);
         if (flag == null) {
             throw new HttpFileTransferError.SLOT_REQUEST("No flag");
@@ -35,14 +35,14 @@ public class Module : XmppStreamModule {
             case NS_URI_0:
                 request_node = new StanzaNode.build("request", NS_URI_0).add_self_xmlns();
                 request_node.put_attribute("filename", filename).put_attribute("size", file_size.to_string());
-                if (content_type != null) request_node.put_attribute("content-type", content_type);
+                if (content_type != null) request_node.put_attribute("content-type", content_type.get_mime_type());
                 break;
             case NS_URI:
                 request_node = new StanzaNode.build("request", NS_URI).add_self_xmlns()
                         .put_node(new StanzaNode.build("filename", NS_URI).put_node(new StanzaNode.text(filename)))
                         .put_node(new StanzaNode.build("size", NS_URI).put_node(new StanzaNode.text(file_size.to_string())));
                 if (content_type != null) {
-                    request_node.put_node(new StanzaNode.build("content-type", NS_URI).put_node(new StanzaNode.text(content_type)));
+                    request_node.put_node(new StanzaNode.build("content-type", NS_URI).put_node(new StanzaNode.text(content_type.get_mime_type())));
                 }
                 break;
         }
diff --git a/xmpp-vala/src/module/xep/0446_file_metadata_element.vala b/xmpp-vala/src/module/xep/0446_file_metadata_element.vala
index cbe0d2c1..ebdcbcfa 100644
--- a/xmpp-vala/src/module/xep/0446_file_metadata_element.vala
+++ b/xmpp-vala/src/module/xep/0446_file_metadata_element.vala
@@ -3,7 +3,7 @@ namespace Xmpp.Xep.FileMetadataElement {
 
     public class FileMetadata {
         public string? name { get; set; }
-        public string? mime_type { get; set; }
+        public FileContentType? content_type { get; set; }
         public int64 size { get; set; default=-1; }
         public string? desc { get; set; }
         public DateTime? date { get; set; }
@@ -19,10 +19,10 @@ namespace Xmpp.Xep.FileMetadataElement {
             if (this.name != null) {
                 node.put_node(new StanzaNode.build("name", NS_URI).put_node(new StanzaNode.text(this.name)));
             }
-            if (this.mime_type != null) {
+            if (this.content_type != null) {
                 // TODO remove the media_type node, it was implemented by accident and temporary provides backwards-compatibility
-                node.put_node(new StanzaNode.build("media_type", NS_URI).put_node(new StanzaNode.text(this.mime_type)));
-                node.put_node(new StanzaNode.build("media-type", NS_URI).put_node(new StanzaNode.text(this.mime_type)));
+                node.put_node(new StanzaNode.build("media_type", NS_URI).put_node(new StanzaNode.text(this.content_type.get_mime_type())));
+                node.put_node(new StanzaNode.build("media-type", NS_URI).put_node(new StanzaNode.text(this.content_type.get_mime_type())));
             }
             if (this.size != -1) {
                 node.put_node(new StanzaNode.build("size", NS_URI).put_node(new StanzaNode.text(this.size.to_string())));
@@ -72,11 +72,11 @@ namespace Xmpp.Xep.FileMetadataElement {
         // TODO remove media_type handling, it was implemented by accident and temporary provides backwards-compatibility
         StanzaNode? mime_node_bad = file_node.get_subnode("media_type");
         if (mime_node_bad != null && mime_node_bad.get_string_content() != null) {
-            metadata.mime_type = mime_node_bad.get_string_content();
+            metadata.content_type = new FileContentType.from_mime_type(mime_node_bad.get_string_content());
         }
         StanzaNode? mime_node = file_node.get_subnode("media-type");
         if (mime_node != null && mime_node.get_string_content() != null) {
-            metadata.mime_type = mime_node.get_string_content();
+            metadata.content_type = new FileContentType.from_mime_type(mime_node.get_string_content());
         }
         StanzaNode? size_node = file_node.get_subnode("size");
         if (size_node != null && size_node.get_string_content() != null) {