From 8aff1c6c992a138bae02b3f53a57cef6078f6837 Mon Sep 17 00:00:00 2001
From: varjolintu <sami.vanttinen@varjolintu.fi>
Date: Mon, 9 Jun 2025 10:57:40 +0300
Subject: [PATCH] Add check for managed API

---
 keepassxc-browser/background/page.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/keepassxc-browser/background/page.js b/keepassxc-browser/background/page.js
index 5a9f8a0..cc4008b 100755
--- a/keepassxc-browser/background/page.js
+++ b/keepassxc-browser/background/page.js
@@ -65,7 +65,7 @@ page.initSettings = async function() {
         const item = await browser.storage.local.get({ 'settings': {} });
 
         // Load managed settings if found
-        if (isFirefox()) {
+        if (isFirefox() && typeof(browser.storage.managed) === 'object') {
             try {
                 const managedSettings = await browser.storage.managed.get('settings');
                 if (managedSettings?.settings) {
@@ -73,16 +73,16 @@ page.initSettings = async function() {
                     item.settings = managedSettings.settings;
                 }
             } catch (err) {
-                logError('page.initSettings error: ' + err);
+                logError('page.initSettings: ' + err);
             }
-        } else {
+        } else if (typeof(chrome.storage.managed) === 'object') {
             chrome.storage.managed.get('settings').then((managedSettings) => {
                 if (managedSettings?.settings) {
                     debugLogMessage('Managed settings found.');
                     item.settings = managedSettings.settings;
                 }
             }).catch((err) => {
-                logError('page.initSettings error: ' + err);
+                logError('page.initSettings: ' + err);
             });
         }