Protect flips before compressing (#865)

idena-network · Dec 7, 2022 · 202b798 · 202b798
1 parent 735fc7e
commit 202b798
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/renderer/screens/flips/components.js b/renderer/screens/flips/components.js
@@ -717,18 +717,23 @@ export function FlipProtectStep({
 
   const regenerateImage = async () => {
     onProtecting()
+
+    const protectedImageSrc = await protectFlipImage(
+      images[originalOrder[currentIndex]]
+    )
+
     const compressedImage = await new Promise(resolve =>
       resolve(
-        Jimp.read(images[originalOrder[currentIndex]]).then(raw =>
+        Jimp.read(protectedImageSrc).then(raw =>
           raw
             .resize(240, 180)
             .quality(60) // jpeg quality
             .getBase64Async('image/jpeg')
         )
       )
     )
-    const protectedImageSrc = await protectFlipImage(compressedImage)
-    onProtectImage(protectedImageSrc, originalOrder[currentIndex])
+
+    onProtectImage(compressedImage, originalOrder[currentIndex])
   }
 
   return (

diff --git a/renderer/screens/flips/utils.js b/renderer/screens/flips/utils.js
@@ -852,8 +852,18 @@ export async function protectFlipImage(imgSrc) {
 
 export async function protectFlip({images}) {
   const protectedFlips = []
+
+  for (let i = 0; i < images.length; i++) {
+    if (images[i]) {
+      const protectedImageSrc = await protectFlipImage(images[i])
+      protectedFlips[i] = protectedImageSrc
+    } else {
+      protectedFlips[i] = images[i]
+    }
+  }
+
   const compressedImages = await Promise.all(
-    images.map(image =>
+    protectedFlips.map(image =>
       image
         ? Jimp.read(image).then(raw =>
             raw
@@ -865,16 +875,7 @@ export async function protectFlip({images}) {
     )
   )
 
-  // eslint-disable-next-line no-plusplus
-  for (let i = 0; i < images.length; i++) {
-    if (compressedImages[i]) {
-      const protectedImageSrc = await protectFlipImage(compressedImages[i])
-      protectedFlips[i] = protectedImageSrc
-    } else {
-      protectedFlips[i] = compressedImages[i]
-    }
-  }
-  return {protectedImages: protectedFlips}
+  return {protectedImages: compressedImages}
 }
 
 export const checkIfFlipNoiseEnabled = epochNumber =>