From 1c3dc048baa572264cbcafea0a114ed1c956fb14 Mon Sep 17 00:00:00 2001
From: Abhinav <abhinavk.grd@gmail.com>
Date: Mon, 30 Jan 2023 17:32:10 +0530
Subject: [PATCH 1/2] updated error handling to ignore windows image processor
 error

---
 src/services/electron/imageProcessor.ts | 14 +++++++++++++-
 src/services/upload/thumbnailService.ts |  7 -------
 src/utils/error/index.ts                |  1 +
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/services/electron/imageProcessor.ts b/src/services/electron/imageProcessor.ts
index 9f8a84aa3..eaa120bbd 100644
--- a/src/services/electron/imageProcessor.ts
+++ b/src/services/electron/imageProcessor.ts
@@ -1,5 +1,6 @@
 import { ElectronAPIs } from 'types/electron';
 import { ElectronFile } from 'types/upload';
+import { CustomError } from 'utils/error';
 import { convertBytesToHumanReadable } from 'utils/file/size';
 import { addLogLine } from 'utils/logging';
 import { logError } from 'utils/sentry';
@@ -37,7 +38,12 @@ class ElectronImageProcessorService {
             );
             return new Blob([convertedFileData]);
         } catch (e) {
-            logError(e, 'failed to convert heic natively');
+            if (
+                e.message !==
+                CustomError.WINDOWS_NATIVE_IMAGE_PROCESSING_NOT_SUPPORTED
+            ) {
+                logError(e, 'failed to convert heic natively');
+            }
             throw e;
         }
     }
@@ -68,6 +74,12 @@ class ElectronImageProcessorService {
             );
             return thumb;
         } catch (e) {
+            if (
+                e.message !==
+                CustomError.WINDOWS_NATIVE_IMAGE_PROCESSING_NOT_SUPPORTED
+            ) {
+                logError(e, 'failed to convert heic natively');
+            }
             logError(e, 'failed to generate image thumbnail natively');
             throw e;
         }
diff --git a/src/services/upload/thumbnailService.ts b/src/services/upload/thumbnailService.ts
index 74215c1ee..ca2025b45 100644
--- a/src/services/upload/thumbnailService.ts
+++ b/src/services/upload/thumbnailService.ts
@@ -88,13 +88,6 @@ async function generateImageThumbnail(
                 MAX_THUMBNAIL_SIZE
             );
         } catch (e) {
-            logError(
-                e,
-                'Error generating thumbnail using electron image processor',
-                {
-                    fileFormat: fileTypeInfo.exactType,
-                }
-            );
             return await generateImageThumbnailUsingCanvas(file, fileTypeInfo);
         }
     } else {
diff --git a/src/utils/error/index.ts b/src/utils/error/index.ts
index 7719d0f61..09c7454df 100644
--- a/src/utils/error/index.ts
+++ b/src/utils/error/index.ts
@@ -48,6 +48,7 @@ export enum CustomError {
     REQUEST_TIMEOUT = 'request taking too long',
     HIDDEN_COLLECTION_SYNC_FILE_ATTEMPTED = 'hidden collection sync file attempted',
     UNKNOWN_ERROR = 'Something went wrong, please try again',
+    WINDOWS_NATIVE_IMAGE_PROCESSING_NOT_SUPPORTED = 'Windows native image processing is not supported',
 }
 
 function parseUploadErrorCodes(error) {

From 197b5f35f3588e142558636ccc1854f44b725861 Mon Sep 17 00:00:00 2001
From: Abhinav <abhinavk.grd@gmail.com>
Date: Mon, 30 Jan 2023 19:02:26 +0530
Subject: [PATCH 2/2] fix issue

---
 src/services/electron/imageProcessor.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/services/electron/imageProcessor.ts b/src/services/electron/imageProcessor.ts
index eaa120bbd..dd3ac3442 100644
--- a/src/services/electron/imageProcessor.ts
+++ b/src/services/electron/imageProcessor.ts
@@ -78,9 +78,8 @@ class ElectronImageProcessorService {
                 e.message !==
                 CustomError.WINDOWS_NATIVE_IMAGE_PROCESSING_NOT_SUPPORTED
             ) {
-                logError(e, 'failed to convert heic natively');
+                logError(e, 'failed to generate image thumbnail natively');
             }
-            logError(e, 'failed to generate image thumbnail natively');
             throw e;
         }
     }