A folder dummy folder facade and a folder property for mails.

Mails in inbox!

5 files changed, 48 insertions, 6 deletions

diff --git a/common/domain/mail.cpp b/common/domain/mail.cpp
index c52bfe0..230ef31 100644
--- a/common/domain/mail.cpp
+++ b/common/domain/mail.cpp
@@ -83,6 +83,9 @@ QSharedPointer<ReadPropertyMapper<TypeImplementation<Mail>::Buffer> > TypeImplem
     propertyMapper->addMapping("important", [](Buffer const *buffer) -> QVariant {
         return propertyToVariant<bool>(buffer->important());
     });
+    propertyMapper->addMapping("folder", [](Buffer const *buffer) -> QVariant {
+        return propertyToVariant<QString>(buffer->folder());
+    });
     return propertyMapper;
 }
 
diff --git a/common/domain/mail.fbs b/common/domain/mail.fbs
index 654f49c..13aa36d 100644
--- a/common/domain/mail.fbs
+++ b/common/domain/mail.fbs
@@ -2,6 +2,7 @@ namespace Akonadi2.ApplicationDomain.Buffer;
 
 table Mail {
   uid:string;
+  folder:string;
   sender:string;
   senderName:string;
   subject:string;
diff --git a/examples/dummyresource/facade.cpp b/examples/dummyresource/facade.cpp
index 63f84f2..5a9d722 100644
--- a/examples/dummyresource/facade.cpp
+++ b/examples/dummyresource/facade.cpp
@@ -38,3 +38,26 @@ DummyResourceMailFacade::DummyResourceMailFacade(const QByteArray &instanceIdent
 DummyResourceMailFacade::~DummyResourceMailFacade()
 {
 }
+
+static void addFolder(const QSharedPointer<Akonadi2::ResultProvider<Akonadi2::ApplicationDomain::Folder::Ptr> > &resultProvider, QByteArray uid, QString name, QString icon)
+{
+    auto folder = Akonadi2::ApplicationDomain::Folder::Ptr::create();
+    folder->setProperty("name", name);
+    folder->setProperty("uid", uid);
+    resultProvider->add(folder);
+}
+
+KAsync::Job<void> load(const Akonadi2::Query &query, const QSharedPointer<Akonadi2::ResultProvider<Akonadi2::ApplicationDomain::Folder::Ptr> > &resultProvider)
+{
+    //Dummy implementation for a fixed set of folders
+    addFolder(resultProvider, "inbox", "INBOX", "mail-folder-inbox");
+    addFolder(resultProvider, "sent", "Sent", "mail-folder-sent");
+    addFolder(resultProvider, "trash", "Trash", "user-trash");
+    addFolder(resultProvider, "drafts", "Drafts", "document-edit");
+    addFolder(resultProvider, "1", "dragons", "folder");
+    addFolder(resultProvider, "1", "super mega long tailed dragons", "folder");
+    resultProvider->initialResultSetComplete();
+    resultProvider->complete();
+    return KAsync::null<void>();
+}
+
diff --git a/examples/dummyresource/facade.h b/examples/dummyresource/facade.h
index 87f68c3..948116b 100644
--- a/examples/dummyresource/facade.h
+++ b/examples/dummyresource/facade.h
@@ -35,3 +35,14 @@ public:
     DummyResourceMailFacade(const QByteArray &instanceIdentifier);
     virtual ~DummyResourceMailFacade();
 };
+
+class DummyResourceFolderFacade : public Akonadi2::StoreFacade<Akonadi2::ApplicationDomain::Folder>
+{
+public:
+    DummyResourceFolderFacade(const QByteArray &instanceIdentifier);
+    virtual ~DummyResourceFolderFacade();
+    virtual KAsync::Job<void> create(const Akonadi2::ApplicationDomain::Folder &domainObject) { return KAsync::null<void>(); };
+    virtual KAsync::Job<void> modify(const Akonadi2::ApplicationDomain::Folder &domainObject) { return KAsync::null<void>(); };
+    virtual KAsync::Job<void> remove(const Akonadi2::ApplicationDomain::Folder &domainObject) { return KAsync::null<void>(); };
+    virtual KAsync::Job<void> load(const Akonadi2::Query &query, const QSharedPointer<Akonadi2::ResultProvider<Akonadi2::ApplicationDomain::Folder::Ptr> > &resultProvider);
+};
diff --git a/examples/dummyresource/resourcefactory.cpp b/examples/dummyresource/resourcefactory.cpp
index 8d605b9..147cb22 100644
--- a/examples/dummyresource/resourcefactory.cpp
+++ b/examples/dummyresource/resourcefactory.cpp
@@ -109,15 +109,19 @@ void DummyResource::createMail(const QByteArray &ridBuffer, const QByteArray &da
     //Map the source format to the buffer format (which happens to be an exact copy here)
     auto subject = m_fbb.CreateString(mailBuffer->subject()->c_str());
     auto rid = m_fbb.CreateString(std::string(ridBuffer.constData(), ridBuffer.size()));
-    // auto description = m_fbb.CreateString(std::string(ridBuffer.constData(), ridBuffer.size()));
-    // static uint8_t rawData[100];
-    // auto attachment = Akonadi2::EntityBuffer::appendAsVector(m_fbb, rawData, 100);
+    auto sender = m_fbb.CreateString(std::string("sender@example.org"));
+    auto senderName = m_fbb.CreateString(std::string("Sender Name"));
+    auto date = m_fbb.CreateString(std::string("2004"));
+    auto folder = m_fbb.CreateString(std::string("inbox"));
 
     auto builder = Akonadi2::ApplicationDomain::Buffer::MailBuilder(m_fbb);
     builder.add_subject(subject);
-    // builder.add(rid);
-    // builder.add_description(description);
-    // builder.add_attachment(attachment);
+    builder.add_sender(sender);
+    builder.add_senderName(senderName);
+    builder.add_unread(true);
+    builder.add_important(false);
+    builder.add_date(date);
+    builder.add_folder(folder);
     auto buffer = builder.Finish();
     Akonadi2::ApplicationDomain::Buffer::FinishMailBuffer(m_fbb, buffer);
     Akonadi2::EntityBuffer::assembleEntityBuffer(entityFbb, 0, 0, 0, 0, m_fbb.GetBufferPointer(), m_fbb.GetSize());