3 files changed, 46 insertions, 50 deletions

diff --git a/accounts/maildir/maildirsettings.cpp b/accounts/maildir/maildirsettings.cpp
index 1d48fc24..847ce92e 100644
--- a/accounts/maildir/maildirsettings.cpp
+++ b/accounts/maildir/maildirsettings.cpp
@@ -31,23 +31,6 @@ MaildirSettings::MaildirSettings(QObject *parent)
 {
 }
 
-void MaildirSettings::setIdentifier(const QByteArray &id)
-{
-    mIdentifier = id;
-    Sink::Store::fetchOne<Sink::ApplicationDomain::SinkResource>(Sink::Query::IdentityFilter(mIdentifier) + Sink::Query::RequestedProperties(QList<QByteArray>() << "path"))
-        .then<void, Sink::ApplicationDomain::SinkResource>([this](const Sink::ApplicationDomain::SinkResource &resource) {
-            auto path = resource.getProperty("path").toString();
-            if (mPath != path) {
-                mPath = path;
-                emit pathChanged();
-            }
-        }).exec();
-}
-
-QByteArray MaildirSettings::identifier() const
-{
-    return mIdentifier;
-}
 
 void MaildirSettings::setAccountIdentifier(const QByteArray &id)
 {
@@ -56,9 +39,22 @@ void MaildirSettings::setAccountIdentifier(const QByteArray &id)
     }
     mAccountIdentifier = id;
     Q_ASSERT(!id.isEmpty());
-    Kube::Account account(id);
-    auto maildirResource = account.property("maildirResource").toByteArray();
-    setIdentifier(maildirResource);
+    Sink::Store::fetchOne<Sink::ApplicationDomain::SinkAccount>(Sink::Query::IdentityFilter(id))
+        .then<void, Sink::ApplicationDomain::SinkAccount>([this](const Sink::ApplicationDomain::SinkAccount &account) {
+            mIcon = account.getProperty("icon").toString();
+            mName = account.getProperty("name").toString();
+            emit changed();
+        }).exec();
+
+    Sink::Store::fetchOne<Sink::ApplicationDomain::SinkResource>(Sink::Query::PropertyFilter("account", QVariant::fromValue(id)))
+        .then<void, Sink::ApplicationDomain::SinkResource>([this](const Sink::ApplicationDomain::SinkResource &resource) {
+            mIdentifier = resource.identifier();
+            auto path = resource.getProperty("path").toString();
+            if (mPath != path) {
+                mPath = path;
+                emit pathChanged();
+            }
+        }).exec();
 }
 
 QByteArray MaildirSettings::accountIdentifier() const
@@ -102,6 +98,19 @@ void MaildirSettings::save()
         qWarning() << "The path doesn't exist: " << mPath;
         return;
     }
