diff --git a/src/app/hooks/useBackgroundSyncPause.test.tsx b/src/app/hooks/useBackgroundSyncPause.test.tsx index 79362eca8..97410a6c1 100644 --- a/src/app/hooks/useBackgroundSyncPause.test.tsx +++ b/src/app/hooks/useBackgroundSyncPause.test.tsx @@ -1,16 +1,25 @@ import { describe, expect, it, vi, beforeEach } from 'vitest'; import { renderHook } from '@testing-library/react'; -const { pause, resume, getSlidingSyncManager, listen, listenOff, mockIsTauri, mockCallEmbed } = - vi.hoisted(() => ({ - pause: vi.fn<() => void>(), - resume: vi.fn<() => void>(), - getSlidingSyncManager: vi.fn<() => unknown>(), - listen: vi.fn<(_event: string, _cb: () => void) => Promise<() => void>>(), - listenOff: vi.fn<() => void>(), - mockIsTauri: { value: false }, - mockCallEmbed: { value: undefined as unknown }, - })); +const { + pause, + resume, + getSlidingSyncManager, + listen, + listenOff, + mockIsTauri, + mockIsMobileTauri, + mockCallEmbed, +} = vi.hoisted(() => ({ + pause: vi.fn<() => void>(), + resume: vi.fn<() => void>(), + getSlidingSyncManager: vi.fn<() => unknown>(), + listen: vi.fn<(_event: string, _cb: () => void) => Promise<() => void>>(), + listenOff: vi.fn<() => void>(), + mockIsTauri: { value: false }, + mockIsMobileTauri: { value: true }, + mockCallEmbed: { value: undefined as unknown }, +})); vi.mock('$client/initMatrix', () => ({ getSlidingSyncManager })); @@ -28,6 +37,8 @@ vi.mock('@tauri-apps/api/event', () => ({ vi.mock('@tauri-apps/api/core', () => ({ isTauri: () => mockIsTauri.value })); +vi.mock('$utils/platform', () => ({ isMobileTauri: () => mockIsMobileTauri.value })); + import { useBackgroundSyncPause } from './useBackgroundSyncPause'; const setVisibility = (state: 'visible' | 'hidden') => @@ -42,6 +53,7 @@ describe('useBackgroundSyncPause', () => { listen.mockReset().mockResolvedValue(listenOff); getSlidingSyncManager.mockReset().mockReturnValue({ pause, resume }); mockIsTauri.value = false; + mockIsMobileTauri.value = true; mockCallEmbed.value = undefined; }); @@ -88,6 +100,17 @@ describe('useBackgroundSyncPause', () => { expect(resume).toHaveBeenCalled(); }); + it('keeps polling when a browser tab is hidden', () => { + mockIsMobileTauri.value = false; + setVisibility('visible'); + renderHook(() => useBackgroundSyncPause({ clientRunning: true } as never)); + + setVisibility('hidden'); + document.dispatchEvent(new Event('visibilitychange')); + + expect(pause).not.toHaveBeenCalled(); + }); + it('does nothing without a client', () => { renderHook(() => useBackgroundSyncPause(undefined)); diff --git a/src/app/hooks/useBackgroundSyncPause.ts b/src/app/hooks/useBackgroundSyncPause.ts index 21486c929..5c904a443 100644 --- a/src/app/hooks/useBackgroundSyncPause.ts +++ b/src/app/hooks/useBackgroundSyncPause.ts @@ -4,6 +4,7 @@ import { TauriEvent, listen } from '@tauri-apps/api/event'; import { isTauri } from '@tauri-apps/api/core'; import type { MatrixClient } from '$types/matrix-sdk'; import { getSlidingSyncManager } from '$client/initMatrix'; +import { isMobileTauri } from '$utils/platform'; import { callEmbedAtom } from '../state/callEmbed'; /** @@ -17,7 +18,7 @@ export const useBackgroundSyncPause = (mx: MatrixClient | undefined): void => { const callActive = callEmbed !== undefined; useEffect(() => { - if (!mx) return undefined; + if (!mx || !isMobileTauri()) return undefined; const resume = () => getSlidingSyncManager(mx)?.resume(); const applyVisibility = () => { diff --git a/src/client/slidingSync.test.ts b/src/client/slidingSync.test.ts index fe67f79ea..f89533023 100644 --- a/src/client/slidingSync.test.ts +++ b/src/client/slidingSync.test.ts @@ -1445,6 +1445,23 @@ describe('SlidingSyncManager pause/resume', () => { } }); + it('keeps the watchdog silent when the aborted poll emits a lifecycle event', () => { + vi.useFakeTimers(); + try { + const manager = makeManager(makeMockMx()); + manager.attach(); + manager.pause(); + mocks.slidingSyncInstance.resend.mockClear(); + + fireLifecycle(SlidingSyncState.RequestFinished, {}); + vi.advanceTimersByTime(DEFAULT_DEADLINE_MS * 3); + + expect(mocks.slidingSyncInstance.resend).not.toHaveBeenCalled(); + } finally { + vi.useRealTimers(); + } + }); + it('re-arms the poll watchdog on resume', () => { vi.useFakeTimers(); try { diff --git a/src/client/slidingSync.ts b/src/client/slidingSync.ts index 87dcb23ce..b7e88c1b3 100644 --- a/src/client/slidingSync.ts +++ b/src/client/slidingSync.ts @@ -706,7 +706,7 @@ export class SlidingSyncManager { * `continue`s without emitting a lifecycle event. */ private armPollWatchdog(): void { - if (this.disposed) return; + if (this.disposed || this.paused) return; globalThis.clearTimeout(this.pollWatchdogTimer); this.pollWatchdogTimer = globalThis.setTimeout(() => { this.pollWatchdogTimer = undefined;