HttpCreds: Fill pw dialog with previous password. #2848 #2879

diff --git a/src/libsync/creds/httpcredentials.cpp b/src/libsync/creds/httpcredentials.cpp
index 92ef2278784bdf9c17cfd79e27e622e3bc265785..2d5569d7d17e9136adbe0419cf85b15024bba046 100644 (file)
--- a/src/libsync/creds/httpcredentials.cpp
+++ b/src/libsync/creds/httpcredentials.cpp
@@ -313,6 +313,9 @@ void HttpCredentials::slotReadJobDone(QKeychain::Job *job)
 
 void HttpCredentials::invalidateToken()
 {
+    if (! _password.isEmpty()) {
+        _previousPassword = _password;
+    }
     _password = QString();
     _ready = false;
 
@@ -387,7 +390,7 @@ QString HttpCredentialsGui::queryPassword(bool *ok)
         QString str = QInputDialog::getText(0, tr("Enter Password"),
                                      tr("Please enter %1 password for user '%2':")
                                      .arg(Theme::instance()->appNameGUI(), _user),
-                                     QLineEdit::Password, QString(), ok);
+                                     QLineEdit::Password, _previousPassword, ok);
         return str;
     } else {
         return QString();

diff --git a/src/libsync/creds/httpcredentials.h b/src/libsync/creds/httpcredentials.h
index 9f60f3b626d5056fb2ede24b3025e1980d2f5474..f0fb4b45c30f4f5c5926df3e3d2a922bba066a5e 100644 (file)
--- a/src/libsync/creds/httpcredentials.h
+++ b/src/libsync/creds/httpcredentials.h
@@ -64,6 +64,7 @@ private Q_SLOTS:
 protected:
     QString _user;
     QString _password;
+    QString _previousPassword;
 
 private:
     QString _certificatePath;