From 541aa82c0cfb6815c205a9ff469454061449d979 Mon Sep 17 00:00:00 2001
From: varjolintu <sami.vanttinen@ahmala.org>
Date: Tue, 8 Aug 2023 09:38:46 +0300
Subject: [PATCH] More recent changes

---
 keepassxc-browser/background/browserAction.js | 2 ++
 keepassxc-browser/background/event.js         | 3 ++-
 keepassxc-browser/background/page.js          | 4 ++++
 keepassxc-browser/options/options.js          | 1 +
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/keepassxc-browser/background/browserAction.js b/keepassxc-browser/background/browserAction.js
index d724eaa..a3b37ee 100755
--- a/keepassxc-browser/background/browserAction.js
+++ b/keepassxc-browser/background/browserAction.js
@@ -30,6 +30,8 @@ browserAction.showDefault = async function(tab) {
 
     if (!response && !keepass.isKeePassXCAvailable) {
         popupData.iconType = 'cross';
+    } else if (!keepass.isAssociated() && !keepass.isDatabaseClosed) {
+        popupData.iconType = 'bang';
     } else if (keepass.isKeePassXCAvailable && keepass.isDatabaseClosed) {
         popupData.iconType = 'locked';
     }
diff --git a/keepassxc-browser/background/event.js b/keepassxc-browser/background/event.js
index df439d2..9c31102 100755
--- a/keepassxc-browser/background/event.js
+++ b/keepassxc-browser/background/event.js
@@ -320,5 +320,6 @@ kpxcEvent.messageHandlers = {
     'username_field_detected': kpxcEvent.usernameFieldDetected,
     'save_settings': kpxcEvent.saveSettings,
     'update_available_keepassxc': kpxcEvent.updateAvailableKeePassXC,
-    'update_context_menu': page.updateContextMenu
+    'update_context_menu': page.updateContextMenu,
+    'update_popup': page.updatePopup
 };
diff --git a/keepassxc-browser/background/page.js b/keepassxc-browser/background/page.js
index 571a769..945c9e2 100755
--- a/keepassxc-browser/background/page.js
+++ b/keepassxc-browser/background/page.js
@@ -315,6 +315,10 @@ page.updateContextMenu = async function(tab, credentials) {
     }
 };
 
+page.updatePopup = function(tab) {
+    browserAction.showDefault(tab);
+}
+
 const createContextMenuItem = function({ action, args, ...options }) {
     return browser.contextMenus.create({
         contexts: menuContexts,
diff --git a/keepassxc-browser/options/options.js b/keepassxc-browser/options/options.js
index a629b8b..231a5e1 100644
--- a/keepassxc-browser/options/options.js
+++ b/keepassxc-browser/options/options.js
@@ -378,6 +378,7 @@ options.initConnectedDatabases = function() {
         });
 
         hideEmptyMessageRow();
+        browser.runtime.sendMessage({ action: 'update_popup' });
     });
 
     const removeButtonClicked = function(e) {