[VSC-1539] Fix scenario for partial encryption (#1373)

* Fix scenario for partial encryption

* Fix partial encryption

Move unencrypted files at the beginning

* Rerun workflow

Author: radurentea

src/flash/flashTask.ts

@@ -292,8 +292,28 @@ export class FlashTask {
         this.model.flashSections &&
         this.model.flashSections.length === encryptedFlashSections.length
       ) {
+        // If all files need encryption, then use --encrypt flag
         flasherArgs.push("--encrypt");
+        // Add all files
+        for (const flashFile of this.model.flashSections) {
+          let binPath = replacePathSep
+            ? flashFile.binFilePath.replace(/\//g, "\\")
+            : flashFile.binFilePath;
+          flasherArgs.push(flashFile.address, binPath);
+        }
       } else {
+        // If only some files need encryption, handle them separately
+        // First add all unencrypted files normally
+        const unencryptedSections = this.model.flashSections.filter(
+          (section) => !section.encrypted
+        );
+        for (const flashFile of unencryptedSections) {
+          let binPath = replacePathSep
+            ? flashFile.binFilePath.replace(/\//g, "\\")
+            : flashFile.binFilePath;
+          flasherArgs.push(flashFile.address, binPath);
+        }
+        // Then add encrypted files after the --encrypt-files flag
         flasherArgs.push("--encrypt-files");
         for (const flashFile of encryptedFlashSections) {
           let binPath = replacePathSep
@@ -302,12 +322,14 @@ export class FlashTask {
           flasherArgs.push(flashFile.address, binPath);
         }
       }
-    }
-    for (const flashFile of this.model.flashSections) {
-      let binPath = replacePathSep
-        ? flashFile.binFilePath.replace(/\//g, "\\")
-        : flashFile.binFilePath;
-      flasherArgs.push(flashFile.address, binPath);
+    } else {
+      // No encryption needed, just add all files.
+      for (const flashFile of this.model.flashSections) {
+        let binPath = replacePathSep
+          ? flashFile.binFilePath.replace(/\//g, "\\")
+          : flashFile.binFilePath;
+        flasherArgs.push(flashFile.address, binPath);
+      }
     }
 
     return flasherArgs;