From c5ab1811fb6aef55d5db85d9ca60c67ffe2386da Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Tue, 23 Apr 2024 16:06:53 +0530
Subject: [PATCH] Inline and skip

---
 .../photos/src/services/upload/uploadService.ts    | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/web/apps/photos/src/services/upload/uploadService.ts b/web/apps/photos/src/services/upload/uploadService.ts
index 835bbe8f3..57c3f6651 100644
--- a/web/apps/photos/src/services/upload/uploadService.ts
+++ b/web/apps/photos/src/services/upload/uploadService.ts
@@ -49,7 +49,7 @@ import {
     updateMagicMetadata,
 } from "utils/magicMetadata";
 import { readStream } from "utils/native-stream";
-import { findMatchingExistingFiles, hasFileHash } from "utils/upload";
+import { hasFileHash } from "utils/upload";
 import { getFileStream } from "../readerService";
 import { getFileType } from "../typeDetectionService";
 import {
@@ -132,14 +132,6 @@ class UploadService {
         );
     }
 
-    async encryptAsset(
-        worker: Remote<DedicatedCryptoWorker>,
-        file: FileWithMetadata,
-        encryptionKey: string,
-    ): Promise<EncryptedFile> {
-        return encryptFile(worker, file, encryptionKey);
-    }
-
     async uploadToBucket(
         logger: Logger,
         file: ProcessedFile,
@@ -397,8 +389,8 @@ export async function uploader(
         if (uploadCancelService.isUploadCancelationRequested()) {
             throw Error(CustomError.UPLOAD_CANCELLED);
         }
-        log.info(`encryptAsset ${fileNameSize}`);
-        const encryptedFile = await uploadService.encryptAsset(
+        log.info(`encryptFile ${fileNameSize}`);
+        const encryptedFile = await encryptFile(
             worker,
             fileWithMetadata,
             collection.key,