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

Use global sitePreferences variable instead of function call

Browse source
This commit is contained in:
AKORA 2024-10-08 10:12:31 +02:00
parent 6473e59063
commit ba21fe292b
3 changed files with 5 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
keepassxc-browser/content/fill.js
View file

@ -316,16 +316,7 @@ kpxcFill.fillInStringFields = function(fields, stringFields) {
// Performs Auto-Submit. If filling single credentials is enabled, a 5 second timeout will be needed for fill
kpxcFill.performAutoSubmit = async function(combination, skipAutoSubmit) {
// Check for site preference overrides
const sitePreference = kpxc.retrieveSitePreference();
let autoSubmitSitePreference = false;
if (sitePreference !== null && sitePreference !== undefined) {
if (sitePreference.autoSubmit === true || sitePreference.autoSubmit === false) {
autoSubmitSitePreference = sitePreference.autoSubmit;
}
}
if (!kpxc.settings.autoSubmit && !autoSubmitSitePreference) {
if (!kpxc.settings.autoSubmit && !kpxc.preferencesForPage?.autoSubmit) {
return;
}

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

@ -26,6 +26,7 @@ kpxc.detectedFields = 0;
kpxc.improvedFieldDetectionEnabledForPage = false;
kpxc.inputs = [];
kpxc.settings = {};
kpxc.preferencesForPage = null;
kpxc.singleInputEnabledForPage = false;
kpxc.submitUrl = null;
kpxc.url = null;
@ -502,19 +503,10 @@ kpxc.prepareCredentials = async function() {
}
if (kpxc.credentials.length === 1) {
if (kpxc.settings.autoFillSingleEntry) {
if (kpxc.preferencesForPage?.autoFillCredentials || kpxc.settings.autoFillSingleEntry) {
kpxcFill.fillFromAutofill();
return;
}
// Check for site preference overrides
const sitePreference = kpxc.retrieveSitePreference();
if (sitePreference !== null && sitePreference !== undefined) {
if (sitePreference.autoFillCredentials === true) {
kpxcFill.fillFromAutofill();
return;
}
}
}
kpxc.initLoginPopup();
@ -983,6 +975,7 @@ const initContentScript = async function() {
}
kpxc.settings = settings;
kpxc.preferencesForPage = kpxc.retrieveSitePreference();
if (await kpxc.siteIgnored()) {
logDebug('This site is ignored in Site Preferences.');

12
keepassxc-browser/content/totp-field.js
View file

@ -106,17 +106,7 @@ class TOTPFieldIcon extends Icon {
// Fill TOTP automatically if option is enabled
TOTPFieldIcon.prototype.autoFillSingleTotp = async function(field) {
// Check for site preference overrides
const sitePreference = kpxc.retrieveSitePreference();
let autoFillSingleTotpSitePreference = false;
if (sitePreference !== null && sitePreference !== undefined) {
if (sitePreference.autoFillTOTP === true || sitePreference.autoFillTOTP === false) {
autoFillSingleTotpSitePreference = sitePreference.autoFillTOTP;
}
}
if (kpxc.settings.autoFillSingleTotp || autoFillSingleTotpSitePreference) {
if (kpxc.preferencesForPage?.autoFillTOTP || kpxc.settings.autoFillSingleTotp) {
if (kpxc.credentials.length === 0) {
await kpxc.receiveCredentialsIfNecessary();
}