Setup a caldav resource as part of the kolabnow plugin

3 files changed, 39 insertions, 1 deletions

diff --git a/accounts/kolabnow/kolabnowsettings.cpp b/accounts/kolabnow/kolabnowsettings.cpp
index 8832621e..6f1f6502 100644
--- a/accounts/kolabnow/kolabnowsettings.cpp
+++ b/accounts/kolabnow/kolabnowsettings.cpp
@@ -40,13 +40,17 @@ void KolabnowSettings::save()
     mSmtpServer = "smtps://smtp.kolabnow.com:587";
     mSmtpUsername = mEmailAddress;
 
-    mCardDavServer = "https://apps.kolabnow.com;
+    mCardDavServer = "https://apps.kolabnow.com";
     mCardDavUsername = mEmailAddress;
 
+    mCalDavServer = "https://apps.kolabnow.com";
+    mCalDavUsername = mEmailAddress;
+
     saveAccount();
     saveImapResource();
     saveMailtransportResource();
     saveCardDavResource();
+    saveCalDavResource();
     saveIdentity();
 }
 
@@ -55,6 +59,7 @@ void KolabnowSettings::remove()
     removeResource(mMailtransportIdentifier);
     removeResource(mImapIdentifier);
     removeResource(mCardDavIdentifier);
+    removeResource(mCalDavIdentifier);
     removeIdentity();
     removeAccount();
 }
diff --git a/framework/src/domain/settings/accountsettings.cpp b/framework/src/domain/settings/accountsettings.cpp
index 9cd41518..00e633fd 100644
--- a/framework/src/domain/settings/accountsettings.cpp
+++ b/framework/src/domain/settings/accountsettings.cpp
@@ -60,6 +60,8 @@ void AccountSettings::setAccountIdentifier(const QByteArray &id)
     mSmtpUsername = QString();
     mCardDavServer = QString();
     mCardDavUsername = QString();
+    mCalDavServer = QString();
+    mCalDavUsername = QString();
     mPath = QString();
     emit changed();
     emit imapResourceChanged();
@@ -253,6 +255,19 @@ void AccountSettings::loadCardDavResource()
         }).exec().waitForFinished();
 }
 
+void AccountSettings::loadCalDavResource()
+{
+    Store::fetchOne<SinkResource>(Query().filter<SinkResource::Account>(mAccountIdentifier).filter<SinkResource::ResourceType>("sink.carddav"))
+        .then([this](const SinkResource &resource) {
+            mCalDavIdentifier = resource.identifier();
+            mCalDavServer = resource.getProperty("server").toString();
+            mCalDavUsername = resource.getProperty("username").toString();
+            emit cardDavResourceChanged();
+        }).onError([](const KAsync::Error &error) {
+            qWarning() << "Failed to load the CalDAV resource: " << error.errorMessage;
+        }).exec().waitForFinished();
+}
+
 
 template<typename ResourceType>
 static QByteArray saveResource(const QByteArray &accountIdentifier, const QByteArray &identifier, const std::map<QByteArray, QVariant> &properties)
@@ -299,6 +314,14 @@ void AccountSettings::saveCardDavResource()
         });
 }
 
+void AccountSettings::saveCalDavResource()
+{
+    mCalDavIdentifier = saveResource<CalDavResource>(mAccountIdentifier, mCalDavIdentifier, {
+            {"server", mCalDavServer},
+            {"username", mCalDavUsername}
+        });
+}
+
 void AccountSettings::saveMaildirResource()
 {
     mMaildirIdentifier = saveResource<MaildirResource>(mAccountIdentifier, mMaildirIdentifier, {
diff --git a/framework/src/domain/settings/accountsettings.h b/framework/src/domain/settings/accountsettings.h
index 88a85b62..ac670a61 100644
--- a/framework/src/domain/settings/accountsettings.h
+++ b/framework/src/domain/settings/accountsettings.h
@@ -44,6 +44,9 @@ class KUBE_EXPORT AccountSettings : public QObject
     Q_PROPERTY(QString carddavServer MEMBER mCardDavServer NOTIFY cardDavResourceChanged)
     Q_PROPERTY(QString carddavUsername MEMBER mCardDavUsername NOTIFY cardDavResourceChanged)
 
+    Q_PROPERTY(QString caldavServer MEMBER mCalDavServer NOTIFY calDavResourceChanged)
+    Q_PROPERTY(QString caldavUsername MEMBER mCalDavUsername NOTIFY calDavResourceChanged)
+
     Q_PROPERTY(QUrl path READ path WRITE setPath NOTIFY pathChanged)
     Q_PROPERTY(QValidator* pathValidator READ pathValidator CONSTANT)
 
@@ -75,6 +78,7 @@ signals:
     void pathChanged();
     void changed();
     void cardDavResourceChanged();
+    void calDavResourceChanged();
 
 protected:
     void saveAccount();
@@ -83,6 +87,7 @@ protected:
     void saveMailtransportResource();
     void saveIdentity();
     void saveCardDavResource();
+    void saveCalDavResource();
 
     void loadAccount();
     void loadImapResource();
@@ -90,6 +95,7 @@ protected:
     void loadMailtransportResource();
     void loadIdentity();
     void loadCardDavResource();
+    void loadCalDavResource();
 
     void removeAccount();
     void removeResource(const QByteArray &identifier);
@@ -119,5 +125,9 @@ protected:
     QByteArray mCardDavIdentifier;
     QString mCardDavServer;
     QString mCardDavUsername;
+
+    QByteArray mCalDavIdentifier;
+    QString mCalDavServer;
+    QString mCalDavUsername;
 };