Fix bugs on Kiwi browser

Author: sheepzh

src/api/chrome/context-menu.ts

@@ -1,15 +1,15 @@
-import { IS_FIREFOX_ANDROID } from "@util/constant/environment"
+import { IS_ANDROID } from "@util/constant/environment"
 import { handleError } from "./common"
 
 function onClick(id: string, handler: Function) {
-    if (IS_FIREFOX_ANDROID) {
+    if (IS_ANDROID) {
         return
     }
     chrome.contextMenus?.onClicked?.addListener(({ menuItemId }) => menuItemId === id && handler?.())
 }
 
 export function createContextMenu(props: ChromeContextMenuCreateProps): Promise<void> {
-    if (IS_FIREFOX_ANDROID) {
+    if (IS_ANDROID) {
         return
     }
     // Add listener by param
@@ -25,7 +25,7 @@ export function createContextMenu(props: ChromeContextMenuCreateProps): Promise<
 }
 
 export function updateContextMenu(menuId: string, props: ChromeContextMenuUpdateProps): Promise<void> {
-    if (IS_FIREFOX_ANDROID) {
+    if (IS_ANDROID) {
         return
     }
     return new Promise(resolve => chrome.contextMenus?.update?.(menuId, props, () => {

src/api/chrome/window.ts

@@ -1,8 +1,8 @@
-import { IS_FIREFOX_ANDROID } from "@util/constant/environment"
+import { IS_ANDROID } from "@util/constant/environment"
 import { handleError } from "./common"
 
 export function listAllWindows(): Promise<chrome.windows.Window[]> {
-    if (IS_FIREFOX_ANDROID) {
+    if (IS_ANDROID) {
         // windows API not supported on Firefox for Android
         return Promise.resolve([])
     }
@@ -13,14 +13,14 @@ export function listAllWindows(): Promise<chrome.windows.Window[]> {
 }
 
 export function isNoneWindowId(windowId: number) {
-    if (IS_FIREFOX_ANDROID) {
+    if (IS_ANDROID) {
         return false
     }
     return !windowId || windowId === chrome.windows.WINDOW_ID_NONE
 }
 
 export function getFocusedNormalWindow(): Promise<chrome.windows.Window> {
-    if (IS_FIREFOX_ANDROID) {
+    if (IS_ANDROID) {
         return Promise.resolve(null)
     }
     return new Promise(resolve => chrome.windows.getLastFocused(
@@ -38,7 +38,7 @@ export function getFocusedNormalWindow(): Promise<chrome.windows.Window> {
 }
 
 export function getWindow(id: number): Promise<chrome.windows.Window> {
-    if (IS_FIREFOX_ANDROID) {
+    if (IS_ANDROID) {
         return Promise.resolve(null)
     }
     return new Promise(resolve => chrome.windows.get(id, win => resolve(win)))
@@ -47,7 +47,7 @@ export function getWindow(id: number): Promise<chrome.windows.Window> {
 type _Handler = (windowId: number) => void
 
 export function onNormalWindowFocusChanged(handler: _Handler) {
-    if (IS_FIREFOX_ANDROID) {
+    if (IS_ANDROID) {
         return
     }
     chrome.windows.onFocusChanged.addListener(windowId => {

src/background/track-server.ts

@@ -4,7 +4,7 @@ import optionHolder from "@service/components/option-holder"
 import itemService from "@service/item-service"
 import limitService from "@service/limit-service"
 import periodService from "@service/period-service"
-import { IS_FIREFOX_ANDROID } from "@util/constant/environment"
+import { IS_ANDROID } from "@util/constant/environment"
 import { extractHostname } from "@util/pattern"
 import { formatTimeYMD, getStartOfDay, MILL_PER_DAY } from "@util/time"
 import badgeManager from "./badge-manager"
@@ -48,7 +48,7 @@ async function handleTrackTimeEvent(event: timer.core.Event, sender: ChromeMessa
 }
 
 async function windowNotFocused(winId: number): Promise<boolean> {
-    if (IS_FIREFOX_ANDROID) return false
+    if (IS_ANDROID) return false
     if (!winId) return true
     const window = await getWindow(winId)
     return !window?.focused

src/util/constant/environment.ts

@@ -51,11 +51,6 @@ export const IS_CHROME: boolean = isChrome
  */
 export const IS_ANDROID: boolean = !!userAgent?.toLowerCase()?.includes("android")
 
-/**
- * @since 3.3.0
- */
-export const IS_FIREFOX_ANDROID = IS_FIREFOX && IS_ANDROID
-
 /**
  * @since 0.8.0
  */