9 files changed, 230 insertions, 10 deletions

diff --git a/accounts/maildir/maildirsettings.cpp b/accounts/maildir/maildirsettings.cpp
index fa30851c..e47b834f 100644
--- a/accounts/maildir/maildirsettings.cpp
+++ b/accounts/maildir/maildirsettings.cpp
@@ -82,6 +82,18 @@ void MaildirSettings::setAccountIdentifier(const QByteArray &id)
         [](int errorCode, const QString &errorMessage) {
             qWarning() << "Failed to find the maildir resource: " << errorMessage;
         }).exec();
+
+    //FIXME this assumes that we only ever have one identity per account
+    Sink::Store::fetchOne<Sink::ApplicationDomain::Identity>(Sink::Query::PropertyFilter("account", QVariant::fromValue(id)))
+        .then<void, Sink::ApplicationDomain::Identity>([this](const Sink::ApplicationDomain::Identity &identity) {
+            mIdentityIdentifier = identity.identifier();
+            mUsername = identity.getProperty("username").toString();
+            mEmailAddress = identity.getProperty("address").toString();
+            emit identityChanged();
+        },
+        [](int errorCode, const QString &errorMessage) {
+            qWarning() << "Failed to find the identity resource: " << errorMessage;
+        }).exec();
 }
 
 QByteArray MaildirSettings::accountIdentifier() const
@@ -207,6 +219,27 @@ void MaildirSettings::save()
         })
         .exec();
     }
+
+    if (!mIdentityIdentifier.isEmpty()) {
+        Sink::ApplicationDomain::Identity identity(mMailtransportIdentifier);
+        identity.setProperty("username", mUsername);
+        identity.setProperty("address", mEmailAddress);
+        Sink::Store::modify(identity).then<void>([](){}, [](int errorCode, const QString &errorMessage) {
+            qWarning() << "Error while modifying identity: " << errorMessage;
+        })
+        .exec();
+    } else {
+        auto identity = Sink::ApplicationDomain::ApplicationDomainType::createEntity<Sink::ApplicationDomain::Identity>();
+        mIdentityIdentifier = identity.identifier();
+        identity.setProperty("account", mAccountIdentifier);
+        identity.setProperty("username", mUsername);
+        identity.setProperty("address", mEmailAddress);
+        Sink::Store::create(identity).then<void>([]() {},
+        [](int errorCode, const QString &errorMessage) {
+            qWarning() << "Error while creating identity: " << errorMessage;
+        })
+        .exec();
+    }
 }
 
 void MaildirSettings::remove()
diff --git a/accounts/maildir/maildirsettings.h b/accounts/maildir/maildirsettings.h
index be69ffb8..a02944d9 100644
--- a/accounts/maildir/maildirsettings.h
+++ b/accounts/maildir/maildirsettings.h
@@ -29,6 +29,8 @@ class MaildirSettings : public QObject
     Q_PROPERTY(QValidator* pathValidator READ pathValidator CONSTANT)
     Q_PROPERTY(QString icon MEMBER mIcon NOTIFY changed)
     Q_PROPERTY(QString accountName MEMBER mName NOTIFY changed)
+    Q_PROPERTY(QString userName MEMBER mUsername NOTIFY identityChanged)
+    Q_PROPERTY(QString emailAddress MEMBER mEmailAddress NOTIFY identityChanged)
     Q_PROPERTY(QString smtpServer MEMBER mSmtpServer NOTIFY smtpResourceChanged)
     Q_PROPERTY(QValidator* smtpServerValidator READ smtpServerValidator CONSTANT)
     Q_PROPERTY(QString smtpUsername MEMBER mSmtpUsername NOTIFY smtpResourceChanged)
@@ -52,15 +54,19 @@ public:
 signals:
     void pathChanged();
     void smtpResourceChanged();
+    void identityChanged();
     void changed();
 
 private:
     QByteArray mIdentifier;
     QByteArray mAccountIdentifier;
     QByteArray mMailtransportIdentifier;
+    QByteArray mIdentityIdentifier;
     QString mPath;
     QString mIcon;
     QString mName;
