From 4076aa1628b52c1f8b7bf6aa7931a529f2bd3d5c Mon Sep 17 00:00:00 2001
From: varjolintu <sami.vanttinen@varjolintu.fi>
Date: Thu, 1 May 2025 15:04:26 +0300
Subject: [PATCH] Some renaming

---
 dist/manifest_chromium.json                    | 2 +-
 dist/manifest_firefox.json                     | 2 +-
 keepassxc-browser/background/init.js           | 2 +-
 keepassxc-browser/background/keepass.js        | 6 +++++-
 keepassxc-browser/content/keepassxc-browser.js | 2 +-
 keepassxc-browser/manifest.json                | 2 +-
 keepassxc-browser/popups/popup.js              | 6 ++++--
 7 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/dist/manifest_chromium.json b/dist/manifest_chromium.json
index 25990f3..a7b1a16 100755
--- a/dist/manifest_chromium.json
+++ b/dist/manifest_chromium.json
@@ -118,7 +118,7 @@
         "choose_credential_fields": {
             "description": "__MSG_popupChooseCredentialsText__"
         },
-        "retrive_credentials_forced": {
+        "retrieve_credentials_forced": {
             "description": "__MSG_popupReopenButton__"
         },
         "request_autotype": {
diff --git a/dist/manifest_firefox.json b/dist/manifest_firefox.json
index 9e90477..1d3918b 100644
--- a/dist/manifest_firefox.json
+++ b/dist/manifest_firefox.json
@@ -131,7 +131,7 @@
         "choose_credential_fields": {
             "description": "__MSG_popupChooseCredentialsText__"
         },
-        "retrive_credentials_forced": {
+        "retrieve_credentials_forced": {
             "description": "__MSG_popupReopenButton__"
         },
         "request_autotype": {
diff --git a/keepassxc-browser/background/init.js b/keepassxc-browser/background/init.js
index 94d382e..a819d5b 100644
--- a/keepassxc-browser/background/init.js
+++ b/keepassxc-browser/background/init.js
@@ -115,7 +115,7 @@ const initListeners = async function() {
         if (contextMenuItems.some(e => e.action === command)
             || command === 'redetect_fields'
             || command === 'choose_credential_fields'
-            || command === 'retrive_credentials_forced'
+            || command === 'retrieve_credentials_forced'
             || command === 'reload_extension') {
             const tab = await getCurrentTab();
             if (tab?.id) {
diff --git a/keepassxc-browser/background/keepass.js b/keepassxc-browser/background/keepass.js
index c1918d9..7e9cdcf 100755
--- a/keepassxc-browser/background/keepass.js
+++ b/keepassxc-browser/background/keepass.js
@@ -851,7 +851,11 @@ keepass.checkDatabaseHash = async function(tab) {
 };
 
 keepass.isAssociated = function() {
-    return (keepass.associated.value && keepass.associated.hash && keepass.associated.hash === keepass.databaseHash);
+    if (!keepass.associated.value || keepass.associated.hash === '') {
+        return false;
+    }
+
+    return keepass.associated.hash === keepass.databaseHash;
 };
 
 keepass.setcurrentKeePassXCVersion = function(version) {
diff --git a/keepassxc-browser/content/keepassxc-browser.js b/keepassxc-browser/content/keepassxc-browser.js
index 70ea565..d4a352f 100755
--- a/keepassxc-browser/content/keepassxc-browser.js
+++ b/keepassxc-browser/content/keepassxc-browser.js
@@ -993,7 +993,7 @@ browser.runtime.onMessage.addListener(async function(req, sender) {
             sendMessage('reconnect');
         } else if (req.action === 'save_credentials') {
             kpxc.rememberCredentialsFromContextMenu();
-        } else if (req.action === 'retrive_credentials_forced') {
+        } else if (req.action === 'retrieve_credentials_forced') {
             await kpxc.retrieveCredentials(true);
         } else if (req.action === 'show_password_generator') {
             kpxcPasswordGenerator.showPasswordGenerator();
diff --git a/keepassxc-browser/manifest.json b/keepassxc-browser/manifest.json
index 25990f3..a7b1a16 100755
--- a/keepassxc-browser/manifest.json
+++ b/keepassxc-browser/manifest.json
@@ -118,7 +118,7 @@
         "choose_credential_fields": {
             "description": "__MSG_popupChooseCredentialsText__"
         },
-        "retrive_credentials_forced": {
+        "retrieve_credentials_forced": {
             "description": "__MSG_popupReopenButton__"
         },
         "request_autotype": {
diff --git a/keepassxc-browser/popups/popup.js b/keepassxc-browser/popups/popup.js
index b40e274..187e697 100644
--- a/keepassxc-browser/popups/popup.js
+++ b/keepassxc-browser/popups/popup.js
@@ -111,7 +111,7 @@ const sendMessageToTab = async function(message) {
         });
 
         // This does not work with Firefox because of https://bugzilla.mozilla.org/show_bug.cgi?id=1665380
-        await sendMessageToTab('retrive_credentials_forced');
+        await sendMessageToTab('retrieve_credentials_forced');
         close();
     });
 
@@ -196,7 +196,8 @@ const sendMessageToTab = async function(message) {
 
     async function getNewStatus() {
         return await browser.runtime.sendMessage({
-            action: 'get_status'
+            action: 'get_status',
+            args: [ true ]
         }).catch((err) => {
             logError('Could not get status: ' + err);
         });
@@ -209,6 +210,7 @@ const sendMessageToTab = async function(message) {
     setInterval(async () => {
         // Check if the popup state has been changed or database has been opened/closed
         const currentStatus = await getNewStatus();
+        console.log(currentStatus);
         if (previousStatus?.popupData?.popup !== currentStatus?.popupData?.popup
             || previousStatus?.databaseClosed !== currentStatus?.databaseClosed
             || previousStatus?.keePassXCAvailable !== currentStatus?.keePassXCAvailable) {