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

Fix accidental loop during backup import

Browse source
This commit is contained in:
Fedor Indutny 2025-01-29 09:53:00 -08:00 • committed by GitHub
parent 6be51fc866
commit 5ed76b9645
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ts/services/tapToViewMessagesDeletionService.ts
View file

@ -89,6 +89,11 @@ class TapToViewMessagesDeletionService {
} }
async #checkTapToViewMessages() { async #checkTapToViewMessages() {
if (!this.#shouldRun()) {
window.SignalContext.log.info('checkTapToViewMessages: not running');
return;
}
const receivedAtMsForOldestTapToViewMessage = const receivedAtMsForOldestTapToViewMessage =
await DataReader.getNextTapToViewMessageTimestampToAgeOut(); await DataReader.getNextTapToViewMessageTimestampToAgeOut();
if (!receivedAtMsForOldestTapToViewMessage) { if (!receivedAtMsForOldestTapToViewMessage) {
@ -116,12 +121,19 @@ class TapToViewMessagesDeletionService {
clearTimeoutIfNecessary(this.#timeout); clearTimeoutIfNecessary(this.#timeout);
this.#timeout = setTimeout(async () => { this.#timeout = setTimeout(async () => {
if (!this.#isPaused && !window.SignalContext.isTestOrMockEnvironment()) { if (!this.#shouldRun()) {
await eraseTapToViewMessages(); window.SignalContext.log.info('checkTapToViewMessages: not running');
return;
} }
await eraseTapToViewMessages();
this.update(); this.update();
}, wait); }, wait);
} }
#shouldRun(): boolean {
return !this.#isPaused && !window.SignalContext.isTestOrMockEnvironment();
}
} }
export const tapToViewMessagesDeletionService = export const tapToViewMessagesDeletionService =