Some renaming

This commit is contained in:
varjolintu 2025-05-01 15:04:26 +03:00
parent 9e9314722b
commit 4076aa1628
7 changed files with 14 additions and 8 deletions

View file

@ -118,7 +118,7 @@
"choose_credential_fields": {
"description": "__MSG_popupChooseCredentialsText__"
},
"retrive_credentials_forced": {
"retrieve_credentials_forced": {
"description": "__MSG_popupReopenButton__"
},
"request_autotype": {

View file

@ -131,7 +131,7 @@
"choose_credential_fields": {
"description": "__MSG_popupChooseCredentialsText__"
},
"retrive_credentials_forced": {
"retrieve_credentials_forced": {
"description": "__MSG_popupReopenButton__"
},
"request_autotype": {

View file

@ -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) {

View file

@ -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) {

View file

@ -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();

View file

@ -118,7 +118,7 @@
"choose_credential_fields": {
"description": "__MSG_popupChooseCredentialsText__"
},
"retrive_credentials_forced": {
"retrieve_credentials_forced": {
"description": "__MSG_popupReopenButton__"
},
"request_autotype": {

View file

@ -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) {