fix: keep active call on lock screen

edospadoni · edospadoni · commit 1746ae00faf5 · 2025-12-15T08:44:28.000+01:00
diff --git a/nethesis-phone-island-0.17.11.tgz b/nethesis-phone-island-0.17.11.tgz
diff --git a/nethesis-phone-island-0.17.12.tgz b/nethesis-phone-island-0.17.12.tgz
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -49,7 +49,7 @@
     "@nethesis/nethesis-brands-svg-icons": "github:nethesis/Font-Awesome#ns-brands",
     "@nethesis/nethesis-light-svg-icons": "github:nethesis/Font-Awesome#ns-light",
     "@nethesis/nethesis-solid-svg-icons": "github:nethesis/Font-Awesome#ns-solid",
-    "@nethesis/phone-island": "^0.17.8",
+    "@nethesis/phone-island": "file:nethesis-phone-island-0.17.12.tgz",
     "@tailwindcss/forms": "^0.5.7",
     "@types/lodash": "^4.14.202",
     "@types/node": "^18.19.9",
diff --git a/src/main/lib/ipcEvents.ts b/src/main/lib/ipcEvents.ts
@@ -21,6 +21,14 @@ const { keyboard, Key } = require("@nut-tree-fork/nut-js");
 // Global flag to ensure audio warm-up runs only once per app session
 let hasRunAudioWarmup = false
 
+// Global flag to track if there's an active call (prevents PhoneIsland reload during calls)
+let hasActiveCall = false
+
+// Export function to check active call state from other modules
+export function isCallActive(): boolean {
+  return hasActiveCall
+}
+
 function onSyncEmitter<T>(
   channel: IPC_EVENTS,
   asyncCallback: (...args: any[]) => Promise<T>
@@ -272,9 +280,20 @@ export function registerIpcEvents() {
     const account = store.get('account') as Account
 
     setTimeout(() => {
-      Log.info('Send CHANGE_PREFERRED_DEVICES event with', account.preferredDevices)
+      // Include flag to indicate if audio warmup should run (only first time)
+      const shouldRunWarmup = !hasRunAudioWarmup
+      if (shouldRunWarmup) {
+        hasRunAudioWarmup = true
+      }
+      Log.info('Send CHANGE_PREFERRED_DEVICES event with', {
+        preferredDevices: account.preferredDevices,
+        shouldRunWarmup
+      })
       AccountController.instance.updatePreferredDevice(account.preferredDevices)
-      PhoneIslandController.instance.window.emit(IPC_EVENTS.CHANGE_PREFERRED_DEVICES, account.preferredDevices)
+      PhoneIslandController.instance.window.emit(IPC_EVENTS.CHANGE_PREFERRED_DEVICES, {
+        ...account.preferredDevices,
+        shouldRunWarmup
+      })
     }, 250)
   })
 
@@ -342,7 +361,14 @@ export function registerIpcEvents() {
     }
   })
 
