From: Christian Kamm <kamm@incasoftware.de>
Date: Wed, 25 Mar 2015 12:27:40 +0000 (+0100)
Subject: HttpCreds: Fill pw dialog with previous password. #2848 #2879
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~1890^2~10
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3cef771868ee94d3b0f5b0575d1c3c4d3b32d394;p=nextcloud-desktop.git

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

diff --git a/src/libsync/creds/httpcredentials.cpp b/src/libsync/creds/httpcredentials.cpp
index 92ef22787..2d5569d7d 100644
--- 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 9f60f3b62..f0fb4b45c 100644
--- 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;