From 4e2397a79db8242f6ff04f9b5c5e61693d21533c Mon Sep 17 00:00:00 2001
From: Hubert Chathi <hubert@uhoreg.ca>
Date: Fri, 18 Sep 2020 20:53:39 -0400
Subject: [PATCH] doc fixes and minor code improvement

---
 src/MatrixClientPeg.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/MatrixClientPeg.ts b/src/MatrixClientPeg.ts
index a5fa0fb3cf..84bc610896 100644
--- a/src/MatrixClientPeg.ts
+++ b/src/MatrixClientPeg.ts
@@ -271,11 +271,12 @@ class _MatrixClientPeg implements IMatrixClientPeg {
 
         if (creds.olmAccount) {
             console.log("got a dehydrated account");
+            const pickleKey = creds.pickleKey || "DEFAULT_KEY";
             opts.deviceToImport = {
                 olmDevice: {
-                    pickledAccount: creds.olmAccount.pickle(creds.pickleKey || "DEFAULT_KEY"),
+                    pickledAccount: creds.olmAccount.pickle(pickleKey),
                     sessions: [],
-                    pickleKey: creds.pickleKey || "DEFAULT_KEY",
+                    pickleKey: pickleKey,
                 },
                 userId: creds.userId,
                 deviceId: creds.deviceId,
@@ -293,7 +294,7 @@ class _MatrixClientPeg implements IMatrixClientPeg {
 
         // set dehydration key after cross-signing gets set up -- we wait until
         // cross-signing is set up because we want to cross-sign the dehydrated
-        // key
+        // device
         const origGetSecretStorageKey = opts.cryptoCallbacks.getSecretStorageKey
         opts.cryptoCallbacks.getSecretStorageKey = async (keyinfo, ssssItemName) => {
             const [name, key] = await origGetSecretStorageKey(keyinfo, ssssItemName);
@@ -302,6 +303,8 @@ class _MatrixClientPeg implements IMatrixClientPeg {
         }
 
         if (creds.rehydrationKey) {
+            // cache the key so that the SSSS prompt tries using it without
+            // prompting the user
             cacheDehydrationKey(creds.rehydrationKey, creds.rehydrationKeyInfo);
         }