Merge lp:~mikemc/ubuntuone-credentials/user-friendly-errors into lp:ubuntuone-credentials

[Mike McCracken]

- Provide general user-friendly error message for network errors. (LP: #1233951)

- Provide general user-friendly error message for network errors. (LP: #1233951)

You can test this on the desktop or device if you build and install, then run system-settings and try to create a u1 account with networking turned off.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:67
http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-ci/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-saucy-amd64-manual/6

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntuone-credentials-ci/8/rebuild

review: Approve (continuous-integration)

[dobey (dobey)]

review: Approve

=== modified file 'libubuntuoneauth/errormessages.h'
--- libubuntuoneauth/errormessages.h	2013-06-14 22:30:19 +0000
+++ libubuntuoneauth/errormessages.h	2013-10-03 23:17:33 +0000
@@ -1,6 +1,9 @@
 #ifndef ERROR_MESSAGES_H
 #define ERROR_MESSAGES_H
 
+
+#define NO_HTTP_REASON "No HTTP error reason"
+
 #define LOGIN_FAILED "LOGIN_FAILED"
 #define CAPTCHA_REQUIRED "CAPTCHA_REQUIRED"
 #define INVALID_CREDENTIALS "INVALID_CREDENTIALS"
@@ -11,7 +14,6 @@
 #define CAN_NOT_RESET_PASSWORD "CAN_NOT_RESET_PASSWORD"
 #define ALREADY_REGISTERED "ALREADY_REGISTERED"
 
-
 enum ErrorCodes
 {
   CODE_LOGIN_FAILED = 0,

=== modified file 'libubuntuoneauth/network.cpp'
--- libubuntuoneauth/network.cpp	2013-07-23 15:47:07 +0000
+++ libubuntuoneauth/network.cpp	2013-10-03 23:17:33 +0000
@@ -28,8 +28,6 @@
 #include "responses.h"
 #include "requests.h"
 
-#define NO_HTTP_REASON QString("No HTTP error reason")
-
 namespace UbuntuOne {
 
 Network::Network(QObject *parent)

=== modified file 'libubuntuoneauth/responses.h'
--- libubuntuoneauth/responses.h	2013-06-14 22:39:59 +0000
+++ libubuntuoneauth/responses.h	2013-10-03 23:17:33 +0000
@@ -131,4 +131,4 @@
 
 } /* end UbuntuOne namespace */
 
-#endif /* _REQUESTS_H_ */
+#endif /* _RESPONSES_H_ */

=== modified file 'qml-credentials-service/ubuntuone_credentials_service.cpp'
--- qml-credentials-service/ubuntuone_credentials_service.cpp	2013-08-26 18:42:47 +0000
+++ qml-credentials-service/ubuntuone_credentials_service.cpp	2013-10-03 23:17:33 +0000
@@ -1,4 +1,5 @@
 #include "ubuntuone_credentials_service.h"
+#include "errormessages.h"
 #include <QDebug>
 
 UbuntuOneCredentialsService::UbuntuOneCredentialsService(QQuickItem *parent):
@@ -153,5 +154,9 @@
 void UbuntuOneCredentialsService::handleError(const ErrorResponse& error)
 {
     _state = IDLE;
-    emit loginOrRegisterError(error.message());
+    if (error.httpStatus() == 0 || error.httpReason() == NO_HTTP_REASON) {
+        emit loginOrRegisterError("Network error - please retry.");
+    } else {
+        emit loginOrRegisterError(error.message());
+    }
 }