7 files changed, 120 insertions, 56 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);
 }
-
diff --git a/examples/dummyresource/dummystore.cpp b/examples/dummyresource/dummystore.cpp
index 8592a30..e948475 100644
--- a/examples/dummyresource/dummystore.cpp
+++ b/examples/dummyresource/dummystore.cpp
@@ -19,6 +19,7 @@
 #include "dummystore.h"
 
 #include <QString>
+#include <QDateTime>
 
 static QMap<QString, QVariant> createEvent(int i)
 {
@@ -29,67 +30,91 @@ static QMap<QString, QVariant> createEvent(int i)
     return event;
 }
 
-static QMap<QString, QVariant> createMail(int i)
+QMap<QString, QMap<QString, QVariant> > DummyStore::populateEvents()
 {
-    QMap<QString, QVariant> mail;
-    mail.insert("subject", QString("subject%1").arg(i));
-    return mail;
+    QMap<QString, QMap<QString, QVariant>> content;
+    for (int i = 0; i < 2; i++) {
+        content.insert(QString("key%1").arg(i), createEvent(i));
+    }
+    return content;
 }
 
-static QMap<QString, QVariant> createFolder(int i)
+static QByteArray addMail(QMap <QString, QMap<QString, QVariant> > &content, const QString &subject, const QDateTime &date, const QString &senderName, const QString &senderEmail, bool isUnread, bool isImportant, const QByteArray &parentFolder)
 {
-    QMap<QString, QVariant> folder;
-    folder.insert("name", QString("folder%1").arg(i));
-    return folder;
+    static int id = 0;
+    id++;
+    const auto uid = QString("key%1").arg(id);
+    QMap<QString, QVariant> mail;
+    mail.insert("subject", subject);
+    mail.insert("date", date);
+    mail.insert("senderName", senderName);
+    mail.insert("senderEmail", senderEmail);
+    mail.insert("unread", isUnread);
+    mail.insert("important", isImportant);
+    mail.insert("parentFolder", parentFolder);
+    content.insert(uid, mail);
+    return uid.toUtf8();
 }
 
