Don't hardcode capabilities

2 files changed, 13 insertions, 2 deletions

diff --git a/examples/imapresource/imapserverproxy.cpp b/examples/imapresource/imapserverproxy.cpp
index e329911..d3de6ba 100644
--- a/examples/imapresource/imapserverproxy.cpp
+++ b/examples/imapresource/imapserverproxy.cpp
@@ -62,6 +62,10 @@ const char* Imap::FolderFlags::Archive = "\\Archive";
 const char* Imap::FolderFlags::Junk = "\\Junk";
 const char* Imap::FolderFlags::Flagged = "\\Flagged";
 
+const char* Imap::Capabilities::Namespace = "NAMESPACE";
+const char* Imap::Capabilities::Uidplus = "UIDPLUS";
+const char* Imap::Capabilities::Condstore = "CONDSTORE";
+
 template <typename T>
 static KAsync::Job<T> runJob(KJob *job, const std::function<T(KJob*)> &f)
 {
@@ -145,7 +149,7 @@ KAsync::Job<void> ImapServerProxy::login(const QString &username, const QString
 
     return runJob(loginJob).then(runJob(capabilitiesJob)).then([this](){
         SinkTrace() << "Supported capabilities: " << mCapabilities;
-        QStringList requiredExtensions = QStringList() << "UIDPLUS" << "NAMESPACE";
+        QStringList requiredExtensions = QStringList() << Capabilities::Uidplus << Capabilities::Namespace;
         for (const auto &requiredExtension : requiredExtensions) {
             if (!mCapabilities.contains(requiredExtension)) {
                 SinkWarning() << "Server doesn't support required capability: " << requiredExtension;
@@ -182,7 +186,7 @@ KAsync::Job<SelectResult> ImapServerProxy::select(const QString &mailbox)
 {
     auto select = new KIMAP2::SelectJob(mSession);
     select->setMailBox(mailbox);
-    select->setCondstoreEnabled(mCapabilities.contains("CONDSTORE"));
+    select->setCondstoreEnabled(mCapabilities.contains(Capabilities::Condstore));
     return runJob<SelectResult>(select, [select](KJob* job) -> SelectResult {
         return {select->uidValidity(), select->nextUid(), select->highestModSequence()};
     }).onError([=] (const KAsync::Error &error) {
diff --git a/examples/imapresource/imapserverproxy.h b/examples/imapresource/imapserverproxy.h
index 081750f..84343eb 100644
--- a/examples/imapresource/imapserverproxy.h
+++ b/examples/imapresource/imapserverproxy.h
@@ -56,6 +56,13 @@ namespace FolderFlags
     extern const char* All;
 }
 
+namespace Capabilities
+{
+    extern const char* Condstore;
+    extern const char* Uidplus;
+    extern const char* Namespace;
+}
+
 struct Message {
     qint64 uid;
     qint64 size;