3 files changed, 27 insertions, 3 deletions

diff --git a/common/domain/folder.cpp b/common/domain/folder.cpp
index 989d2c4..5558060 100644
--- a/common/domain/folder.cpp
+++ b/common/domain/folder.cpp
@@ -80,8 +80,9 @@ void TypeImplementation<Folder>::removeIndex(const QByteArray &identifier, const
 QSharedPointer<ReadPropertyMapper<TypeImplementation<Folder>::Buffer> > TypeImplementation<Folder>::initializeReadPropertyMapper()
 {
     auto propertyMapper = QSharedPointer<ReadPropertyMapper<Buffer> >::create();
-    propertyMapper->addMapping<QString, Buffer>("parent", &Buffer::parent);
+    propertyMapper->addMapping<QByteArray, Buffer>("parent", &Buffer::parent);
     propertyMapper->addMapping<QString, Buffer>("name", &Buffer::name);
+    propertyMapper->addMapping<QByteArray, Buffer>("icon", &Buffer::icon);
     return propertyMapper;
 }
 
@@ -89,12 +90,16 @@ QSharedPointer<WritePropertyMapper<TypeImplementation<Folder>::BufferBuilder> >
 {
     auto propertyMapper = QSharedPointer<WritePropertyMapper<BufferBuilder> >::create();
     propertyMapper->addMapping("parent", [](const QVariant &value, flatbuffers::FlatBufferBuilder &fbb) -> std::function<void(BufferBuilder &)> {
-        auto offset = variantToProperty<QString>(value, fbb);
+        auto offset = variantToProperty<QByteArray>(value, fbb);
         return [offset](BufferBuilder &builder) { builder.add_parent(offset); };
     });
     propertyMapper->addMapping("name", [](const QVariant &value, flatbuffers::FlatBufferBuilder &fbb) -> std::function<void(BufferBuilder &)> {
         auto offset = variantToProperty<QString>(value, fbb);
         return [offset](BufferBuilder &builder) { builder.add_name(offset); };
     });
+    propertyMapper->addMapping("icon", [](const QVariant &value, flatbuffers::FlatBufferBuilder &fbb) -> std::function<void(BufferBuilder &)> {
+        auto offset = variantToProperty<QByteArray>(value, fbb);
+        return [offset](BufferBuilder &builder) { builder.add_icon(offset); };
+    });
     return propertyMapper;
 }
diff --git a/common/domain/folder.fbs b/common/domain/folder.fbs
index 3476d58..31dc32a 100644
--- a/common/domain/folder.fbs
+++ b/common/domain/folder.fbs
@@ -3,6 +3,7 @@ namespace Akonadi2.ApplicationDomain.Buffer;
 table Folder {
   name:string;
   parent:string;
+  icon:string;
 }
 
 root_type Folder;
diff --git a/common/propertymapper.cpp b/common/propertymapper.cpp
index 7ff072a..60f7dd5 100644
--- a/common/propertymapper.cpp
+++ b/common/propertymapper.cpp
@@ -29,6 +29,15 @@ flatbuffers::uoffset_t variantToProperty<QString>(const QVariant &property, flat
 }
 
 template <>
+flatbuffers::uoffset_t variantToProperty<QByteArray>(const QVariant &property, flatbuffers::FlatBufferBuilder &fbb)
+{
+    if (property.isValid()) {
+        return fbb.CreateString(property.toByteArray().toStdString()).o;
+    }
+    return 0;
+}
+
+template <>
 QVariant propertyToVariant<QString>(const flatbuffers::String *property)
 {
     if (property) {
@@ -39,8 +48,17 @@ QVariant propertyToVariant<QString>(const flatbuffers::String *property)
 }
 
 template <>
+QVariant propertyToVariant<QByteArray>(const flatbuffers::String *property)
+{
+    if (property) {
+        //We have to copy the memory, otherwise it would become eventually invalid
+        return QString::fromStdString(property->c_str()).toUtf8();
+    }
+    return QVariant();
+}
+
+template <>
 QVariant propertyToVariant<bool>(uint8_t property)
 {
     return static_cast<bool>(property);
 }
-