+  ipcMain.on(IPC_EVENTS.EMIT_CALL_ACTIVE, (_) => {
+    Log.info('Call active (started or answered) - setting hasActiveCall = true')
+    hasActiveCall = true
+  })
+
   ipcMain.on(IPC_EVENTS.EMIT_CALL_END, (_) => {
+    Log.info('Call ended - setting hasActiveCall = false')
+    hasActiveCall = false
     try {
       NethLinkController.instance.window.emit(IPC_EVENTS.EMIT_CALL_END)
     } catch (e) {
diff --git a/src/main/main.ts b/src/main/main.ts
@@ -1,5 +1,5 @@
 import { app, ipcMain, nativeTheme, powerMonitor, protocol, systemPreferences, dialog, shell, globalShortcut } from 'electron'
-import { registerIpcEvents } from '@/lib/ipcEvents'
+import { registerIpcEvents, isCallActive } from '@/lib/ipcEvents'
 import { AccountController } from './classes/controllers'
 import { PhoneIslandController } from './classes/controllers/PhoneIslandController'
 import { Account, AuthAppData, AvailableThemes } from '@shared/types'
@@ -564,7 +564,14 @@ async function onAppResume() {
       if (autoLoginResult) {
         NethLinkController.instance.window.getWindow()?.reload()
         await delay(500)
-        PhoneIslandController.instance.window.getWindow()?.reload()
+        // Don't reload PhoneIsland if there's an active call - this would destroy the call
+        const activeCall = isCallActive()
+        if (activeCall) {
+          Log.info('APP POWER RESUME - Skipping PhoneIsland reload due to active call')
+        } else {
+          Log.info('APP POWER RESUME - Reloading PhoneIsland (no active call)')
+          PhoneIslandController.instance.window.getWindow()?.reload()
+        }
       }
     }
     isInPowerResume = false
diff --git a/src/renderer/src/hooks/usePhoneIslandEventListeners.ts b/src/renderer/src/hooks/usePhoneIslandEventListeners.ts
@@ -83,15 +83,21 @@ export const usePhoneIslandEventListener = () => {
       }),
 
       ...eventHandler(PHONE_ISLAND_EVENTS["phone-island-call-answer"]),
-      ...eventHandler(PHONE_ISLAND_EVENTS["phone-island-call-answered"]),
+      ...eventHandler(PHONE_ISLAND_EVENTS["phone-island-call-answered"], () => {
+        // Incoming call answered - mark as active call
+        window.electron.send(IPC_EVENTS.EMIT_CALL_ACTIVE)
+      }),
 
       ...eventHandler(PHONE_ISLAND_EVENTS["phone-island-call-audio-input-switch"]),
       ...eventHandler(PHONE_ISLAND_EVENTS["phone-island-call-audio-input-switched"]),
       ...eventHandler(PHONE_ISLAND_EVENTS["phone-island-call-audio-output-switch"]),
       ...eventHandler(PHONE_ISLAND_EVENTS["phone-island-call-audio-output-switched"]),
 
       ...eventHandler(PHONE_ISLAND_EVENTS["phone-island-call-start"]),
-      ...eventHandler(PHONE_ISLAND_EVENTS["phone-island-call-started"]),
+      ...eventHandler(PHONE_ISLAND_EVENTS["phone-island-call-started"], () => {
+        // Outgoing call started - mark as active call
+        window.electron.send(IPC_EVENTS.EMIT_CALL_ACTIVE)
+      }),
       ...eventHandler(PHONE_ISLAND_EVENTS["phone-island-call-end"]),
       ...eventHandler(PHONE_ISLAND_EVENTS["phone-island-call-ended"], () => {
         window.electron.send(IPC_EVENTS.EMIT_CALL_END)
diff --git a/src/renderer/src/pages/PhoneIslandPage.tsx b/src/renderer/src/pages/PhoneIslandPage.tsx
@@ -32,7 +32,6 @@ export function PhoneIslandPage() {
   const isUrlOpening = useRef<boolean>(false)
   const urlOpenAttempts = useRef<number>(0)
   const urlOpenListenerRegistered = useRef<boolean>(false)
-  const hasRunWarmup = useRef<boolean>(false)
 
   useEffect(() => {
     resize(phoneIsalndSizes)
@@ -75,29 +74,31 @@ export function PhoneIslandPage() {
       eventDispatch(PHONE_ISLAND_EVENTS['phone-island-call-end'])
     })
 
-    window.electron.receive(IPC_EVENTS.CHANGE_PREFERRED_DEVICES, (devices: PreferredDevices) => {
-      Log.info('Received CHANGE_PREFERRED_DEVICES in PhoneIslandPage:', devices)
+    window.electron.receive(IPC_EVENTS.CHANGE_PREFERRED_DEVICES, (devices: PreferredDevices & { shouldRunWarmup?: boolean }) => {
+      const { shouldRunWarmup, audioInput, videoInput, audioOutput } = devices
+      Log.info('Received CHANGE_PREFERRED_DEVICES in PhoneIslandPage:', { devices, shouldRunWarmup })
 
       // Run audio warm-up first, only once after PhoneIsland is fully initialized
-      // Only on Windows/macOS where the issue occurs
-      if (!hasRunWarmup.current) {
-        hasRunWarmup.current = true
-        Log.info('Requesting audio warm-up from main process...')
+      // Main process tracks whether warmup has already run (survives re-renders/reconnections)
+      // Phone-island also checks for active calls before running warmup
+      if (shouldRunWarmup) {
+        Log.info('Requesting audio warm-up from main process (first initialization)...')
         setTimeout(() => {
           eventDispatch(PHONE_ISLAND_EVENTS['phone-island-init-audio'])
         }, 1000)
 
         // Dispatch device changes after warm-up completes (after ~5 seconds)
         setTimeout(() => {
-          eventDispatch(PHONE_ISLAND_EVENTS['phone-island-audio-input-change'], { deviceId: devices.audioInput })
-          eventDispatch(PHONE_ISLAND_EVENTS['phone-island-video-input-change'], { deviceId: devices.videoInput })
-          eventDispatch(PHONE_ISLAND_EVENTS['phone-island-audio-output-change'], { deviceId: devices.audioOutput })
+          eventDispatch(PHONE_ISLAND_EVENTS['phone-island-audio-input-change'], { deviceId: audioInput })
+          eventDispatch(PHONE_ISLAND_EVENTS['phone-island-video-input-change'], { deviceId: videoInput })
+          eventDispatch(PHONE_ISLAND_EVENTS['phone-island-audio-output-change'], { deviceId: audioOutput })
         }, 5000)
       } else {
-        // If warm-up already done or not needed, dispatch immediately
-        eventDispatch(PHONE_ISLAND_EVENTS['phone-island-audio-input-change'], { deviceId: devices.audioInput })
-        eventDispatch(PHONE_ISLAND_EVENTS['phone-island-video-input-change'], { deviceId: devices.videoInput })
-        eventDispatch(PHONE_ISLAND_EVENTS['phone-island-audio-output-change'], { deviceId: devices.audioOutput })
+        // If warm-up already done or not needed (reconnection), dispatch device changes immediately
+        Log.info('Skipping audio warm-up (already done or reconnection), dispatching device changes immediately')
+        eventDispatch(PHONE_ISLAND_EVENTS['phone-island-audio-input-change'], { deviceId: audioInput })
+        eventDispatch(PHONE_ISLAND_EVENTS['phone-island-video-input-change'], { deviceId: videoInput })
+        eventDispatch(PHONE_ISLAND_EVENTS['phone-island-audio-output-change'], { deviceId: audioOutput })
       }
     })
 
diff --git a/src/shared/constants.ts b/src/shared/constants.ts
@@ -75,6 +75,7 @@ export enum IPC_EVENTS {
   STOP_DRAG = "STOP_DRAG",
   ENABLE_CLICK = "ENABLE_CLICK",
   DELETE_ACCOUNT = "DELETE_ACCOUNT",
+  EMIT_CALL_ACTIVE = "EMIT_CALL_ACTIVE",
   EMIT_CALL_END = "EMIT_CALL_END",
   EMIT_MAIN_PRESENCE_UPDATE = "EMIT_MAIN_PRESENCE_CHANGE",
   EMIT_QUEUE_UPDATE = "EMIT_QUEUE_UPDATE",
