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 pull request #2455 from keepassxreboot/fix/always_load_managed_settings

Browse source 
Load managed settings always when found
This commit is contained in:
Sami Vänttinen 2025-02-08 17:14:38 +02:00 committed by GitHub
commit 092ce24720
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
keepassxc-browser/background/page.js
View file

@ -63,17 +63,15 @@ page.initSettings = async function() {
try {
const item = await browser.storage.local.get({ 'settings': {} });
// Load managed settings if found when extension is started for the first time
if (Object.keys(item.settings).length === 0) {
try {
const managedSettings = await browser.storage.managed.get('settings');
if (managedSettings?.settings) {
console.log('Managed settings found.');
item.settings = managedSettings.settings;
}
} catch (err) {
logError('page.initSettings error: ' + err);
// Load managed settings if found
try {
const managedSettings = await browser.storage.managed.get('settings');
if (managedSettings?.settings) {
console.log('Managed settings found.');
item.settings = managedSettings.settings;
}
} catch (err) {
logError('page.initSettings error: ' + err);
}
page.settings = item.settings;