[Pkg-owncloud-commits] [owncloud-client] 86/164: Do not ask for the password when the check server job times up

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit b43e0f5ebd9117e1416c312e29a0775b18b23583
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Tue Mar 3 08:33:59 2015 +0100

    Do not ask for the password when the check server job times up
    
    QNetworkReply::OperationCanceledError may be both because of anthentication
    error (because the HTTPCredentials abort the reply) or because of a timeout
    (the timer abort the reply). We should only ask for the password if the
    reply was canceled because the password was wrong.
---
 src/libsync/connectionvalidator.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libsync/connectionvalidator.cpp b/src/libsync/connectionvalidator.cpp
index 8cc5345..e586fb3 100644
--- a/src/libsync/connectionvalidator.cpp
+++ b/src/libsync/connectionvalidator.cpp
@@ -140,7 +140,7 @@ void ConnectionValidator::slotAuthFailed(QNetworkReply *reply)
     Status stat = Timeout;
 
     if( reply->error() == QNetworkReply::AuthenticationRequiredError ||
-            reply->error() == QNetworkReply::OperationCanceledError ) { // returned if the user/pwd is wrong.
+             !_account->credentials()->stillValid(reply)) {
         qDebug() <<  reply->error() << reply->errorString();
         qDebug() << "******** Password is wrong!";
         _errors << tr("The provided credentials are not correct");

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git