-QMap<QString, QMap<QString, QVariant> > populateEvents()
+QMap<QString, QMap<QString, QVariant> > DummyStore::populateMails()
 {
     QMap<QString, QMap<QString, QVariant>> content;
-    for (int i = 0; i < 2; i++) {
-        content.insert(QString("key%1").arg(i), createEvent(i));
+    for (const auto &parentFolder : mFolders.keys()) {
+        addMail(content, "Hello World!", QDateTime::currentDateTimeUtc(), "John Doe", "doe@example.com", true, false, parentFolder.toUtf8());
     }
     return content;
 }
 
-QMap<QString, QMap<QString, QVariant> > populateMails()
+static QByteArray addFolder(QMap <QString, QMap<QString, QVariant> > &content, const QString &name, const QByteArray &icon, const QByteArray &parent = QByteArray())
 {
-    QMap<QString, QMap<QString, QVariant>> content;
-    for (int i = 0; i < 2; i++) {
-        content.insert(QString("key%1").arg(i), createMail(i));
+    static int id = 0;
+    id++;
+    const auto uid = QString("key%1").arg(id);
+    QMap<QString, QVariant> folder;
+    folder.insert("name", name);
+    if (!parent.isEmpty()) {
+        folder.insert("parent", parent);
     }
-    return content;
+    folder.insert("icon", icon);
+    content.insert(uid, folder);
+    return uid.toUtf8();
 }
 
-QMap<QString, QMap<QString, QVariant> > populateFolders()
+QMap<QString, QMap<QString, QVariant> > DummyStore::populateFolders()
 {
     QMap<QString, QMap<QString, QVariant>> content;
-    int i = 0;
-    for (i = 0; i < 5; i++) {
-        content.insert(QString("key%1").arg(i), createFolder(i));
+    addFolder(content, "Inbox", "mail-folder-inbox");
+    auto data = addFolder(content, "Data", "folder");
+    addFolder(content, "Sent", "mail-folder-sent");
+    addFolder(content, "Trash", "user-trash");
+    addFolder(content, "Drafts", "document-edit");
+    addFolder(content, "Stuff", "folder", data);
+    auto bulk = addFolder(content, "Bulk", "folder", data);
+    for (int i = 0; i < 5; i++) {
+        addFolder(content, QString("Folder %1").arg(i), "folder", bulk);
     }
-    i++;
-    auto folder = createFolder(i);
-    folder.insert("parent", "key0");
-    content.insert(QString("key%1").arg(i), folder);
     return content;
 }
 
-static QMap<QString, QMap<QString, QVariant> > s_eventSource = populateEvents();
-static QMap<QString, QMap<QString, QVariant> > s_mailSource = populateMails();
-static QMap<QString, QMap<QString, QVariant> > s_folderSource = populateFolders();
+DummyStore::DummyStore()
+{
+    mFolders = populateFolders();
+    mMails = populateMails();
+    mEvents = populateEvents();
+
+}
 
-QMap<QString, QMap<QString, QVariant> > DummyStore::events() const
+QMap<QString, QMap<QString, QVariant> > &DummyStore::events()
 {
-    return s_eventSource;
+    return mEvents;
 }
 
-QMap<QString, QMap<QString, QVariant> > DummyStore::mails() const
+QMap<QString, QMap<QString, QVariant> > &DummyStore::mails()
 {
-    return s_mailSource;
+    return mMails;
 }
 
-QMap<QString, QMap<QString, QVariant> > DummyStore::folders() const
+QMap<QString, QMap<QString, QVariant> > &DummyStore::folders()
 {
-    return s_folderSource;
+    return mFolders;
 }
diff --git a/examples/dummyresource/dummystore.h b/examples/dummyresource/dummystore.h
index c730118..a29ce38 100644
--- a/examples/dummyresource/dummystore.h
+++ b/examples/dummyresource/dummystore.h
@@ -29,7 +29,18 @@ public:
         return instance;
     }
 
-    QMap<QString, QMap<QString, QVariant> > events() const;
-    QMap<QString, QMap<QString, QVariant> > mails() const;
-    QMap<QString, QMap<QString, QVariant> > folders() const;
+    QMap<QString, QMap<QString, QVariant> > &events();
+    QMap<QString, QMap<QString, QVariant> > &mails();
+    QMap<QString, QMap<QString, QVariant> > &folders();
+
+private:
+    DummyStore();
+
+    QMap<QString, QMap<QString, QVariant> > populateEvents();
+    QMap<QString, QMap<QString, QVariant> > populateMails();
+    QMap<QString, QMap<QString, QVariant> > populateFolders();
+
+    QMap<QString, QMap<QString, QVariant> > mEvents;
+    QMap<QString, QMap<QString, QVariant> > mMails;
+    QMap<QString, QMap<QString, QVariant> > mFolders;
 };
diff --git a/examples/dummyresource/resourcefactory.cpp b/examples/dummyresource/resourcefactory.cpp
index 9a577a0..a084c19 100644
--- a/examples/dummyresource/resourcefactory.cpp
+++ b/examples/dummyresource/resourcefactory.cpp
@@ -160,14 +160,27 @@ void DummyResource::createEvent(const QByteArray &ridBuffer, const QMap<QString,
     Akonadi2::EntityBuffer::assembleEntityBuffer(entityFbb, 0, 0, m_fbb.GetBufferPointer(), m_fbb.GetSize(), 0, 0);
 }
 
+QString DummyResource::resolveRemoteId(const QByteArray &bufferType, const QString &remoteId, Akonadi2::Storage::Transaction &transaction)
+{
+    //Lookup local id for remote id, or insert a new pair otherwise
+    auto remoteIdWithType = bufferType + remoteId.toUtf8();
+    QByteArray akonadiId = Index("rid.mapping", transaction).lookup(remoteIdWithType);
+    if (akonadiId.isEmpty()) {
+        akonadiId = QUuid::createUuid().toString().toUtf8();
+        Index("rid.mapping", transaction).add(remoteIdWithType, akonadiId);
+    }
+    return akonadiId;
+}
+
+
 void DummyResource::createMail(const QByteArray &ridBuffer, const QMap<QString, QVariant> &data, flatbuffers::FlatBufferBuilder &entityFbb, Akonadi2::Storage::Transaction &transaction)
 {
-    //Map the source format to the buffer format (which happens to be an exact copy here)
+    //Map the source format to the buffer format (which happens to be an almost exact copy here)
     auto subject = m_fbb.CreateString(data.value("subject").toString().toStdString());
-    auto sender = m_fbb.CreateString(data.value("sender").toString().toStdString());
+    auto sender = m_fbb.CreateString(data.value("senderEmail").toString().toStdString());
     auto senderName = m_fbb.CreateString(data.value("senderName").toString().toStdString());
     auto date = m_fbb.CreateString(data.value("date").toDate().toString().toStdString());
-    auto folder = m_fbb.CreateString(std::string("inbox"));
+    auto folder = m_fbb.CreateString(resolveRemoteId(ENTITY_TYPE_MAIL, data.value("parentFolder").toString(), transaction).toStdString());
 
     auto builder = Akonadi2::ApplicationDomain::Buffer::MailBuilder(m_fbb);
     builder.add_subject(subject);
@@ -182,26 +195,16 @@ void DummyResource::createMail(const QByteArray &ridBuffer, const QMap<QString,
     Akonadi2::EntityBuffer::assembleEntityBuffer(entityFbb, 0, 0, 0, 0, m_fbb.GetBufferPointer(), m_fbb.GetSize());
 }
 
-QString DummyResource::resolveRemoteId(const QString &remoteId, Akonadi2::Storage::Transaction &transaction)
-{
-    //Lookup local id for remote id, or insert a new pair otherwise
-    QByteArray akonadiId = Index("rid.mapping", transaction).lookup(remoteId.toLatin1());
-    if (akonadiId.isEmpty()) {
-        akonadiId = QUuid::createUuid().toString().toUtf8();
-        Index("rid.mapping", transaction).add(remoteId.toLatin1(), akonadiId);
-    }
-    return akonadiId;
-}
-
 void DummyResource::createFolder(const QByteArray &ridBuffer, const QMap<QString, QVariant> &data, flatbuffers::FlatBufferBuilder &entityFbb, Akonadi2::Storage::Transaction &transaction)
 {
     //Map the source format to the buffer format (which happens to be an exact copy here)
     auto name = m_fbb.CreateString(data.value("name").toString().toStdString());
+    auto icon = m_fbb.CreateString(data.value("icon").toString().toStdString());
     flatbuffers::Offset<flatbuffers::String> parent;
     bool hasParent = false;
     if (!data.value("parent").toString().isEmpty()) {
         hasParent = true;
-        auto akonadiId = resolveRemoteId(data.value("parent").toString(), transaction);
+        auto akonadiId = resolveRemoteId(ENTITY_TYPE_FOLDER, data.value("parent").toString(), transaction);
         parent = m_fbb.CreateString(akonadiId.toStdString());
     }
 
@@ -210,6 +213,7 @@ void DummyResource::createFolder(const QByteArray &ridBuffer, const QMap<QString
     if (hasParent) {
         builder.add_parent(parent);
     }
+    builder.add_icon(icon);
     auto buffer = builder.Finish();
     Akonadi2::ApplicationDomain::Buffer::FinishFolderBuffer(m_fbb, buffer);
     Akonadi2::EntityBuffer::assembleEntityBuffer(entityFbb, 0, 0, 0, 0, m_fbb.GetBufferPointer(), m_fbb.GetSize());
@@ -222,7 +226,7 @@ void DummyResource::synchronize(const QString &bufferType, const QMap<QString, Q
     Index ridMapping("rid.mapping", synchronizationTransaction);
     for (auto it = data.constBegin(); it != data.constEnd(); it++) {
         const auto remoteId = it.key().toUtf8();
-        auto akonadiId = resolveRemoteId(remoteId, synchronizationTransaction);
+        auto akonadiId = resolveRemoteId(bufferType.toUtf8(), remoteId, synchronizationTransaction);
 
         bool found = false;
         transaction.openDatabase(bufferType.toUtf8() + ".main").scan(akonadiId.toUtf8(), [&found](const QByteArray &, const QByteArray &) -> bool {
diff --git a/examples/dummyresource/resourcefactory.h b/examples/dummyresource/resourcefactory.h
index 5706c16..4144985 100644
--- a/examples/dummyresource/resourcefactory.h
+++ b/examples/dummyresource/resourcefactory.h
@@ -36,7 +36,7 @@ public:
     KAsync::Job<void> synchronizeWithSource() Q_DECL_OVERRIDE;
     static void removeFromDisk(const QByteArray &instanceIdentifier);
 private:
-    QString resolveRemoteId(const QString &remoteId, Akonadi2::Storage::Transaction &transaction);
+    QString resolveRemoteId(const QByteArray &type, const QString &remoteId, Akonadi2::Storage::Transaction &transaction);
     void createEvent(const QByteArray &rid, const QMap<QString, QVariant> &data, flatbuffers::FlatBufferBuilder &entityFbb, Akonadi2::Storage::Transaction &);
     void createMail(const QByteArray &rid, const QMap<QString, QVariant> &data, flatbuffers::FlatBufferBuilder &entityFbb, Akonadi2::Storage::Transaction &);
     void createFolder(const QByteArray &rid, const QMap<QString, QVariant> &data, flatbuffers::FlatBufferBuilder &entityFbb, Akonadi2::Storage::Transaction &);