[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [sink/develop] /: Maildir trash support
From:       Christian Mollekopf <chrigi_1 () fastmail ! fm>
Date:       2016-06-30 19:49:33
Message-ID: E1bIhxt-0005c3-Cd () code ! kde ! org
[Download RAW message or body]

Git commit f9379318d801df204cc50385c5eca1f28e91755e by Christian Mollekopf.
Committed on 30/06/2016 at 15:31.
Pushed by cmollekopf into branch 'develop'.

Maildir trash support

M  +10   -4    examples/maildirresource/maildirresource.cpp
M  +5    -0    tests/mailsynctest.cpp

http://commits.kde.org/akonadi-next/f9379318d801df204cc50385c5eca1f28e91755e

diff --git a/examples/maildirresource/maildirresource.cpp \
b/examples/maildirresource/maildirresource.cpp index b14a1bd..e1fcfdf 100644
--- a/examples/maildirresource/maildirresource.cpp
+++ b/examples/maildirresource/maildirresource.cpp
@@ -473,10 +473,16 @@ MaildirResource::MaildirResource(const QByteArray \
&instanceIdentifier, const QSh  
     KPIM::Maildir dir(mMaildirPath, true);
     Trace() << "Started maildir resource for maildir: " << mMaildirPath;
-    auto draftsFolder = dir.addSubFolder("Drafts");
-
-    auto remoteId = synchronizer->createFolder(draftsFolder, "folder", \
                QByteArrayList() << "drafts");
-    auto draftsFolderLocalId = \
synchronizer->syncStore().resolveRemoteId(ENTITY_TYPE_FOLDER, remoteId); +    {
+        auto draftsFolder = dir.addSubFolder("Drafts");
+        auto remoteId = synchronizer->createFolder(draftsFolder, "folder", \
QByteArrayList() << "drafts"); +        auto draftsFolderLocalId = \
synchronizer->syncStore().resolveRemoteId(ENTITY_TYPE_FOLDER, remoteId); +    }
+    {
+        auto trashFolder = dir.addSubFolder("Trash");
+        auto remoteId = synchronizer->createFolder(trashFolder, "folder", \
QByteArrayList() << "trash"); +        auto trashFolderLocalId = \
synchronizer->syncStore().resolveRemoteId(ENTITY_TYPE_FOLDER, remoteId); +    }
     synchronizer->commit();
 }
 
diff --git a/tests/mailsynctest.cpp b/tests/mailsynctest.cpp
index ff56030..e70e34e 100644
--- a/tests/mailsynctest.cpp
+++ b/tests/mailsynctest.cpp
@@ -104,6 +104,11 @@ void MailSyncTest::testListFolders()
             names.removeAll("Drafts");
             QVERIFY(specialPurposeFolders.contains("drafts"));
         }
+        if (mCapabilities.contains(ResourceCapabilities::Mail::trash)) {
+            QVERIFY(names.contains("Trash"));
+            names.removeAll("Trash");
+            QVERIFY(specialPurposeFolders.contains("trash"));
+        }
         QCOMPARE(names.size(), 2);
         QVERIFY(names.contains("INBOX"));
         QVERIFY(names.contains("test"));


[prev in list] [next in list] [prev in thread] [next in thread]