improve WindowsApi

Author: slavaleleka

Extension/src/common/api/extension/tabs.ts

@@ -18,7 +18,8 @@
 import browser, { type Tabs } from 'webextension-polyfill';
 
 import { Prefs } from '../../../background/prefs';
-import { UserAgent } from '../../user-agent';
+
+import { WindowsApi } from './windows';
 
 /**
  * Helper class for browser.tabs API.
@@ -47,17 +48,7 @@ export class TabsApi {
 
         await browser.tabs.update(id, { active: true });
 
-        // browser.windows is not available in Firefox for Android
-        // TODO: check how it works in Edge on Android
-        if (UserAgent.isFirefox && (await UserAgent.getIsAndroid())) {
-            return;
-        }
-
-        if (!windowId) {
-            return;
-        }
-
-        await browser.windows.update(windowId, { focused: true });
+        await WindowsApi.update(windowId, { focused: true });
     }
 
     /**

Extension/src/common/api/extension/windows.ts

@@ -17,13 +17,27 @@
  */
 import browser, { type Windows, type Tabs } from 'webextension-polyfill';
 
-import { UserAgent } from '../../user-agent';
 import { getErrorMessage } from '../../error';
+import { logger } from '../../logger';
 
 /**
  * Helper class for browser.windows API.
  */
 export class WindowsApi {
+    /**
+     * Checks if browser.windows API is supported.
+     *
+     * Do not use browser.windows API if it is not supported,
+     * for example on Android: not supported in Firefox and does not work in Edge.
+     *
+     * @returns True if browser.windows API is supported, false otherwise.
+     */
+    private static isSupported() {
+        return !!browser.windows
+            && typeof browser.windows.update === 'function'
+            && typeof browser.windows.create === 'function';
+    }
+
     /**
      * Calls browser.windows.create with fallback to browser.tabs.create.
      * In case of fallback, compatible data will be reused.
@@ -41,10 +55,7 @@ export class WindowsApi {
     public static async create(
         createData?: Windows.CreateCreateDataType,
     ): Promise<Windows.Window | Tabs.Tab | null> {
-        const isAndroid = await UserAgent.getIsAndroid();
-
-        // Do not use browser.windows API on Android, as it is not supported (Firefox) / does not work (Edge).
-        if (browser.windows && !isAndroid) {
+        if (WindowsApi.isSupported()) {
             return browser.windows.create(createData);
         }
 
@@ -76,4 +87,27 @@ export class WindowsApi {
             return null;
         }
     }
+
+    /**
+     * Updates the properties of a window with specified ID.
+     *
+     * @param windowId Window ID. May be undefined.
+     * @param updateInfo Update info.
+     */
+    public static async update(
+        windowId: number | undefined,
+        updateInfo: Windows.UpdateUpdateInfoType,
+    ): Promise<void> {
+        if (!windowId) {
+            logger.debug('windowId is not specified');
+            return;
+        }
+
+        if (!WindowsApi.isSupported()) {
+            logger.debug('browser.windows API is not supported');
+            return;
+        }
+
+        await browser.windows.update(windowId, updateInfo);
+    }
 }