+    QString mUsername;
+    QString mEmailAddress;
     QString mSmtpServer;
     QString mSmtpUsername;
     QString mSmtpPassword;
diff --git a/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml b/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml
index e508a475..d9d0741d 100644
--- a/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml
+++ b/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml
@@ -53,6 +53,22 @@ Rectangle {
             onTextChanged: { maildirSettings.accountName = text; }
         }
 
+        Label { text: "User Name" }
+        TextField {
+            placeholderText: "Your Name"
+            Layout.fillWidth: true
+            text: maildirSettings.userName
+            onTextChanged: { maildirSettings.userName = text; }
+        }
+
+        Label { text: "Email Address" }
+        TextField {
+            placeholderText: "Your EMail Address"
+            Layout.fillWidth: true
+            text: maildirSettings.emailAddress
+            onTextChanged: { maildirSettings.emailAddress = text; }
+        }
+
         Text {
             Layout.columnSpan: 2
             Layout.fillWidth: true
diff --git a/accounts/maildir/tests/settingstest.cpp b/accounts/maildir/tests/settingstest.cpp
index 07665c24..1967bcfc 100644
--- a/accounts/maildir/tests/settingstest.cpp
+++ b/accounts/maildir/tests/settingstest.cpp
@@ -26,6 +26,8 @@ private slots:
         auto smtpServer = QString("smtpserver");
         auto smtpUsername = QString("username");
         auto smtpPassword = QString("password");
+        auto username = QString("username");
+        auto emailAddress = QString("emailAddress");
 
         MaildirSettings settings;
         settings.setAccountIdentifier(accountId);
@@ -33,6 +35,8 @@ private slots:
         settings.setProperty("smtpServer", smtpServer);
         settings.setProperty("smtpUsername", smtpUsername);
         settings.setProperty("smtpPassword", smtpPassword);
+        settings.setProperty("username", username);
+        settings.setProperty("emailAddress", emailAddress);
         settings.save();
 
         Sink::Store::fetchAll<Sink::ApplicationDomain::SinkResource>(Sink::Query()).then<void, QList<Sink::ApplicationDomain::SinkResource>>([](const QList<Sink::ApplicationDomain::SinkResource> &resources) {
@@ -46,20 +50,23 @@ private slots:
             QSignalSpy spy(&readSettings, &MaildirSettings::pathChanged);
             QSignalSpy spy1(&readSettings, &MaildirSettings::smtpResourceChanged);
             readSettings.setAccountIdentifier(accountId);
-            QTRY_VERIFY(spy.count());
-            QTRY_VERIFY(spy1.count());
+            //Once for clear and once for once for the new setting
+            QTRY_COMPARE(spy.count(), 2);
+            QTRY_COMPARE(spy1.count(), 2);
             QVERIFY(!readSettings.accountIdentifier().isEmpty());
             QCOMPARE(readSettings.path().toString(), maildirPath);
             QCOMPARE(readSettings.property("smtpServer").toString(), smtpServer);
             QCOMPARE(readSettings.property("smtpUsername").toString(), smtpUsername);
             QCOMPARE(readSettings.property("smtpPassword").toString(), smtpPassword);
+            QCOMPARE(readSettings.property("username").toString(), smtpUsername);
+            QCOMPARE(readSettings.property("emailAddress").toString(), smtpPassword);
         }
 
         {
             MaildirSettings settings;
             QSignalSpy spy(&settings, &MaildirSettings::pathChanged);
             settings.setAccountIdentifier(accountId);
-            QTRY_VERIFY(spy.count());
+            QTRY_COMPARE(spy.count(), 2);
             settings.remove();
         }
 
diff --git a/components/package/contents/ui/Composer.qml b/components/package/contents/ui/Composer.qml
index 99b518b1..8c6f9c77 100644
--- a/components/package/contents/ui/Composer.qml
+++ b/components/package/contents/ui/Composer.qml
@@ -68,7 +68,7 @@ Item {
             ComboBox {
                 id: identityCombo
                 model: composer.identityModel
-                textRole: "name"
+                textRole: "displayName"
 
                 Layout.fillWidth: true
 
diff --git a/framework/domain/CMakeLists.txt b/framework/domain/CMakeLists.txt
index f40463be..b3d47750 100644
--- a/framework/domain/CMakeLists.txt
+++ b/framework/domain/CMakeLists.txt
@@ -15,6 +15,7 @@ set(mailplugin_SRCS
     accountfactory.cpp
     accountscontroller.cpp
     accountsmodel.cpp
+    identitiesmodel.cpp
 )
 add_definitions(-DMAIL_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data")
 
diff --git a/framework/domain/composercontroller.cpp b/framework/domain/composercontroller.cpp
index a383de26..bca90d33 100644
--- a/framework/domain/composercontroller.cpp
+++ b/framework/domain/composercontroller.cpp
@@ -29,6 +29,7 @@
 #include <QQmlEngine>
 
 #include "accountsmodel.h"
+#include "identitiesmodel.h"
 #include "mailtemplates.h"
 
 ComposerController::ComposerController(QObject *parent) : QObject(parent)
@@ -102,9 +103,9 @@ void ComposerController::setBody(const QString &body)
 
 QAbstractItemModel *ComposerController::identityModel() const
 {
-    static auto accountsModel = new AccountsModel();
-    QQmlEngine::setObjectOwnership(accountsModel, QQmlEngine::CppOwnership);
-    return accountsModel;;
+    static auto model = new IdentitiesModel();
+    QQmlEngine::setObjectOwnership(model, QQmlEngine::CppOwnership);
+    return model;
 }
 
 QStringList ComposerController::attachemts() const
@@ -155,8 +156,11 @@ KMime::Message::Ptr ComposerController::assembleMessage()
         KEmailAddress::splitAddress(to.toUtf8(), displayName, addrSpec, comment);
         mail->to(true)->addAddress(addrSpec, displayName);
     }
-    //FIXME set "from" from identity (or do that in the action directly?)
-    // mail->from(true)->addAddress("test@example.com", "John Doe");
+    auto currentIndex = identityModel()->index(m_currentAccountIndex, 0);
+    KMime::Types::Mailbox mb;
+    mb.setName(currentIndex.data(IdentitiesModel::Username).toString());
+    mb.setAddress(currentIndex.data(IdentitiesModel::Address).toString().toUtf8());
+    mail->from(true)->addAddress(mb);
     mail->subject(true)->fromUnicodeString(m_subject, "utf-8");
     mail->setBody(m_body.toUtf8());
     mail->assemble();
@@ -166,7 +170,7 @@ KMime::Message::Ptr ComposerController::assembleMessage()
 void ComposerController::send()
 {
     auto mail = assembleMessage();
-    auto currentAccountId = identityModel()->index(m_currentAccountIndex, 0).data(AccountsModel::AccountId).toByteArray();
+    auto currentAccountId = identityModel()->index(m_currentAccountIndex, 0).data(IdentitiesModel::AccountId).toByteArray();
 
     Kube::Context context;
     context.setProperty("message", QVariant::fromValue(mail));
diff --git a/framework/domain/identitiesmodel.cpp b/framework/domain/identitiesmodel.cpp
new file mode 100644
index 00000000..adb5d625
--- /dev/null
+++ b/framework/domain/identitiesmodel.cpp
@@ -0,0 +1,93 @@
+/*
+    Copyright (c) 2016 Christian Mollekopf <mollekopf@kolabsys.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+#include "identitiesmodel.h"
+#include <sink/store.h>
+
+IdentitiesModel::IdentitiesModel(QObject *parent) : QIdentityProxyModel()
+{
+    Sink::Query query;
+    query.liveQuery = true;
+    query.requestedProperties << "name" << "username" << "address" << "account";
+    runQuery(query);
+}
+
+IdentitiesModel::~IdentitiesModel()
+{
+
+}
+
+QHash< int, QByteArray > IdentitiesModel::roleNames() const
+{
+    QHash<int, QByteArray> roles;
+
+    roles[Name] = "name";
+    roles[Username] = "username";
+    roles[Address] = "address";
+    roles[IdentityId] = "identityId";
+    roles[AccountId] = "accountId";
+    roles[AccountName] = "accountName";
+    roles[AccountIcon] = "accountIcon";
+    roles[DisplayName] = "displayName";
+
+    return roles;
+}
+
+QVariant IdentitiesModel::data(const QModelIndex &idx, int role) const
+{
+    auto srcIdx = mapToSource(idx);
+    switch (role) {
+        case Name:
+            return srcIdx.sibling(srcIdx.row(), 0).data(Qt::DisplayRole).toString();
+        case Username:
+            return srcIdx.sibling(srcIdx.row(), 1).data(Qt::DisplayRole).toString();
+        case Address:
+            return srcIdx.sibling(srcIdx.row(), 2).data(Qt::DisplayRole).toString();
+        case IdentityId:
+            return srcIdx.data(Sink::Store::DomainObjectBaseRole).value<Sink::ApplicationDomain::ApplicationDomainType::Ptr>()->identifier();
+        case AccountId:
+            return srcIdx.data(Sink::Store::DomainObjectBaseRole).value<Sink::ApplicationDomain::ApplicationDomainType::Ptr>()->getProperty("account").toByteArray();
+        case AccountName: {
+            const auto accountId = srcIdx.sibling(srcIdx.row(), 3).data(Qt::DisplayRole).toByteArray();
+            return mAccountNames.value(accountId);
+        }
+        case AccountIcon: {
+            const auto accountId = srcIdx.sibling(srcIdx.row(), 3).data(Qt::DisplayRole).toByteArray();
+            return mAccountIcons.value(accountId);
+        }
+        case DisplayName: {
+            return data(idx, AccountName).toString() + ": " + data(idx, Username).toString() + ", " + data(idx, Address).toString();
+        }
+    }
+    return QIdentityProxyModel::data(idx, role);
+}
+
+void IdentitiesModel::runQuery(const Sink::Query &query)
+{
+    mModel = Sink::Store::loadModel<Sink::ApplicationDomain::Identity>(query);
+    setSourceModel(mModel.data());
+
+    Sink::Store::fetchAll<Sink::ApplicationDomain::SinkAccount>(Sink::Query())
+        .then<void, QList<Sink::ApplicationDomain::SinkAccount::Ptr> >([this](const QList<Sink::ApplicationDomain::SinkAccount::Ptr> &accounts) {
+            for (const auto &account : accounts) {
+                mAccountNames.insert(account->identifier(), account->getProperty("name").toString());
+                mAccountIcons.insert(account->identifier(), account->getProperty("icon").toString());
+            }
+            emit layoutChanged();
+        }).exec();
+}
diff --git a/framework/domain/identitiesmodel.h b/framework/domain/identitiesmodel.h
new file mode 100644
index 00000000..9b172251
--- /dev/null
+++ b/framework/domain/identitiesmodel.h
@@ -0,0 +1,60 @@
+/*
+    Copyright (c) 2016 Christian Mollekopf <mollekopf@kolabsys.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#pragma once
+
+#include <QObject>
+#include <QIdentityProxyModel>
+#include <QSharedPointer>
+#include <QStringList>
+
+namespace Sink {
+    class Query;
+}
+
+class IdentitiesModel : public QIdentityProxyModel
+{
+    Q_OBJECT
+
+public:
+    IdentitiesModel(QObject *parent = Q_NULLPTR);
+    ~IdentitiesModel();
+
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+
+    enum Roles {
+        Name  = Qt::UserRole + 1,
+        Username,
+        Address,
+        IdentityId,
+        AccountId,
+        AccountName,
+        AccountIcon,
+        DisplayName
+    };
+    Q_ENUMS(Roles)
+
+    QHash<int, QByteArray> roleNames() const;
+
+private:
+    void runQuery(const Sink::Query &query);
+    QSharedPointer<QAbstractItemModel> mModel;
+    QHash <QByteArray, QString> mAccountNames;
+    QHash <QByteArray, QString> mAccountIcons;
+};