Merge lp:~radonapps/dekko/master into lp:~dpniel/dekko/trunk2

[Daniyaal Rasheed]

Implemented prompt to check settings on connection & authentication errors

Implements prompt to check settings on connection & authentication errors

This patch implements a prompt that will pop up whenever an error occurs
while trying to send an email. The prompt will both allow you to check your
settings in order to locate the source of the error, and it will allow you
to try sending the email again.

fixes: bug 1441505

[Dan Chapman  (dpniel)]

Hey, sorry for the slow response.

So I have left a couple of comments inline that need addressing.

Not quite sure how you ended up with a bzr branch, out of curiosity did you find the git UI hard to navigate? Anyway i'll export this patch to git when it's complete so just carry on with bzr for now.

Hope you had a great xmas.

review: Needs Fixing

[lp:~radonapps/dekko/master]

578. By Daniyaal Rasheed on 2015-12-28

password dialog now waits for the password to be stored before closing.

[Dan Chapman  (dpniel)]

Looking good. Just one small fixup needed :-)

[lp:~radonapps/dekko/master]

579. By Daniyaal Rasheed on 2015-12-29

Closing Password Dialog will no longer close the imap connection/authentication process

[Dan Chapman  (dpniel)]

LGTM!

I'll export this and apply it to the git branch this afternoon.

Thanks alot for you contribution, i'll update your task now.

review: Approve

Unmerged revisions

579. By Daniyaal Rasheed on 2015-12-29

Closing Password Dialog will no longer close the imap connection/authentication process

578. By Daniyaal Rasheed on 2015-12-28

password dialog now waits for the password to be stored before closing.

577. By Daniyaal Rasheed on 2015-12-24

Implements prompt to check settings on connection & authentication errors

This patch implements a prompt that will pop up whenever an error occurs
while trying to send an email. The prompt will both allow you to check your
settings in order to locate the source of the error, and it will allow you
to try sending the email again.

fixes: bug 1441505

=== modified file 'qml/Composer/MessageComposer.qml'
--- qml/Composer/MessageComposer.qml	2015-11-17 16:07:05 +0000
+++ qml/Composer/MessageComposer.qml	2015-12-29 14:23:35 +0000
@@ -288,6 +288,15 @@
                         }
                         );
     }
+    function compositionFailed(msg) {
+        PopupUtils.open(Qt.resolvedUrl("../Dialogs/PasswordDialog.qml"), dekko, {
+                            type: "smtp",
+                            accountId: getSenderAccount().accountId,
+                            authErrorMessage: msg,
+                            onRetryBtnClicked: sendEmail()
+                        }
+                        );
+    }
 
     function getSenderAccount() {
         return dekko.accountsManager.getFromId(
@@ -561,6 +570,7 @@
 
     Component.onCompleted: {
         submissionManager.messageBuildFailed.connect(buildingFailed)
+        submissionManager.failed.connect(compositionFailed)
         submissionManager.passwordRequested.connect(function (user, host) {
             dekko.submissionManager = submissionManager;
             passwordManager.requestPassword(getSenderAccount().accountId, PasswordManager.SMTP);

=== modified file 'qml/Dialogs/PasswordDialog.qml'
--- qml/Dialogs/PasswordDialog.qml	2015-11-17 16:07:05 +0000
+++ qml/Dialogs/PasswordDialog.qml	2015-12-29 14:23:35 +0000
@@ -23,10 +23,10 @@
 
 DialogBase {
     id: passwordDialog
-
     property string type
     property string accountId
     property alias authErrorMessage: authErrorMessage.text
+    signal retryBtnClicked()
 
     readonly property string username: type === "imap" ? imapSettings.username : smtpSettings.username
 
@@ -87,16 +87,24 @@
             anchors.right: parent.right
             spacing: units.gu(1)
             Button {
-                text: qsTr("Cancel")
+                text: qsTr("View Settings")
                 color: UbuntuColors.red
                 width: parent.width / 2 - units.gu(0.5)
-                onClicked: closeConnection.trigger()
+                onClicked: {
+                    closeConnection.trigger()
+                    rootPageStack.push(Qt.resolvedUrl("../Settings/global/GlobalSettingsListView.qml"));
+                }
             }
             Button {
-                text: qsTr("Confirm")
+                id: retryBtn
+                text: qsTr("Retry")
                 color: UbuntuColors.green
                 width: parent.width / 2 - units.gu(0.5)
-                onClicked: setPwdAction.trigger()
+                property bool wantsToRetry: false
+                onClicked: {
+                    wantsToRetry = true
+                    setPwdAction.trigger()
+                }
             }
         }
     ]
@@ -114,5 +122,13 @@
         id: passwordManager
         accountId: passwordDialog.accountId
         type: passwordDialog.type === "imap" ? PasswordManager.IMAP : PasswordManager.SMTP
+        onPasswordStored: {
+            if (id === accountId) {
+                if (retryBtn.wantsToRetry)
+                    retryBtnClicked()
+                if (type === "smtp")
+                    closeConnection.trigger()
+            }
+        }
     }
 }