Do not initialize receivedAtCounter in connect

signalapp · Aug 17, 2021 · 6343e7c · 6343e7c
1 parent d222376
commit 6343e7c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/ts/background.ts b/ts/background.ts
@@ -2173,9 +2173,6 @@ export async function startApp(): Promise<void> {
   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
@@ -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
@@ -189,7 +189,6 @@ declare global {
     baseAttachmentsPath: string;
     baseStickersPath: string;
     baseTempPath: string;
-    receivedAtCounter: number;
     enterKeyboardMode: () => void;
     enterMouseMode: () => void;
     getAccountManager: () => AccountManager;