From 7f97270d2f6a5e8baf24f9080914ec2b7ecb61eb Mon Sep 17 00:00:00 2001
From: varjolintu <sami.vanttinen@protonmail.com>
Date: Thu, 16 Apr 2020 17:02:41 +0300
Subject: [PATCH] Ignore banner on tab change

---
 keepassxc-browser/background/event.js | 8 ++++++--
 keepassxc-browser/background/page.js  | 3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/keepassxc-browser/background/event.js b/keepassxc-browser/background/event.js
index 1d067f7..5b1e2f8 100755
--- a/keepassxc-browser/background/event.js
+++ b/keepassxc-browser/background/event.js
@@ -214,13 +214,17 @@ kpxcEvent.pageClearSubmitted = function() {
     return Promise.resolve();
 };
 
-kpxcEvent.pageGetSubmitted = async function() {
+kpxcEvent.pageGetSubmitted = async function(tab) {
+    // Do not return any credentials if the tab ID does not match.
+    if (tab.id !== page.submittedCredentials.tabId) {
+        return {};
+    }
     return page.submittedCredentials;
 };
 
 kpxcEvent.pageSetSubmitted = function(tab, args = []) {
     const [ submitted, username, password, url, oldCredentials ] = args;
-    page.setSubmittedCredentials(submitted, username, password, url, oldCredentials);
+    page.setSubmittedCredentials(submitted, username, password, url, oldCredentials, tab.id);
     return Promise.resolve();
 };
 
diff --git a/keepassxc-browser/background/page.js b/keepassxc-browser/background/page.js
index 516ee39..d75af94 100755
--- a/keepassxc-browser/background/page.js
+++ b/keepassxc-browser/background/page.js
@@ -180,12 +180,13 @@ page.clearLogins = function(tabId) {
     page.passwordFilled = false;
 };
 
-page.setSubmittedCredentials = function(submitted, username, password, url, oldCredentials) {
+page.setSubmittedCredentials = function(submitted, username, password, url, oldCredentials, tabId) {
     page.submittedCredentials.submitted = submitted;
     page.submittedCredentials.username = username;
     page.submittedCredentials.password = password;
     page.submittedCredentials.url = url;
     page.submittedCredentials.oldCredentials = oldCredentials;
+    page.submittedCredentials.tabId = tabId;
 };
 
 page.clearSubmittedCredentials = function() {