From 06aa2f6ce4aeb2a47d9047fba069eac74e091c7f Mon Sep 17 00:00:00 2001 From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com> Date: Tue, 21 Jan 2025 10:36:46 -0800 Subject: [PATCH] Fix provisioner early termination --- ts/state/ducks/installer.ts | 1 + ts/textsecure/Provisioner.ts | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ts/state/ducks/installer.ts b/ts/state/ducks/installer.ts index 433219c0be..038f9444af 100644 --- a/ts/state/ducks/installer.ts +++ b/ts/state/ducks/installer.ts @@ -356,6 +356,7 @@ function finishInstall({ // Cleanup const { baton } = state.installer; + cancelByBaton.get(baton)?.(); cancelByBaton.delete(baton); const accountManager = window.getAccountManager(); diff --git a/ts/textsecure/Provisioner.ts b/ts/textsecure/Provisioner.ts index 0dca38c4ee..2ff5e6156a 100644 --- a/ts/textsecure/Provisioner.ts +++ b/ts/textsecure/Provisioner.ts @@ -220,7 +220,7 @@ export class Provisioner { // #start(): void { - log.info('Provisioniner: starting'); + log.info('Provisioner: starting'); if (this.#abortController) { strictAssert(this.#isRunning, 'Must be running to have controller'); @@ -237,7 +237,7 @@ export class Provisioner { if (!this.#isRunning) { return; } - log.info(`Provisioniner: stopping, reason=${reason}`); + log.info(`Provisioner: stopping, reason=${reason}`); this.#abortController?.abort(); this.#abortController = undefined;