3 files changed, 61 insertions, 1 deletions

diff --git a/common/resourceconfig.cpp b/common/resourceconfig.cpp
index ec72fb9..99e111e 100644
--- a/common/resourceconfig.cpp
+++ b/common/resourceconfig.cpp
@@ -21,12 +21,19 @@
 #include <QSettings>
 #include <QSharedPointer>
 #include <QStandardPaths>
+#include <QFile>
 
 static QSharedPointer<QSettings> getSettings()
 {
     return QSharedPointer<QSettings>::create(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/akonadi2/resources.ini", QSettings::IniFormat);
 }
 
+static QSharedPointer<QSettings> getResourceConfig(const QByteArray &identifier)
+{
+    return QSharedPointer<QSettings>::create(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/akonadi2/" + identifier, QSettings::IniFormat);
+}
+
+
 void ResourceConfig::addResource(const QByteArray &identifier, const QByteArray &type)
 {
     auto settings = getSettings();
@@ -44,6 +51,7 @@ void ResourceConfig::removeResource(const QByteArray &identifier)
     settings->remove("");
     settings->endGroup();
     settings->sync();
+    QFile::remove(getResourceConfig(identifier)->fileName());
 }
 
 QMap<QByteArray, QByteArray> ResourceConfig::getResources()
@@ -65,3 +73,24 @@ void ResourceConfig::clear()
     settings->clear();
     settings->sync();
 }
+
+void ResourceConfig::configureResource(const QByteArray &identifier, const QMap<QByteArray, QVariant> &configuration)
+{
+    auto config = getResourceConfig(identifier);
+    config->clear();
+    for (const auto &key : configuration.keys()) {
+        config->setValue(key, configuration.value(key));
+    }
+    config->sync();
+}
+
+QMap<QByteArray, QVariant> ResourceConfig::getConfiguration(const QByteArray &identifier)
+{
+    QMap<QByteArray, QVariant> configuration;
+    auto config = getResourceConfig(identifier);
+    for (const auto &key : config->allKeys()) {
+        configuration.insert(key.toLatin1(), config->value(key));
+    }
+    return configuration;
+}
+
diff --git a/common/resourceconfig.h b/common/resourceconfig.h
index e1ba2bc..fec9f56 100644
--- a/common/resourceconfig.h
+++ b/common/resourceconfig.h
@@ -21,6 +21,7 @@
 
 #include <QList>
 #include <QByteArray>
+#include <QVariant>
 #include <QMap>
 
 class ResourceConfig
@@ -30,4 +31,6 @@ public:
     static void addResource(const QByteArray &identifier, const QByteArray &type);
     static void removeResource(const QByteArray &identifier);
     static void clear();
+    static void configureResource(const QByteArray &identifier, const QMap<QByteArray, QVariant> &configuration);
+    static QMap<QByteArray, QVariant> getConfiguration(const QByteArray &identifier);
 };
diff --git a/common/resourcefacade.cpp b/common/resourcefacade.cpp
index a00bab5..89d072c 100644
--- a/common/resourcefacade.cpp
+++ b/common/resourcefacade.cpp
@@ -38,12 +38,40 @@ KAsync::Job<void> ResourceFacade::create(const Akonadi2::ApplicationDomain::Akon
         const QByteArray identifier = resource.getProperty("identifier").toByteArray();
         const QByteArray type = resource.getProperty("type").toByteArray();
         ResourceConfig::addResource(identifier, type);
+        auto changedProperties = resource.changedProperties();
+        changedProperties.removeOne("identifier");
+        changedProperties.removeOne("type");
+        if (!changedProperties.isEmpty()) {
+            //We have some configuration values
+            QMap<QByteArray, QVariant> configurationValues;
+            for (const auto &property : changedProperties) {
+                configurationValues.insert(property, resource.getProperty(property));
+            }
+            ResourceConfig::configureResource(identifier, configurationValues);
+        }
     });
 }
 
 KAsync::Job<void> ResourceFacade::modify(const Akonadi2::ApplicationDomain::AkonadiResource &resource)
 {
-    return KAsync::null<void>();
+    return KAsync::start<void>([resource, this]() {
+        const QByteArray identifier = resource.getProperty("identifier").toByteArray();
+        if (identifier.isEmpty()) {
+            Warning() << "We need an \"identifier\" property to identify the resource to configure";
+            return;
+        }
+        auto changedProperties = resource.changedProperties();
+        changedProperties.removeOne("identifier");
+        changedProperties.removeOne("type");
+        if (!changedProperties.isEmpty()) {
+            //We have some configuration values
+            QMap<QByteArray, QVariant> configurationValues;
+            for (const auto &property : changedProperties) {
+                configurationValues.insert(property, resource.getProperty(property));
+            }
+            ResourceConfig::configureResource(identifier, configurationValues);
+        }
+    });
 }
 
 KAsync::Job<void> ResourceFacade::remove(const Akonadi2::ApplicationDomain::AkonadiResource &resource)