Merge ~radonapps/dekko:fix-1341547 into dekko:master

[Daniyaal Rasheed]

Implemented a Reply-To field as part of an Identity

This patch implements the skeleton required for future use of a reply-to
email by adding the GUI necessary for a user to configure their reply-to
email address.

fixes: bug 1341547

[Daniyaal Rasheed (radonapps)]

Both NotificationWorker classes are not supposed to be there, when I pulled in the new code it apparently made changes to this file, which I blindly staged because everything above it was right. I don't how I can "uncommit" this but still have the changes I've made to all the other files inside my local repository.

[Dan Chapman  (dpniel)]

Good start. See comments inline

review: Needs Fixing

[Dan Chapman  (dpniel)]

Looks good to me. Nice job

I'll get this new field added to the message headers in the next couple of days while i finish off this smtp owrk.

Thanks again!

review: Approve

Unmerged commits

240d960... by Daniyaal Rasheed on 2016-01-04

Fixed invalid email popup's title and message.

6f6affa... by Daniyaal Rasheed on 2016-01-03

Implemented a Reply-To field as part of an Identity

This patch implements the skeleton required for future use of a reply-to
email by adding the GUI necessary for a user to configure their reply-to
email address.

fixes: bug 1341547

d498ade... by Daniyaal Rasheed on 2016-01-01

Merge branch 'fix-1522549'

diff --git a/qml/Settings/user/NewIdentityPage.qml b/qml/Settings/user/NewIdentityPage.qml
index 9d51aea..990e7a7 100644
--- a/qml/Settings/user/NewIdentityPage.qml
+++ b/qml/Settings/user/NewIdentityPage.qml
@@ -1,5 +1,6 @@
 import QtQuick 2.4
 import Ubuntu.Components 1.2
+import Ubuntu.Components.Popups 1.0
 import DekkoCore 0.2
 import "../../Components"
 
@@ -14,11 +15,24 @@ Page {
         if (edit) {
             input.nameField = identity.name
             input.emailField = identity.email
+            input.replyToField = identity.replyTo
             input.organizationField = identity.organization
             input.signatureField = identity.signature
         }
     }
 
