From c0dcce7c820ea150822dfed67597d3afbccf453c Mon Sep 17 00:00:00 2001
From: Evan Hahn <69474926+EvanHahn-Signal@users.noreply.github.com>
Date: Fri, 3 Dec 2021 11:46:44 -0600
Subject: [PATCH] Clean up `AccountManager#registerSecondDevice`

---
 ts/textsecure/AccountManager.ts | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/ts/textsecure/AccountManager.ts b/ts/textsecure/AccountManager.ts
index 32f8456a7..f62aa1fed 100644
--- a/ts/textsecure/AccountManager.ts
+++ b/ts/textsecure/AccountManager.ts
@@ -194,9 +194,8 @@ export default class AccountManager extends EventTarget {
   }
 
   async registerSecondDevice(
-    setProvisioningUrl: Function,
-    confirmNumber: (number?: string) => Promise<string>,
-    progressCallback?: Function
+    setProvisioningUrl: (url: string) => unknown,
+    confirmNumber: (number?: string) => Promise<string>
   ) {
     const clearSessionsAndPreKeys = this.clearSessionsAndPreKeys.bind(this);
     const provisioningCipher = new ProvisioningCipher();
@@ -289,8 +288,7 @@ export default class AccountManager extends EventTarget {
       // TODO: DESKTOP-2794
       const keys = await this.generateKeys(
         SIGNED_KEY_GEN_BATCH_SIZE,
-        UUIDKind.ACI,
-        progressCallback
+        UUIDKind.ACI
       );
       await this.server.registerKeys(keys, UUIDKind.ACI);
       await this.confirmKeys(keys, UUIDKind.ACI);
@@ -677,15 +675,7 @@ export default class AccountManager extends EventTarget {
     await store.storeSignedPreKey(ourUuid, key.keyId, key.keyPair, confirmed);
   }
 
-  async generateKeys(
-    count: number,
-    uuidKind: UUIDKind,
-    providedProgressCallback?: Function
-  ) {
-    const progressCallback =
-      typeof providedProgressCallback === 'function'
-        ? providedProgressCallback
-        : null;
+  async generateKeys(count: number, uuidKind: UUIDKind) {
     const startId = window.textsecure.storage.get('maxPreKeyId', 1);
     const signedKeyId = window.textsecure.storage.get('signedKeyId', 1);
     const ourUuid = window.textsecure.storage.user.getCheckedUuid(uuidKind);
@@ -717,9 +707,6 @@ export default class AccountManager extends EventTarget {
               keyId: res.keyId,
               publicKey: res.keyPair.pubKey,
             });
-            if (progressCallback) {
-              progressCallback();
-            }
           })
         );
       }