+    qDebug() << "Saving account " << mAccountIdentifier << mIdentifier;
+    Q_ASSERT(!mAccountIdentifier.isEmpty());
+    Sink::ApplicationDomain::SinkAccount account(mAccountIdentifier);
+    account.setProperty("type", "maildir");
+    account.setProperty("name", mName);
+    account.setProperty("icon", mIcon);
+    Q_ASSERT(!account.identifier().isEmpty());
+    Sink::Store::modify(account).then<void>([]() {},
+    [](int errorCode, const QString &errorMessage) {
+        qWarning() << "Error while creating account: " << errorMessage;
+    })
+    .exec();
+
     if (!mIdentifier.isEmpty()) {
         Sink::ApplicationDomain::SinkResource resource(mIdentifier);
         resource.setProperty("path", mPath);
@@ -117,12 +126,8 @@ void MaildirSettings::save()
         resource.setProperty("path", property("path"));
         resource.setProperty("identifier", resourceIdentifier);
         resource.setProperty("type", "org.kde.maildir");
-        Sink::Store::create(resource).then<void>([this, resourceIdentifier]() {
-            Q_ASSERT(!mAccountIdentifier.isEmpty());
-            Kube::Account account(mAccountIdentifier);
-            account.setProperty("maildirResource", resourceIdentifier);
-            account.save();
-        },
+        resource.setProperty("account", mAccountIdentifier);
+        Sink::Store::create(resource).then<void>([]() {},
         [](int errorCode, const QString &errorMessage) {
             qWarning() << "Error while creating resource: " << errorMessage;
         })
@@ -136,20 +141,18 @@ void MaildirSettings::remove()
         qWarning() << "We're missing an identifier";
     } else {
         Sink::ApplicationDomain::SinkResource resource("", mIdentifier, 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create());
-        Sink::Store::remove(resource).then<void>([this]() {
-            Kube::Account account(mAccountIdentifier);
-            account.remove();
-
-            Kube::Settings settings("accounts");
-            auto accounts = settings.property("accounts").toStringList();
-            accounts.removeAll(mAccountIdentifier);
-            settings.setProperty("accounts", accounts);
-            settings.save();
-        },
+        Sink::Store::remove(resource).then<void>([]() {},
         [](int errorCode, const QString &errorMessage) {
             qWarning() << "Error while removing resource: " << errorMessage;
         })
         .exec();
+
+        Sink::ApplicationDomain::SinkAccount account("", mAccountIdentifier, 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create());
+        Sink::Store::remove(account).then<void>([]() {},
+        [](int errorCode, const QString &errorMessage) {
+            qWarning() << "Error while removing account: " << errorMessage;
+        })
+        .exec();
     }
 }
 
diff --git a/accounts/maildir/maildirsettings.h b/accounts/maildir/maildirsettings.h
index 9e5b6a4c..f79208db 100644
--- a/accounts/maildir/maildirsettings.h
+++ b/accounts/maildir/maildirsettings.h
@@ -24,17 +24,15 @@
 class MaildirSettings : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QByteArray identifier READ identifier WRITE setIdentifier)
     Q_PROPERTY(QByteArray accountIdentifier READ accountIdentifier WRITE setAccountIdentifier)
     Q_PROPERTY(QUrl path READ path WRITE setPath NOTIFY pathChanged)
     Q_PROPERTY(QValidator* pathValidator READ pathValidator CONSTANT)
+    Q_PROPERTY(QString icon MEMBER mIcon NOTIFY changed)
+    Q_PROPERTY(QString accountName MEMBER mName NOTIFY changed)
 
 public:
     MaildirSettings(QObject *parent = 0);
 
-    void setIdentifier(const QByteArray &);
-    QByteArray identifier() const;
-
     void setAccountIdentifier(const QByteArray &);
     QByteArray accountIdentifier() const;
 
@@ -47,9 +45,12 @@ public:
 
 signals:
     void pathChanged();
+    void changed();
 
 private:
     QByteArray mIdentifier;
     QByteArray mAccountIdentifier;
     QString mPath;
+    QString mIcon;
+    QString mName;
 };
diff --git a/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml b/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml
index 174683c4..0175fc46 100644
--- a/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml
+++ b/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml
@@ -49,8 +49,8 @@ Rectangle {
             id: name
             placeholderText: accountName
             Layout.fillWidth: true
-            text: accountSettings.accountName
-            onTextChanged: { accountSettings.accountName = text; }
+            text: maildirSettings.accountName
+            onTextChanged: { maildirSettings.accountName = text; }
         }
 
         Text {
@@ -149,19 +149,11 @@ Rectangle {
             property string password;
         }
 
-        KubeSettings.Settings {
-            id: accountSettings
-            identifier: "account." + accountId
-            property string accountName;
-            property string icon: root.icon;
-        }
-
         Button {
             text: "Save"
             onClicked: {
                 transportSettings.save();
                 maildirSettings.save();
-                accountSettings.save();
             }
         }
         Button {