3 files changed, 35 insertions, 5 deletions

diff --git a/common/domain/mail.cpp b/common/domain/mail.cpp
index 59b75ea..0170357 100644
--- a/common/domain/mail.cpp
+++ b/common/domain/mail.cpp
@@ -73,10 +73,10 @@ QSharedPointer<ReadPropertyMapper<TypeImplementation<Mail>::Buffer> > TypeImplem
     propertyMapper->addMapping<QString, Buffer>("sender", &Buffer::sender);
     propertyMapper->addMapping<QString, Buffer>("senderName", &Buffer::senderName);
     propertyMapper->addMapping<QString, Buffer>("subject", &Buffer::subject);
-    propertyMapper->addMapping<QString, Buffer>("date", &Buffer::date);
+    propertyMapper->addMapping<QDateTime, Buffer>("date", &Buffer::date);
     propertyMapper->addMapping<bool, Buffer>("unread", &Buffer::unread);
     propertyMapper->addMapping<bool, Buffer>("important", &Buffer::important);
-    propertyMapper->addMapping<QString, Buffer>("folder", &Buffer::folder);
+    propertyMapper->addMapping<QByteArray, Buffer>("folder", &Buffer::folder);
     return propertyMapper;
 }
 
@@ -87,9 +87,9 @@ QSharedPointer<WritePropertyMapper<TypeImplementation<Mail>::BufferBuilder> > Ty
     propertyMapper->addMapping<QString>("sender", &BufferBuilder::add_sender);
     propertyMapper->addMapping<QString>("senderName", &BufferBuilder::add_senderName);
     propertyMapper->addMapping<QString>("subject", &BufferBuilder::add_subject);
-    propertyMapper->addMapping<QString>("date", &BufferBuilder::add_date);
-    // propertyMapper->addMapping<bool>("unread", &BufferBuilder::add_unread);
-    // propertyMapper->addMapping<bool>("important", &BufferBuilder::add_important);
+    propertyMapper->addMapping<QDateTime>("date", &BufferBuilder::add_date);
+    propertyMapper->addMapping<bool>("unread", &BufferBuilder::add_unread);
+    propertyMapper->addMapping<bool>("important", &BufferBuilder::add_important);
     propertyMapper->addMapping<QString>("folder", &BufferBuilder::add_folder);
     return propertyMapper;
 }
diff --git a/common/propertymapper.cpp b/common/propertymapper.cpp
index 60f7dd5..17a73cb 100644
--- a/common/propertymapper.cpp
+++ b/common/propertymapper.cpp
@@ -18,6 +18,7 @@
  */
 
 #include "propertymapper.h"
+#include <QDateTime>
 
 template <>
 flatbuffers::uoffset_t variantToProperty<QString>(const QVariant &property, flatbuffers::FlatBufferBuilder &fbb)
@@ -38,6 +39,15 @@ flatbuffers::uoffset_t variantToProperty<QByteArray>(const QVariant &property, f
 }
 
 template <>
+flatbuffers::uoffset_t variantToProperty<QDateTime>(const QVariant &property, flatbuffers::FlatBufferBuilder &fbb)
+{
+    if (property.isValid()) {
+        return fbb.CreateString(property.toDateTime().toString().toStdString()).o;
+    }
+    return 0;
+}
+
+template <>
 QVariant propertyToVariant<QString>(const flatbuffers::String *property)
 {
     if (property) {
@@ -62,3 +72,13 @@ QVariant propertyToVariant<bool>(uint8_t property)
 {
     return static_cast<bool>(property);
 }
+
+template <>
+QVariant propertyToVariant<QDateTime>(const flatbuffers::String *property)
+{
+    if (property) {
+        //We have to copy the memory, otherwise it would become eventually invalid
+        return QDateTime::fromString(QString::fromStdString(property->c_str()));
+    }
+    return QVariant();
+}
diff --git a/common/propertymapper.h b/common/propertymapper.h
index 98ad397..fbde2d9 100644
--- a/common/propertymapper.h
+++ b/common/propertymapper.h
@@ -100,6 +100,16 @@ public:
     }
 
     template <typename T>
+    void addMapping(const QByteArray &name, void (BufferBuilder::*f)(uint8_t))
+    {
+        addMapping(name, [f](const QVariant &value, flatbuffers::FlatBufferBuilder &fbb) -> std::function<void(BufferBuilder &)> {
+            return [value, f](BufferBuilder &builder) {
+                (builder.*f)(value.value<T>());
+            };
+        });
+    }
+
+    template <typename T>
     void addMapping(const QByteArray &name, void (BufferBuilder::*f)(flatbuffers::Offset<flatbuffers::String>))
     {
         addMapping(name, [f](const QVariant &value, flatbuffers::FlatBufferBuilder &fbb) -> std::function<void(BufferBuilder &)> {