prehistoric-systems/keepassxc-browser
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc-browser.git synced 2026-03-11 08:54:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 8cbc714240 into e444eab33c

Browse source
This commit is contained in:
Aleksandr Kolbasov 2025-12-29 23:57:46 +03:00 committed by GitHub
commit 0a339ccbf8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
keepassxc-browser/content/keepassxc-browser.js
View file

@ -648,7 +648,7 @@ kpxc.rememberCredentialsFromContextMenu = async function() {
// The basic function for retrieving credentials from KeePassXC. // The basic function for retrieving credentials from KeePassXC.
// Credential Banner can force the retrieval for reloading new/modified credentials. // Credential Banner can force the retrieval for reloading new/modified credentials.
kpxc.retrieveCredentials = async function(force = false) { kpxc.retrieveCredentials = async function(notFromCache = false, ignoreAutoRetrieveSetting = false) {
if (!await isIframeAllowed()) { if (!await isIframeAllowed()) {
return; return;
} }
@ -656,9 +656,9 @@ kpxc.retrieveCredentials = async function(force = false) {
kpxc.url = document.location.href; kpxc.url = document.location.href;
kpxc.submitUrl = kpxc.getFormActionUrl(kpxc.combinations[0]); kpxc.submitUrl = kpxc.getFormActionUrl(kpxc.combinations[0]);
if (kpxc.settings.autoRetrieveCredentials && kpxc.url && kpxc.submitUrl) { if ((kpxc.settings.autoRetrieveCredentials || ignoreAutoRetrieveSetting) && kpxc.url && kpxc.submitUrl) {
await kpxc.retrieveCredentialsCallback( await kpxc.retrieveCredentialsCallback(
await sendMessage('retrieve_credentials', [ kpxc.url, kpxc.submitUrl, force ]), await sendMessage('retrieve_credentials', [ kpxc.url, kpxc.submitUrl, notFromCache ]),
); );
} }
}; };
@ -963,7 +963,7 @@ browser.runtime.onMessage.addListener(async function(req, sender) {
} else if (req.action === 'save_credentials') { } else if (req.action === 'save_credentials') {
kpxc.rememberCredentialsFromContextMenu(); kpxc.rememberCredentialsFromContextMenu();
} else if (req.action === 'retrive_credentials_forced') { } else if (req.action === 'retrive_credentials_forced') {
await kpxc.retrieveCredentials(true); await kpxc.retrieveCredentials(true, true);
} else if (req.action === 'show_password_generator') { } else if (req.action === 'show_password_generator') {
kpxcPasswordGenerator.showPasswordGenerator(); kpxcPasswordGenerator.showPasswordGenerator();
} else if (req.action === 'request_autotype') { } else if (req.action === 'request_autotype') {