mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Add "clean up timer if necessary" utility

Browse source
This commit is contained in:
Evan Hahn 2022-02-25 12:37:15 -06:00 • committed by GitHub
parent c2a65306e2
commit 052a8e65e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 150 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ts/challenge.ts
View file

@ -1,4 +1,4 @@
// Copyright 2021 Signal Messenger, LLC
// Copyright 2021-2022 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
// `ChallengeHandler` is responsible for:
@ -17,6 +17,7 @@ import { assert } from './util/assert';
import { isNotNil } from './util/isNotNil';
import { isOlderThan } from './util/timestamp';
import { parseRetryAfter } from './util/parseRetryAfter';
import { clearTimeoutIfNecessary } from './util/clearTimeoutIfNecessary';
import { getEnvironment, Environment } from './environment';
import type { StorageInterface } from './types/Storage.d';
import { HTTPError } from './textsecure/Errors';
@ -250,7 +251,7 @@ export class ChallengeHandler {
const waitTime = Math.max(0, error.retryAfter - Date.now());
const oldTimer = this.retryTimers.get(message.id);
if (oldTimer) {
clearTimeout(oldTimer);
clearTimeoutIfNecessary(oldTimer);
}
this.retryTimers.set(
message.id,
@ -305,9 +306,7 @@ export class ChallengeHandler {
const timer = this.retryTimers.get(message.id);
this.retryTimers.delete(message.id);
if (timer) {
clearTimeout(timer);
}
clearTimeoutIfNecessary(timer);
await this.persist();
}