diff --git a/ts/background.ts b/ts/background.ts index bfa63d2ab4..2f6b13864b 100644 --- a/ts/background.ts +++ b/ts/background.ts @@ -2173,9 +2173,6 @@ export async function startApp(): Promise { let connectCount = 0; let connecting = false; async function connect(firstRun?: boolean) { - window.receivedAtCounter = - window.storage.get('lastReceivedAtCounter') || Date.now(); - if (connecting) { window.log.warn('connect already running', { connectCount }); return; diff --git a/ts/util/incrementMessageCounter.ts b/ts/util/incrementMessageCounter.ts index ab910d45fb..c6b4a1c8d4 100644 --- a/ts/util/incrementMessageCounter.ts +++ b/ts/util/incrementMessageCounter.ts @@ -3,21 +3,20 @@ import { debounce } from 'lodash'; +let receivedAtCounter: number | undefined; + export function incrementMessageCounter(): number { - if (!window.receivedAtCounter) { - window.receivedAtCounter = + if (!receivedAtCounter) { + receivedAtCounter = Number(localStorage.getItem('lastReceivedAtCounter')) || Date.now(); } - window.receivedAtCounter += 1; + receivedAtCounter += 1; debouncedUpdateLastReceivedAt(); - return window.receivedAtCounter; + return receivedAtCounter; } const debouncedUpdateLastReceivedAt = debounce(() => { - localStorage.setItem( - 'lastReceivedAtCounter', - String(window.receivedAtCounter) - ); + localStorage.setItem('lastReceivedAtCounter', String(receivedAtCounter)); }, 500); diff --git a/ts/window.d.ts b/ts/window.d.ts index 34a3d2e878..82e30726a7 100644 --- a/ts/window.d.ts +++ b/ts/window.d.ts @@ -189,7 +189,6 @@ declare global { baseAttachmentsPath: string; baseStickersPath: string; baseTempPath: string; - receivedAtCounter: number; enterKeyboardMode: () => void; enterMouseMode: () => void; getAccountManager: () => AccountManager;