+    function validateAddress(address) {
+        if (address && !EmailValidator.validate(address)) {
+            var msg = qsTr("%1 is not a valid email address").arg(address)
+            PopupUtils.open(Qt.resolvedUrl("../../Dialogs/InfoDialog.qml"), dekko, {
+                                title: qsTr("Invaid address"),
+                                text: msg
+                            })
+            return false
+        }
+        return true
+    }
+
     DekkoHeader {
         id: header
         title: edit ? qsTr("Edit identity") : qsTr("New identity")
@@ -30,16 +44,19 @@ Page {
             id: saveAction
             iconName: "ok"
             onTriggered: {
-                if (edit) {
-                    identity.name = input.nameField
-                    identity.email = input.emailField
-                    identity.organization = input.organizationField
-                    identity.signature = input.signatureField
-                } else {
-                    model.appendRow(newIdentity)
+                if (validateAddress(input.emailField) && validateAddress(input.replyToField)) {
+                    if (edit) {
+                        identity.name = input.nameField
+                        identity.email = input.emailField
+                        identity.replyTo = input.replyToField
+                        identity.organization = input.organizationField
+                        identity.signature = input.signatureField
+                    } else {
+                        model.appendRow(newIdentity)
+                    }
+                    closing()
+                    rootPageStack.pop()
                 }
-                closing()
-                rootPageStack.pop()
             }
         }
     }
@@ -52,9 +69,9 @@ Page {
         id: newIdentity
         name: input.nameField
         email: input.emailField
+        replyTo: input.replyToField
         organization: input.organizationField
         signature: input.signatureField
-
     }
     Flickable {
         anchors {
diff --git a/qml/Settings/user/SenderIdentityInput.qml b/qml/Settings/user/SenderIdentityInput.qml
index 6818ac5..e92cf7a 100644
--- a/qml/Settings/user/SenderIdentityInput.qml
+++ b/qml/Settings/user/SenderIdentityInput.qml
@@ -27,6 +27,7 @@ Column {
 
     property alias nameField: nameField.text
     property alias emailField: emailField.text
+    property alias replyToField: replyToField.text
     property alias organizationField: organizationField.text
     property alias signatureField: signatureField.text
     property alias signatureFieldVisible: signatureField.visible
@@ -61,6 +62,14 @@ Column {
         inputMethodHints: Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText | Qt.ImhEmailCharactersOnly
         sendTabEventOnEnter: true
         KeyNavigation.priority: KeyNavigation.BeforeItem
+        KeyNavigation.tab: replyToField.textFieldFocusHandle
+    }
+    TitledTextField {
+        id: replyToField
+        title: qsTr("Reply-To")
+        inputMethodHints: Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText | Qt.ImhEmailCharactersOnly
+        sendTabEventOnEnter: true
+        KeyNavigation.priority: KeyNavigation.BeforeItem
         KeyNavigation.tab: organizationField.textFieldFocusHandle
     }
     TitledTextField {
diff --git a/qml/SetupWizard/IdentityInput.qml b/qml/SetupWizard/IdentityInput.qml
index 4809ca2..f7ad072 100644
--- a/qml/SetupWizard/IdentityInput.qml
+++ b/qml/SetupWizard/IdentityInput.qml
@@ -32,6 +32,7 @@ Item {
     property alias name: input.nameField
     property alias email: input.emailField
     property alias organization: input.organizationField
+    property alias replyTo: input.replyToField
 
     DekkoHeader {
         id: header
@@ -50,6 +51,18 @@ Item {
         }
     }
 
+    function validateAddress(address) {
+        if (address && !EmailValidator.validate(address)) {
+            var msg = qsTr("%1 is not a valid email address").arg(address)
+            PopupUtils.open(Qt.resolvedUrl("../../Dialogs/InfoDialog.qml"), dekko, {
+                                title: qsTr("Invaid address"),
+                                text: msg
+                            })
+            return false
+        }
+        return true
+    }
+
     Action {
         id: nextAction
         iconName: "next"
@@ -58,8 +71,7 @@ Item {
                 input.showMissingFields = true
                 return
             }
-            if (!EmailValidator.validate(email)) {
-                PopupUtils.open(Qt.resolvedUrl("../Dialogs/InfoDialog.qml"), wizard, {title: qsTr("Invalid address"), text: qsTr("%1 is not a valid email address").arg(email)})
+            if (!validateAddress(email) || !validateAddress(replyTo)) {
                 return
             }
             inputComplete()
@@ -80,6 +92,7 @@ Item {
             nameField: wizard.identity.name
             emailField: EmailValidator.validate(wizard.account.smtpSettings.username) ? wizard.account.smtpSettings.username : wizard.identity.email
             organizationField: wizard.identity.organization
+            replyToField: wizard.identity.replyTo
         }
     }
 }
diff --git a/qml/SetupWizard/ManualSetup.qml b/qml/SetupWizard/ManualSetup.qml
index 5da64b9..2393723 100644
--- a/qml/SetupWizard/ManualSetup.qml
+++ b/qml/SetupWizard/ManualSetup.qml
@@ -41,6 +41,7 @@ Column {
     property alias smtpPort: smtpPortField.text
     function parsedSmtpPort(){ return parseInt(smtpPortField.text)}
     property alias smtpUsername: smtpEmailField.text
+    property alias smtpReplyTo: smtpReplyToField.text
     property alias smtpPassword: smtpPasswordField.text
     readonly property bool isImap: serverInput.state === "imap"
     readonly property bool isSmtp: serverInput.state === "smtp"
@@ -219,6 +220,16 @@ Column {
         sendTabEventOnEnter: true
         requiredField: internal.invalidFields
         KeyNavigation.priority: KeyNavigation.BeforeItem
+        KeyNavigation.tab: smtpReplyToField.textFieldFocusHandle
+    }
+
+    TitledTextField {
+        id: smtpReplyToField
+        title: qsTr("Reply-To")
+        visible: !isImap
+        inputMethodHints: Qt.ImhNoAutoUppercase | Qt.ImhEmailCharactersOnly | Qt.ImhNoPredictiveText
+        sendTabEventOnEnter: true
+        KeyNavigation.priority: KeyNavigation.BeforeItem
         KeyNavigation.tab: smtpPasswordField.textFieldFocusHandle
     }
 
diff --git a/qml/SetupWizard/SetupWizard.qml b/qml/SetupWizard/SetupWizard.qml
index 8925a7b..af07c85 100644
--- a/qml/SetupWizard/SetupWizard.qml
+++ b/qml/SetupWizard/SetupWizard.qml
@@ -80,6 +80,10 @@ Item {
             when: identityInput.active
             value: loader.item.organization
         }
+        Binding on replyTo {
+            when: identityInput.active
+            value: loader.item.replyTo
+        }
     }
 
     // For now let's just create seperate ones
diff --git a/src/3rdParty/trojita/Common/SettingsNames.cpp b/src/3rdParty/trojita/Common/SettingsNames.cpp
index 8b803bc..ce7286b 100644
--- a/src/3rdParty/trojita/Common/SettingsNames.cpp
+++ b/src/3rdParty/trojita/Common/SettingsNames.cpp
@@ -29,6 +29,7 @@ const QString SettingsNames::realNameKey = QLatin1String("realName");
 const QString SettingsNames::addressKey = QLatin1String("address");
 const QString SettingsNames::organisationKey = QLatin1String("organisation");
 const QString SettingsNames::signatureKey = QLatin1String("signature");
+const QString SettingsNames::replyToKey = QLatin1String("replyTo");
 const QString SettingsNames::obsRealNameKey = QLatin1String("identity.realName");
 const QString SettingsNames::obsAddressKey = QLatin1String("identity.address");
 const QString SettingsNames::msaMethodKey = QLatin1String("msa.method");
diff --git a/src/3rdParty/trojita/Common/SettingsNames.h b/src/3rdParty/trojita/Common/SettingsNames.h
index 1a47a70..7a52e40 100644
--- a/src/3rdParty/trojita/Common/SettingsNames.h
+++ b/src/3rdParty/trojita/Common/SettingsNames.h
@@ -28,7 +28,7 @@ namespace Common
 {
 
 struct SettingsNames {
-    static const QString identitiesKey, realNameKey, addressKey, organisationKey, signatureKey, obsRealNameKey, obsAddressKey;
+    static const QString identitiesKey, realNameKey, addressKey, organisationKey, signatureKey, replyToKey, obsRealNameKey, obsAddressKey;
     static const QString msaMethodKey, methodSMTP, methodSSMTP, methodSENDMAIL, methodImapSendmail, smtpHostKey,
            smtpPortKey, smtpAuthKey, smtpStartTlsKey, smtpUserKey,
            sendmailKey, sendmailDefaultCmd;
diff --git a/src/app/Accounts/SenderIdentity.cpp b/src/app/Accounts/SenderIdentity.cpp
index aa293ac..0a98a82 100644
--- a/src/app/Accounts/SenderIdentity.cpp
+++ b/src/app/Accounts/SenderIdentity.cpp
@@ -85,6 +85,20 @@ void SenderIdentity::setSignature(const QString &signature)
     emit dataChanged();
 }
 
+QString SenderIdentity::replyTo() const
+{
+    return m_replyTo;
+}
+
+void SenderIdentity::setReplyTo(const QString &replyTo)
+{
+    if (replyTo == m_replyTo) {
+        return;
+    }
+    m_replyTo = replyTo;
+    emit dataChanged();
+}
+
 QString SenderIdentity::getDefaultSignature() const
 {
     return QString(tr("Sent using Dekko from my Ubuntu device"));
diff --git a/src/app/Accounts/SenderIdentity.h b/src/app/Accounts/SenderIdentity.h
index 0b814e0..a3ce49c 100644
--- a/src/app/Accounts/SenderIdentity.h
+++ b/src/app/Accounts/SenderIdentity.h
@@ -38,6 +38,7 @@ class SenderIdentity : public QObject
     Q_PROPERTY(QString email READ email WRITE setEmail NOTIFY dataChanged)
     Q_PROPERTY(QString organization READ organization WRITE setOrganization NOTIFY dataChanged)
     Q_PROPERTY(QString signature READ signature WRITE setSignature NOTIFY dataChanged)
+    Q_PROPERTY(QString replyTo READ replyTo WRITE setReplyTo NOTIFY dataChanged)
     Q_PROPERTY(bool useDefaultSignature READ useDefaultSignature WRITE setUseDefaultSignature NOTIFY dataChanged)
 public:
     /*!
@@ -113,6 +114,20 @@ public:
     /*!
      \brief
 
+     \fn replyTo
+     \return QString
+    */
+    QString replyTo() const;
+    /*!
+     \breif
+
+     \fn setReplyTo
+     \param replyTo
+    */
+    void setReplyTo(const QString &replyTo);
+    /*!
+     \brief
+
      \fn useDefaultSignature
      \return bool
     */
@@ -146,6 +161,7 @@ private:
     QString m_email; /*!< TODO */
     QString m_organization; /*!< TODO */
     QString m_signature; /*!< TODO */
+    QString m_replyTo;
     bool m_useDefaultSignature; /*!< TODO */
 
     /*!
diff --git a/src/app/Accounts/SenderIdentityModel.cpp b/src/app/Accounts/SenderIdentityModel.cpp
index 5dbfae4..7e4bcc8 100644
--- a/src/app/Accounts/SenderIdentityModel.cpp
+++ b/src/app/Accounts/SenderIdentityModel.cpp
@@ -56,6 +56,7 @@ void SenderIdentityModel::reloadIdentities()
         identity->setOrganization(settings.value(Common::SettingsNames::organisationKey).toString());
         identity->setUseDefaultSignature(settings.value("useDefaultSignature", true).toBool());
         identity->setSignature(settings.value(Common::SettingsNames::signatureKey).toString());
+        identity->setReplyTo(settings.value(Common::SettingsNames::replyToKey).toString());
         appendRow(identity);
     }
     settings.endArray();
@@ -75,6 +76,7 @@ void SenderIdentityModel::saveIdentites()
         settings.setValue(Common::SettingsNames::organisationKey, m_identities[i]->organization());
         settings.setValue("useDefaultSignature", m_identities[i]->useDefaultSignature());
         settings.setValue(Common::SettingsNames::signatureKey, m_identities[i]->signature());
+        settings.setValue(Common::SettingsNames::replyToKey, m_identities[i]->replyTo());
     }
     settings.endArray();
     settings.endGroup();
@@ -87,6 +89,7 @@ QHash<int, QByteArray> SenderIdentityModel::roleNames() const
     roles[IdentityEmailRole] = "email";
     roles[IdentityOrganizationRole] = "organization";
     roles[IdentitySignatureRole] = "signature";
+    roles[IdentityReplyToRole] = "replyTo";
     roles[IdentityRecipientStringRole] = "formattedString";
     roles[IdentityUseDefaultSignature] = "useDefaultSignature";
     return roles;
@@ -106,6 +109,8 @@ QVariant SenderIdentityModel::data(const QModelIndex &index, int role) const
         return m_identities[index.row()]->organization();
     case IdentitySignatureRole:
         return m_identities[index.row()]->signature();
+    case IdentityReplyToRole:
+        return m_identities[index.row()]->replyTo();
     case IdentityUseDefaultSignature:
         return m_identities[index.row()]->useDefaultSignature();
     case IdentityRecipientStringRole:
@@ -173,6 +178,7 @@ QVariant SenderIdentityModel::get(int index)
     identityData.insert(QString("email"), identity->email());
     identityData.insert(QString("organization"), identity->organization());
     identityData.insert(QString("signature"), identity->signature());
+    identityData.insert(QString("replyTo"), identity->replyTo());
     identityData.insert(QString("formattedString"), identity->toFormattedString());
     identityData.insert(QString("useDefaultSignature"), identity->useDefaultSignature());
     return identityData;
@@ -202,6 +208,9 @@ bool SenderIdentityModel::setData(const QModelIndex &index, const QVariant &valu
     case IdentitySignatureRole:
         m_identities[index.row()]->setSignature(value.toString());
         break;
+    case IdentityReplyToRole:
+        m_identities[index.row()]->setReplyTo(value.toString());
+        break;
     case IdentityUseDefaultSignature:
         m_identities[index.row()]->setUseDefaultSignature(value.toBool());
         break;
diff --git a/src/app/Accounts/SenderIdentityModel.h b/src/app/Accounts/SenderIdentityModel.h
index 08544f8..dbaaf5e 100644
--- a/src/app/Accounts/SenderIdentityModel.h
+++ b/src/app/Accounts/SenderIdentityModel.h
@@ -63,6 +63,7 @@ public:
         IdentityEmailRole,
         IdentityOrganizationRole,
         IdentitySignatureRole,
+        IdentityReplyToRole,
         IdentityUseDefaultSignature,
         IdentityRecipientStringRole
     };
diff --git a/src/app/Settings/SettingsNames.cpp b/src/app/Settings/SettingsNames.cpp
index f457612..720c66a 100644
--- a/src/app/Settings/SettingsNames.cpp
+++ b/src/app/Settings/SettingsNames.cpp
@@ -7,6 +7,7 @@ const QString SettingsNames::realNameKey = QLatin1String("realName");
 const QString SettingsNames::addressKey = QLatin1String("address");
 const QString SettingsNames::organisationKey = QLatin1String("organisation");
 const QString SettingsNames::signatureKey = QLatin1String("signature");
+const QString SettingsNames::replyToKey = QLatin1String("replyTo");
 const QString SettingsNames::obsRealNameKey = QLatin1String("identity.realName");
 const QString SettingsNames::obsAddressKey = QLatin1String("identity.address");
 const QString SettingsNames::msaMethodKey = QLatin1String("msa.method");
diff --git a/src/app/Settings/SettingsNames.h b/src/app/Settings/SettingsNames.h
index 28f4260..12ed3e0 100644
--- a/src/app/Settings/SettingsNames.h
+++ b/src/app/Settings/SettingsNames.h
@@ -6,7 +6,7 @@
 namespace Dekko {
 
 struct SettingsNames {
-    static const QString identitiesKey, realNameKey, addressKey, organisationKey, signatureKey, obsRealNameKey, obsAddressKey;
+    static const QString identitiesKey, realNameKey, addressKey, organisationKey, signatureKey, replyToKey, obsRealNameKey, obsAddressKey;
     static const QString msaMethodKey, methodSMTP, methodSSMTP, methodSENDMAIL, methodImapSendmail, smtpHostKey,
            smtpPortKey, smtpAuthKey, smtpStartTlsKey, smtpUserKey, smtpAuthType,
            sendmailKey, sendmailDefaultCmd;