1 files changed, 83 insertions, 2 deletions

diff --git a/accounts/maildir/maildirsettings.cpp b/accounts/maildir/maildirsettings.cpp
index 847ce92e..fa30851c 100644
--- a/accounts/maildir/maildirsettings.cpp
+++ b/accounts/maildir/maildirsettings.cpp
@@ -38,6 +38,18 @@ void MaildirSettings::setAccountIdentifier(const QByteArray &id)
         return;
     }
     mAccountIdentifier = id;
+
+    //Clear
+    mIcon = QString();
+    mName = QString();
+    mPath = QString();
+    mSmtpServer = QString();
+    mSmtpUsername = QString();
+    mSmtpPassword = QString();
+    emit changed();
+    emit pathChanged();
+    emit smtpResourceChanged();
+
     Q_ASSERT(!id.isEmpty());
     Sink::Store::fetchOne<Sink::ApplicationDomain::SinkAccount>(Sink::Query::IdentityFilter(id))
         .then<void, Sink::ApplicationDomain::SinkAccount>([this](const Sink::ApplicationDomain::SinkAccount &account) {
@@ -46,7 +58,7 @@ void MaildirSettings::setAccountIdentifier(const QByteArray &id)
             emit changed();
         }).exec();
 
-    Sink::Store::fetchOne<Sink::ApplicationDomain::SinkResource>(Sink::Query::PropertyFilter("account", QVariant::fromValue(id)))
+    Sink::Store::fetchOne<Sink::ApplicationDomain::SinkResource>(Sink::Query::PropertyFilter("account", QVariant::fromValue(id)) + Sink::Query::PropertyFilter("type", QString("org.kde.maildir")))
         .then<void, Sink::ApplicationDomain::SinkResource>([this](const Sink::ApplicationDomain::SinkResource &resource) {
             mIdentifier = resource.identifier();
             auto path = resource.getProperty("path").toString();
@@ -54,6 +66,21 @@ void MaildirSettings::setAccountIdentifier(const QByteArray &id)
                 mPath = path;
                 emit pathChanged();
             }
+        },
+        [](int errorCode, const QString &errorMessage) {
+            qWarning() << "Failed to find the maildir resource: " << errorMessage;
+        }).exec();
+
+    Sink::Store::fetchOne<Sink::ApplicationDomain::SinkResource>(Sink::Query::PropertyFilter("account", QVariant::fromValue(id)) + Sink::Query::PropertyFilter("type", QString("org.kde.mailtransport")))
+        .then<void, Sink::ApplicationDomain::SinkResource>([this](const Sink::ApplicationDomain::SinkResource &resource) {
+            mMailtransportIdentifier = resource.identifier();
+            mSmtpServer = resource.getProperty("server").toString();
+            mSmtpUsername = resource.getProperty("username").toString();
+            mSmtpPassword = resource.getProperty("password").toString();
+            emit smtpResourceChanged();
+        },
+        [](int errorCode, const QString &errorMessage) {
+            qWarning() << "Failed to find the maildir resource: " << errorMessage;
         }).exec();
 }
 
@@ -92,13 +119,32 @@ QValidator *MaildirSettings::pathValidator() const
     return pathValidator;
 }
 
+QValidator *MaildirSettings::smtpServerValidator() const
+{
+    class SmtpServerValidator : public QValidator {
+        State validate(QString &input, int &pos) const {
+            Q_UNUSED(pos);
+            // smtps://mainserver.example.net:475
+            const QUrl url(input);
+            static QSet<QString> validProtocols = QSet<QString>() << "smtp" << "smtps";
+            if (url.isValid() && validProtocols.contains(url.scheme().toLower())) {
+                return Acceptable;
+            } else {
+                return Intermediate;
+            }
+        }
+    };
+    static SmtpServerValidator *validator = new SmtpServerValidator;
+    return validator;
+}
+
 void MaildirSettings::save()
 {
     if (!QDir(mPath).exists()) {
         qWarning() << "The path doesn't exist: " << mPath;
         return;
     }
-    qDebug() << "Saving account " << mAccountIdentifier << mIdentifier;
+    qDebug() << "Saving account " << mAccountIdentifier << mIdentifier << mMailtransportIdentifier;
     Q_ASSERT(!mAccountIdentifier.isEmpty());
     Sink::ApplicationDomain::SinkAccount account(mAccountIdentifier);
     account.setProperty("type", "maildir");
@@ -133,6 +179,34 @@ void MaildirSettings::save()
         })
         .exec();
     }
+
+    if (!mMailtransportIdentifier.isEmpty()) {
+        Sink::ApplicationDomain::SinkResource resource(mMailtransportIdentifier);
+        resource.setProperty("server", mSmtpServer);
+        resource.setProperty("username", mSmtpUsername);
+        resource.setProperty("password", mSmtpPassword);
+        Sink::Store::modify(resource).then<void>([](){}, [](int errorCode, const QString &errorMessage) {
+            qWarning() << "Error while modifying resource: " << errorMessage;
+        })
+        .exec();
+    } else {
+        //FIXME we shouldn't have to do this magic
+        const auto resourceIdentifier = "org.kde.mailtransport." + QUuid::createUuid().toByteArray();
+        mMailtransportIdentifier = resourceIdentifier;
+
+        Sink::ApplicationDomain::SinkResource resource;
+        resource.setProperty("identifier", resourceIdentifier);
+        resource.setProperty("type", "org.kde.mailtransport");
+        resource.setProperty("account", mAccountIdentifier);
+        resource.setProperty("server", mSmtpServer);
+        resource.setProperty("username", mSmtpUsername);
+        resource.setProperty("password", mSmtpPassword);
+        Sink::Store::create(resource).then<void>([]() {},
+        [](int errorCode, const QString &errorMessage) {
+            qWarning() << "Error while creating resource: " << errorMessage;
+        })
+        .exec();
+    }
 }
 
 void MaildirSettings::remove()
@@ -140,6 +214,13 @@ void MaildirSettings::remove()
     if (mIdentifier.isEmpty()) {
         qWarning() << "We're missing an identifier";
     } else {
+        Sink::ApplicationDomain::SinkResource mailTransportResource("", mMailtransportIdentifier, 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create());
+        Sink::Store::remove(mailTransportResource).then<void>([]() {},
+        [](int errorCode, const QString &errorMessage) {
+            qWarning() << "Error while removing resource: " << errorMessage;
+        })
+        .exec();
+
         Sink::ApplicationDomain::SinkResource resource("", mIdentifier, 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create());
         Sink::Store::remove(resource).then<void>([]() {},
         [](int errorCode, const QString &errorMessage) {