From fdfaadfb1e683c1fd14741ab4784be1583af3877 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sat, 17 Aug 2024 20:56:05 +0530
Subject: [PATCH] Use

---
 web/packages/base/crypto/ente-impl.ts        |  2 +-
 web/packages/base/crypto/ente.ts             |  9 +++------
 web/packages/new/photos/services/download.ts | 12 +++++++-----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/web/packages/base/crypto/ente-impl.ts b/web/packages/base/crypto/ente-impl.ts
index 875510f0bf..b1be404067 100644
--- a/web/packages/base/crypto/ente-impl.ts
+++ b/web/packages/base/crypto/ente-impl.ts
@@ -42,7 +42,7 @@ export const _decryptBlobB64 = libsodium.decryptBlobB64;
 
 export const _decryptAssociatedData = libsodium.decryptBlob;
 
-export const _decryptThumbnail = _decryptAssociatedData;
+export const _decryptThumbnail = _decryptBlob;
 
 export const _decryptAssociatedDataB64 = async ({
     encryptedDataB64,
diff --git a/web/packages/base/crypto/ente.ts b/web/packages/base/crypto/ente.ts
index 2ce57f3395..95d0ce5aed 100644
--- a/web/packages/base/crypto/ente.ts
+++ b/web/packages/base/crypto/ente.ts
@@ -54,7 +54,6 @@ import * as ei from "./ente-impl";
 import type {
     BytesOrB64,
     DecryptBlobB64,
-    DecryptBlobBytes,
     EncryptedBlob_2,
     EncryptedBox2,
     EncryptJSON,
@@ -179,12 +178,10 @@ export const decryptBlobB64 = (blob: EncryptedBlob_2, key: BytesOrB64) =>
         : sharedCryptoWorker().then((w) => w.decryptBlobB64(blob, key));
 
 /**
- * Decrypt the thumbnail for a file.
- *
- * This is the sibling of {@link encryptThumbnail}.
+ * Decrypt the thumbnail encrypted using {@link encryptThumbnail}.
  */
-export const decryptThumbnail = (r: DecryptBlobBytes) =>
-    assertInWorker(ei._decryptThumbnail(r));
+export const decryptThumbnail = (blob: EncryptedBlob_2, key: BytesOrB64) =>
+    assertInWorker(ei._decryptThumbnail(blob, key));
 
 /**
  * Decrypt the metadata JSON associated with an Ente object.
diff --git a/web/packages/new/photos/services/download.ts b/web/packages/new/photos/services/download.ts
index a5b06c27cf..47a0dbfa58 100644
--- a/web/packages/new/photos/services/download.ts
+++ b/web/packages/new/photos/services/download.ts
@@ -124,11 +124,13 @@ class DownloadManagerImpl {
         const { downloadClient, cryptoWorker } = this.ensureInitialized();
 
         const encrypted = await downloadClient.downloadThumbnail(file);
-        const decrypted = await cryptoWorker.decryptThumbnail({
-            encryptedData: encrypted,
-            decryptionHeaderB64: file.thumbnail.decryptionHeader,
-            keyB64: file.key,
-        });
+        const decrypted = await cryptoWorker.decryptThumbnail(
+            {
+                encryptedData: encrypted,
+                decryptionHeader: file.thumbnail.decryptionHeader,
+            },
+            file.key,
+        );
         return decrypted;
     };