From 79bb991a61eb6d40f214b2b67e22b366189dd9c5 Mon Sep 17 00:00:00 2001
From: varjolintu <sami.vanttinen@protonmail.com>
Date: Fri, 12 Jul 2019 09:16:24 +0300
Subject: [PATCH] Disable remember checkbox with Basic HTTP Auth

---
 src/browser/BrowserAccessControlDialog.cpp | 5 +++++
 src/browser/BrowserAccessControlDialog.h   | 1 +
 src/browser/BrowserService.cpp             | 6 ++++--
 src/browser/BrowserService.h               | 3 ++-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/browser/BrowserAccessControlDialog.cpp b/src/browser/BrowserAccessControlDialog.cpp
index 9a10e555..2571610e 100644
--- a/src/browser/BrowserAccessControlDialog.cpp
+++ b/src/browser/BrowserAccessControlDialog.cpp
@@ -59,3 +59,8 @@ void BrowserAccessControlDialog::setRemember(bool r)
 {
     m_ui->rememberDecisionCheckBox->setChecked(r);
 }
+
+void BrowserAccessControlDialog::setHTTPAuth(bool httpAuth)
+{
+    m_ui->rememberDecisionCheckBox->setVisible(!httpAuth);
+}
diff --git a/src/browser/BrowserAccessControlDialog.h b/src/browser/BrowserAccessControlDialog.h
index 4c93a54f..79aba9c4 100644
--- a/src/browser/BrowserAccessControlDialog.h
+++ b/src/browser/BrowserAccessControlDialog.h
@@ -41,6 +41,7 @@ public:
     void setItems(const QList<Entry*>& items);
     bool remember() const;
     void setRemember(bool r);
+    void setHTTPAuth(bool httpAuth);
 
 private:
     QScopedPointer<Ui::BrowserAccessControlDialog> m_ui;
diff --git a/src/browser/BrowserService.cpp b/src/browser/BrowserService.cpp
index eb88b5c1..990b5312 100644
--- a/src/browser/BrowserService.cpp
+++ b/src/browser/BrowserService.cpp
@@ -400,7 +400,7 @@ QJsonArray BrowserService::findMatchingEntries(const QString& id,
     }
 
     // Confirm entries
-    if (confirmEntries(pwEntriesToConfirm, url, host, submitHost, realm)) {
+    if (confirmEntries(pwEntriesToConfirm, url, host, submitHost, realm, httpAuth)) {
         pwEntries.append(pwEntriesToConfirm);
     }
 
@@ -764,7 +764,8 @@ bool BrowserService::confirmEntries(QList<Entry*>& pwEntriesToConfirm,
                                     const QString& url,
                                     const QString& host,
                                     const QString& submitHost,
-                                    const QString& realm)
+                                    const QString& realm,
+                                    const bool httpAuth)
 {
     if (pwEntriesToConfirm.isEmpty() || m_dialogActive) {
         return false;
@@ -775,6 +776,7 @@ bool BrowserService::confirmEntries(QList<Entry*>& pwEntriesToConfirm,
     connect(m_dbTabWidget, SIGNAL(databaseLocked(DatabaseWidget*)), &accessControlDialog, SLOT(reject()));
     accessControlDialog.setUrl(url);
     accessControlDialog.setItems(pwEntriesToConfirm);
+    accessControlDialog.setHTTPAuth(httpAuth);
 
     raiseWindow();
     accessControlDialog.show();
diff --git a/src/browser/BrowserService.h b/src/browser/BrowserService.h
index a64cc733..d6f14f8e 100644
--- a/src/browser/BrowserService.h
+++ b/src/browser/BrowserService.h
@@ -118,7 +118,8 @@ private:
                         const QString& url,
                         const QString& host,
                         const QString& submitHost,
-                        const QString& realm);
+                        const QString& realm,
+                        const bool httpAuth);
     QJsonObject prepareEntry(const Entry* entry);
     Access checkAccess(const Entry* entry, const QString& host, const QString& submitHost, const QString& realm);
     Group* getDefaultEntryGroup(const QSharedPointer<Database>& selectedDb = {});