From 7db1a3fd1b806ae3ebd9e85e103d1f4c7ead717d Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Wed, 2 Feb 2022 17:03:11 +0100
Subject: [PATCH 01/31] update FeedbackController: change parent class from
 AbstractSubController to StepController. Also set few field final in
 different methods and set the 'String deviceModel' to be a method field
 instead of a class field

---
 .../subcontrollers/FeedbackController.java    | 45 +++++++++++--------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/src/main/java/ecorp/easy/installer/controllers/subcontrollers/FeedbackController.java b/src/main/java/ecorp/easy/installer/controllers/subcontrollers/FeedbackController.java
index 1b71eaca..10db8a7a 100644
--- a/src/main/java/ecorp/easy/installer/controllers/subcontrollers/FeedbackController.java
+++ b/src/main/java/ecorp/easy/installer/controllers/subcontrollers/FeedbackController.java
@@ -18,6 +18,7 @@ package ecorp.easy.installer.controllers.subcontrollers;
 
 import ecorp.easy.installer.AppConstants;
 import ecorp.easy.installer.controllers.MainWindowController;
+import ecorp.easy.installer.controllers.stepControllers.StepController;
 import ecorp.easy.installer.models.Phone;
 import ecorp.easy.installer.tasks.UploadToEcloudTask;
 import ecorp.easy.installer.utils.UiUtils;
@@ -25,7 +26,9 @@ import java.io.BufferedWriter;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.net.URL;
 import java.time.LocalDateTime;
+import java.util.ResourceBundle;
 import java.util.UUID;
 import java.util.regex.Pattern;
 import javafx.fxml.FXML;
@@ -42,7 +45,7 @@ import org.slf4j.LoggerFactory;
  *
  * @author Vincent Bourgmayer
  */
-public class FeedbackController extends AbstractSubController {
+public class FeedbackController extends StepController {
     private final static Logger logger = LoggerFactory.getLogger(FeedbackController.class);
     private final static Pattern feelingsPattern = Pattern.compile("\nFeelings: .*");
     
@@ -55,19 +58,12 @@ public class FeedbackController extends AbstractSubController {
     private Button selectedFeelings;
     
     private final static String SELECTED_STYLE="selected-feelings";
-    String deviceModel = "undefined";
     
     @Override
-    public void setParentController(MainWindowController parentController) {
-        super.setParentController(parentController); //To change body of generated methods, choose Tools | Templates.
+    public void initialize(URL url, ResourceBundle rb) {
+        super.initialize(url, rb); //To change body of generated methods, choose Tools | Templates.
         parentController.setNextButtonText("feedback_btn_leave");
-        Phone device = parentController.getPhone();
-        if(device != null){
-            logger.debug("setParentController(), ParentController.getDevice() != null");
-            deviceModel = device.getAdbModel()+", "+device.getAdbDevice();
-        }else{
-            logger.warn("setParentController(), parentController.getDevice() == null");
-        }
+
         commentArea.setWrapText(true);
         prefillCommentArea();
     }
@@ -102,7 +98,7 @@ public class FeedbackController extends AbstractSubController {
      * @param event 
      */
     public void onSendBtnClicked(MouseEvent event){
-        String filePath = createAnswerFile();
+        final String filePath = createAnswerFile();
         sendAnswerBtn.setDisable(true);
         UploadToEcloudTask uploadTask = new UploadToEcloudTask(AppConstants.FEEDBACK_STORAGE_URL, filePath);
         
@@ -135,13 +131,24 @@ public class FeedbackController extends AbstractSubController {
      * Prefill CommentArea with data
      */
     private void prefillCommentArea(){
-        StringBuilder sb = new StringBuilder();
-        String time = LocalDateTime.now().withNano(0).toString();
+        final StringBuilder sb = new StringBuilder();
+        final String time = LocalDateTime.now().withNano(0).toString();
+        
+        final String deviceModel;
+        final Phone device = parentController.getPhone();
+        
+        if(device != null){ //Need to check when this could be null, then if possible remove it.
+            logger.debug("setParentController(), ParentController.getDevice() != null");
+            deviceModel = device.getAdbModel()+", "+device.getAdbDevice();
+        }else{
+            logger.warn("setParentController(), parentController.getDevice() == null");
+             deviceModel = "undefined";
+        }
         
-        sb.append("Timestamp: "+time.replace("T", " "))
-                .append("\nDevice model: "+this.deviceModel)
-                .append("\nOS name: "+AppConstants.OsName)
-                .append("\nEasy-Installer version: "+AppConstants.APP_VERSION)
+        sb.append("Timestamp: ").append(time.replace("T", " "))
+                .append("\nDevice model: ").append(deviceModel)
+                .append("\nOS name: ").append(AppConstants.OsName)
+                .append("\nEasy-Installer version: ").append(AppConstants.APP_VERSION)
                 .append("\nFeelings: ");
             if(selectedFeelings != null){
                 sb.append(selectedFeelings.getId());
@@ -174,7 +181,7 @@ public class FeedbackController extends AbstractSubController {
      * @return 
      */
     private String createAnswerFile(){
-        String answerFilePath = AppConstants.getWritableFolder()+"feedback-"+UUID.randomUUID()+".txt";
+        final String answerFilePath = AppConstants.getWritableFolder()+"feedback-"+UUID.randomUUID()+".txt";
 
         try(PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(answerFilePath, true)))) {
             out.write(fixedFeedbackContent.getText()+"\n");
-- 
GitLab


From 57b90041453856d86363d5d45b07cf4863234186 Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Wed, 2 Feb 2022 17:24:22 +0100
Subject: [PATCH 02/31] update ExecutableStepController.displayError(...):
 remove dead code, update documentation of methods

---
 .../stepControllers/ExecutableStepController.java     | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/ecorp/easy/installer/controllers/stepControllers/ExecutableStepController.java b/src/main/java/ecorp/easy/installer/controllers/stepControllers/ExecutableStepController.java
index c7d02028..7a257ec9 100644
--- a/src/main/java/ecorp/easy/installer/controllers/stepControllers/ExecutableStepController.java
+++ b/src/main/java/ecorp/easy/installer/controllers/stepControllers/ExecutableStepController.java
@@ -58,12 +58,13 @@ public class ExecutableStepController extends StepController<IExecutableStep>{
     }
     
     
+    /**
+     * Show error UI and hide everything that should be hidden
+     * like restart btn, etc.
+     * @param errorMsgKey 
+     */
     protected void displayError(String errorMsgKey){
-        //Show error UI and hide everything that should be hidden
-        //like restart btn, etc.
-        if(i18n.containsKey(errorMsgKey)){
-            //Set text to a label
-        }
+        //not implemented
     }
     
 }
-- 
GitLab


From 48de75726056a779f1f710c66c20935a5c2ff821 Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Wed, 2 Feb 2022 17:29:58 +0100
Subject: [PATCH 03/31] change DeviceDetectedController.java's parent class
 from AbstractSubController to StepController

---
 .../controllers/subcontrollers/DeviceDetectedController.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/ecorp/easy/installer/controllers/subcontrollers/DeviceDetectedController.java b/src/main/java/ecorp/easy/installer/controllers/subcontrollers/DeviceDetectedController.java
index eb1e5522..055de997 100644
--- a/src/main/java/ecorp/easy/installer/controllers/subcontrollers/DeviceDetectedController.java
+++ b/src/main/java/ecorp/easy/installer/controllers/subcontrollers/DeviceDetectedController.java
@@ -18,6 +18,7 @@ package ecorp.easy.installer.controllers.subcontrollers;
 
 
 import ecorp.easy.installer.AppConstants;
+import ecorp.easy.installer.controllers.stepControllers.StepController;
 import ecorp.easy.installer.helpers.DeviceHelper;
 import ecorp.easy.installer.exceptions.TooManyDevicesException;
 import ecorp.easy.installer.models.Phone;
@@ -37,11 +38,12 @@ import javafx.scene.layout.VBox;
 import javafx.scene.text.TextAlignment;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 /**
  *
  * @author Vincent Bourgmayer
  */
-public class DeviceDetectedController extends AbstractSubController{
+public class DeviceDetectedController extends StepController{
     private final static Logger logger = LoggerFactory.getLogger(DeviceDetectedController.class);
     @FXML private Button buyNewDevice;
     @FXML private Button startDetectionButton;
-- 
GitLab


From 192db9300782c9964ff32b8d31ada42e6d7de995 Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Thu, 3 Feb 2022 13:29:06 +0100
Subject: [PATCH 04/31] rename DeviceDetectedController in
 DeviceDetectionController and move it into controllers.stepControllers
 package

---
 .../DeviceDetectionController.java}                             | 0
 src/main/resources/fxml/4-deviceDetected.fxml                   | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename src/main/java/ecorp/easy/installer/controllers/{subcontrollers/DeviceDetectedController.java => stepControllers/DeviceDetectionController.java} (100%)

diff --git a/src/main/java/ecorp/easy/installer/controllers/subcontrollers/DeviceDetectedController.java b/src/main/java/ecorp/easy/installer/controllers/stepControllers/DeviceDetectionController.java
similarity index 100%
rename from src/main/java/ecorp/easy/installer/controllers/subcontrollers/DeviceDetectedController.java
rename to src/main/java/ecorp/easy/installer/controllers/stepControllers/DeviceDetectionController.java
diff --git a/src/main/resources/fxml/4-deviceDetected.fxml b/src/main/resources/fxml/4-deviceDetected.fxml
index a0944c69..00388cde 100644
--- a/src/main/resources/fxml/4-deviceDetected.fxml
+++ b/src/main/resources/fxml/4-deviceDetected.fxml
@@ -30,7 +30,7 @@
 <VBox fx:id="deviceDetectedRoot" alignment="CENTER" spacing="35"
             AnchorPane.leftAnchor="5.0" AnchorPane.rightAnchor="5.0" 
             AnchorPane.topAnchor="50.0" AnchorPane.bottomAnchor="80.0"
-            fx:controller="ecorp.easy.installer.controllers.subcontrollers.DeviceDetectedController"
+            fx:controller="ecorp.easy.installer.controllers.stepControllers.DeviceDetectionController"
             xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
    <children>
         <Label fx:id="detectionMsg" textAlignment="CENTER"/>
-- 
GitLab


From 2d65f672e171a9858614b46c244159e4c6d5305d Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Thu, 3 Feb 2022 13:29:31 +0100
Subject: [PATCH 05/31] remove useless import in Phone.java

---
 src/main/java/ecorp/easy/installer/models/Phone.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/ecorp/easy/installer/models/Phone.java b/src/main/java/ecorp/easy/installer/models/Phone.java
index 8630c8bd..81277bf1 100644
--- a/src/main/java/ecorp/easy/installer/models/Phone.java
+++ b/src/main/java/ecorp/easy/installer/models/Phone.java
@@ -16,8 +16,6 @@
  */
 package ecorp.easy.installer.models;
 
-import ecorp.easy.installer.models.PreparationProcess;
-
 
 /**
  * Encapsulate data about the device
-- 
GitLab


From 59e019aefcc11e1dc04f3da8829c88d2888be422 Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Thu, 3 Feb 2022 13:31:18 +0100
Subject: [PATCH 06/31] update DeviceDetectionController to fit with new
 package and complete the StepController extension

---
 .../stepControllers/DeviceDetectionController.java         | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/ecorp/easy/installer/controllers/stepControllers/DeviceDetectionController.java b/src/main/java/ecorp/easy/installer/controllers/stepControllers/DeviceDetectionController.java
index 055de997..b4f1c9b3 100644
--- a/src/main/java/ecorp/easy/installer/controllers/stepControllers/DeviceDetectionController.java
+++ b/src/main/java/ecorp/easy/installer/controllers/stepControllers/DeviceDetectionController.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package ecorp.easy.installer.controllers.subcontrollers;
+package ecorp.easy.installer.controllers.stepControllers;
 
 
 import ecorp.easy.installer.AppConstants;
@@ -22,6 +22,7 @@ import ecorp.easy.installer.controllers.stepControllers.StepController;
 import ecorp.easy.installer.helpers.DeviceHelper;
 import ecorp.easy.installer.exceptions.TooManyDevicesException;
 import ecorp.easy.installer.models.Phone;
+import ecorp.easy.installer.models.steps.BasicStep;
 import ecorp.easy.installer.tasks.DeviceDetectionTask;
 import ecorp.easy.installer.utils.UiUtils;
 import java.io.IOException;
@@ -43,8 +44,8 @@ import org.slf4j.LoggerFactory;
  *
  * @author Vincent Bourgmayer
  */
-public class DeviceDetectedController extends StepController{
-    private final static Logger logger = LoggerFactory.getLogger(DeviceDetectedController.class);
+public class DeviceDetectionController extends StepController<BasicStep>{
+    private final static Logger logger = LoggerFactory.getLogger(DeviceDetectionController.class);
     @FXML private Button buyNewDevice;
     @FXML private Button startDetectionButton;
     @FXML private Label detectionMsg;
-- 
GitLab


From e36d522aff73619ac0dd69ca0a599c9e6de4ee66 Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Thu, 3 Feb 2022 13:39:24 +0100
Subject: [PATCH 07/31] add a DownloadStep in order to replace
 PreparationProgress

---
 .../installer/models/steps/DownloadStep.java  | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 src/main/java/ecorp/easy/installer/models/steps/DownloadStep.java

diff --git a/src/main/java/ecorp/easy/installer/models/steps/DownloadStep.java b/src/main/java/ecorp/easy/installer/models/steps/DownloadStep.java
new file mode 100644
index 00000000..13b662e0
--- /dev/null
+++ b/src/main/java/ecorp/easy/installer/models/steps/DownloadStep.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2022 - ECORP SAS 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package ecorp.easy.installer.models.steps;
+
+import ecorp.easy.installer.models.RomSource;
+import java.util.HashMap;
+
+/**
+ * This class encapsulate data about a step
+ * where Easy-installer have to download something
+ * @author vincent
+ */
+public class DownloadStep extends BasicStep{
+    private HashMap<String, RomSource> sourcesToDownload;
+    
+    public DownloadStep(String type, String nextStepKey, int stepNumber, HashMap<String, RomSource> sources){
+        super(type, nextStepKey, stepNumber);
+        this.sourcesToDownload = sources;
+    }
+    
+    /**
+     * Get the list of file to download
+     * @return HashMap<String, RomSource>
+     */
+    public final HashMap<String, RomSource> getSourcesToDownload() {
+        return sourcesToDownload;
+    } 
+}
-- 
GitLab


From 3c257dc83b04619dc76b3b7ae079e2df522ae640 Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Thu, 3 Feb 2022 14:00:05 +0100
Subject: [PATCH 08/31] update ConfigParser.java: - rename 'yaml' parameter in
 each function into 'yamlContent'. \n Add function parseDownloadStep(...). \n
 Replace hard written value by private static String when used in multiple
 function

---
 .../easy/installer/utils/ConfigParser.java    | 107 ++++++++++--------
 1 file changed, 62 insertions(+), 45 deletions(-)

diff --git a/src/main/java/ecorp/easy/installer/utils/ConfigParser.java b/src/main/java/ecorp/easy/installer/utils/ConfigParser.java
index a433ac17..87b8707c 100644
--- a/src/main/java/ecorp/easy/installer/utils/ConfigParser.java
+++ b/src/main/java/ecorp/easy/installer/utils/ConfigParser.java
@@ -22,6 +22,7 @@ import ecorp.easy.installer.models.RomSource;
 import ecorp.easy.installer.models.steps.BasicStep;
 import ecorp.easy.installer.models.steps.CustomExecutableStep;
 import ecorp.easy.installer.models.steps.CustomStep;
+import ecorp.easy.installer.models.steps.DownloadStep;
 import ecorp.easy.installer.models.steps.ExecutableStep;
 import ecorp.easy.installer.models.steps.IStep;
 import ecorp.easy.installer.models.steps.LoadStep;
@@ -46,7 +47,11 @@ import org.slf4j.LoggerFactory;
  */
 public class ConfigParser {
     private final static Logger logger = LoggerFactory.getLogger(ConfigParser.class);
-    
+    private final static String STEP_NUMBER = "stepNumber";
+    private final static String NEXT_STEP_KEY = "nextStepKey";
+    private final static String TITLE_KEY = "titleKey";
+    private final static String TITLE_ICON_NAME = "titleIconName";
+    private final static String INSTRUCTIONS = "instructions";
     /**
      * Parse steps from yaml (both for preparation and flashing)
      * @param yaml The data map load from yaml file
@@ -96,6 +101,9 @@ public class ConfigParser {
                 result = parseExecutableStep(yaml, type);
                 //Example: Device detection
                 break;
+            case "download":
+                result = parseDownloadStep(yaml, type);
+                break;
             default:
                 result = parseBasicStep(yaml, type);
                 break;
@@ -116,13 +124,13 @@ public class ConfigParser {
     /**
      * create a basic step from yaml.
      * This is perfect to integrate fixed step like deviceDetection
-     * @param yaml the yaml input
+     * @param yamlContent the yaml input
      * @param type type of the step
      * @return Step object with nextStepKey, stepNumber and type
      */
-    private static BasicStep parseBasicStep(Map yaml, String type) throws ParseException, ClassCastException{
-        final int stepNumber = (int) yaml.get("stepNumber");
-        final String nextStepKey = (String) yaml.get("nextStepKey");
+    private static BasicStep parseBasicStep(Map yamlContent, String type) throws ParseException, ClassCastException{
+        final int stepNumber = (int) yamlContent.get(STEP_NUMBER);
+        final String nextStepKey = (String) yamlContent.get(NEXT_STEP_KEY);
         
         return new BasicStep(type, nextStepKey, stepNumber);
     }
@@ -131,19 +139,19 @@ public class ConfigParser {
     /**
      * Parse yaml content into LoadStep
      * example of this kind of step is /e/ or TWRP installation
-     * @param yaml yaml content
+     * @param yamlContent yaml content
      * @param type Type of step
      * @return LoadStep the step
      */
-    private static LoadStep parseLoadStep(Map yaml, String type) throws ParseException, ClassCastException{
-        final int stepNumber = (int)yaml.get("stepNumber");
-        final String nextStepKey = (String) yaml.get("nextStepKey");
-        final String titleKey = (String) yaml.get("titleKey");
-        final String titleIconName = (String) yaml.getOrDefault("titleIconName", "");
-        final ArrayList<String> instructions = (ArrayList<String>) yaml.getOrDefault("instructions", new ArrayList<String>());        
-        final int averageTime = (int) yaml.get("averageTime");
+    private static LoadStep parseLoadStep(Map yamlContent, String type) throws ParseException, ClassCastException{
+        final int stepNumber = (int)yamlContent.get(STEP_NUMBER);
+        final String nextStepKey = (String) yamlContent.get(NEXT_STEP_KEY);
+        final String titleKey = (String) yamlContent.get(TITLE_KEY);
+        final String titleIconName = (String) yamlContent.getOrDefault(TITLE_ICON_NAME, "");
+        final ArrayList<String> instructions = (ArrayList<String>) yamlContent.getOrDefault(INSTRUCTIONS, new ArrayList<String>());        
+        final int averageTime = (int) yamlContent.get("averageTime");
 
-        final Command cmd = parseCommand(yaml);
+        final Command cmd = parseCommand(yamlContent);
         LoadStep result = new LoadStep(type, nextStepKey, stepNumber , 
                 titleKey, titleIconName, instructions, cmd, averageTime);
         return result;
@@ -153,17 +161,17 @@ public class ConfigParser {
      * Parse yaml content into CustomStep object
      * Example of this kind of test is when you tell
      * the user to enable developer mode.
-     * @param yaml Map yaml content
+     * @param yamlContent Map yaml content
      * @param type Type of step
      * @return CustomStep object
      */
-    private static CustomStep parseCustomStep(Map yaml, String type) throws ParseException, ClassCastException{
+    private static CustomStep parseCustomStep(Map yamlContent, String type) throws ParseException, ClassCastException{
         logger.debug("parseCustomStep(yaml)");
-        int stepNumber = (int)yaml.get("stepNumber");
-        String nextStepKey = (String) yaml.get("nextStepKey");
-        String titleKey = (String) yaml.get("titleKey");
-        String titleIconName = (String) yaml.get("titleIconName");
-        ArrayList<String> instructions = (ArrayList<String>) yaml.getOrDefault("instructions", new ArrayList<String>());       
+        int stepNumber = (int)yamlContent.get(STEP_NUMBER);
+        String nextStepKey = (String) yamlContent.get(NEXT_STEP_KEY);
+        String titleKey = (String) yamlContent.get(TITLE_KEY);
+        String titleIconName = (String) yamlContent.getOrDefault(TITLE_ICON_NAME, "");
+        ArrayList<String> instructions = (ArrayList<String>) yamlContent.getOrDefault(INSTRUCTIONS, new ArrayList<String>());       
         
         CustomStep result = new CustomStep(type, nextStepKey, stepNumber, titleKey, titleIconName, instructions);
         return result;
@@ -173,31 +181,40 @@ public class ConfigParser {
      * Parse yaml content into ExecutableStep
      * example of this kind of step is the step 
      * to detect device
-     * @param yaml yaml content
+     * @param YamlContent yaml content
      * @param type Type of step
      * @return ExecutableStep the step
      */
-    private static ExecutableStep parseExecutableStep(Map yaml, String type) throws ParseException, ClassCastException{
-        final int stepNumber = (int)yaml.get("stepNumber");
-        final String nextStepKey = (String) yaml.get("nextStepKey");
-        final Command cmd = parseCommand(yaml);
+    private static ExecutableStep parseExecutableStep(Map YamlContent, String type) throws ParseException, ClassCastException{
+        final int stepNumber = (int)YamlContent.get(STEP_NUMBER);
+        final String nextStepKey = (String) YamlContent.get(NEXT_STEP_KEY);
+        final Command cmd = parseCommand(YamlContent);
         ExecutableStep result = new ExecutableStep(type, nextStepKey, stepNumber, cmd);
         return result;
     }
 
+    
+    private static DownloadStep parseDownloadStep(Map yamlContent, String type) throws ParseException, ClassCastException{
+        final int stepNumber = (int)yamlContent.get(STEP_NUMBER);
+        final String nextStepKey = (String) yamlContent.get(NEXT_STEP_KEY);
+        HashMap<String, RomSource> sourcesToDownload = parseSourcesToDownload((HashMap) yamlContent.get("sources"));
+        
+        return new DownloadStep(type, nextStepKey, stepNumber, sourcesToDownload);
+    }
+    
     /**
      * Parse yaml content into Command object
      * @TODO rewrite when splitting command between data and job
-     * @param yaml Map yaml content 
+     * @param yamlContent Map yaml content 
      * @return Command object
      */
-    private static Command parseCommand(Map yaml) throws ParseException, ClassCastException{
-        final String commandBase = AppConstants.getScriptsFolderPath()+(String) yaml.get("script")+( AppConstants.isWindowsOs() ? ".bat" : ".sh" ) ;
+    private static Command parseCommand(Map yamlContent) throws ParseException, ClassCastException{
+        final String commandBase = AppConstants.getScriptsFolderPath()+(String) yamlContent.get("script")+( AppConstants.isWindowsOs() ? ".bat" : ".sh" ) ;
 
-        final String outputKey = (String) yaml.getOrDefault("outputKey", null);
-        final LinkedHashMap<String, String> parameters = (LinkedHashMap) yaml.get("parameters");
-        final HashMap<Integer, String> okCodes = (HashMap) yaml.getOrDefault("okCodes", null);
-        final HashMap<Integer, String> koCodes = (HashMap) yaml.getOrDefault("koCodes", null);
+        final String outputKey = (String) yamlContent.getOrDefault("outputKey", null);
+        final LinkedHashMap<String, String> parameters = (LinkedHashMap) yamlContent.get("parameters");
+        final HashMap<Integer, String> okCodes = (HashMap) yamlContent.getOrDefault("okCodes", null);
+        final HashMap<Integer, String> koCodes = (HashMap) yamlContent.getOrDefault("koCodes", null);
         
         final Command result = new Command(commandBase);
         result.setOutputKey(outputKey);
@@ -213,17 +230,17 @@ public class ConfigParser {
      * example of this kind of step is the step on
      * Samsung galaxy device when user must leave 
      * download mode to start on TWRP
-     * @param yaml yaml content
+     * @param yamlContent yaml content
      * @param type Type of step
      * @return ExecutableCustomStep the step
      */
-    private static CustomExecutableStep parseCustomExecutableStep(Map yaml, String type) throws ParseException, ClassCastException{
-        final int stepNumber = (int)yaml.get("stepNumber");
-        final String nextStepKey = (String) yaml.get("nextStepKey");
-        final String titleKey = (String) yaml.get("titleKey");
-        final String titleIconName = (String) yaml.getOrDefault("titleIconName", "");
-        final ArrayList<String> instructions = (ArrayList<String>) yaml.getOrDefault("instructions", new ArrayList<String>());     
-        final Command cmd = parseCommand(yaml);
+    private static CustomExecutableStep parseCustomExecutableStep(Map yamlContent, String type) throws ParseException, ClassCastException{
+        final int stepNumber = (int)yamlContent.get(STEP_NUMBER);
+        final String nextStepKey = (String) yamlContent.get(NEXT_STEP_KEY);
+        final String titleKey = (String) yamlContent.get(TITLE_KEY);
+        final String titleIconName = (String) yamlContent.getOrDefault(TITLE_ICON_NAME, "");
+        final ArrayList<String> instructions = (ArrayList<String>) yamlContent.getOrDefault(INSTRUCTIONS, new ArrayList<String>());     
+        final Command cmd = parseCommand(yamlContent);
         CustomExecutableStep result = new CustomExecutableStep(type, nextStepKey, stepNumber,
                 titleKey, titleIconName, instructions, cmd);
         return result;
@@ -232,18 +249,18 @@ public class ConfigParser {
     
     /**
      * Parse Sources To Download from Yaml file
-     * @param yaml data load from Yaml
+     * @param yamlContent data load from Yaml
      * @return HashMap<String, RomSource> containing sources's URL & local path to store associated to a key
      * @throws java.text.ParseException
      */
-    public static HashMap<String, RomSource> parseSourcesToDownload(HashMap yaml) throws ParseException, ClassCastException{
+    public static HashMap<String, RomSource> parseSourcesToDownload(HashMap yamlContent) throws ParseException, ClassCastException{
         logger.info("parseSourcesToDownload(...yaml...)");
         
         HashMap<String, RomSource> result = new HashMap<>();
         
-        for(String key : (Set<String>) yaml.keySet() ){
+        for(String key : (Set<String>) yamlContent.keySet() ){
 
-            Map source = (Map) yaml.get(key);
+            Map source = (Map) yamlContent.get(key);
             //@TODO Would be better to put below tests elsewhere
             if(key.equals("rom")){
                 AppConstants.setEArchivePath((String) source.get("filePath"));
-- 
GitLab


From 65b3feb046034394ee1c52479f7093cd50e8f339 Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Thu, 3 Feb 2022 14:09:27 +0100
Subject: [PATCH 09/31] Remove PreparationProcess.java because it will replaced
 by DownloadStep. Rename Process.java into StepTree.java. Refactor Phone.java
 & DeviceHelper.java to accord with those changes

---
 .../easy/installer/helpers/DeviceHelper.java  | 40 ++--------------
 .../ecorp/easy/installer/models/Phone.java    | 12 ++---
 .../installer/models/PreparationProcess.java  | 48 -------------------
 .../models/{Process.java => StepTree.java}    |  4 +-
 4 files changed, 11 insertions(+), 93 deletions(-)
 delete mode 100644 src/main/java/ecorp/easy/installer/models/PreparationProcess.java
 rename src/main/java/ecorp/easy/installer/models/{Process.java => StepTree.java} (95%)

diff --git a/src/main/java/ecorp/easy/installer/helpers/DeviceHelper.java b/src/main/java/ecorp/easy/installer/helpers/DeviceHelper.java
index 8e9295d9..5743dc2a 100644
--- a/src/main/java/ecorp/easy/installer/helpers/DeviceHelper.java
+++ b/src/main/java/ecorp/easy/installer/helpers/DeviceHelper.java
@@ -15,11 +15,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package ecorp.easy.installer.helpers;
-import ecorp.easy.installer.models.PreparationProcess;
 import ecorp.easy.installer.models.steps.IStep;
-import ecorp.easy.installer.models.Process;
-import ecorp.easy.installer.models.RomSource;
-import ecorp.easy.installer.utils.ConfigParser;
+import ecorp.easy.installer.models.StepTree;
 import static ecorp.easy.installer.utils.ConfigParser.parseSteps;
 import java.io.IOException;
 import java.io.InputStream;
@@ -95,45 +92,14 @@ public class DeviceHelper {
      * @throws java.io.IOException  
      * @throws java.text.ParseException  
      */
-    public static Process loadFlashProcess(String adbDevice) throws IOException, ParseException, NumberFormatException, NullPointerException{
+    public static StepTree loadStepTree(String adbDevice) throws IOException, ParseException, NumberFormatException, NullPointerException{
 
         final Map yamlContent = loadYaml(adbDevice+"_flash.yml");
         final int stepsCount = (Integer) yamlContent.get("stepsCount");
         final HashMap<String, IStep> steps = parseSteps( (HashMap) yamlContent.get("steps") );
         //@TODO: check if steps is null, etc.
-        final Process flashingProcess = new Process(stepsCount, steps);
+        final StepTree flashingProcess = new StepTree(stepsCount, steps);
 
         return flashingProcess;
     }
-    
-    
-    /**
-     * Load the preparation process
-     * @param adbDevice
-     * @return
-     * @throws IOException
-     * @throws ParseException
-     * @throws NumberFormatException
-     * @throws NullPointerException 
-     */
-    public static PreparationProcess loadPreparationProcess(String adbDevice) throws IOException, ParseException, NumberFormatException, NullPointerException{
-
-        final HashMap yamlContent = loadYaml(adbDevice+"_preparation.yml");
-        final int stepsCount = (Integer) yamlContent.getOrDefault("stepsCount", 0);
-        
-        final HashMap<String, IStep> steps; 
-        if(yamlContent.containsKey("steps"))
-            steps = parseSteps( (HashMap) yamlContent.get("steps") ); //What to do if null...
-        else{
-            logger.debug("Preparation config file has no specific steps");
-            steps = new HashMap<>();
-        }
-        
-        if(!yamlContent.containsKey("sources")) throw new NullPointerException("Invalid prepration config file. Doesn't contains \"sources\" entry");
-        final HashMap<String, RomSource> sourcesToDownload = ConfigParser.parseSourcesToDownload( (HashMap) yamlContent.get("sources"));
-        
-        //@TODO: check if steps is null, etc.
-        final PreparationProcess prepProcess = new PreparationProcess(stepsCount, steps, sourcesToDownload);
-        return prepProcess;
-    }
 }
\ No newline at end of file
diff --git a/src/main/java/ecorp/easy/installer/models/Phone.java b/src/main/java/ecorp/easy/installer/models/Phone.java
index 81277bf1..d6262137 100644
--- a/src/main/java/ecorp/easy/installer/models/Phone.java
+++ b/src/main/java/ecorp/easy/installer/models/Phone.java
@@ -33,8 +33,8 @@ public class Phone {
     private boolean adbAuthorized = false;
     //private boolean isReady = false; //tell if preparation process succeed
     
-    private Process flashingProcess;
-    private PreparationProcess prepProcess;
+    private StepTree flashingProcess;
+    private StepTree prepProcess;
 
     
  /**
@@ -152,7 +152,7 @@ public class Phone {
      * Can return null if not setted
      * @return 
      */
-    public Process getFlashingProcess() {
+    public StepTree getFlashingProcess() {
         return flashingProcess;
     }
 
@@ -161,7 +161,7 @@ public class Phone {
      * Set the flashing process of the phone
      * @param flashingProcess 
      */
-    public void setFlashingProcess(final Process flashingProcess) {
+    public void setFlashingProcess(final StepTree flashingProcess) {
         this.flashingProcess = flashingProcess;
     }
     
@@ -169,7 +169,7 @@ public class Phone {
      * Return the PreparationProcess instance
      * @return PreparationProcess
      */
-    public PreparationProcess getPrepProcess() {
+    public StepTree getPrepProcess() {
         return prepProcess;
     }
 
@@ -177,7 +177,7 @@ public class Phone {
      * Define the preparationProcess
      * @param prepProcess 
      */
-    public void setPrepProcess(final PreparationProcess prepProcess) {
+    public void setPrepProcess(final StepTree prepProcess) {
         this.prepProcess = prepProcess;
     }
 }
diff --git a/src/main/java/ecorp/easy/installer/models/PreparationProcess.java b/src/main/java/ecorp/easy/installer/models/PreparationProcess.java
deleted file mode 100644
index 59a39270..00000000
--- a/src/main/java/ecorp/easy/installer/models/PreparationProcess.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2021-2022 - ECORP SAS 
-
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package ecorp.easy.installer.models;
-
-import ecorp.easy.installer.models.steps.IStep;
-import java.util.HashMap;
-
-/**
- * This class encapsulate data about process to prepare a device before flashing
- * @author vincent Bourgmayer
- */
-public class PreparationProcess extends Process{
-    
-    private HashMap<String, RomSource> sourcesToDownload;
-
-    /**
-     * Constructor of PreparationProcess
-     * Create an empty list of Sources to download
-     * 
-     * @param stepCount number of step in the process 
-     */
-    public PreparationProcess(int stepCount, HashMap<String, IStep> steps, HashMap<String, RomSource> sources){
-        super(stepCount, steps);
-        sourcesToDownload = sources;
-    }
-    
-    /**
-     * Get the list of file to download
-     * @return HashMap<String, RomSource>
-     */
-    public final HashMap<String, RomSource> getSourcesToDownload() {
-        return sourcesToDownload;
-    } 
-}
\ No newline at end of file
diff --git a/src/main/java/ecorp/easy/installer/models/Process.java b/src/main/java/ecorp/easy/installer/models/StepTree.java
similarity index 95%
rename from src/main/java/ecorp/easy/installer/models/Process.java
rename to src/main/java/ecorp/easy/installer/models/StepTree.java
index 85883394..36a3ed86 100644
--- a/src/main/java/ecorp/easy/installer/models/Process.java
+++ b/src/main/java/ecorp/easy/installer/models/StepTree.java
@@ -25,7 +25,7 @@ import java.util.HashMap;
  * Could be name: StepTree or StepMap or FlashingProcess
  * @author Vincent Bourgmayer
  */
-public class Process {
+public class StepTree {
 
     private final int stepsCount; //Number of step to consider
     private HashMap<String, IStep> steps; //Map of steps to follow
@@ -36,7 +36,7 @@ public class Process {
      * @param stepCount int number of step used for FlashProcess
      * @param steps HashMap<String, IStep> list of steps
      */
-    public Process(int stepCount, HashMap<String, IStep> steps){
+    public StepTree(int stepCount, HashMap<String, IStep> steps){
         this.stepsCount = stepCount;
         this.steps = steps;
     }
-- 
GitLab


From cfcb687bbf0461732d7b6d9aac622020330b114e Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Thu, 3 Feb 2022 14:18:42 +0100
Subject: [PATCH 10/31] update ConfigParser.java: update parseStep to avoid a
 NPE if step's type not written in config file. Also rename a forgotten 'yaml'
 parameter into 'yamlContent' and move parseCommand(...) under the
 parseCustomExecutableStep() method

---
 .../easy/installer/utils/ConfigParser.java    | 78 ++++++++++---------
 1 file changed, 41 insertions(+), 37 deletions(-)

diff --git a/src/main/java/ecorp/easy/installer/utils/ConfigParser.java b/src/main/java/ecorp/easy/installer/utils/ConfigParser.java
index 87b8707c..88e2f99a 100644
--- a/src/main/java/ecorp/easy/installer/utils/ConfigParser.java
+++ b/src/main/java/ecorp/easy/installer/utils/ConfigParser.java
@@ -52,6 +52,7 @@ public class ConfigParser {
     private final static String TITLE_KEY = "titleKey";
     private final static String TITLE_ICON_NAME = "titleIconName";
     private final static String INSTRUCTIONS = "instructions";
+    
     /**
      * Parse steps from yaml (both for preparation and flashing)
      * @param yaml The data map load from yaml file
@@ -68,44 +69,43 @@ public class ConfigParser {
         return result;
     }
 
-    
     /**
      * Create a single Step instance from a Map<String, String> containing yaml content
-     * @param yaml
+     * @param yamlContent
      * @return the IStep implementation's instance
      * @throws ParseException
      * @throws NumberFormatException 
      */
-    public static IStep parseStep(Map yaml) throws ParseException, NumberFormatException, NullPointerException{
+    public static IStep parseStep(Map yamlContent) throws ParseException, NumberFormatException, NullPointerException{
         IStep result = null;
         
-        String type = (String) yaml.get("type");
+        String type = (String) yamlContent.getOrDefault("type", "");
         logger.debug("--step type:"+type);
         switch(type){
             case "load":
-                result = parseLoadStep(yaml, type);
+                result = parseLoadStep(yamlContent, type);
                 // example: twrp or /e/ installation
                 break;
             case "custom":
-                result = parseCustomStep(yaml, type);
+                result = parseCustomStep(yamlContent, type);
                 // Example: enable DevOption, enable ADB, enable MTP
                 // S9: OEM unlock
                 // FP3: update phone & oem unlock
                 // GS290 update stockrom
                 break;
             case "custom-executable":
-                result = parseCustomExecutableStep(yaml, type);
+                result = parseCustomExecutableStep(yamlContent, type);
                 //Example: reboot from download mode into twrp, etc.
                 break;
             case "executable":
-                result = parseExecutableStep(yaml, type);
+                result = parseExecutableStep(yamlContent, type);
                 //Example: Device detection
                 break;
             case "download":
-                result = parseDownloadStep(yaml, type);
+                result = parseDownloadStep(yamlContent, type);
                 break;
             default:
-                result = parseBasicStep(yaml, type);
+                result = parseBasicStep(yamlContent, type);
                 break;
         }
         return result;
@@ -118,9 +118,6 @@ public class ConfigParser {
     * to null
     */
     
-    
-    
-    
     /**
      * create a basic step from yaml.
      * This is perfect to integrate fixed step like deviceDetection
@@ -193,7 +190,14 @@ public class ConfigParser {
         return result;
     }
 
-    
+    /**
+     * Parse yaml content into DownloadStep
+     * @param yamlContent yaml content
+     * @param type Type of step
+     * @return
+     * @throws ParseException
+     * @throws ClassCastException 
+     */
     private static DownloadStep parseDownloadStep(Map yamlContent, String type) throws ParseException, ClassCastException{
         final int stepNumber = (int)yamlContent.get(STEP_NUMBER);
         final String nextStepKey = (String) yamlContent.get(NEXT_STEP_KEY);
@@ -202,6 +206,28 @@ public class ConfigParser {
         return new DownloadStep(type, nextStepKey, stepNumber, sourcesToDownload);
     }
     
+    /**
+     * Parse yaml content into ExecutableCustomStep
+     * example of this kind of step is the step on
+     * Samsung galaxy device when user must leave 
+     * download mode to start on TWRP
+     * @param yamlContent yaml content
+     * @param type Type of step
+     * @return ExecutableCustomStep the step
+     */
+    private static CustomExecutableStep parseCustomExecutableStep(Map yamlContent, String type) throws ParseException, ClassCastException{
+        final int stepNumber = (int)yamlContent.get(STEP_NUMBER);
+        final String nextStepKey = (String) yamlContent.get(NEXT_STEP_KEY);
+        final String titleKey = (String) yamlContent.get(TITLE_KEY);
+        final String titleIconName = (String) yamlContent.getOrDefault(TITLE_ICON_NAME, "");
+        final ArrayList<String> instructions = (ArrayList<String>) yamlContent.getOrDefault(INSTRUCTIONS, new ArrayList<String>());     
+        final Command cmd = parseCommand(yamlContent);
+        CustomExecutableStep result = new CustomExecutableStep(type, nextStepKey, stepNumber,
+                titleKey, titleIconName, instructions, cmd);
+        return result;
+    }
+    
+        
     /**
      * Parse yaml content into Command object
      * @TODO rewrite when splitting command between data and job
@@ -225,35 +251,13 @@ public class ConfigParser {
         return result;
     }
     
-    /**
-     * Parse yaml content into ExecutableCustomStep
-     * example of this kind of step is the step on
-     * Samsung galaxy device when user must leave 
-     * download mode to start on TWRP
-     * @param yamlContent yaml content
-     * @param type Type of step
-     * @return ExecutableCustomStep the step
-     */
-    private static CustomExecutableStep parseCustomExecutableStep(Map yamlContent, String type) throws ParseException, ClassCastException{
-        final int stepNumber = (int)yamlContent.get(STEP_NUMBER);
-        final String nextStepKey = (String) yamlContent.get(NEXT_STEP_KEY);
-        final String titleKey = (String) yamlContent.get(TITLE_KEY);
-        final String titleIconName = (String) yamlContent.getOrDefault(TITLE_ICON_NAME, "");
-        final ArrayList<String> instructions = (ArrayList<String>) yamlContent.getOrDefault(INSTRUCTIONS, new ArrayList<String>());     
-        final Command cmd = parseCommand(yamlContent);
-        CustomExecutableStep result = new CustomExecutableStep(type, nextStepKey, stepNumber,
-                titleKey, titleIconName, instructions, cmd);
-        return result;
-    }
-    
-    
     /**
      * Parse Sources To Download from Yaml file
      * @param yamlContent data load from Yaml
      * @return HashMap<String, RomSource> containing sources's URL & local path to store associated to a key
      * @throws java.text.ParseException
      */
-    public static HashMap<String, RomSource> parseSourcesToDownload(HashMap yamlContent) throws ParseException, ClassCastException{
+    private static HashMap<String, RomSource> parseSourcesToDownload(HashMap yamlContent) throws ParseException, ClassCastException{
         logger.info("parseSourcesToDownload(...yaml...)");
         
         HashMap<String, RomSource> result = new HashMap<>();
-- 
GitLab


From d3f0b506bf6e458d80bdbe46a396de3363cb36a5 Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Thu, 3 Feb 2022 14:31:42 +0100
Subject: [PATCH 11/31] Move some field from Phone.java into new
 'Progression.java' class which must represent the flashing progression
 (including preparation)

---
 .../ecorp/easy/installer/models/Phone.java    | 55 +------------------
 1 file changed, 2 insertions(+), 53 deletions(-)

diff --git a/src/main/java/ecorp/easy/installer/models/Phone.java b/src/main/java/ecorp/easy/installer/models/Phone.java
index d6262137..d5a54dc6 100644
--- a/src/main/java/ecorp/easy/installer/models/Phone.java
+++ b/src/main/java/ecorp/easy/installer/models/Phone.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2020 - ECORP SAS 
+ * Copyright 2019-2022 - ECORP SAS 
 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,12 +29,10 @@ public class Phone {
     private String adbModel;
     private String adbProduct;
     //private String androidAPI; //Android api level unused yet
-    private boolean flashed = false;
     private boolean adbAuthorized = false;
     //private boolean isReady = false; //tell if preparation process succeed
     
-    private StepTree flashingProcess;
-    private StepTree prepProcess;
+
 
     
  /**
@@ -116,21 +114,6 @@ public class Phone {
         this.adbProduct = adbProduct;
     }
 
-    /**
-     * tell if device has been flashed with success
-     * @return boolean true if device has been flashed with success
-     */
-    public boolean isFlashed() {
-        return flashed;
-    }
-
-    /**
-     * tell that device has been flashed with success
-    */
-    public void setFlashed() {
-        this.flashed = true;
-    }
-    
     /**
      * tell if device authorize computer to communicate through adb
      * @return boolean true if device allow computer to communicate
@@ -146,38 +129,4 @@ public class Phone {
     public void setAdbAuthorized(final boolean adbAuthorized) {
         this.adbAuthorized = adbAuthorized;
     }
-    
-    /**
-     * Get the flashing process of the phone
-     * Can return null if not setted
-     * @return 
-     */
-    public StepTree getFlashingProcess() {
-        return flashingProcess;
-    }
-
-    
-    /**
-     * Set the flashing process of the phone
-     * @param flashingProcess 
-     */
-    public void setFlashingProcess(final StepTree flashingProcess) {
-        this.flashingProcess = flashingProcess;
-    }
-    
-    /**
-     * Return the PreparationProcess instance
-     * @return PreparationProcess
-     */
-    public StepTree getPrepProcess() {
-        return prepProcess;
-    }
-
-    /**
-     * Define the preparationProcess
-     * @param prepProcess 
-     */
-    public void setPrepProcess(final StepTree prepProcess) {
-        this.prepProcess = prepProcess;
-    }
 }
-- 
GitLab


From 2b6cbf0146b051a60e416cfe64dc7dcd3a2007ff Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Thu, 3 Feb 2022 14:42:59 +0100
Subject: [PATCH 12/31] update MainWindowController to use Progression.java,
 update Phone.java to remove unused method

---
 .../controllers/MainWindowController.java     | 29 +++++++------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/src/main/java/ecorp/easy/installer/controllers/MainWindowController.java b/src/main/java/ecorp/easy/installer/controllers/MainWindowController.java
index 7826c410..c316078c 100644
--- a/src/main/java/ecorp/easy/installer/controllers/MainWindowController.java
+++ b/src/main/java/ecorp/easy/installer/controllers/MainWindowController.java
@@ -24,6 +24,7 @@ import ecorp.easy.installer.controllers.stepControllers.CustomStepController;
 import ecorp.easy.installer.controllers.stepControllers.StepController;
 import ecorp.easy.installer.controllers.stepControllers.Stoppable;
 import ecorp.easy.installer.models.Phone;
+import ecorp.easy.installer.models.Progression;
 import ecorp.easy.installer.models.steps.IStep;
 import ecorp.easy.installer.tasks.CommandExecutionTask;
 import ecorp.easy.installer.utils.UiUtils;
@@ -61,8 +62,8 @@ public class MainWindowController implements Initializable {
     
     private ResourceBundle i18n ;//internationalization
     private String currentSubRootId =null;
-    Phone phone; //Object encapsulating data about the device to flash
-    private String currentStepKey = "f0";
+    private Phone phone; //Object encapsulating data about the device to flash
+    private Progression progression;
     
     private Object subController;
 
@@ -85,7 +86,6 @@ public class MainWindowController implements Initializable {
         );
         
         StepController.setParentController(this);
-        
     }
     
     /**
@@ -190,8 +190,9 @@ public class MainWindowController implements Initializable {
                     StepController controller = null;
                     String fxmlName = "";
                     String title ="installationTitle";
-                    if(currentStepKey.equals(IStep.LAST_STEP_KEY)){
-                        if(phone.isFlashed()){
+                    //@TODO change to include preparation process situation
+                    if(progression.getCurrentStepKey().equals(IStep.LAST_STEP_KEY)){
+                        if(progression.isFlashed()){
                             fxmlName="7-flashResult.fxml";
                             title="installationTitle";
                         }else{
@@ -199,7 +200,8 @@ public class MainWindowController implements Initializable {
                             title="feedback_mTitle";
                         }
                     }else{
-                        final IStep step = phone.getFlashingProcess().getSteps().get(currentStepKey);
+                        //@TODO change to include preparationprocess
+                        final IStep step = progression.getFlashingProcess().getSteps().get(progression.getCurrentStepKey());
 
                         switch(step.getType()){
                             case "askAccount":
@@ -237,7 +239,7 @@ public class MainWindowController implements Initializable {
                 case "flashResultRoot":
                     final String fxmlFileName;
                     final String nextViewTitle;
-                    if( phone.isFlashed() ){
+                    if( progression.isFlashed() ){
                         fxmlFileName = "8-congrats.fxml";
                         nextViewTitle ="congrats_mTitle";
                     }
@@ -264,7 +266,7 @@ public class MainWindowController implements Initializable {
      * Reset the flashing process to the begining
      */
     public void retryToFlash(){
-        currentStepKey = "f0";
+        progression.setCurrentStepKey(Progression.FLASHING_FIRST_STEP_KEY);
         loadSubScene();
     }
     
@@ -443,15 +445,4 @@ public class MainWindowController implements Initializable {
     public Phone getPhone() {
         return phone;
     }
-    
-    
-    public String getCurrentStepKey() {
-        return currentStepKey;
-    }
-
-    
-    public void setCurrentStepKey(String currentStepKey) {
-        this.currentStepKey = currentStepKey;
-    }
-
 }
-- 
GitLab


From 00eb30994c62112ee789d48b2daa233d328ef9e6 Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Thu, 3 Feb 2022 14:43:36 +0100
Subject: [PATCH 13/31] add Phone.java's changes forgotten in previous commit..

---
 src/main/java/ecorp/easy/installer/models/Phone.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/main/java/ecorp/easy/installer/models/Phone.java b/src/main/java/ecorp/easy/installer/models/Phone.java
index d5a54dc6..c9d5752d 100644
--- a/src/main/java/ecorp/easy/installer/models/Phone.java
+++ b/src/main/java/ecorp/easy/installer/models/Phone.java
@@ -23,17 +23,13 @@ package ecorp.easy.installer.models;
  * @author Ingo
  */
 public class Phone {
-    private String internalCode; //Internal code of Easy-installer to identify device's model
+    private String internalCode; //Internal code from Easy-installer to identify device's model
     private String serialNo;
     private String adbDevice;
     private String adbModel;
     private String adbProduct;
     //private String androidAPI; //Android api level unused yet
-    private boolean adbAuthorized = false;
-    //private boolean isReady = false; //tell if preparation process succeed
-    
-
-
+    private boolean adbAuthorized = false;    
     
  /**
      * get Device internal Code
-- 
GitLab


From ba146dc2cc9fe5f8114d60a5a236a7578b36af5e Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Thu, 3 Feb 2022 14:49:19 +0100
Subject: [PATCH 14/31] include Progression.java. I thought it has already been
 included but looks not... then Update DownloadSrcController to extends
 StepController.java & to use new DownloadStep inside

---
 .../DownloadSrcController.java                | 34 ++-----
 .../easy/installer/models/Progression.java    | 97 +++++++++++++++++++
 src/main/resources/fxml/5-downloadSrc.fxml    |  2 +-
 3 files changed, 107 insertions(+), 26 deletions(-)
 rename src/main/java/ecorp/easy/installer/controllers/{subcontrollers => stepControllers}/DownloadSrcController.java (86%)
 create mode 100644 src/main/java/ecorp/easy/installer/models/Progression.java

diff --git a/src/main/java/ecorp/easy/installer/controllers/subcontrollers/DownloadSrcController.java b/src/main/java/ecorp/easy/installer/controllers/stepControllers/DownloadSrcController.java
similarity index 86%
rename from src/main/java/ecorp/easy/installer/controllers/subcontrollers/DownloadSrcController.java
rename to src/main/java/ecorp/easy/installer/controllers/stepControllers/DownloadSrcController.java
index c0096285..be3d8d76 100644
--- a/src/main/java/ecorp/easy/installer/controllers/subcontrollers/DownloadSrcController.java
+++ b/src/main/java/ecorp/easy/installer/controllers/stepControllers/DownloadSrcController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2020 - ECORP SAS 
+ * Copyright 2019-2022 - ECORP SAS 
 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,12 +14,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package ecorp.easy.installer.controllers.subcontrollers;
+package ecorp.easy.installer.controllers.stepControllers;
 
 
 import ecorp.easy.installer.AppConstants;
-import ecorp.easy.installer.controllers.MainWindowController;
+import ecorp.easy.installer.controllers.stepControllers.StepController;
 import ecorp.easy.installer.models.RomSource;
+import ecorp.easy.installer.models.steps.DownloadStep;
 import ecorp.easy.installer.tasks.CommandExecutionTask;
 import ecorp.easy.installer.tasks.DownloadTask;
 import ecorp.easy.installer.utils.UiUtils;
@@ -43,14 +44,13 @@ import org.slf4j.LoggerFactory;
  *
  * @author Vincent Bourgmayer
  */
-public class DownloadSrcController extends AbstractSubController {
+public class DownloadSrcController extends StepController<DownloadStep> {
     private final static Logger logger = LoggerFactory.getLogger(DownloadSrcController.class);
     private @FXML ProgressBar preparationProgressBar;
     private @FXML Label progressLabel;
     private @FXML Label progressTitle;
     private @FXML Button restartDownloadBtn;
-    
-    private HashMap<String, RomSource> sourcesToDownload;
+
     private Iterator<HashMap.Entry<String, RomSource>> sourceIterator;
     private DownloadService currentService;
     
@@ -58,29 +58,13 @@ public class DownloadSrcController extends AbstractSubController {
     public void initialize(URL location, ResourceBundle resources) {
         super.initialize(location, resources);
         UiUtils.hideNode(restartDownloadBtn);
+        
+        sourceIterator =  this.step.getSourcesToDownload().entrySet().iterator();
         currentService = new DownloadService();
-    }
-
-    @Override
-    public void setParentController(MainWindowController parentController){
-        super.setParentController(parentController);
         
-        //@todo replace with parentController.getPreparationprocess.getSourcesToDownload();
-        //Also move the try catch when we load preparationprocess
-        sourcesToDownload = parentController.getPhone().getPrepProcess().getSourcesToDownload();
-        sourceIterator =  sourcesToDownload.entrySet().iterator();
-        /*try{
-            
-            //sourcesToDownload = DeviceHelper.getSourcesToDownload(parentController.getPhone().getAdbDevice());
-        }catch(IOException | ParseException | ClassCastException e){
-            logger.debug("Can't load Sources URL & local path from config file: {}", e.getMessage());
-            //@TODO add UI information
-            
-            return;
-        }*/
         startNextDownload();
-
     }
+
     
     /**
      * Start to download a part of the rom
diff --git a/src/main/java/ecorp/easy/installer/models/Progression.java b/src/main/java/ecorp/easy/installer/models/Progression.java
new file mode 100644
index 00000000..d1b6552b
--- /dev/null
+++ b/src/main/java/ecorp/easy/installer/models/Progression.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2022 - ECORP SAS 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package ecorp.easy.installer.models;
+
+/**
+ * this class encapsulate progression's data about both: preparation and flash of a given device
+ * @author vincent
+ */
+public class Progression {
+    public final static String PREPARATION_FIRST_STEP_KEY ="p0";
+    public final static String FLASHING_FIRST_STEP_KEY ="f0";
+    
+    private String currentStepKey=PREPARATION_FIRST_STEP_KEY;
+    private boolean flashed = false;
+    private boolean prepared = false;
+    private StepTree flashingProcess;
+    private final StepTree preparationProcess;
+    
+    public Progression(StepTree preparationProcess){
+        this.preparationProcess = preparationProcess;
+    }
+    
+    public StepTree getCurrentProcess(){
+        if(!prepared ) return preparationProcess;
+        return flashingProcess;
+    }
+        
+    /**
+     * Get the flashing process of the phone
+     * Can return null if not setted
+     * @return 
+     */
+    public StepTree getFlashingProcess() {
+        return flashingProcess;
+    }
+
+    /**
+     * Set the flashing process of the phone
+     * @param flashingProcess 
+     */
+    public void setFlashingProcess(final StepTree flashingProcess) {
+        this.flashingProcess = flashingProcess;
+    }
+    
+    /**
+     * Return the PreparationProcess instance
+     * @return PreparationProcess
+     */
+    public StepTree getPrepProcess() {
+        return preparationProcess;
+    }
+    
+    /**
+     * tell if device has been flashed with success
+     * @return boolean true if device has been flashed with success
+     */
+    public boolean isFlashed() {
+        return flashed;
+    }
+
+    /**
+     * tell that device has been flashed with success
+    */
+    public void setFlashed() {
+        this.flashed = true;
+    }
+    
+    public String getCurrentStepKey() {
+        return currentStepKey;
+    }
+
+    public void setCurrentStepKey(String currentStepKey) {
+        this.currentStepKey = currentStepKey;
+    }
+
+    public boolean isPrepared() {
+        return prepared;
+    }
+
+    public void setPrepared(boolean prepared) {
+        this.prepared = prepared;
+    }
+}
diff --git a/src/main/resources/fxml/5-downloadSrc.fxml b/src/main/resources/fxml/5-downloadSrc.fxml
index 093d92b2..ed403632 100644
--- a/src/main/resources/fxml/5-downloadSrc.fxml
+++ b/src/main/resources/fxml/5-downloadSrc.fxml
@@ -30,7 +30,7 @@
             AnchorPane.leftAnchor="5.0" AnchorPane.rightAnchor="5.0" 
             AnchorPane.topAnchor="50.0" AnchorPane.bottomAnchor="80.0"
             xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
-            fx:controller="ecorp.easy.installer.controllers.subcontrollers.DownloadSrcController">
+            fx:controller="ecorp.easy.installer.controllers.stepControllers.DownloadSrcController">
     <children>
         <Label text="%download_lbl_download" textAlignment="CENTER" wrapText="true"/>
         <Label text="%download_lbl_bePatient" textAlignment="CENTER" wrapText="true"/>
-- 
GitLab


From 05f734394d4a03dadd347cb8b228149f637ed772 Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Thu, 3 Feb 2022 14:59:07 +0100
Subject: [PATCH 15/31] fix issue due to new Progression.java into each
 StepController

---
 .../controllers/MainWindowController.java     | 10 +++++++-
 .../CustomExecutableController.java           |  5 ++--
 .../stepControllers/CustomStepController.java |  2 +-
 .../DeviceDetectionController.java            | 17 +++++++++-----
 .../stepControllers/LoadStepController.java   |  5 ++--
 .../stepControllers/StepController.java       | 23 +++++++++++++++----
 .../stepControllers/UnlockOemController.java  |  2 +-
 7 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/src/main/java/ecorp/easy/installer/controllers/MainWindowController.java b/src/main/java/ecorp/easy/installer/controllers/MainWindowController.java
index c316078c..42cbf545 100644
--- a/src/main/java/ecorp/easy/installer/controllers/MainWindowController.java
+++ b/src/main/java/ecorp/easy/installer/controllers/MainWindowController.java
@@ -191,7 +191,7 @@ public class MainWindowController implements Initializable {
                     String fxmlName = "";
                     String title ="installationTitle";
                     //@TODO change to include preparation process situation
-                    if(progression.getCurrentStepKey().equals(IStep.LAST_STEP_KEY)){
+                    if(progression.getCurrentStepKey().equals(Progression.LAST_STEP_KEY)){
                         if(progression.isFlashed()){
                             fxmlName="7-flashResult.fxml";
                             title="installationTitle";
@@ -445,4 +445,12 @@ public class MainWindowController implements Initializable {
     public Phone getPhone() {
         return phone;
     }
+    
+    /**
+     * return progression instance for subController
+     * @return 
+     */
+    public Progression getProgression(){
+        return progression;
+    }
 }
diff --git a/src/main/java/ecorp/easy/installer/controllers/stepControllers/CustomExecutableController.java b/src/main/java/ecorp/easy/installer/controllers/stepControllers/CustomExecutableController.java
index 4dfe1915..34952c6f 100644
--- a/src/main/java/ecorp/easy/installer/controllers/stepControllers/CustomExecutableController.java
+++ b/src/main/java/ecorp/easy/installer/controllers/stepControllers/CustomExecutableController.java
@@ -24,6 +24,7 @@ import ecorp.easy.installer.models.steps.CustomExecutableStep;
 import ecorp.easy.installer.tasks.CommandRunnerService;
 import ecorp.easy.installer.utils.UiUtils;
 import ecorp.easy.installer.graphics.FlashGlobalProgressManager;
+import ecorp.easy.installer.models.Progression;
 import ecorp.easy.installer.models.steps.CommandExecutionResult;
 import ecorp.easy.installer.models.steps.IStep;
 import java.net.URL;
@@ -89,7 +90,7 @@ public class CustomExecutableController extends StepController<CustomExecutableS
         displayInstructionImage(instructions.get(currentEmphasizedInstruction));
         instructionsCount = instructions.size();
         
-        globalProgressMgr = new FlashGlobalProgressManager(parentController.getPhone().getFlashingProcess().getStepsCount());
+        globalProgressMgr = new FlashGlobalProgressManager(parentController.getProgression().getFlashingProcess().getStepsCount());
         for(int i = 0;i < step.getStepNumber(); i++){
             globalProgressMgr.updateProgression();
         }
@@ -183,7 +184,7 @@ public class CustomExecutableController extends StepController<CustomExecutableS
         parentController.resetNextButtonEventHandler(); 
         //parentController.setNextButtonVisible(false);
         //parentController.setIsFlashed(false);
-        parentController.setCurrentStepKey(IStep.LAST_STEP_KEY);
+        parentController.getProgression().setCurrentStepKey(Progression.LAST_STEP_KEY);
         
         if(i18n.containsKey(errorMsgKey)){
             final Label errorLbl = new Label(i18n.getString(errorMsgKey));
diff --git a/src/main/java/ecorp/easy/installer/controllers/stepControllers/CustomStepController.java b/src/main/java/ecorp/easy/installer/controllers/stepControllers/CustomStepController.java
index a2f3588e..d684234e 100644
--- a/src/main/java/ecorp/easy/installer/controllers/stepControllers/CustomStepController.java
+++ b/src/main/java/ecorp/easy/installer/controllers/stepControllers/CustomStepController.java
@@ -77,7 +77,7 @@ public class CustomStepController extends StepController<ICustomStep>{
         instructionsCount = instructions.size();
 
         
-        globalProgressMgr = new FlashGlobalProgressManager(parentController.getPhone().getFlashingProcess().getStepsCount());
+        globalProgressMgr = new FlashGlobalProgressManager(parentController.getProgression().getFlashingProcess().getStepsCount());
         for(int i = 0;i < step.getStepNumber(); i++){
             globalProgressMgr.updateProgression();
         }
diff --git a/src/main/java/ecorp/easy/installer/controllers/stepControllers/DeviceDetectionController.java b/src/main/java/ecorp/easy/installer/controllers/stepControllers/DeviceDetectionController.java
index b4f1c9b3..5dac3d10 100644
--- a/src/main/java/ecorp/easy/installer/controllers/stepControllers/DeviceDetectionController.java
+++ b/src/main/java/ecorp/easy/installer/controllers/stepControllers/DeviceDetectionController.java
@@ -18,7 +18,6 @@ package ecorp.easy.installer.controllers.stepControllers;
 
 
 import ecorp.easy.installer.AppConstants;
-import ecorp.easy.installer.controllers.stepControllers.StepController;
 import ecorp.easy.installer.helpers.DeviceHelper;
 import ecorp.easy.installer.exceptions.TooManyDevicesException;
 import ecorp.easy.installer.models.Phone;
@@ -125,17 +124,23 @@ public class DeviceDetectionController extends StepController<BasicStep>{
                 phone.setInternalCode(DeviceHelper.getDeviceInternalcode(phone.getAdbDevice()));
 
                 try{
-                    phone.setFlashingProcess(DeviceHelper.loadFlashProcess(phone.getAdbDevice()));
-                    phone.setPrepProcess(DeviceHelper.loadPreparationProcess(phone.getAdbDevice()));
+                    parentController.getProgression().setFlashingProcess(DeviceHelper.loadStepTree(phone.getAdbDevice()));
+                    
+                    
+                    //@TODO: temporarily just replace "downloadStep" in Progression.preparationprocess
+                    //phone.setPrepProcess(DeviceHelper.loadStepTree(phone.getAdbDevice()));
+                    //e.g : parentController.getProgression().getPrepProcess().addStep("", DownloadStep);
+                
+                
                 }catch(IOException | NullPointerException | NumberFormatException | ParseException e){
                     logger.debug("Can't load Flashing Process from Yaml : {}", e.getClass());
                     displayIncompatibleDeviceFound(model);
                     return;
                 }
-
-                AppConstants.setDeviceModel(phone.getAdbDevice()); //this line must be before the "parentController.setDevice(phone). If it's not the case,
-
+                //this line must be before the "parentController.setPhone(phone). If it's not the case,
                 //the AppConstants.getSourceFolder() won't include the device model's name
+                AppConstants.setDeviceModel(phone.getAdbDevice()); 
+
                 parentController.setPhone(phone);
                 parentController.disableNextButton(false);
             }
diff --git a/src/main/java/ecorp/easy/installer/controllers/stepControllers/LoadStepController.java b/src/main/java/ecorp/easy/installer/controllers/stepControllers/LoadStepController.java
index 23a808f5..b58b2534 100644
--- a/src/main/java/ecorp/easy/installer/controllers/stepControllers/LoadStepController.java
+++ b/src/main/java/ecorp/easy/installer/controllers/stepControllers/LoadStepController.java
@@ -22,6 +22,7 @@ import ecorp.easy.installer.models.Command;
 import ecorp.easy.installer.models.steps.LoadStep;
 import ecorp.easy.installer.tasks.CommandRunnerService;
 import ecorp.easy.installer.graphics.FlashGlobalProgressManager;
+import ecorp.easy.installer.models.Progression;
 import ecorp.easy.installer.models.steps.CommandExecutionResult;
 import ecorp.easy.installer.models.steps.IStep;
 import java.net.URL;
@@ -77,7 +78,7 @@ public class LoadStepController extends StepController<LoadStep> implements Stop
         }
         
         
-        globalProgressMgr = new FlashGlobalProgressManager(parentController.getPhone().getFlashingProcess().getStepsCount());
+        globalProgressMgr = new FlashGlobalProgressManager(parentController.getProgression().getFlashingProcess().getStepsCount());
         for(int i = 0;i < step.getStepNumber(); i++){
             globalProgressMgr.updateProgression();
         }
@@ -129,7 +130,7 @@ public class LoadStepController extends StepController<LoadStep> implements Stop
     protected void displayError(String errorMsgKey){
         
         //parentController.setIsFlashed(false);
-        parentController.setCurrentStepKey(IStep.LAST_STEP_KEY);
+        parentController.getProgression().setCurrentStepKey(Progression.LAST_STEP_KEY);
         parentController.resetNextButtonEventHandler();
         parentController.setNextButtonVisible(true);
         
diff --git a/src/main/java/ecorp/easy/installer/controllers/stepControllers/StepController.java b/src/main/java/ecorp/easy/installer/controllers/stepControllers/StepController.java
index a94d6ca9..3ba967e5 100644
--- a/src/main/java/ecorp/easy/installer/controllers/stepControllers/StepController.java
+++ b/src/main/java/ecorp/easy/installer/controllers/stepControllers/StepController.java
@@ -17,6 +17,7 @@
 package ecorp.easy.installer.controllers.stepControllers;
 
 import ecorp.easy.installer.controllers.MainWindowController;
+import ecorp.easy.installer.models.Progression;
 import ecorp.easy.installer.models.steps.IStep;
 import java.net.URL;
 import java.util.ResourceBundle;
@@ -45,10 +46,21 @@ public class StepController<S extends IStep> implements Initializable{
     public void initialize(URL url, ResourceBundle rb) {
         i18n = rb;
         
-        final String stepKey = parentController.getCurrentStepKey();
+        final String stepKey = parentController.getProgression().getCurrentStepKey();
         System.out.println("stepKey = "+stepKey);
         
-        step = (S) parentController.getPhone().getFlashingProcess().getSteps().get(stepKey);
+        //Using FlashingProcess here cause an issue for preparationProcess...
+        //I need to be able to load either PreparationProcess or FlashingProcess.
+        
+        //How can I do that ?
+        //1. Override in subClass & replace. But he imply code duplication
+        //2. Create a specific method that can be override just for getting the step.
+        //something like: protected void setStep(). But it's not good for preparationProcess step that use default controller.
+        //3. Check a field in device like "if ready: use flashingProcess. Else use Prepration process".
+        //4. In the previous way, I used a "currentProcess" instance in parentController. ParentController had a singleProcess instance which could be any of them
+        //5. Add a "getCurrentProcess()" method in Phone, but in a way it's out of Phone class's scope.
+        //The question is when do I need to access the current Process ? At step load to retrieve data, and when I move to the next step
+        step = (S) parentController.getProgression().getFlashingProcess().getSteps().get(stepKey);
         
         parentController.setNextButtonOnClickListener( ( MouseEvent event) -> {
             if(event.getEventType().equals(MouseEvent.MOUSE_CLICKED)){
@@ -80,9 +92,10 @@ public class StepController<S extends IStep> implements Initializable{
      */
     protected void onStepEnd(){
         System.out.println("onStepEnd() load: "+step.getNextStepKey());
-        parentController.setCurrentStepKey(step.getNextStepKey());
-        if(step.getNextStepKey().equals(IStep.LAST_STEP_KEY)){
-            parentController.getPhone().setFlashed();
+        parentController.getProgression().setCurrentStepKey(step.getNextStepKey());
+        //@ToDo The below part would depend of the current process.
+        if(step.getNextStepKey().equals(Progression.LAST_STEP_KEY)){
+            parentController.getProgression().setFlashed();
         }
         parentController.loadSubScene();
         
diff --git a/src/main/java/ecorp/easy/installer/controllers/stepControllers/UnlockOemController.java b/src/main/java/ecorp/easy/installer/controllers/stepControllers/UnlockOemController.java
index 8fd35af8..46215586 100644
--- a/src/main/java/ecorp/easy/installer/controllers/stepControllers/UnlockOemController.java
+++ b/src/main/java/ecorp/easy/installer/controllers/stepControllers/UnlockOemController.java
@@ -46,7 +46,7 @@ public class UnlockOemController extends StepController{
         link.setBorder(Border.EMPTY);
         
         parentController.setNextButtonVisible(true);   
-        globalProgressMgr = new FlashGlobalProgressManager( parentController.getPhone().getFlashingProcess().getStepsCount() );
+        globalProgressMgr = new FlashGlobalProgressManager( parentController.getProgression().getFlashingProcess().getStepsCount() );
         globalProgressIndicator.getChildren().addAll(globalProgressMgr.getSegments());
         globalProgressMgr.updateProgression();
     }
-- 
GitLab


From ed4248fd6f01b487822eba534d1df54d250ae7d0 Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Thu, 3 Feb 2022 14:59:56 +0100
Subject: [PATCH 16/31] move 'LAST_STEP_KEY' string from IStep.java to
 Progression.java

---
 src/main/java/ecorp/easy/installer/models/Progression.java     | 1 +
 src/main/java/ecorp/easy/installer/models/steps/BasicStep.java | 3 ---
 src/main/java/ecorp/easy/installer/models/steps/IStep.java     | 2 --
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/main/java/ecorp/easy/installer/models/Progression.java b/src/main/java/ecorp/easy/installer/models/Progression.java
index d1b6552b..2807ce4b 100644
--- a/src/main/java/ecorp/easy/installer/models/Progression.java
+++ b/src/main/java/ecorp/easy/installer/models/Progression.java
@@ -23,6 +23,7 @@ package ecorp.easy.installer.models;
 public class Progression {
     public final static String PREPARATION_FIRST_STEP_KEY ="p0";
     public final static String FLASHING_FIRST_STEP_KEY ="f0";
+    public final static String LAST_STEP_KEY = "end"; //When a next step key has this value, it means that this is the last step of the process
     
     private String currentStepKey=PREPARATION_FIRST_STEP_KEY;
     private boolean flashed = false;
diff --git a/src/main/java/ecorp/easy/installer/models/steps/BasicStep.java b/src/main/java/ecorp/easy/installer/models/steps/BasicStep.java
index 1f2e3a96..8a96d3c0 100644
--- a/src/main/java/ecorp/easy/installer/models/steps/BasicStep.java
+++ b/src/main/java/ecorp/easy/installer/models/steps/BasicStep.java
@@ -72,9 +72,6 @@ public class BasicStep implements IStep{
      * @param nextStepKey String if null, the value is then LAST_STEP_KEY's value.
      */
     public void setNextStepKey(String nextStepKey) {
-        if( nextStepKey == null )
-            this.nextStepKey = LAST_STEP_KEY;
-        else
             this.nextStepKey = nextStepKey;
     }
 }
diff --git a/src/main/java/ecorp/easy/installer/models/steps/IStep.java b/src/main/java/ecorp/easy/installer/models/steps/IStep.java
index 21bdd651..a5443570 100644
--- a/src/main/java/ecorp/easy/installer/models/steps/IStep.java
+++ b/src/main/java/ecorp/easy/installer/models/steps/IStep.java
@@ -33,8 +33,6 @@ package ecorp.easy.installer.models.steps;
  * @author vincent Bourgmayer
  */
 public interface IStep {
-    public final static String LAST_STEP_KEY = "end"; //When a next step key has this value, it means that this is the last step of the process
-    
     /**
      * Get the type of the step
      * @return 
-- 
GitLab


From 916240aca133074adf3a13ea2546ae733f80ca31 Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Thu, 3 Feb 2022 15:03:17 +0100
Subject: [PATCH 17/31] move FeedbackController.java into StepControllers
 package. Update FXML accordingly

---
 .../FeedbackController.java                                    | 3 +--
 src/main/resources/fxml/9-feedback.fxml                        | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
 rename src/main/java/ecorp/easy/installer/controllers/{subcontrollers => stepControllers}/FeedbackController.java (98%)

diff --git a/src/main/java/ecorp/easy/installer/controllers/subcontrollers/FeedbackController.java b/src/main/java/ecorp/easy/installer/controllers/stepControllers/FeedbackController.java
similarity index 98%
rename from src/main/java/ecorp/easy/installer/controllers/subcontrollers/FeedbackController.java
rename to src/main/java/ecorp/easy/installer/controllers/stepControllers/FeedbackController.java
index 10db8a7a..30074288 100644
--- a/src/main/java/ecorp/easy/installer/controllers/subcontrollers/FeedbackController.java
+++ b/src/main/java/ecorp/easy/installer/controllers/stepControllers/FeedbackController.java
@@ -14,10 +14,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package ecorp.easy.installer.controllers.subcontrollers;
+package ecorp.easy.installer.controllers.stepControllers;
 
 import ecorp.easy.installer.AppConstants;
-import ecorp.easy.installer.controllers.MainWindowController;
 import ecorp.easy.installer.controllers.stepControllers.StepController;
 import ecorp.easy.installer.models.Phone;
 import ecorp.easy.installer.tasks.UploadToEcloudTask;
diff --git a/src/main/resources/fxml/9-feedback.fxml b/src/main/resources/fxml/9-feedback.fxml
index b569bf4f..8fabf59a 100644
--- a/src/main/resources/fxml/9-feedback.fxml
+++ b/src/main/resources/fxml/9-feedback.fxml
@@ -31,7 +31,7 @@
             AnchorPane.leftAnchor="5.0" AnchorPane.rightAnchor="5.0" 
             AnchorPane.topAnchor="105.0" AnchorPane.bottomAnchor="80.0"
             xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
-            fx:controller="ecorp.easy.installer.controllers.subcontrollers.FeedbackController">
+            fx:controller="ecorp.easy.installer.controllers.stepControllers.FeedbackController">
     <children>
         <Label text="%feedback_lbl_yourFeel"/>
         <HBox fx:id="feelingsHBox" alignment="CENTER" spacing="30" minHeight="160.0">
-- 
GitLab


From 50728afc2cfafe76430c7389bd84d3cfcee41f53 Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Thu, 3 Feb 2022 15:05:11 +0100
Subject: [PATCH 18/31] move CommandExecutionResult out of models.step package
 in models package

---
 .../controllers/stepControllers/CustomExecutableController.java | 2 +-
 .../controllers/stepControllers/ExecutableStepController.java   | 2 +-
 .../controllers/stepControllers/LoadStepController.java         | 2 +-
 .../installer/models/{steps => }/CommandExecutionResult.java    | 2 +-
 .../java/ecorp/easy/installer/tasks/CommandExecutionTask.java   | 2 +-
 .../java/ecorp/easy/installer/tasks/CommandRunnerService.java   | 2 +-
 .../java/ecorp/easy/installer/tasks/DeviceDetectionTask.java    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
 rename src/main/java/ecorp/easy/installer/models/{steps => }/CommandExecutionResult.java (97%)

diff --git a/src/main/java/ecorp/easy/installer/controllers/stepControllers/CustomExecutableController.java b/src/main/java/ecorp/easy/installer/controllers/stepControllers/CustomExecutableController.java
index 34952c6f..6b0bbcb7 100644
--- a/src/main/java/ecorp/easy/installer/controllers/stepControllers/CustomExecutableController.java
+++ b/src/main/java/ecorp/easy/installer/controllers/stepControllers/CustomExecutableController.java
@@ -25,7 +25,7 @@ import ecorp.easy.installer.tasks.CommandRunnerService;
 import ecorp.easy.installer.utils.UiUtils;
 import ecorp.easy.installer.graphics.FlashGlobalProgressManager;
 import ecorp.easy.installer.models.Progression;
-import ecorp.easy.installer.models.steps.CommandExecutionResult;
+import ecorp.easy.installer.models.CommandExecutionResult;
 import ecorp.easy.installer.models.steps.IStep;
 import java.net.URL;
 import java.util.ArrayList;
diff --git a/src/main/java/ecorp/easy/installer/controllers/stepControllers/ExecutableStepController.java b/src/main/java/ecorp/easy/installer/controllers/stepControllers/ExecutableStepController.java
index 7a257ec9..2d51c7ed 100644
--- a/src/main/java/ecorp/easy/installer/controllers/stepControllers/ExecutableStepController.java
+++ b/src/main/java/ecorp/easy/installer/controllers/stepControllers/ExecutableStepController.java
@@ -17,7 +17,7 @@
 package ecorp.easy.installer.controllers.stepControllers;
 
 import ecorp.easy.installer.models.Command;
-import ecorp.easy.installer.models.steps.CommandExecutionResult;
+import ecorp.easy.installer.models.CommandExecutionResult;
 import ecorp.easy.installer.models.steps.IExecutableStep;
 import ecorp.easy.installer.tasks.CommandRunnerService;
 import java.net.URL;
diff --git a/src/main/java/ecorp/easy/installer/controllers/stepControllers/LoadStepController.java b/src/main/java/ecorp/easy/installer/controllers/stepControllers/LoadStepController.java
index b58b2534..80ef0f5f 100644
--- a/src/main/java/ecorp/easy/installer/controllers/stepControllers/LoadStepController.java
+++ b/src/main/java/ecorp/easy/installer/controllers/stepControllers/LoadStepController.java
@@ -23,7 +23,7 @@ import ecorp.easy.installer.models.steps.LoadStep;
 import ecorp.easy.installer.tasks.CommandRunnerService;
 import ecorp.easy.installer.graphics.FlashGlobalProgressManager;
 import ecorp.easy.installer.models.Progression;
-import ecorp.easy.installer.models.steps.CommandExecutionResult;
+import ecorp.easy.installer.models.CommandExecutionResult;
 import ecorp.easy.installer.models.steps.IStep;
 import java.net.URL;
 import java.util.ResourceBundle;
diff --git a/src/main/java/ecorp/easy/installer/models/steps/CommandExecutionResult.java b/src/main/java/ecorp/easy/installer/models/CommandExecutionResult.java
similarity index 97%
rename from src/main/java/ecorp/easy/installer/models/steps/CommandExecutionResult.java
rename to src/main/java/ecorp/easy/installer/models/CommandExecutionResult.java
index 2a5574a3..62b1e90c 100644
--- a/src/main/java/ecorp/easy/installer/models/steps/CommandExecutionResult.java
+++ b/src/main/java/ecorp/easy/installer/models/CommandExecutionResult.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package ecorp.easy.installer.models.steps;
+package ecorp.easy.installer.models;
 
 /**
  * This class encapsulate the different output from command execution
diff --git a/src/main/java/ecorp/easy/installer/tasks/CommandExecutionTask.java b/src/main/java/ecorp/easy/installer/tasks/CommandExecutionTask.java
index 992b2683..c640ca48 100644
--- a/src/main/java/ecorp/easy/installer/tasks/CommandExecutionTask.java
+++ b/src/main/java/ecorp/easy/installer/tasks/CommandExecutionTask.java
@@ -18,7 +18,7 @@ package ecorp.easy.installer.tasks;
 
 import ecorp.easy.installer.AppConstants;
 import ecorp.easy.installer.models.Command;
-import ecorp.easy.installer.models.steps.CommandExecutionResult;
+import ecorp.easy.installer.models.CommandExecutionResult;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/ecorp/easy/installer/tasks/CommandRunnerService.java b/src/main/java/ecorp/easy/installer/tasks/CommandRunnerService.java
index adb2b414..ed7828e8 100644
--- a/src/main/java/ecorp/easy/installer/tasks/CommandRunnerService.java
+++ b/src/main/java/ecorp/easy/installer/tasks/CommandRunnerService.java
@@ -17,7 +17,7 @@
 package ecorp.easy.installer.tasks;
 
 import ecorp.easy.installer.models.Command;
-import ecorp.easy.installer.models.steps.CommandExecutionResult;
+import ecorp.easy.installer.models.CommandExecutionResult;
 import javafx.concurrent.Service;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/ecorp/easy/installer/tasks/DeviceDetectionTask.java b/src/main/java/ecorp/easy/installer/tasks/DeviceDetectionTask.java
index 717b4e2e..fb2c78bb 100644
--- a/src/main/java/ecorp/easy/installer/tasks/DeviceDetectionTask.java
+++ b/src/main/java/ecorp/easy/installer/tasks/DeviceDetectionTask.java
@@ -20,7 +20,7 @@ import ecorp.easy.installer.AppConstants;
 import ecorp.easy.installer.exceptions.TooManyDevicesException;
 import ecorp.easy.installer.models.Command;
 import ecorp.easy.installer.models.Phone;
-import ecorp.easy.installer.models.steps.CommandExecutionResult;
+import ecorp.easy.installer.models.CommandExecutionResult;
 import java.util.regex.Pattern;
 import javafx.concurrent.Task;
 import org.slf4j.Logger;
-- 
GitLab


From 14b7a9d4e2625748db6711ba4ff582888dfa9c42 Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Thu, 3 Feb 2022 15:16:16 +0100
Subject: [PATCH 19/31] Update StepController.java to replace
 progression.getFlashingProcess() by progression.getCurrentProcess()

---
 .../installer/controllers/stepControllers/StepController.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/ecorp/easy/installer/controllers/stepControllers/StepController.java b/src/main/java/ecorp/easy/installer/controllers/stepControllers/StepController.java
index 3ba967e5..5465535b 100644
--- a/src/main/java/ecorp/easy/installer/controllers/stepControllers/StepController.java
+++ b/src/main/java/ecorp/easy/installer/controllers/stepControllers/StepController.java
@@ -60,7 +60,7 @@ public class StepController<S extends IStep> implements Initializable{
         //4. In the previous way, I used a "currentProcess" instance in parentController. ParentController had a singleProcess instance which could be any of them
         //5. Add a "getCurrentProcess()" method in Phone, but in a way it's out of Phone class's scope.
         //The question is when do I need to access the current Process ? At step load to retrieve data, and when I move to the next step
-        step = (S) parentController.getProgression().getFlashingProcess().getSteps().get(stepKey);
+        step = (S) parentController.getProgression().getCurrentProcess().getSteps().get(stepKey);
         
         parentController.setNextButtonOnClickListener( ( MouseEvent event) -> {
             if(event.getEventType().equals(MouseEvent.MOUSE_CLICKED)){
-- 
GitLab


From 21291cea115b7bf35895287d028bc88451f4da37 Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Thu, 3 Feb 2022 15:19:54 +0100
Subject: [PATCH 20/31] update licence of BasicStep.java & StepController.java.
 Add a temp dummy PreparationProcess in MainWindowController to be able to
 instanciate Progression object in order to avoid NPE with it's progression
 field

---
 .../controllers/MainWindowController.java       | 17 ++++++++++++++++-
 .../stepControllers/StepController.java         | 13 +------------
 .../easy/installer/models/steps/BasicStep.java  |  2 +-
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/main/java/ecorp/easy/installer/controllers/MainWindowController.java b/src/main/java/ecorp/easy/installer/controllers/MainWindowController.java
index 42cbf545..36efcde6 100644
--- a/src/main/java/ecorp/easy/installer/controllers/MainWindowController.java
+++ b/src/main/java/ecorp/easy/installer/controllers/MainWindowController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 - ECORP SAS 
+ * Copyright 2019-2022 - ECORP SAS 
 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,11 +25,14 @@ import ecorp.easy.installer.controllers.stepControllers.StepController;
 import ecorp.easy.installer.controllers.stepControllers.Stoppable;
 import ecorp.easy.installer.models.Phone;
 import ecorp.easy.installer.models.Progression;
+import ecorp.easy.installer.models.StepTree;
+import ecorp.easy.installer.models.steps.BasicStep;
 import ecorp.easy.installer.models.steps.IStep;
 import ecorp.easy.installer.tasks.CommandExecutionTask;
 import ecorp.easy.installer.utils.UiUtils;
 import java.io.IOException;
 import java.net.URL;
+import java.util.HashMap;
 import java.util.ResourceBundle;
 import javafx.animation.FadeTransition;
 import javafx.fxml.Initializable;
@@ -86,6 +89,18 @@ public class MainWindowController implements Initializable {
         );
         
         StepController.setParentController(this);
+        
+        //getDefaultPreparationProcess
+        //TMP
+        HashMap<String, IStep> preparationSteps = new HashMap<>();
+        preparationSteps.put(Progression.PREPARATION_FIRST_STEP_KEY, new BasicStep("welcome", "p1", 0));
+        preparationSteps.put("p1", new BasicStep("connectDevice", "p2", 1));
+        preparationSteps.put("p2", new BasicStep("enableDevOption", "p3", 2));
+        preparationSteps.put("p3", new BasicStep("enableUsbDebugging", "p4", 3));
+        preparationSteps.put("p4", new BasicStep("deviceDetection", "p5", 4));
+        preparationSteps.put("p5", new BasicStep("sourceDownload", "p6", 5));
+        this.progression = new Progression(new StepTree(7, preparationSteps));
+        
     }
     
     /**
diff --git a/src/main/java/ecorp/easy/installer/controllers/stepControllers/StepController.java b/src/main/java/ecorp/easy/installer/controllers/stepControllers/StepController.java
index 5465535b..25fe7747 100644
--- a/src/main/java/ecorp/easy/installer/controllers/stepControllers/StepController.java
+++ b/src/main/java/ecorp/easy/installer/controllers/stepControllers/StepController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 - ECORP SAS 
+ * Copyright 2019-2022 - ECORP SAS 
 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -49,17 +49,6 @@ public class StepController<S extends IStep> implements Initializable{
         final String stepKey = parentController.getProgression().getCurrentStepKey();
         System.out.println("stepKey = "+stepKey);
         
-        //Using FlashingProcess here cause an issue for preparationProcess...
-        //I need to be able to load either PreparationProcess or FlashingProcess.
-        
-        //How can I do that ?
-        //1. Override in subClass & replace. But he imply code duplication
-        //2. Create a specific method that can be override just for getting the step.
-        //something like: protected void setStep(). But it's not good for preparationProcess step that use default controller.
-        //3. Check a field in device like "if ready: use flashingProcess. Else use Prepration process".
-        //4. In the previous way, I used a "currentProcess" instance in parentController. ParentController had a singleProcess instance which could be any of them
-        //5. Add a "getCurrentProcess()" method in Phone, but in a way it's out of Phone class's scope.
-        //The question is when do I need to access the current Process ? At step load to retrieve data, and when I move to the next step
         step = (S) parentController.getProgression().getCurrentProcess().getSteps().get(stepKey);
         
         parentController.setNextButtonOnClickListener( ( MouseEvent event) -> {
diff --git a/src/main/java/ecorp/easy/installer/models/steps/BasicStep.java b/src/main/java/ecorp/easy/installer/models/steps/BasicStep.java
index 8a96d3c0..d2b5a1e3 100644
--- a/src/main/java/ecorp/easy/installer/models/steps/BasicStep.java
+++ b/src/main/java/ecorp/easy/installer/models/steps/BasicStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 - ECORP SAS 
+ * Copyright 2021-2022 - ECORP SAS 
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
-- 
GitLab


From 6fc675d4b02933b85883465790a0e986179eec9d Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Thu, 3 Feb 2022 17:16:45 +0100
Subject: [PATCH 21/31] add preparation process for FP3 based on current
 preparation process. I will use it by default for implementation

---
 src/main/resources/yaml/FP3_preparation.yml | 66 +++++++++++++++++++--
 1 file changed, 62 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/yaml/FP3_preparation.yml b/src/main/resources/yaml/FP3_preparation.yml
index 88ca6731..01811391 100644
--- a/src/main/resources/yaml/FP3_preparation.yml
+++ b/src/main/resources/yaml/FP3_preparation.yml
@@ -14,7 +14,65 @@
 ## along with this program.  If not, see <https://www.gnu.org/licenses/>.
 ## Author: Vincent Bourgmayer
 ---
-sources:
-  rom:
-    url: https://images.ecloud.global/stable/FP3/IMG-e-latest-FP3.zip
-    filePath: IMG-e-latest-FP3.zip
\ No newline at end of file
+stepsCount: 7
+steps:
+    p0:
+        type: welcome
+        stepNumber: 1
+        nextStepKey: p1
+    p1:
+        type: connectDevice
+        stepNumber: 2
+        nextStepKey: p2
+    p2:
+        type: custom
+        stepNumber: 3
+        nextStepKey: p3
+        titleKey: devMode_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - devMode_instr_settings
+          - devMode_instr_build
+          - devMode_instr_tap7
+    p3:
+        type: custom
+        stepNumber: 4
+        nextStepKey: p4
+        titleKey: debugADB_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - debugADB_instr_settings
+          - debugADB_instr_search
+          - debugADB_instr_androidDebug
+    p4:
+        type: custom
+        stepNumber: 5
+        nextStepKey: p5
+        titleKey: enableMTP_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - enableMTP_instr_settings
+          - enableMTP_instr_scrollToUSBConfig
+          - enableMTP_instr_selectMTP
+    p5:
+        type: custom
+        stepNumber: 6
+        nextStepKey: p6
+        titleKey: removeAccounts_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - debugADB_instr_settings
+          - removeAccounts_instr_openAccounts
+          - removeAccounts_instr_selectAccounts
+    p6:
+        type: deviceDetection
+        stepNumber: 7
+        nextStepKey: p7
+    p7:
+        type: downloadSources
+        stepNumber: 7
+        nextStepKey: end
+        sources:
+          rom:
+            url: https://images.ecloud.global/stable/FP3/IMG-e-latest-FP3.zip
+            filePath: IMG-e-latest-FP3.zip
\ No newline at end of file
-- 
GitLab


From 6ac5f826ebb41ca7975b1f9a2e6c1350f9130a9d Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Thu, 3 Feb 2022 17:18:22 +0100
Subject: [PATCH 22/31] add a updateProgressionBySuccess() method in
 Progression.java to update progression status. There is probably a better way
 to do that but at the moment it's good enough

---
 .../easy/installer/models/Progression.java     | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/main/java/ecorp/easy/installer/models/Progression.java b/src/main/java/ecorp/easy/installer/models/Progression.java
index 2807ce4b..7ee936f0 100644
--- a/src/main/java/ecorp/easy/installer/models/Progression.java
+++ b/src/main/java/ecorp/easy/installer/models/Progression.java
@@ -16,6 +16,8 @@
  */
 package ecorp.easy.installer.models;
 
+import ecorp.easy.installer.models.steps.IStep;
+
 /**
  * this class encapsulate progression's data about both: preparation and flash of a given device
  * @author vincent
@@ -95,4 +97,20 @@ public class Progression {
     public void setPrepared(boolean prepared) {
         this.prepared = prepared;
     }
+    
+    public void updateProgressionBySuccess(){
+        IStep step = getCurrentProcess().getSteps().get(this.currentStepKey);
+        
+        if (step.getNextStepKey().equals(Progression.LAST_STEP_KEY)){
+            if(!this.prepared){
+                prepared = true;
+                currentStepKey = FLASHING_FIRST_STEP_KEY;
+            }else if(!this.flashed){
+                    flashed = true;
+            }
+            
+        } else{
+            currentStepKey = step.getNextStepKey();
+        }
+    }
 }
-- 
GitLab


From ea5f5db550810d863d201a022f060ece1e21b679 Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Thu, 3 Feb 2022 17:19:53 +0100
Subject: [PATCH 23/31] allow to load preparation config file from
 DeviceHelper.java by adding a parameter to the method 'loadStepTree(...)'

---
 src/main/java/ecorp/easy/installer/helpers/DeviceHelper.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ecorp/easy/installer/helpers/DeviceHelper.java b/src/main/java/ecorp/easy/installer/helpers/DeviceHelper.java
index 5743dc2a..21515a22 100644
--- a/src/main/java/ecorp/easy/installer/helpers/DeviceHelper.java
+++ b/src/main/java/ecorp/easy/installer/helpers/DeviceHelper.java
@@ -92,9 +92,10 @@ public class DeviceHelper {
      * @throws java.io.IOException  
      * @throws java.text.ParseException  
      */
-    public static StepTree loadStepTree(String adbDevice) throws IOException, ParseException, NumberFormatException, NullPointerException{
+    public static StepTree loadStepTree(String adbDevice, boolean isPreparation) throws IOException, ParseException, NumberFormatException, NullPointerException{
 
-        final Map yamlContent = loadYaml(adbDevice+"_flash.yml");
+        String fileName = adbDevice+ (isPreparation ? "_preparation.yml":"_flash.yml");
+        final Map yamlContent = loadYaml(fileName);
         final int stepsCount = (Integer) yamlContent.get("stepsCount");
         final HashMap<String, IStep> steps = parseSteps( (HashMap) yamlContent.get("steps") );
         //@TODO: check if steps is null, etc.
-- 
GitLab


From 35a53942f58b0cf0ef62fde59474f0c9cf2eb9ab Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Thu, 3 Feb 2022 17:20:50 +0100
Subject: [PATCH 24/31] update controllers to start to work with progression.
 Start to load preparation process from config file

---
 .../controllers/MainWindowController.java     | 99 ++++++++++++++++---
 .../stepControllers/CustomStepController.java |  8 +-
 .../DeviceDetectionController.java            |  2 +-
 .../stepControllers/StepController.java       |  8 +-
 4 files changed, 93 insertions(+), 24 deletions(-)

diff --git a/src/main/java/ecorp/easy/installer/controllers/MainWindowController.java b/src/main/java/ecorp/easy/installer/controllers/MainWindowController.java
index 36efcde6..9ce60fc7 100644
--- a/src/main/java/ecorp/easy/installer/controllers/MainWindowController.java
+++ b/src/main/java/ecorp/easy/installer/controllers/MainWindowController.java
@@ -23,16 +23,15 @@ import ecorp.easy.installer.controllers.stepControllers.CustomExecutableControll
 import ecorp.easy.installer.controllers.stepControllers.CustomStepController;
 import ecorp.easy.installer.controllers.stepControllers.StepController;
 import ecorp.easy.installer.controllers.stepControllers.Stoppable;
+import ecorp.easy.installer.helpers.DeviceHelper;
 import ecorp.easy.installer.models.Phone;
 import ecorp.easy.installer.models.Progression;
-import ecorp.easy.installer.models.StepTree;
-import ecorp.easy.installer.models.steps.BasicStep;
 import ecorp.easy.installer.models.steps.IStep;
 import ecorp.easy.installer.tasks.CommandExecutionTask;
 import ecorp.easy.installer.utils.UiUtils;
 import java.io.IOException;
 import java.net.URL;
-import java.util.HashMap;
+import java.text.ParseException;
 import java.util.ResourceBundle;
 import javafx.animation.FadeTransition;
 import javafx.fxml.Initializable;
@@ -80,7 +79,7 @@ public class MainWindowController implements Initializable {
         logger.info("initialize()");
         this.i18n = rb;
         disableNextButton(false); //just for test
-        loadSubScene();
+        //loadSubScene();
         DoubleProperty fontSize = new SimpleDoubleProperty(0);
         
         fontSize.bind(root.widthProperty().add(root.heightProperty()).divide(123.2)); //72 = 1440 (default width): 20 (default font size). 51.2 = 1024 / 20        
@@ -90,16 +89,14 @@ public class MainWindowController implements Initializable {
         
         StepController.setParentController(this);
         
-        //getDefaultPreparationProcess
         //TMP
-        HashMap<String, IStep> preparationSteps = new HashMap<>();
-        preparationSteps.put(Progression.PREPARATION_FIRST_STEP_KEY, new BasicStep("welcome", "p1", 0));
-        preparationSteps.put("p1", new BasicStep("connectDevice", "p2", 1));
-        preparationSteps.put("p2", new BasicStep("enableDevOption", "p3", 2));
-        preparationSteps.put("p3", new BasicStep("enableUsbDebugging", "p4", 3));
-        preparationSteps.put("p4", new BasicStep("deviceDetection", "p5", 4));
-        preparationSteps.put("p5", new BasicStep("sourceDownload", "p6", 5));
-        this.progression = new Progression(new StepTree(7, preparationSteps));
+        try{
+            this.progression = new Progression(DeviceHelper.loadStepTree("FP3", true) );            
+        }catch(IOException | NullPointerException | NumberFormatException | ParseException e){
+            logger.error(e.getClass().getSimpleName());
+        }
+
+        loadSubScenev2();
         
     }
     
@@ -116,7 +113,10 @@ public class MainWindowController implements Initializable {
     /**
      * Event happening when using click on "NextButton"
      */
-    public void onNextBtnClick(){ loadSubScene(); }
+    public void onNextBtnClick(){ 
+        progression.updateProgressionBySuccess();
+        loadSubScenev2();
+    }
     
     /**
      * Define if nextButton is disable or not
@@ -167,8 +167,79 @@ public class MainWindowController implements Initializable {
         this.titleLabel.setText(i18n.getString(titleKey));
     }
     
+    
+    
+    
+    public void loadSubScenev2(){
+        logger.info("loadSubScenev2("+currentSubRootId+")");
+        
+        StepController controller = null;
+        String fxmlName = "";
+        String title ="installationTitle";
+
+        //@TODO change to include preparationprocess
+        final IStep step = progression.getCurrentProcess().getSteps().get(progression.getCurrentStepKey());
+
+        logger.debug("step : {} ", step.getType());
+        switch(step.getType()){
+            case "askAccount":
+                fxmlName = "6-2-eAccount.fxml";
+                break;
+            case "enableOemUnlock":
+                fxmlName = "6-3-unlockOEM.fxml";
+                break;
+            case "custom":
+                controller = new CustomStepController();
+                fxmlName ="customStep.fxml";
+                break;
+            case "custom-executable":
+                controller = new CustomExecutableController();
+                fxmlName ="customStep.fxml";
+                break;
+            case "executable":
+                //no interface there
+                break;
+            case "load":
+                fxmlName = "loadStep.fxml";
+                break;
+            case "welcome":
+                fxmlName = "1-beforeYouBegin.fxml";
+                title= "before_mTitle";
+                break;
+            case "connectDevice":
+                fxmlName = "2-connectDevice.fxml";
+                title = "connect_mTitle";
+                break;
+            case "deviceDetection":
+                fxmlName = "4-deviceDetected.fxml";
+                title = "detect_mTitle";
+                break;
+            case "downloadSources":
+                fxmlName = "5-downloadSrc.fxml";
+                title = "download_mTitle";
+                break;
+            default:
+                //no interface there
+                break;
+        }
+
+
+        if(!fxmlName.isBlank()) {
+            if (currentSubRootId == null)
+                currentSubRootId = loadSubUI(fxmlName, title, null).getId();
+            else
+                changeView(fxmlName, title, controller);
+        }
+        else
+            logger.error("No interface to load!");
+                    
+    }
+    
+    
+    
     /**
      * Load different group of controls depending of the current step (of whole process)
+     * @deprecated 
      */
     public void loadSubScene(){
         logger.info("loadSubScene("+currentSubRootId+")");
diff --git a/src/main/java/ecorp/easy/installer/controllers/stepControllers/CustomStepController.java b/src/main/java/ecorp/easy/installer/controllers/stepControllers/CustomStepController.java
index d684234e..ba228cc3 100644
--- a/src/main/java/ecorp/easy/installer/controllers/stepControllers/CustomStepController.java
+++ b/src/main/java/ecorp/easy/installer/controllers/stepControllers/CustomStepController.java
@@ -42,9 +42,11 @@ public class CustomStepController extends StepController<ICustomStep>{
         new Locale.Builder()
        .setRegion("en")
        .setLanguage("EN")
-       .setVariant(parentController.getPhone().getInternalCode())
+       .setVariant("0008" /*parentController.getPhone().getInternalCode()*/) //@TODOneed to byPass that while we don't have this information
        .build());
     
+    
+    
     private int currentEmphasizedInstruction = 0; 
     private int instructionsCount;
 
@@ -60,7 +62,7 @@ public class CustomStepController extends StepController<ICustomStep>{
     public void initialize(URL url, ResourceBundle rb) {
         super.initialize(url, rb); 
         logger.debug("initialize customStep controller");
-        
+    
         parentController.setNextButtonVisible(true);
         titleLbl.setText(i18n.getString(step.getTitleKey() ));
         if(step.getTitleIconName() != null){
@@ -77,7 +79,7 @@ public class CustomStepController extends StepController<ICustomStep>{
         instructionsCount = instructions.size();
 
         
-        globalProgressMgr = new FlashGlobalProgressManager(parentController.getProgression().getFlashingProcess().getStepsCount());
+        globalProgressMgr = new FlashGlobalProgressManager(parentController.getProgression().getCurrentProcess().getStepsCount());
         for(int i = 0;i < step.getStepNumber(); i++){
             globalProgressMgr.updateProgression();
         }
diff --git a/src/main/java/ecorp/easy/installer/controllers/stepControllers/DeviceDetectionController.java b/src/main/java/ecorp/easy/installer/controllers/stepControllers/DeviceDetectionController.java
index 5dac3d10..042d7374 100644
--- a/src/main/java/ecorp/easy/installer/controllers/stepControllers/DeviceDetectionController.java
+++ b/src/main/java/ecorp/easy/installer/controllers/stepControllers/DeviceDetectionController.java
@@ -124,7 +124,7 @@ public class DeviceDetectionController extends StepController<BasicStep>{
                 phone.setInternalCode(DeviceHelper.getDeviceInternalcode(phone.getAdbDevice()));
 
                 try{
-                    parentController.getProgression().setFlashingProcess(DeviceHelper.loadStepTree(phone.getAdbDevice()));
+                    parentController.getProgression().setFlashingProcess(DeviceHelper.loadStepTree(phone.getAdbDevice(), false));
                     
                     
                     //@TODO: temporarily just replace "downloadStep" in Progression.preparationprocess
diff --git a/src/main/java/ecorp/easy/installer/controllers/stepControllers/StepController.java b/src/main/java/ecorp/easy/installer/controllers/stepControllers/StepController.java
index 25fe7747..257f4140 100644
--- a/src/main/java/ecorp/easy/installer/controllers/stepControllers/StepController.java
+++ b/src/main/java/ecorp/easy/installer/controllers/stepControllers/StepController.java
@@ -81,12 +81,8 @@ public class StepController<S extends IStep> implements Initializable{
      */
     protected void onStepEnd(){
         System.out.println("onStepEnd() load: "+step.getNextStepKey());
-        parentController.getProgression().setCurrentStepKey(step.getNextStepKey());
-        //@ToDo The below part would depend of the current process.
-        if(step.getNextStepKey().equals(Progression.LAST_STEP_KEY)){
-            parentController.getProgression().setFlashed();
-        }
-        parentController.loadSubScene();
+        parentController.getProgression().updateProgressionBySuccess(); //not big fan of this method...
+        parentController.loadSubScenev2();
         
 
         //Question is: Should I call this only if we are at the last step
-- 
GitLab


From 883a69dfb0b0b207c2b87d7ee1ed3978e6cf8790 Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Mon, 7 Feb 2022 12:28:20 +0100
Subject: [PATCH 25/31] remove two old controller classes: EnableAdbControllers
 and AbstractSubSteppedControllers

---
 .../ExecutableStepController.java             |   1 +
 .../AbstractSubSteppedController.java         |  75 --------
 .../subcontrollers/EnableADBController.java   | 165 ------------------
 3 files changed, 1 insertion(+), 240 deletions(-)
 delete mode 100644 src/main/java/ecorp/easy/installer/controllers/subcontrollers/AbstractSubSteppedController.java
 delete mode 100644 src/main/java/ecorp/easy/installer/controllers/subcontrollers/EnableADBController.java

diff --git a/src/main/java/ecorp/easy/installer/controllers/stepControllers/ExecutableStepController.java b/src/main/java/ecorp/easy/installer/controllers/stepControllers/ExecutableStepController.java
index 2d51c7ed..9622b758 100644
--- a/src/main/java/ecorp/easy/installer/controllers/stepControllers/ExecutableStepController.java
+++ b/src/main/java/ecorp/easy/installer/controllers/stepControllers/ExecutableStepController.java
@@ -61,6 +61,7 @@ public class ExecutableStepController extends StepController<IExecutableStep>{
     /**
      * Show error UI and hide everything that should be hidden
      * like restart btn, etc.
+     * @todo: This method shouldn't be empty. There is something to do here
      * @param errorMsgKey 
      */
     protected void displayError(String errorMsgKey){
diff --git a/src/main/java/ecorp/easy/installer/controllers/subcontrollers/AbstractSubSteppedController.java b/src/main/java/ecorp/easy/installer/controllers/subcontrollers/AbstractSubSteppedController.java
deleted file mode 100644
index 70d456ca..00000000
--- a/src/main/java/ecorp/easy/installer/controllers/subcontrollers/AbstractSubSteppedController.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2019-2020 - ECORP SAS 
-
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package ecorp.easy.installer.controllers.subcontrollers;
-
-import ecorp.easy.installer.controllers.MainWindowController;
-import javafx.scene.control.Label;
-import javafx.scene.input.MouseEvent;
-
-/**
- * @TODO: may be find a better name
- * @author vincent
- */
-public abstract class AbstractSubSteppedController extends AbstractSubController{
-    
-    protected final String  currentSubStepCssClass = "currentSubStep";
-    protected int currentSubStepId =0;
-    
-    /**
-     * Override setParentController, to set the nextButton on click Listener
-     * @param parentController the parent controller
-     */
-    @Override
-    public void setParentController(MainWindowController parentController){
-        super.setParentController(parentController);
-        setNextButtonOnClickListener();
-    }
-    
-    protected void setNextButtonOnClickListener(){
-        parentController.setNextButtonOnClickListener( ( MouseEvent event) -> {
-            if(event.getEventType().equals(MouseEvent.MOUSE_CLICKED)){
-                onNextButtonClicked();
-            }
-            ++currentSubStepId;
-        });
-    }
-    
-    /**
-     * Remove the currentSubStepCssClass from the given label
-     * @param label 
-     */
-    protected void deemphasizeLabel(Label label){
-        label.getStyleClass().remove(currentSubStepCssClass);
-    }
-    
-    /**
-     * Add the currentSubStepCssClass to the given label
-     * @param label 
-     */
-    protected void emphasizeLabel(Label label){
-        label.getStyleClass().add(currentSubStepCssClass);
-    }
-    
-    /**
-     * Set the new behaviour of the nextButton when it is clicked.
-     * 
-     * /!\ In many case, don't forget to reset it to normal behaviour /!\
-     * 
-     * /!\ currentSubStepId is increase by 1 just after the call of this method /!\
-     */
-    protected abstract void onNextButtonClicked();
-}
diff --git a/src/main/java/ecorp/easy/installer/controllers/subcontrollers/EnableADBController.java b/src/main/java/ecorp/easy/installer/controllers/subcontrollers/EnableADBController.java
deleted file mode 100644
index 974e06e6..00000000
--- a/src/main/java/ecorp/easy/installer/controllers/subcontrollers/EnableADBController.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright 2019-2021 - ECORP SAS 
-
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package ecorp.easy.installer.controllers.subcontrollers;
-
-import ecorp.easy.installer.utils.UiUtils;
-import java.net.URL;
-import java.util.ResourceBundle;
-import javafx.collections.ObservableList;
-import javafx.fxml.FXML;
-import javafx.scene.Node;
-import javafx.scene.control.ContentDisplay;
-import javafx.scene.control.Label;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
-import javafx.scene.layout.VBox;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * FXML Controller class
- *
- * @author Vincent
- */
-public class EnableADBController extends AbstractSubSteppedController  {
-    private final static Logger logger = LoggerFactory.getLogger(EnableADBController.class);
-
-    @FXML private VBox instructionsContainer;
-    @FXML private ImageView enableADBImg;
-    private int stepIndex;
-    private int currentInstructionIndex;
-    private int imgIndex;
-    
-    @Override
-    public void initialize(URL location, ResourceBundle resources) {
-        super.initialize(location, resources); //To change body of generated methods, choose Tools | Templates.
-        stepIndex =0;
-        imgIndex =1;
-        currentInstructionIndex = 0;
-        loadStepContent(instructionsContainer.getChildren());
-        updateImage();
-        emphasizeLabel((Label) instructionsContainer.getChildren().get(currentInstructionIndex));
-    }
-    
-    /**
-     * Update instruction's Image
-     */
-    private void updateImage(){
-        this.enableADBImg.setImage(loadImage("enableADB"+imgIndex+".png"));
-    }
-    
-    /**
-     * Load an image
-     * @TODO: move into UiUtils
-     * @param imgName
-     * @return 
-     */
-    private Image loadImage(String imgName){
-        Image image;
-        try{
-            image = new Image(this.getClass().getResourceAsStream("/images/"+imgName));
-        }catch(Exception e){
-            logger.warn("imageName = {}, error = {}", imgName, e.toString());
-            image = null; 
-        }
-        return image;
-    }
-    
-    /**
-     * create lbl instance
-     * apply style, etc...
-     * @param text the text's translation key
-     * @param imageName The name of the image to add as icon for the label
-     * @return Label object The label instance to add into the view
-     */
-    private Label createInstructionLabel(String text, String imageName){
-        Label result = new Label(i18n.getString(text));
-        result.setWrapText(true);
-        result.getStyleClass().addAll("subtitle");
-        result.setGraphic(new ImageView(loadImage(imageName)));
-        result.setGraphicTextGap(18); //set spacing between icon and text
-        result.setContentDisplay(ContentDisplay.LEFT); //set Icon to be displayed on left
-        result.getStyleClass().add("leftInsets"); //set css class to don't cover icon with emphased background
-        return result;
-    }
-    
-    /**
-     * Load the content to display
-     * @param instructions 
-     */
-    private void loadStepContent(final ObservableList<Node> instructions){
-        instructions.clear();
-        
-        switch(stepIndex){
-            case 0: //enable dev mode
-                instructions.add(0, createInstructionLabel("devMode_instr_settings", "icon-gear.png"));
-                instructions.add(1, createInstructionLabel("devMode_instr_build","icon-wrench.png"));     
-                instructions.add(2, createInstructionLabel("devMode_instr_tap7","icon-hand.png"));     
-                break;
-            case 1: //enable usb debugging
-                parentController.setViewTitle("debugADB_mTitle");
-                instructions.add(0, createInstructionLabel("debugADB_instr_settings", "icon-gear.png"));
-                instructions.add(1, createInstructionLabel("debugADB_instr_search","icon-wrench.png"));     
-                instructions.add(2, createInstructionLabel("debugADB_instr_androidDebug","icon-hand.png"));     
-                break;
-            case 2: //enable file transfer
-                parentController.setViewTitle("enableMTP_mTitle");
-                instructions.add(0, createInstructionLabel("enableMTP_instr_settings", "icon-gear.png"));
-                instructions.add(1, createInstructionLabel("enableMTP_instr_scrollToUSBConfig", "icon-wrench.png"));     
-                instructions.add(2, createInstructionLabel("enableMTP_instr_selectMTP", "icon-hand.png"));     
-                break;
-            case 3: //remove all G's account
-                parentController.setViewTitle("removeAccounts_mTitle");
-                instructions.add(0, createInstructionLabel("debugADB_instr_settings", "icon-gear.png"));
-                instructions.add(1, createInstructionLabel("removeAccounts_instr_openAccounts", "icon-wrench.png"));
-                instructions.add(2, createInstructionLabel("removeAccounts_instr_selectAccounts", "icon-hand.png"));
-                break;
-            default:
-                break;
-        }
-    }
-    
-    @Override
-    protected void onNextButtonClicked() {
-        final ObservableList<Node> instructions = instructionsContainer.getChildren();
-        
-        deemphasizeLabel((Label) instructions.get(currentInstructionIndex));
-        ++imgIndex;
-       
-        if(currentInstructionIndex == instructions.size()-1){
-            currentInstructionIndex = 0;
-                ++stepIndex;
-                
-                UiUtils.playFadeAnimation(instructionsContainer.getParent(), 
-                e->{ //Load new content
-                    loadStepContent(instructions); 
-                    emphasizeLabel((Label) instructions.get(currentInstructionIndex));
-                    updateImage();},
-                e->{});
-        }else{
-            if(stepIndex == 3 && currentInstructionIndex == instructions.size()-2){ //at last step, move to device detection
-                parentController.resetNextButtonEventHandler();
-            }
-            ++currentInstructionIndex; 
-            // The two below lines can't be put at the end of the method
-            // because of FadeAnimation below
-            emphasizeLabel((Label) instructions.get(currentInstructionIndex));
-            updateImage();
-        }
-    }
-}
\ No newline at end of file
-- 
GitLab


From 445b412353559a949c97d30d26530fd8d78c5d20 Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Wed, 16 Feb 2022 16:19:49 +0100
Subject: [PATCH 26/31] Fix Image not displayed in preparation for enable dev
 option, enable usb debugging and enable MTP

---
 .../resources/instructions/imageName.properties  | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/instructions/imageName.properties b/src/main/resources/instructions/imageName.properties
index f1f30bed..6c55a76f 100644
--- a/src/main/resources/instructions/imageName.properties
+++ b/src/main/resources/instructions/imageName.properties
@@ -13,7 +13,21 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-#install_instr_turnOff
+#Preparation's instruction
+devMode_instr_settings=enableADB1.png
+devMode_instr_build=enableADB2.png
+devMode_instr_tap7=enableADB3.png
+debugADB_instr_settings=enableADB4.png
+debugADB_instr_search=enableADB5.png
+debugADB_instr_androidDebug=enableADB6.png
+enableMTP_instr_settings=enableADB7.png
+enableMTP_instr_scrollToUSBConfig=enableADB8.png
+enableMTP_instr_selectMTP=enableADB9.png
+#debugADB_instr_settings=
+#removeAccounts_instr_openAccounts=
+#removeAccounts_instr_selectAccounts=
+
+
 install_instr_startDownload=galaxyS7_Download_mode_400px.png
 install_instr_acceptWarning=galaxyS7_Accept_warning_400px.png
 #install_instr_oemUnlock
-- 
GitLab


From 1528f14efe6c51fc5cff63d1943c0276ece40845 Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Thu, 17 Feb 2022 15:10:39 +0100
Subject: [PATCH 27/31] removed old UI: 3-enableADB.fxml

---
 src/main/resources/fxml/3-enableADB.fxml | 48 ------------------------
 1 file changed, 48 deletions(-)
 delete mode 100644 src/main/resources/fxml/3-enableADB.fxml

diff --git a/src/main/resources/fxml/3-enableADB.fxml b/src/main/resources/fxml/3-enableADB.fxml
deleted file mode 100644
index 637ec7d7..00000000
--- a/src/main/resources/fxml/3-enableADB.fxml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Copyright 2019-2020 - ECORP SAS 
-
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
--->
-<?import java.lang.*?>
-<?import java.net.*?>
-<?import java.util.*?>
-<?import javafx.scene.*?>
-<?import javafx.scene.text.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.image.*?>
-
-<VBox fx:id="enableDevMode" alignment="CENTER" spacing="25"
-            AnchorPane.leftAnchor="5.0" AnchorPane.rightAnchor="5.0" 
-            AnchorPane.topAnchor="90.0" AnchorPane.bottomAnchor="80.0"
-            xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
-            fx:controller="ecorp.easy.installer.controllers.subcontrollers.EnableADBController">
-   <children>
-      <Label fx:id="pleaseFollowThisStepsLbl"  text="%devMode_lbl" wrapText="true"/>
-      <HBox spacing="20" alignment="CENTER" >
-          <children>
-                <VBox fx:id="instructionsContainer" alignment="CENTER_LEFT" maxHeight="515.0" maxWidth="650.0" spacing="80">
-                </VBox>
-                <ImageView fx:id="enableADBImg" preserveRatio="true" smooth="true" fitHeight="515.0">
-                    <image>
-                        <Image url="@../images/enableADB1.png" />
-                    </image>
-                </ImageView>                                    
-          </children>
-      </HBox>
-   </children>
-</VBox>
\ No newline at end of file
-- 
GitLab


From 8b373d3c296f9932ddc9ad70b3c785989b024c60 Mon Sep 17 00:00:00 2001
From: Vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Wed, 23 Feb 2022 10:39:04 +0000
Subject: [PATCH 28/31] add loadPreparationProcess  in DeviceHelper.java & and
 replace...

---
 .../controllers/MainWindowController.java     | 45 +++++++--
 .../CustomExecutableController.java           | 10 +-
 .../stepControllers/CustomStepController.java |  9 +-
 .../DownloadSrcController.java                |  1 -
 .../stepControllers/EAccountController.java   |  1 -
 .../stepControllers/FeedbackController.java   |  1 -
 .../stepControllers/LoadStepController.java   |  9 +-
 .../stepControllers/StepController.java       | 20 ++--
 .../stepControllers/UnlockOemController.java  |  7 +-
 .../graphics/FlashGlobalProgressManager.java  | 84 -----------------
 .../installer/graphics/GlobalProgressBar.java | 92 +++++++++++++++++++
 .../easy/installer/models/Progression.java    | 12 ++-
 .../installer/models/steps/BasicStep.java     | 51 +++++++---
 .../models/steps/CustomExecutableStep.java    |  5 +-
 .../installer/models/steps/CustomStep.java    |  5 +-
 .../installer/models/steps/DownloadStep.java  |  7 +-
 .../models/steps/ExecutableStep.java          |  5 +-
 .../easy/installer/models/steps/IStep.java    | 28 ++++++
 .../easy/installer/models/steps/LoadStep.java |  5 +-
 .../installer/models/steps/StepStatus.java    | 16 ++++
 .../easy/installer/utils/ConfigParser.java    | 58 +++++++-----
 src/main/resources/yaml/FP3_preparation.yml   | 25 +++--
 22 files changed, 311 insertions(+), 185 deletions(-)
 delete mode 100644 src/main/java/ecorp/easy/installer/graphics/FlashGlobalProgressManager.java
 create mode 100644 src/main/java/ecorp/easy/installer/graphics/GlobalProgressBar.java
 create mode 100644 src/main/java/ecorp/easy/installer/models/steps/StepStatus.java

diff --git a/src/main/java/ecorp/easy/installer/controllers/MainWindowController.java b/src/main/java/ecorp/easy/installer/controllers/MainWindowController.java
index 9ce60fc7..1fa35690 100644
--- a/src/main/java/ecorp/easy/installer/controllers/MainWindowController.java
+++ b/src/main/java/ecorp/easy/installer/controllers/MainWindowController.java
@@ -27,11 +27,13 @@ import ecorp.easy.installer.helpers.DeviceHelper;
 import ecorp.easy.installer.models.Phone;
 import ecorp.easy.installer.models.Progression;
 import ecorp.easy.installer.models.steps.IStep;
+import ecorp.easy.installer.models.steps.StepStatus;
 import ecorp.easy.installer.tasks.CommandExecutionTask;
 import ecorp.easy.installer.utils.UiUtils;
 import java.io.IOException;
 import java.net.URL;
 import java.text.ParseException;
+import java.util.List;
 import java.util.ResourceBundle;
 import javafx.animation.FadeTransition;
 import javafx.fxml.Initializable;
@@ -114,7 +116,14 @@ public class MainWindowController implements Initializable {
      * Event happening when using click on "NextButton"
      */
     public void onNextBtnClick(){ 
-        progression.updateProgressionBySuccess();
+        
+        final IStep step = progression.getCurrentStep();
+        if(step.getStatus() != StepStatus.SKIPPED){
+            step.setStatus(StepStatus.ACHIEVED);
+        }
+
+        
+        progression.updateProgression();
         loadSubScenev2();
     }
     
@@ -168,6 +177,17 @@ public class MainWindowController implements Initializable {
     }
     
     
+    /**
+     * Evaluate if the given step can be skipped or not
+     * @return true if condition are met to skip
+     */
+    private boolean areSkipConditionsMet(List<String> skipConditions){
+        if( (skipConditions.contains("windows") && AppConstants.isWindowsOs()) ||
+            (skipConditions.contains("linux") && AppConstants.isLinuxOs()) ){
+            return true;
+        }
+        return false;
+    }
     
     
     public void loadSubScenev2(){
@@ -178,9 +198,16 @@ public class MainWindowController implements Initializable {
         String title ="installationTitle";
 
         //@TODO change to include preparationprocess
-        final IStep step = progression.getCurrentProcess().getSteps().get(progression.getCurrentStepKey());
-
-        logger.debug("step : {} ", step.getType());
+        final IStep step = progression.getCurrentStep();
+        //if(step == null) return;
+        if( areSkipConditionsMet(step.getSkipConditions()) ){
+            logger.debug("Skip Step N°{}", step.getStepNumber());
+            step.setStatus(StepStatus.SKIPPED);
+            onNextBtnClick();
+            return;
+        }
+        step.setStatus(StepStatus.ONGOING);
+        logger.debug("step's type : {} ", step.getType());
         switch(step.getType()){
             case "askAccount":
                 fxmlName = "6-2-eAccount.fxml";
@@ -218,6 +245,10 @@ public class MainWindowController implements Initializable {
                 fxmlName = "5-downloadSrc.fxml";
                 title = "download_mTitle";
                 break;
+            case "checkDriver":
+                fxmlName="3-2-checkDriverInstallation.fxml";
+                title= "checkDriverInstall_mTitle";
+                break;
             default:
                 //no interface there
                 break;
@@ -249,7 +280,7 @@ public class MainWindowController implements Initializable {
             currentSubRootId =loadSubUI("1-beforeYouBegin.fxml", "before_mTitle", null).getId();
         }else{
             switch(currentSubRootId){
-                case "beforeYouBeginRoot":
+                /*case "beforeYouBeginRoot":
                     changeView("2-connectDevice.fxml", "connect_mTitle", null);
                     break;
                 case "connectDeviceRoot":
@@ -262,7 +293,7 @@ public class MainWindowController implements Initializable {
                         changeView("4-deviceDetected.fxml", "detect_mTitle", null);
                         disableNextButton(true);
                     }
-                    break;
+                    break;*/
                 case "checkDriverInstallation":
                     changeView("4-deviceDetected.fxml", "detect_mTitle", null);
                     disableNextButton(true);                    
@@ -287,7 +318,7 @@ public class MainWindowController implements Initializable {
                         }
                     }else{
                         //@TODO change to include preparationprocess
-                        final IStep step = progression.getFlashingProcess().getSteps().get(progression.getCurrentStepKey());
+                        final IStep step = progression.getCurrentStep();
 
                         switch(step.getType()){
                             case "askAccount":
diff --git a/src/main/java/ecorp/easy/installer/controllers/stepControllers/CustomExecutableController.java b/src/main/java/ecorp/easy/installer/controllers/stepControllers/CustomExecutableController.java
index 6b0bbcb7..3c9f3081 100644
--- a/src/main/java/ecorp/easy/installer/controllers/stepControllers/CustomExecutableController.java
+++ b/src/main/java/ecorp/easy/installer/controllers/stepControllers/CustomExecutableController.java
@@ -23,10 +23,9 @@ import ecorp.easy.installer.models.Command;
 import ecorp.easy.installer.models.steps.CustomExecutableStep;
 import ecorp.easy.installer.tasks.CommandRunnerService;
 import ecorp.easy.installer.utils.UiUtils;
-import ecorp.easy.installer.graphics.FlashGlobalProgressManager;
+import ecorp.easy.installer.graphics.GlobalProgressBar;
 import ecorp.easy.installer.models.Progression;
 import ecorp.easy.installer.models.CommandExecutionResult;
-import ecorp.easy.installer.models.steps.IStep;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Locale;
@@ -68,7 +67,7 @@ public class CustomExecutableController extends StepController<CustomExecutableS
     
     // progress bar's node of global Flash's process :
     @FXML HBox globalProgressIndicator;
-    private FlashGlobalProgressManager globalProgressMgr;
+    private GlobalProgressBar globalProgressMgr;
     
     @Override
     public void initialize(URL url, ResourceBundle rb) {
@@ -90,10 +89,7 @@ public class CustomExecutableController extends StepController<CustomExecutableS
         displayInstructionImage(instructions.get(currentEmphasizedInstruction));
         instructionsCount = instructions.size();
         
-        globalProgressMgr = new FlashGlobalProgressManager(parentController.getProgression().getFlashingProcess().getStepsCount());
-        for(int i = 0;i < step.getStepNumber(); i++){
-            globalProgressMgr.updateProgression();
-        }
+        globalProgressMgr = new GlobalProgressBar(parentController.getProgression());
         globalProgressIndicator.getChildren().addAll(globalProgressMgr.getSegments());
         
         
diff --git a/src/main/java/ecorp/easy/installer/controllers/stepControllers/CustomStepController.java b/src/main/java/ecorp/easy/installer/controllers/stepControllers/CustomStepController.java
index ba228cc3..2cbd773c 100644
--- a/src/main/java/ecorp/easy/installer/controllers/stepControllers/CustomStepController.java
+++ b/src/main/java/ecorp/easy/installer/controllers/stepControllers/CustomStepController.java
@@ -17,7 +17,7 @@
 package ecorp.easy.installer.controllers.stepControllers;
 
 
-import ecorp.easy.installer.graphics.FlashGlobalProgressManager;
+import ecorp.easy.installer.graphics.GlobalProgressBar;
 import ecorp.easy.installer.graphics.Instruction;
 import ecorp.easy.installer.models.steps.ICustomStep;
 import ecorp.easy.installer.utils.UiUtils;
@@ -55,7 +55,7 @@ public class CustomStepController extends StepController<ICustomStep>{
     @FXML private ImageView imgView;
     // progress bar's node of global Flash's process :
     @FXML HBox globalProgressIndicator;
-    private FlashGlobalProgressManager globalProgressMgr;
+    private GlobalProgressBar globalProgressMgr;
 
 
     @Override
@@ -79,10 +79,7 @@ public class CustomStepController extends StepController<ICustomStep>{
         instructionsCount = instructions.size();
 
         
-        globalProgressMgr = new FlashGlobalProgressManager(parentController.getProgression().getCurrentProcess().getStepsCount());
-        for(int i = 0;i < step.getStepNumber(); i++){
-            globalProgressMgr.updateProgression();
-        }
+        globalProgressMgr = new GlobalProgressBar(parentController.getProgression());
         globalProgressIndicator.getChildren().addAll(globalProgressMgr.getSegments());
     }
     
diff --git a/src/main/java/ecorp/easy/installer/controllers/stepControllers/DownloadSrcController.java b/src/main/java/ecorp/easy/installer/controllers/stepControllers/DownloadSrcController.java
index be3d8d76..c1904055 100644
--- a/src/main/java/ecorp/easy/installer/controllers/stepControllers/DownloadSrcController.java
+++ b/src/main/java/ecorp/easy/installer/controllers/stepControllers/DownloadSrcController.java
@@ -18,7 +18,6 @@ package ecorp.easy.installer.controllers.stepControllers;
 
 
 import ecorp.easy.installer.AppConstants;
-import ecorp.easy.installer.controllers.stepControllers.StepController;
 import ecorp.easy.installer.models.RomSource;
 import ecorp.easy.installer.models.steps.DownloadStep;
 import ecorp.easy.installer.tasks.CommandExecutionTask;
diff --git a/src/main/java/ecorp/easy/installer/controllers/stepControllers/EAccountController.java b/src/main/java/ecorp/easy/installer/controllers/stepControllers/EAccountController.java
index 87f3d81c..4fa95329 100644
--- a/src/main/java/ecorp/easy/installer/controllers/stepControllers/EAccountController.java
+++ b/src/main/java/ecorp/easy/installer/controllers/stepControllers/EAccountController.java
@@ -30,7 +30,6 @@ import javafx.scene.control.TextField;
 import javafx.scene.input.MouseButton;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.HBox;
-import javafx.scene.layout.VBox;
 
 /**
  *
diff --git a/src/main/java/ecorp/easy/installer/controllers/stepControllers/FeedbackController.java b/src/main/java/ecorp/easy/installer/controllers/stepControllers/FeedbackController.java
index 30074288..82e2a7a0 100644
--- a/src/main/java/ecorp/easy/installer/controllers/stepControllers/FeedbackController.java
+++ b/src/main/java/ecorp/easy/installer/controllers/stepControllers/FeedbackController.java
@@ -17,7 +17,6 @@
 package ecorp.easy.installer.controllers.stepControllers;
 
 import ecorp.easy.installer.AppConstants;
-import ecorp.easy.installer.controllers.stepControllers.StepController;
 import ecorp.easy.installer.models.Phone;
 import ecorp.easy.installer.tasks.UploadToEcloudTask;
 import ecorp.easy.installer.utils.UiUtils;
diff --git a/src/main/java/ecorp/easy/installer/controllers/stepControllers/LoadStepController.java b/src/main/java/ecorp/easy/installer/controllers/stepControllers/LoadStepController.java
index 80ef0f5f..8ec2ff83 100644
--- a/src/main/java/ecorp/easy/installer/controllers/stepControllers/LoadStepController.java
+++ b/src/main/java/ecorp/easy/installer/controllers/stepControllers/LoadStepController.java
@@ -21,7 +21,7 @@ import static ecorp.easy.installer.controllers.stepControllers.StepController.pa
 import ecorp.easy.installer.models.Command;
 import ecorp.easy.installer.models.steps.LoadStep;
 import ecorp.easy.installer.tasks.CommandRunnerService;
-import ecorp.easy.installer.graphics.FlashGlobalProgressManager;
+import ecorp.easy.installer.graphics.GlobalProgressBar;
 import ecorp.easy.installer.models.Progression;
 import ecorp.easy.installer.models.CommandExecutionResult;
 import ecorp.easy.installer.models.steps.IStep;
@@ -58,7 +58,7 @@ public class LoadStepController extends StepController<LoadStep> implements Stop
     
     // progress bar's node of global Flash's process :
     @FXML HBox globalProgressIndicator;
-    private FlashGlobalProgressManager globalProgressMgr;
+    private GlobalProgressBar globalProgressMgr;
     
     @Override
     public void initialize(URL url, ResourceBundle rb) {
@@ -78,10 +78,7 @@ public class LoadStepController extends StepController<LoadStep> implements Stop
         }
         
         
-        globalProgressMgr = new FlashGlobalProgressManager(parentController.getProgression().getFlashingProcess().getStepsCount());
-        for(int i = 0;i < step.getStepNumber(); i++){
-            globalProgressMgr.updateProgression();
-        }
+        globalProgressMgr = new GlobalProgressBar(parentController.getProgression());
         globalProgressIndicator.getChildren().addAll(globalProgressMgr.getSegments());
         
         /** Prepare ProgressBar animation **/
diff --git a/src/main/java/ecorp/easy/installer/controllers/stepControllers/StepController.java b/src/main/java/ecorp/easy/installer/controllers/stepControllers/StepController.java
index 257f4140..e644e7b7 100644
--- a/src/main/java/ecorp/easy/installer/controllers/stepControllers/StepController.java
+++ b/src/main/java/ecorp/easy/installer/controllers/stepControllers/StepController.java
@@ -17,8 +17,8 @@
 package ecorp.easy.installer.controllers.stepControllers;
 
 import ecorp.easy.installer.controllers.MainWindowController;
-import ecorp.easy.installer.models.Progression;
 import ecorp.easy.installer.models.steps.IStep;
+import ecorp.easy.installer.models.steps.StepStatus;
 import java.net.URL;
 import java.util.ResourceBundle;
 import javafx.fxml.FXML;
@@ -45,11 +45,9 @@ public class StepController<S extends IStep> implements Initializable{
     @Override
     public void initialize(URL url, ResourceBundle rb) {
         i18n = rb;
-        
-        final String stepKey = parentController.getProgression().getCurrentStepKey();
-        System.out.println("stepKey = "+stepKey);
-        
-        step = (S) parentController.getProgression().getCurrentProcess().getSteps().get(stepKey);
+
+        step = (S) parentController.getProgression().getCurrentStep();
+        //@TODO what happens if null ?
         
         parentController.setNextButtonOnClickListener( ( MouseEvent event) -> {
             if(event.getEventType().equals(MouseEvent.MOUSE_CLICKED)){
@@ -81,7 +79,8 @@ public class StepController<S extends IStep> implements Initializable{
      */
     protected void onStepEnd(){
         System.out.println("onStepEnd() load: "+step.getNextStepKey());
-        parentController.getProgression().updateProgressionBySuccess(); //not big fan of this method...
+        updateStepStatus();
+        parentController.getProgression().updateProgression(); //not big fan of this method...
         parentController.loadSubScenev2();
         
 
@@ -93,4 +92,11 @@ public class StepController<S extends IStep> implements Initializable{
         //@Todo
         parentController.resetNextButtonEventHandler();
     }
+    
+    /**
+     * Method to update the stepStatus
+     */
+    protected void updateStepStatus(){
+        step.setStatus(StepStatus.ACHIEVED);
+    }
 }
diff --git a/src/main/java/ecorp/easy/installer/controllers/stepControllers/UnlockOemController.java b/src/main/java/ecorp/easy/installer/controllers/stepControllers/UnlockOemController.java
index 46215586..68ab01f1 100644
--- a/src/main/java/ecorp/easy/installer/controllers/stepControllers/UnlockOemController.java
+++ b/src/main/java/ecorp/easy/installer/controllers/stepControllers/UnlockOemController.java
@@ -17,7 +17,7 @@
 package ecorp.easy.installer.controllers.stepControllers;
 
 
-import ecorp.easy.installer.graphics.FlashGlobalProgressManager;
+import ecorp.easy.installer.graphics.GlobalProgressBar;
 import java.net.URL;
 import java.util.ResourceBundle;
 import javafx.fxml.FXML;
@@ -37,7 +37,7 @@ public class UnlockOemController extends StepController{
     @FXML Label instruction;
     @FXML Hyperlink link;
     @FXML HBox globalProgressIndicator;
-    private FlashGlobalProgressManager globalProgressMgr;
+    private GlobalProgressBar globalProgressMgr;
     
     
     @Override
@@ -46,9 +46,8 @@ public class UnlockOemController extends StepController{
         link.setBorder(Border.EMPTY);
         
         parentController.setNextButtonVisible(true);   
-        globalProgressMgr = new FlashGlobalProgressManager( parentController.getProgression().getFlashingProcess().getStepsCount() );
+        globalProgressMgr = new GlobalProgressBar( parentController.getProgression());
         globalProgressIndicator.getChildren().addAll(globalProgressMgr.getSegments());
-        globalProgressMgr.updateProgression();
     }
     
     public void openUrl(){
diff --git a/src/main/java/ecorp/easy/installer/graphics/FlashGlobalProgressManager.java b/src/main/java/ecorp/easy/installer/graphics/FlashGlobalProgressManager.java
deleted file mode 100644
index 2fb7b8d3..00000000
--- a/src/main/java/ecorp/easy/installer/graphics/FlashGlobalProgressManager.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2019-2020 - ECORP SAS 
-
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package ecorp.easy.installer.graphics;
-
-import java.util.ArrayList;
-import javafx.scene.paint.Paint;
-import javafx.scene.shape.Rectangle;
-
-/**
- *
- * @author vincent Bourgmayer
- */
-public class FlashGlobalProgressManager {
-    private final static String COLOR_CURRENT_SEGMENT = "#1789E9"; //blue
-    private final static String COLOR_PENDING_SEGMENT = "#E5E5E5"; //grey
-    private final static String COLOR_SUCCEED_SEGMENT = "#1EBE54"; //green
-    
-    int stepNumber;
-    ArrayList<Rectangle> segments;
-    int currentStepId; //store the index of the segment of the current step
-    
-    public FlashGlobalProgressManager(int stepNumber){
-        this.stepNumber = stepNumber;
-        segments = new ArrayList<>();
-        currentStepId = -1;
-        initSegments();
-    }
-    
-    /**
-     * Add as many segments as stepNumber
-     */
-    private void initSegments(){
-        for(int i =0; i < stepNumber;i++){
-            Rectangle segment = new Rectangle();
-            segment.setWidth(118.0);
-            segment.setHeight(6.0);
-            segment.setFill(Paint.valueOf(COLOR_PENDING_SEGMENT));
-
-            segments.add( segment );
-        }
-    }
-
-    /**
-     * Update Progression to the specified step
-     * @return 
-     */
-    public boolean updateProgression(){
-        if(currentStepId >= 0){
-            //Replace the currentStep style of the segment which borrow it by a success style
-            segments.get(currentStepId).setFill(Paint.valueOf(COLOR_SUCCEED_SEGMENT));
-        }
-        
-        final int nextId = currentStepId+1;
-        if(nextId< stepNumber){
-            
-            //add the current style to the current new current segment
-            segments.get(nextId).setFill(Paint.valueOf(COLOR_CURRENT_SEGMENT));
-            currentStepId = nextId;
-        }
-        return true;
-    }
-    
-    /**
-     * Return the array with the different segments
-     * @return 
-     */
-    public ArrayList<Rectangle> getSegments(){
-        return segments;
-    }
-}
diff --git a/src/main/java/ecorp/easy/installer/graphics/GlobalProgressBar.java b/src/main/java/ecorp/easy/installer/graphics/GlobalProgressBar.java
new file mode 100644
index 00000000..e565be45
--- /dev/null
+++ b/src/main/java/ecorp/easy/installer/graphics/GlobalProgressBar.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2019-2020 - ECORP SAS 
+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package ecorp.easy.installer.graphics;
+
+import ecorp.easy.installer.models.Progression;
+import ecorp.easy.installer.models.steps.IStep;
+import ecorp.easy.installer.models.steps.StepStatus;
+import java.util.ArrayList;
+import java.util.HashMap;
+import javafx.scene.paint.Paint;
+import javafx.scene.shape.Rectangle;
+
+/**
+ * This is a graphical element that represent the progression in the current process (preparation or flash)
+ * @author vincent Bourgmayer
+ */
+public class GlobalProgressBar {
+    private final static String COLOR_CURRENT_SEGMENT = "#1789E9"; //blue
+    private final static String COLOR_PENDING_SEGMENT = "#E5E5E5"; //grey
+    private final static String COLOR_SUCCEED_SEGMENT = "#1EBE54"; //green
+    private final static String COLOR_SKIPPED_SEGMENT = "#000000"; //black
+    
+    Progression progression;
+    ArrayList<Rectangle> segments;
+    
+    public GlobalProgressBar(Progression progression){
+        this.progression = progression;
+        segments = new ArrayList<>();
+        createSegments();
+    }
+    
+    /**
+     * Add as many segments as stepNumber
+     */
+    private void createSegments(){
+        String key = progression.isPrepared() ? Progression.FLASHING_FIRST_STEP_KEY : Progression.PREPARATION_FIRST_STEP_KEY;
+        
+        final HashMap<String, IStep> steps = progression.getCurrentProcess().getSteps();
+        
+        while (!key.equals(Progression.LAST_STEP_KEY)){
+            final IStep step = steps.get(key);
+            
+            Rectangle segment = new Rectangle( 118.0, 6.0, getSegmentColor(step.getStatus()) );
+            segments.add( segment );
+            key = step.getNextStepKey();
+        }
+    }
+
+
+    private Paint getSegmentColor(StepStatus status){
+        String color;
+
+        switch(status){
+            case ONGOING:
+                color = COLOR_CURRENT_SEGMENT;
+                break;                
+            case SKIPPED:
+                color= COLOR_SKIPPED_SEGMENT;
+                break;
+            case ACHIEVED:
+                color = COLOR_SUCCEED_SEGMENT;
+                break;
+            case PENDING:
+            default:
+                color = COLOR_PENDING_SEGMENT;
+                break;
+        }
+        return Paint.valueOf(color);
+    }
+    
+    /**
+     * Return the array with the different segments
+     * @return 
+     */
+    public ArrayList<Rectangle> getSegments(){
+        return segments;
+    }
+}
diff --git a/src/main/java/ecorp/easy/installer/models/Progression.java b/src/main/java/ecorp/easy/installer/models/Progression.java
index 7ee936f0..3953ed1a 100644
--- a/src/main/java/ecorp/easy/installer/models/Progression.java
+++ b/src/main/java/ecorp/easy/installer/models/Progression.java
@@ -98,8 +98,8 @@ public class Progression {
         this.prepared = prepared;
     }
     
-    public void updateProgressionBySuccess(){
-        IStep step = getCurrentProcess().getSteps().get(this.currentStepKey);
+    public void updateProgression(){
+        IStep step = getCurrentStep();
         
         if (step.getNextStepKey().equals(Progression.LAST_STEP_KEY)){
             if(!this.prepared){
@@ -113,4 +113,12 @@ public class Progression {
             currentStepKey = step.getNextStepKey();
         }
     }
+    
+    /**
+     * return the current Step of the current process
+     * @return can be null if the current step is the end of the process 
+     */
+    public IStep getCurrentStep(){
+        return getCurrentProcess().getSteps().get(this.currentStepKey);
+    }
 }
diff --git a/src/main/java/ecorp/easy/installer/models/steps/BasicStep.java b/src/main/java/ecorp/easy/installer/models/steps/BasicStep.java
index d2b5a1e3..3d9d22e1 100644
--- a/src/main/java/ecorp/easy/installer/models/steps/BasicStep.java
+++ b/src/main/java/ecorp/easy/installer/models/steps/BasicStep.java
@@ -16,6 +16,9 @@
  */
 package ecorp.easy.installer.models.steps;
 
+import java.util.Collections;
+import java.util.List;
+
 /**
  * This class encapsulate basic data about a step of a process
  * @idea: this class and subclass could define setters to allow to update ConfigParser
@@ -23,25 +26,28 @@ package ecorp.easy.installer.models.steps;
  * @author Vincent Bourgmayer
  */
 public class BasicStep implements IStep{
-    private final String type;
-    private final int stepNumber; //= step index
-    protected String nextStepKey; 
+    protected final String type;
+    protected final int stepNumber; //= step index
+    protected final String nextStepKey; 
+    protected StepStatus status = StepStatus.PENDING;
+    protected final List<String> skipConditions;
 
     /**
      * Create an instance of Step
      * @param type the type of the step
-     * @param nextStepKey
+     * @param nextStepKey the key of the next step
      * @param stepNumber the number of the step in the whole process
+     * @param skipConditions the list of condition in which the step can be skipped
      */
-    public BasicStep(String type, String nextStepKey, int stepNumber) {
+    public BasicStep(String type, String nextStepKey, int stepNumber, List<String> skipConditions) {
         this.type = type;
         this.nextStepKey = nextStepKey;
         this.stepNumber = stepNumber;
+        this.skipConditions = skipConditions;
     }
     
     /**
-     * Get the type of the step (Custom, CustomExecutable, Load, etc.)
-     * @return String the value of the type
+     * @@inheritDoc 
      */
     @Override
     public String getType() {
@@ -50,8 +56,7 @@ public class BasicStep implements IStep{
 
     
     /**
-     * Get the index of the step in a given process
-     * @return Int index of the step
+     * @@inheritDoc 
      */
     @Override
     public int getStepNumber() {
@@ -59,19 +64,35 @@ public class BasicStep implements IStep{
     }
 
     /**
-     * Give the key of the step to load when this one will be achieved
-     * @return String the next step key
+     * @@inheritDoc 
      */
     @Override
     public String getNextStepKey() {
         return nextStepKey;
     }
     
+
+    /**
+     * @@inheritDoc 
+     */
+    @Override
+    public StepStatus getStatus(){
+        return status;
+    }
+    
     /**
-     * Define the key of the next step to call.
-     * @param nextStepKey String if null, the value is then LAST_STEP_KEY's value.
+     * @@inheritDoc 
      */
-    public void setNextStepKey(String nextStepKey) {
-            this.nextStepKey = nextStepKey;
+    @Override
+    public void setStatus(StepStatus status){
+        this.status = status;
+    }
+    
+    /**
+     * @@inheritDoc 
+     */
+    @Override
+    public List<String> getSkipConditions(){
+        return skipConditions;
     }
 }
diff --git a/src/main/java/ecorp/easy/installer/models/steps/CustomExecutableStep.java b/src/main/java/ecorp/easy/installer/models/steps/CustomExecutableStep.java
index 13692a2e..bc68ac73 100644
--- a/src/main/java/ecorp/easy/installer/models/steps/CustomExecutableStep.java
+++ b/src/main/java/ecorp/easy/installer/models/steps/CustomExecutableStep.java
@@ -18,6 +18,7 @@ package ecorp.easy.installer.models.steps;
 
 import ecorp.easy.installer.models.Command;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  *
@@ -31,9 +32,9 @@ public class CustomExecutableStep extends BasicStep implements ICustomStep, IExe
     private final ArrayList<String> textContentKeys;
     
     public CustomExecutableStep(String type, String nextStepKey, int stepNumber,
-            String titleKey, String titleIconName,
+            List<String> skipConditions,  String titleKey, String titleIconName,
             ArrayList<String> contentKeys, Command command) {
-        super(type, nextStepKey, stepNumber);
+        super(type, nextStepKey, stepNumber, skipConditions);
         this.titleKey = titleKey;
         this.titleIconName = titleIconName;
         this.command = command;
diff --git a/src/main/java/ecorp/easy/installer/models/steps/CustomStep.java b/src/main/java/ecorp/easy/installer/models/steps/CustomStep.java
index ee9f0fcd..899bbee8 100644
--- a/src/main/java/ecorp/easy/installer/models/steps/CustomStep.java
+++ b/src/main/java/ecorp/easy/installer/models/steps/CustomStep.java
@@ -17,6 +17,7 @@
 package ecorp.easy.installer.models.steps;
 
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * This class represent a step with some instructions
@@ -29,8 +30,8 @@ public class CustomStep extends BasicStep implements ICustomStep{
     private final String titleIconName;
     private final ArrayList<String> textContentKeys; 
     
-    public CustomStep(String type, String nextStepKey, int stepNumber, String titleKey, String titleIconName, ArrayList<String> contentKeys) {
-        super(type, nextStepKey, stepNumber);
+    public CustomStep(String type, String nextStepKey, int stepNumber, List<String> skipConditions, String titleKey, String titleIconName, ArrayList<String> contentKeys) {
+        super(type, nextStepKey, stepNumber, skipConditions);
         this.titleKey = titleKey;
         this.titleIconName = titleIconName;
         this.textContentKeys = contentKeys;
diff --git a/src/main/java/ecorp/easy/installer/models/steps/DownloadStep.java b/src/main/java/ecorp/easy/installer/models/steps/DownloadStep.java
index 13b662e0..faffbdbf 100644
--- a/src/main/java/ecorp/easy/installer/models/steps/DownloadStep.java
+++ b/src/main/java/ecorp/easy/installer/models/steps/DownloadStep.java
@@ -18,6 +18,7 @@ package ecorp.easy.installer.models.steps;
 
 import ecorp.easy.installer.models.RomSource;
 import java.util.HashMap;
+import java.util.List;
 
 /**
  * This class encapsulate data about a step
@@ -25,10 +26,10 @@ import java.util.HashMap;
  * @author vincent
  */
 public class DownloadStep extends BasicStep{
-    private HashMap<String, RomSource> sourcesToDownload;
+    private final HashMap<String, RomSource> sourcesToDownload;
     
-    public DownloadStep(String type, String nextStepKey, int stepNumber, HashMap<String, RomSource> sources){
-        super(type, nextStepKey, stepNumber);
+    public DownloadStep(String type, String nextStepKey, int stepNumber, List<String> skipConditions, HashMap<String, RomSource> sources){
+        super(type, nextStepKey, stepNumber, skipConditions);
         this.sourcesToDownload = sources;
     }
     
diff --git a/src/main/java/ecorp/easy/installer/models/steps/ExecutableStep.java b/src/main/java/ecorp/easy/installer/models/steps/ExecutableStep.java
index b036f0ba..9cb7e3a4 100644
--- a/src/main/java/ecorp/easy/installer/models/steps/ExecutableStep.java
+++ b/src/main/java/ecorp/easy/installer/models/steps/ExecutableStep.java
@@ -17,6 +17,7 @@
 package ecorp.easy.installer.models.steps;
 
 import ecorp.easy.installer.models.Command;
+import java.util.List;
 
 /**
  * This concern step with Fixed UI
@@ -28,8 +29,8 @@ public class ExecutableStep extends BasicStep implements IExecutableStep{
 
     private final Command command;
     
-    public ExecutableStep(String type, String nextStepKey, int stepNumber, Command command) {
-        super(type, nextStepKey, stepNumber);
+    public ExecutableStep(String type, String nextStepKey, int stepNumber, List<String> skipConditions, Command command) {
+        super(type, nextStepKey, stepNumber, skipConditions);
         this.command = command;
     }
 
diff --git a/src/main/java/ecorp/easy/installer/models/steps/IStep.java b/src/main/java/ecorp/easy/installer/models/steps/IStep.java
index a5443570..417e29db 100644
--- a/src/main/java/ecorp/easy/installer/models/steps/IStep.java
+++ b/src/main/java/ecorp/easy/installer/models/steps/IStep.java
@@ -16,6 +16,8 @@
  */
 package ecorp.easy.installer.models.steps;
 
+import java.util.List;
+
 /**
  * Represent a basic Step type
  * 
@@ -51,4 +53,30 @@ public interface IStep {
      * @return String
      */
     public String getNextStepKey();
+     
+    
+    /**
+     * Get the status of the current Step
+     * @return enum StepStatus
+     */
+    public StepStatus getStatus();
+    
+    
+    /**
+     * Set the current step's status to the given input
+     * @param status enum StepStatus
+     */
+    public void setStatus(StepStatus status);
+    
+    
+    /**
+     * Get the list of String representing the condition in which the step
+     * must be skipped. Example: windows, linux, mac. And probably further: android N, android P, android Q, etc.
+     * Those conditions must be considered as "Or" conditons!
+     * If the list contains "windows" and "android Q" then the step must be skip
+     * if the running OS is windows OR if the device is android Q API!
+     * @return List< String >
+     */
+    public List<String> getSkipConditions();
+    
 }
diff --git a/src/main/java/ecorp/easy/installer/models/steps/LoadStep.java b/src/main/java/ecorp/easy/installer/models/steps/LoadStep.java
index 15cd3113..5c183958 100644
--- a/src/main/java/ecorp/easy/installer/models/steps/LoadStep.java
+++ b/src/main/java/ecorp/easy/installer/models/steps/LoadStep.java
@@ -18,6 +18,7 @@ package ecorp.easy.installer.models.steps;
 
 import ecorp.easy.installer.models.Command;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * This encapsulate Step where user have to wait for
@@ -28,8 +29,8 @@ import java.util.ArrayList;
 public class LoadStep extends CustomExecutableStep{
     private int averageTime; //Used to fill the ProgressIndicator in UI
 
-    public LoadStep(String type, String nextStepKey, int stepNumber, String titleKey, String titleIconName, ArrayList<String> contentKeys, Command command, int averageTime) {
-        super(type, nextStepKey,  stepNumber, titleKey, titleIconName, contentKeys, command);
+    public LoadStep(String type, String nextStepKey, int stepNumber, List<String> skipConditions, String titleKey, String titleIconName, ArrayList<String> contentKeys, Command command, int averageTime) {
+        super(type, nextStepKey,  stepNumber, skipConditions, titleKey, titleIconName, contentKeys, command);
         this.averageTime = averageTime;
     }
     
diff --git a/src/main/java/ecorp/easy/installer/models/steps/StepStatus.java b/src/main/java/ecorp/easy/installer/models/steps/StepStatus.java
new file mode 100644
index 00000000..4fd8d3d5
--- /dev/null
+++ b/src/main/java/ecorp/easy/installer/models/steps/StepStatus.java
@@ -0,0 +1,16 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Enum.java to edit this template
+ */
+package ecorp.easy.installer.models.steps;
+
+/**
+ *
+ * @author vincent
+ */
+public enum StepStatus {
+    ONGOING,
+    SKIPPED,
+    PENDING,
+    ACHIEVED;
+}
diff --git a/src/main/java/ecorp/easy/installer/utils/ConfigParser.java b/src/main/java/ecorp/easy/installer/utils/ConfigParser.java
index 88e2f99a..3c886c6c 100644
--- a/src/main/java/ecorp/easy/installer/utils/ConfigParser.java
+++ b/src/main/java/ecorp/easy/installer/utils/ConfigParser.java
@@ -28,8 +28,10 @@ import ecorp.easy.installer.models.steps.IStep;
 import ecorp.easy.installer.models.steps.LoadStep;
 import java.text.ParseException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import org.slf4j.Logger;
@@ -38,6 +40,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Class in charge of parsing yaml config file
  * into IStep's implementation
+ * This class follow factory pattern
  * 
  * I wonder, if I should make it a singleton...
  * This class is perfect candidate for unit test
@@ -52,6 +55,7 @@ public class ConfigParser {
     private final static String TITLE_KEY = "titleKey";
     private final static String TITLE_ICON_NAME = "titleIconName";
     private final static String INSTRUCTIONS = "instructions";
+    private final static String SKIP_IF= "skipIf";
     
     /**
      * Parse steps from yaml (both for preparation and flashing)
@@ -61,10 +65,11 @@ public class ConfigParser {
      */
     public static HashMap<String, IStep> parseSteps(Map yaml)throws ParseException, NumberFormatException{
         logger.debug("parseSteps(yaml)");
-        final HashMap<String, IStep> result = new HashMap<>();
+        final HashMap<String, IStep> result = new HashMap<>(); 
         for(String key : (Set<String>) yaml.keySet() ){
-            IStep step = ConfigParser.parseStep( (Map) yaml.get(key) );
-            result.put(key,step);
+            Map yamlContent = (Map) yaml.get(key);
+                IStep step = ConfigParser.parseStep(yamlContent );
+                result.put(key,step);
         }
         return result;
     }
@@ -128,8 +133,9 @@ public class ConfigParser {
     private static BasicStep parseBasicStep(Map yamlContent, String type) throws ParseException, ClassCastException{
         final int stepNumber = (int) yamlContent.get(STEP_NUMBER);
         final String nextStepKey = (String) yamlContent.get(NEXT_STEP_KEY);
+        final List<String> skipConditions = (List<String>) yamlContent.getOrDefault(SKIP_IF, Collections.emptyList());
         
-        return new BasicStep(type, nextStepKey, stepNumber);
+        return new BasicStep(type, nextStepKey, stepNumber, skipConditions);
     }
 
 
@@ -143,15 +149,15 @@ public class ConfigParser {
     private static LoadStep parseLoadStep(Map yamlContent, String type) throws ParseException, ClassCastException{
         final int stepNumber = (int)yamlContent.get(STEP_NUMBER);
         final String nextStepKey = (String) yamlContent.get(NEXT_STEP_KEY);
+        final List<String> skipConditions = (List<String>) yamlContent.getOrDefault(SKIP_IF, Collections.emptyList());
         final String titleKey = (String) yamlContent.get(TITLE_KEY);
         final String titleIconName = (String) yamlContent.getOrDefault(TITLE_ICON_NAME, "");
-        final ArrayList<String> instructions = (ArrayList<String>) yamlContent.getOrDefault(INSTRUCTIONS, new ArrayList<String>());        
+        final ArrayList<String> instructions = (ArrayList<String>) yamlContent.getOrDefault(INSTRUCTIONS, Collections.emptyList());        
         final int averageTime = (int) yamlContent.get("averageTime");
 
         final Command cmd = parseCommand(yamlContent);
-        LoadStep result = new LoadStep(type, nextStepKey, stepNumber , 
+        return new LoadStep(type, nextStepKey, stepNumber, skipConditions,  
                 titleKey, titleIconName, instructions, cmd, averageTime);
-        return result;
     }   
 
     /**
@@ -165,29 +171,30 @@ public class ConfigParser {
     private static CustomStep parseCustomStep(Map yamlContent, String type) throws ParseException, ClassCastException{
         logger.debug("parseCustomStep(yaml)");
         int stepNumber = (int)yamlContent.get(STEP_NUMBER);
-        String nextStepKey = (String) yamlContent.get(NEXT_STEP_KEY);
-        String titleKey = (String) yamlContent.get(TITLE_KEY);
-        String titleIconName = (String) yamlContent.getOrDefault(TITLE_ICON_NAME, "");
-        ArrayList<String> instructions = (ArrayList<String>) yamlContent.getOrDefault(INSTRUCTIONS, new ArrayList<String>());       
+        final String nextStepKey = (String) yamlContent.get(NEXT_STEP_KEY);
+        final List<String> skipConditions = (List<String>) yamlContent.getOrDefault(SKIP_IF, Collections.emptyList());
+        final String titleKey = (String) yamlContent.get(TITLE_KEY);
+        final String titleIconName = (String) yamlContent.getOrDefault(TITLE_ICON_NAME, "");
+        final ArrayList<String> instructions = (ArrayList<String>) yamlContent.getOrDefault(INSTRUCTIONS, Collections.emptyList());       
         
-        CustomStep result = new CustomStep(type, nextStepKey, stepNumber, titleKey, titleIconName, instructions);
-        return result;
+        return new CustomStep(type, nextStepKey, stepNumber, skipConditions, titleKey, titleIconName, instructions);
     }
     
     /**
      * Parse yaml content into ExecutableStep
      * example of this kind of step is the step 
      * to detect device
-     * @param YamlContent yaml content
+     * @param yamlContent yaml content
      * @param type Type of step
      * @return ExecutableStep the step
      */
-    private static ExecutableStep parseExecutableStep(Map YamlContent, String type) throws ParseException, ClassCastException{
-        final int stepNumber = (int)YamlContent.get(STEP_NUMBER);
-        final String nextStepKey = (String) YamlContent.get(NEXT_STEP_KEY);
-        final Command cmd = parseCommand(YamlContent);
-        ExecutableStep result = new ExecutableStep(type, nextStepKey, stepNumber, cmd);
-        return result;
+    private static ExecutableStep parseExecutableStep(Map yamlContent, String type) throws ParseException, ClassCastException{
+        final int stepNumber = (int)yamlContent.get(STEP_NUMBER);
+        final String nextStepKey = (String) yamlContent.get(NEXT_STEP_KEY);
+        final List<String> skipConditions = (List<String>) yamlContent.getOrDefault(SKIP_IF, Collections.emptyList());
+        final Command cmd = parseCommand(yamlContent);
+        
+        return new ExecutableStep(type, nextStepKey, stepNumber, skipConditions, cmd);
     }
 
     /**
@@ -201,9 +208,10 @@ public class ConfigParser {
     private static DownloadStep parseDownloadStep(Map yamlContent, String type) throws ParseException, ClassCastException{
         final int stepNumber = (int)yamlContent.get(STEP_NUMBER);
         final String nextStepKey = (String) yamlContent.get(NEXT_STEP_KEY);
+        final List<String> skipConditions = (List<String>) yamlContent.getOrDefault(SKIP_IF, Collections.emptyList());
         HashMap<String, RomSource> sourcesToDownload = parseSourcesToDownload((HashMap) yamlContent.get("sources"));
         
-        return new DownloadStep(type, nextStepKey, stepNumber, sourcesToDownload);
+        return new DownloadStep(type, nextStepKey, stepNumber, skipConditions, sourcesToDownload);
     }
     
     /**
@@ -218,13 +226,15 @@ public class ConfigParser {
     private static CustomExecutableStep parseCustomExecutableStep(Map yamlContent, String type) throws ParseException, ClassCastException{
         final int stepNumber = (int)yamlContent.get(STEP_NUMBER);
         final String nextStepKey = (String) yamlContent.get(NEXT_STEP_KEY);
+        final List<String> skipConditions = (List<String>) yamlContent.getOrDefault(SKIP_IF, Collections.emptyList());
         final String titleKey = (String) yamlContent.get(TITLE_KEY);
         final String titleIconName = (String) yamlContent.getOrDefault(TITLE_ICON_NAME, "");
-        final ArrayList<String> instructions = (ArrayList<String>) yamlContent.getOrDefault(INSTRUCTIONS, new ArrayList<String>());     
+        final ArrayList<String> instructions = (ArrayList<String>) yamlContent.getOrDefault(INSTRUCTIONS, Collections.emptyList());     
         final Command cmd = parseCommand(yamlContent);
-        CustomExecutableStep result = new CustomExecutableStep(type, nextStepKey, stepNumber,
+
+        
+        return new CustomExecutableStep(type, nextStepKey, stepNumber, skipConditions,
                 titleKey, titleIconName, instructions, cmd);
-        return result;
     }
     
         
diff --git a/src/main/resources/yaml/FP3_preparation.yml b/src/main/resources/yaml/FP3_preparation.yml
index 01811391..0824c9a2 100644
--- a/src/main/resources/yaml/FP3_preparation.yml
+++ b/src/main/resources/yaml/FP3_preparation.yml
@@ -45,32 +45,39 @@ steps:
           - debugADB_instr_search
           - debugADB_instr_androidDebug
     p4:
-        type: custom
+        type: checkDriver
         stepNumber: 5
         nextStepKey: p5
+        skipIf:
+          - linux
+          - windows
+    p5:
+        type: custom
+        stepNumber: 6
+        nextStepKey: p6
         titleKey: enableMTP_mTitle
         titleIconName: icon-hand.png
         instructions:
           - enableMTP_instr_settings
           - enableMTP_instr_scrollToUSBConfig
           - enableMTP_instr_selectMTP
-    p5:
+    p6:
         type: custom
-        stepNumber: 6
-        nextStepKey: p6
+        stepNumber: 7
+        nextStepKey: p7
         titleKey: removeAccounts_mTitle
         titleIconName: icon-hand.png
         instructions:
           - debugADB_instr_settings
           - removeAccounts_instr_openAccounts
           - removeAccounts_instr_selectAccounts
-    p6:
-        type: deviceDetection
-        stepNumber: 7
-        nextStepKey: p7
     p7:
+        type: deviceDetection
+        stepNumber: 8
+        nextStepKey: p8
+    p8:
         type: downloadSources
-        stepNumber: 7
+        stepNumber: 9
         nextStepKey: end
         sources:
           rom:
-- 
GitLab


From 1e76f0083ee216bc2fd60edaa10a6a9e3c973c38 Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Wed, 23 Feb 2022 15:45:48 +0100
Subject: [PATCH 29/31] Fill all device's preparation config file with default
 value

- Duplicate FP3's preparation config file for each device
- replace the sources values by the one corresponding to each device
- update date in licence header of each preparation config file
---
 src/main/resources/yaml/FP3_preparation.yml   |  2 +-
 src/main/resources/yaml/GS290_preparation.yml | 99 +++++++++++++++----
 .../yaml/Teracube_2e_preparation.yml          | 75 +++++++++++++-
 .../resources/yaml/dream2lte_preparation.yml  | 81 +++++++++++++--
 .../resources/yaml/dreamlte_preparation.yml   | 81 +++++++++++++--
 .../resources/yaml/hero2lte_preparation.yml   | 81 +++++++++++++--
 .../resources/yaml/herolte_preparation.yml    | 81 +++++++++++++--
 .../resources/yaml/star2lte_preparation.yml   | 93 ++++++++++++++---
 .../resources/yaml/starlte_preparation.yml    | 93 ++++++++++++++---
 9 files changed, 603 insertions(+), 83 deletions(-)

diff --git a/src/main/resources/yaml/FP3_preparation.yml b/src/main/resources/yaml/FP3_preparation.yml
index 0824c9a2..8c68ef3f 100644
--- a/src/main/resources/yaml/FP3_preparation.yml
+++ b/src/main/resources/yaml/FP3_preparation.yml
@@ -1,4 +1,4 @@
-## Copyright 2019-2020 - ECORP SAS
+## Copyright 2019-2022 - ECORP SAS
 
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/src/main/resources/yaml/GS290_preparation.yml b/src/main/resources/yaml/GS290_preparation.yml
index ecb849f0..377ab655 100644
--- a/src/main/resources/yaml/GS290_preparation.yml
+++ b/src/main/resources/yaml/GS290_preparation.yml
@@ -1,4 +1,4 @@
-## Copyright 2019-2021 - ECORP SAS
+## Copyright 2019-2022 - ECORP SAS
 
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -14,19 +14,84 @@
 ## along with this program.  If not, see <https://www.gnu.org/licenses/>.
 ## Author: Vincent Bourgmayer
 ---
-sources:
-  rom:
-    url: https://images.ecloud.global/stable/GS290/IMG-e-latest-GS290.zip
-    filePath: IMG-e-latest-GS290.zip
-  boot.img:
-    url: https://images.ecloud.global/stable/GS290/boot.img
-    filePath: boot.img
-  lk.img:
-    url: https://images.ecloud.global/stable/GS290/lk.img
-    filePath: lk.img
-  logo.bin:
-    url: https://images.ecloud.global/stable/GS290/logo.bin
-    filePath: logo.bin
-  recovery:
-    url: https://images.ecloud.global/stable/GS290/recovery-e-latest-GS290.img
-    filePath: recovery-e-latest-GS290.img
+stepsCount: 7
+steps:
+    p0:
+        type: welcome
+        stepNumber: 1
+        nextStepKey: p1
+    p1:
+        type: connectDevice
+        stepNumber: 2
+        nextStepKey: p2
+    p2:
+        type: custom
+        stepNumber: 3
+        nextStepKey: p3
+        titleKey: devMode_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - devMode_instr_settings
+          - devMode_instr_build
+          - devMode_instr_tap7
+    p3:
+        type: custom
+        stepNumber: 4
+        nextStepKey: p4
+        titleKey: debugADB_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - debugADB_instr_settings
+          - debugADB_instr_search
+          - debugADB_instr_androidDebug
+    p4:
+        type: checkDriver
+        stepNumber: 5
+        nextStepKey: p5
+        skipIf:
+          - linux
+          - windows
+    p5:
+        type: custom
+        stepNumber: 6
+        nextStepKey: p6
+        titleKey: enableMTP_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - enableMTP_instr_settings
+          - enableMTP_instr_scrollToUSBConfig
+          - enableMTP_instr_selectMTP
+    p6:
+        type: custom
+        stepNumber: 7
+        nextStepKey: p7
+        titleKey: removeAccounts_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - debugADB_instr_settings
+          - removeAccounts_instr_openAccounts
+          - removeAccounts_instr_selectAccounts
+    p7:
+        type: deviceDetection
+        stepNumber: 8
+        nextStepKey: p8
+    p8:
+        type: downloadSources
+        stepNumber: 9
+        nextStepKey: end
+        sources:
+            rom:
+              url: https://images.ecloud.global/stable/GS290/IMG-e-latest-GS290.zip
+              filePath: IMG-e-latest-GS290.zip
+            boot.img:
+              url: https://images.ecloud.global/stable/GS290/boot.img
+              filePath: boot.img
+            lk.img:
+              url: https://images.ecloud.global/stable/GS290/lk.img
+              filePath: lk.img
+            logo.bin:
+              url: https://images.ecloud.global/stable/GS290/logo.bin
+              filePath: logo.bin
+            recovery:
+              url: https://images.ecloud.global/stable/GS290/recovery-e-latest-GS290.img
+              filePath: recovery-e-latest-GS290.img
diff --git a/src/main/resources/yaml/Teracube_2e_preparation.yml b/src/main/resources/yaml/Teracube_2e_preparation.yml
index 41f90507..b208809e 100644
--- a/src/main/resources/yaml/Teracube_2e_preparation.yml
+++ b/src/main/resources/yaml/Teracube_2e_preparation.yml
@@ -1,4 +1,4 @@
-## Copyright 2019-2020 - ECORP SAS
+## Copyright 2019-2022 - ECORP SAS
 
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -14,7 +14,72 @@
 ## along with this program.  If not, see <https://www.gnu.org/licenses/>.
 ## Author: Vincent Bourgmayer
 ---
-sources:
-  rom:
-    url: https://images.ecloud.global/stable/2e/IMG-e-latest-2e.zip
-    filePath: IMG-e-latest-2e.zip
+stepsCount: 7
+steps:
+    p0:
+        type: welcome
+        stepNumber: 1
+        nextStepKey: p1
+    p1:
+        type: connectDevice
+        stepNumber: 2
+        nextStepKey: p2
+    p2:
+        type: custom
+        stepNumber: 3
+        nextStepKey: p3
+        titleKey: devMode_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - devMode_instr_settings
+          - devMode_instr_build
+          - devMode_instr_tap7
+    p3:
+        type: custom
+        stepNumber: 4
+        nextStepKey: p4
+        titleKey: debugADB_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - debugADB_instr_settings
+          - debugADB_instr_search
+          - debugADB_instr_androidDebug
+    p4:
+        type: checkDriver
+        stepNumber: 5
+        nextStepKey: p5
+        skipIf:
+          - linux
+          - windows
+    p5:
+        type: custom
+        stepNumber: 6
+        nextStepKey: p6
+        titleKey: enableMTP_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - enableMTP_instr_settings
+          - enableMTP_instr_scrollToUSBConfig
+          - enableMTP_instr_selectMTP
+    p6:
+        type: custom
+        stepNumber: 7
+        nextStepKey: p7
+        titleKey: removeAccounts_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - debugADB_instr_settings
+          - removeAccounts_instr_openAccounts
+          - removeAccounts_instr_selectAccounts
+    p7:
+        type: deviceDetection
+        stepNumber: 8
+        nextStepKey: p8
+    p8:
+        type: downloadSources
+        stepNumber: 9
+        nextStepKey: end
+        sources:
+            rom:
+              url: https://images.ecloud.global/stable/2e/IMG-e-latest-2e.zip
+              filePath: IMG-e-latest-2e.zip
diff --git a/src/main/resources/yaml/dream2lte_preparation.yml b/src/main/resources/yaml/dream2lte_preparation.yml
index 81cfb3fc..b555b255 100644
--- a/src/main/resources/yaml/dream2lte_preparation.yml
+++ b/src/main/resources/yaml/dream2lte_preparation.yml
@@ -1,4 +1,4 @@
-## Copyright 2019-2021 - ECORP SAS 
+## Copyright 2019-2022 - ECORP SAS 
 
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -14,10 +14,75 @@
 ## along with this program.  If not, see <https://www.gnu.org/licenses/>.
 ## Author: Vincent Bourgmayer
 ---
-sources: 
-   rom:
-        url: https://images.ecloud.global/stable/dream2lte/e-latest-dream2lte.zip
-        filePath: e-latest-dream2lte.zip
-   twrp:         
-        url: https://images.ecloud.global/stable/twrp/dream2lte/twrp-3.3.1-2-dream2lte.img
-        filePath: twrp-3.3.1-2-dream2lte.img
\ No newline at end of file
+stepsCount: 7
+steps:
+    p0:
+        type: welcome
+        stepNumber: 1
+        nextStepKey: p1
+    p1:
+        type: connectDevice
+        stepNumber: 2
+        nextStepKey: p2
+    p2:
+        type: custom
+        stepNumber: 3
+        nextStepKey: p3
+        titleKey: devMode_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - devMode_instr_settings
+          - devMode_instr_build
+          - devMode_instr_tap7
+    p3:
+        type: custom
+        stepNumber: 4
+        nextStepKey: p4
+        titleKey: debugADB_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - debugADB_instr_settings
+          - debugADB_instr_search
+          - debugADB_instr_androidDebug
+    p4:
+        type: checkDriver
+        stepNumber: 5
+        nextStepKey: p5
+        skipIf:
+          - linux
+          - windows
+    p5:
+        type: custom
+        stepNumber: 6
+        nextStepKey: p6
+        titleKey: enableMTP_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - enableMTP_instr_settings
+          - enableMTP_instr_scrollToUSBConfig
+          - enableMTP_instr_selectMTP
+    p6:
+        type: custom
+        stepNumber: 7
+        nextStepKey: p7
+        titleKey: removeAccounts_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - debugADB_instr_settings
+          - removeAccounts_instr_openAccounts
+          - removeAccounts_instr_selectAccounts
+    p7:
+        type: deviceDetection
+        stepNumber: 8
+        nextStepKey: p8
+    p8:
+        type: downloadSources
+        stepNumber: 9
+        nextStepKey: end
+        sources:
+            rom:
+                 url: https://images.ecloud.global/stable/dream2lte/e-latest-dream2lte.zip
+                 filePath: e-latest-dream2lte.zip
+            twrp:         
+                 url: https://images.ecloud.global/stable/twrp/dream2lte/twrp-3.3.1-2-dream2lte.img
+                 filePath: twrp-3.3.1-2-dream2lte.img
\ No newline at end of file
diff --git a/src/main/resources/yaml/dreamlte_preparation.yml b/src/main/resources/yaml/dreamlte_preparation.yml
index 865c0d77..483c86c0 100644
--- a/src/main/resources/yaml/dreamlte_preparation.yml
+++ b/src/main/resources/yaml/dreamlte_preparation.yml
@@ -1,4 +1,4 @@
-## Copyright 2019-2020 - ECORP SAS 
+## Copyright 2019-2022 - ECORP SAS 
 
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -14,10 +14,75 @@
 ## along with this program.  If not, see <https://www.gnu.org/licenses/>.
 ## Author: Vincent Bourgmayer
 ---
-sources: 
-   rom:
-        url: https://images.ecloud.global/stable/dreamlte/e-latest-dreamlte.zip
-        filePath: e-latest-dreamlte.zip
-   twrp:         
-        url: https://images.ecloud.global/stable/twrp/dreamlte/twrp-3.3.1-2-dreamlte.img
-        filePath: twrp-3.3.1-2-dreamlte.img
\ No newline at end of file
+stepsCount: 7
+steps:
+    p0:
+        type: welcome
+        stepNumber: 1
+        nextStepKey: p1
+    p1:
+        type: connectDevice
+        stepNumber: 2
+        nextStepKey: p2
+    p2:
+        type: custom
+        stepNumber: 3
+        nextStepKey: p3
+        titleKey: devMode_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - devMode_instr_settings
+          - devMode_instr_build
+          - devMode_instr_tap7
+    p3:
+        type: custom
+        stepNumber: 4
+        nextStepKey: p4
+        titleKey: debugADB_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - debugADB_instr_settings
+          - debugADB_instr_search
+          - debugADB_instr_androidDebug
+    p4:
+        type: checkDriver
+        stepNumber: 5
+        nextStepKey: p5
+        skipIf:
+          - linux
+          - windows
+    p5:
+        type: custom
+        stepNumber: 6
+        nextStepKey: p6
+        titleKey: enableMTP_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - enableMTP_instr_settings
+          - enableMTP_instr_scrollToUSBConfig
+          - enableMTP_instr_selectMTP
+    p6:
+        type: custom
+        stepNumber: 7
+        nextStepKey: p7
+        titleKey: removeAccounts_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - debugADB_instr_settings
+          - removeAccounts_instr_openAccounts
+          - removeAccounts_instr_selectAccounts
+    p7:
+        type: deviceDetection
+        stepNumber: 8
+        nextStepKey: p8
+    p8:
+        type: downloadSources
+        stepNumber: 9
+        nextStepKey: end
+        sources:
+            rom:
+              url: https://images.ecloud.global/stable/dreamlte/e-latest-dreamlte.zip
+              filePath: e-latest-dreamlte.zip
+            twrp:         
+              url: https://images.ecloud.global/stable/twrp/dreamlte/twrp-3.3.1-2-dreamlte.img
+              filePath: twrp-3.3.1-2-dreamlte.img
\ No newline at end of file
diff --git a/src/main/resources/yaml/hero2lte_preparation.yml b/src/main/resources/yaml/hero2lte_preparation.yml
index a5bf1bba..1860c632 100644
--- a/src/main/resources/yaml/hero2lte_preparation.yml
+++ b/src/main/resources/yaml/hero2lte_preparation.yml
@@ -1,4 +1,4 @@
-## Copyright 2019-2020 - ECORP SAS 
+## Copyright 2019-2022 - ECORP SAS 
 
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -14,10 +14,75 @@
 ## along with this program.  If not, see <https://www.gnu.org/licenses/>.
 ## Author: Vincent Bourgmayer
 ---
-sources: 
-   rom:
-        url: https://images.ecloud.global/stable/hero2lte/e-latest-hero2lte.zip
-        filePath: e-latest-hero2lte.zip
-   twrp:         
-        url: https://images.ecloud.global/stable/twrp/hero2lte/twrp-3.2.3-0-hero2lte.img
-        filePath: twrp-3.2.3-0-hero2lte.img
\ No newline at end of file
+stepsCount: 7
+steps:
+    p0:
+        type: welcome
+        stepNumber: 1
+        nextStepKey: p1
+    p1:
+        type: connectDevice
+        stepNumber: 2
+        nextStepKey: p2
+    p2:
+        type: custom
+        stepNumber: 3
+        nextStepKey: p3
+        titleKey: devMode_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - devMode_instr_settings
+          - devMode_instr_build
+          - devMode_instr_tap7
+    p3:
+        type: custom
+        stepNumber: 4
+        nextStepKey: p4
+        titleKey: debugADB_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - debugADB_instr_settings
+          - debugADB_instr_search
+          - debugADB_instr_androidDebug
+    p4:
+        type: checkDriver
+        stepNumber: 5
+        nextStepKey: p5
+        skipIf:
+          - linux
+          - windows
+    p5:
+        type: custom
+        stepNumber: 6
+        nextStepKey: p6
+        titleKey: enableMTP_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - enableMTP_instr_settings
+          - enableMTP_instr_scrollToUSBConfig
+          - enableMTP_instr_selectMTP
+    p6:
+        type: custom
+        stepNumber: 7
+        nextStepKey: p7
+        titleKey: removeAccounts_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - debugADB_instr_settings
+          - removeAccounts_instr_openAccounts
+          - removeAccounts_instr_selectAccounts
+    p7:
+        type: deviceDetection
+        stepNumber: 8
+        nextStepKey: p8
+    p8:
+        type: downloadSources
+        stepNumber: 9
+        nextStepKey: end
+        sources:
+            rom:
+              url: https://images.ecloud.global/stable/hero2lte/e-latest-hero2lte.zip
+              filePath: e-latest-hero2lte.zip
+            twrp:         
+              url: https://images.ecloud.global/stable/twrp/hero2lte/twrp-3.2.3-0-hero2lte.img
+              filePath: twrp-3.2.3-0-hero2lte.img
\ No newline at end of file
diff --git a/src/main/resources/yaml/herolte_preparation.yml b/src/main/resources/yaml/herolte_preparation.yml
index 33f682b9..fa4284f9 100644
--- a/src/main/resources/yaml/herolte_preparation.yml
+++ b/src/main/resources/yaml/herolte_preparation.yml
@@ -1,4 +1,4 @@
-## Copyright 2019-2020 - ECORP SAS 
+## Copyright 2019-2022 - ECORP SAS 
 
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -14,10 +14,75 @@
 ## along with this program.  If not, see <https://www.gnu.org/licenses/>.
 ## Author: Vincent Bourgmayer
 ---
-sources: 
-   rom:
-        url: https://images.ecloud.global/stable/herolte/e-latest-herolte.zip
-        filePath: e-latest-herolte.zip
-   twrp:         
-        url: https://images.ecloud.global/stable/twrp/herolte/twrp-3.2.3-0-herolte.img
-        filePath: twrp-3.2.3-0-herolte.img
\ No newline at end of file
+stepsCount: 7
+steps:
+    p0:
+        type: welcome
+        stepNumber: 1
+        nextStepKey: p1
+    p1:
+        type: connectDevice
+        stepNumber: 2
+        nextStepKey: p2
+    p2:
+        type: custom
+        stepNumber: 3
+        nextStepKey: p3
+        titleKey: devMode_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - devMode_instr_settings
+          - devMode_instr_build
+          - devMode_instr_tap7
+    p3:
+        type: custom
+        stepNumber: 4
+        nextStepKey: p4
+        titleKey: debugADB_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - debugADB_instr_settings
+          - debugADB_instr_search
+          - debugADB_instr_androidDebug
+    p4:
+        type: checkDriver
+        stepNumber: 5
+        nextStepKey: p5
+        skipIf:
+          - linux
+          - windows
+    p5:
+        type: custom
+        stepNumber: 6
+        nextStepKey: p6
+        titleKey: enableMTP_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - enableMTP_instr_settings
+          - enableMTP_instr_scrollToUSBConfig
+          - enableMTP_instr_selectMTP
+    p6:
+        type: custom
+        stepNumber: 7
+        nextStepKey: p7
+        titleKey: removeAccounts_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - debugADB_instr_settings
+          - removeAccounts_instr_openAccounts
+          - removeAccounts_instr_selectAccounts
+    p7:
+        type: deviceDetection
+        stepNumber: 8
+        nextStepKey: p8
+    p8:
+        type: downloadSources
+        stepNumber: 9
+        nextStepKey: end
+        sources:
+            rom:
+              url: https://images.ecloud.global/stable/herolte/e-latest-herolte.zip
+              filePath: e-latest-herolte.zip
+            twrp:         
+              url: https://images.ecloud.global/stable/twrp/herolte/twrp-3.2.3-0-herolte.img
+              filePath: twrp-3.2.3-0-herolte.img
\ No newline at end of file
diff --git a/src/main/resources/yaml/star2lte_preparation.yml b/src/main/resources/yaml/star2lte_preparation.yml
index e036cd17..8e80a096 100644
--- a/src/main/resources/yaml/star2lte_preparation.yml
+++ b/src/main/resources/yaml/star2lte_preparation.yml
@@ -1,4 +1,4 @@
-## Copyright 2019-2021 - ECORP SAS 
+## Copyright 2019-2022 - ECORP SAS 
 
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -14,16 +14,81 @@
 ## along with this program.  If not, see <https://www.gnu.org/licenses/>.
 ## Author: Vincent Bourgmayer
 ---
-sources: 
-    rom:
-        url: https://images.ecloud.global/stable/star2lte/e-latest-star2lte.zip
-        filePath: e-latest-star2lte.zip
-    twrp:         
-        url: https://images.ecloud.global/stable/twrp/star2lte/twrp-3.2.3-0-star2lte.img
-        filePath: twrp-3.2.3-0-star2lte.img
-    f2:
-        url:  https://images.ecloud.global/stable/vendors/VENDOR-27_ARI9.zip
-        filePath: VENDOR-27_ARI9.zip
-    f3:
-        url:  https://images.ecloud.global/stable/patch/no-verity-opt-encrypt-samsung-1.0.zip
-        filePath: no-verity-opt-encrypt-samsung-1.0.zip
\ No newline at end of file
+stepsCount: 7
+steps:
+    p0:
+        type: welcome
+        stepNumber: 1
+        nextStepKey: p1
+    p1:
+        type: connectDevice
+        stepNumber: 2
+        nextStepKey: p2
+    p2:
+        type: custom
+        stepNumber: 3
+        nextStepKey: p3
+        titleKey: devMode_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - devMode_instr_settings
+          - devMode_instr_build
+          - devMode_instr_tap7
+    p3:
+        type: custom
+        stepNumber: 4
+        nextStepKey: p4
+        titleKey: debugADB_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - debugADB_instr_settings
+          - debugADB_instr_search
+          - debugADB_instr_androidDebug
+    p4:
+        type: checkDriver
+        stepNumber: 5
+        nextStepKey: p5
+        skipIf:
+          - linux
+          - windows
+    p5:
+        type: custom
+        stepNumber: 6
+        nextStepKey: p6
+        titleKey: enableMTP_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - enableMTP_instr_settings
+          - enableMTP_instr_scrollToUSBConfig
+          - enableMTP_instr_selectMTP
+    p6:
+        type: custom
+        stepNumber: 7
+        nextStepKey: p7
+        titleKey: removeAccounts_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - debugADB_instr_settings
+          - removeAccounts_instr_openAccounts
+          - removeAccounts_instr_selectAccounts
+    p7:
+        type: deviceDetection
+        stepNumber: 8
+        nextStepKey: p8
+    p8:
+        type: downloadSources
+        stepNumber: 9
+        nextStepKey: end
+        sources:
+            rom:
+                url: https://images.ecloud.global/stable/star2lte/e-latest-star2lte.zip
+                filePath: e-latest-star2lte.zip
+            twrp:         
+                url: https://images.ecloud.global/stable/twrp/star2lte/twrp-3.2.3-0-star2lte.img
+                filePath: twrp-3.2.3-0-star2lte.img
+            f2:
+                url:  https://images.ecloud.global/stable/vendors/VENDOR-27_ARI9.zip
+                filePath: VENDOR-27_ARI9.zip
+            f3:
+                url:  https://images.ecloud.global/stable/patch/no-verity-opt-encrypt-samsung-1.0.zip
+                filePath: no-verity-opt-encrypt-samsung-1.0.zip
\ No newline at end of file
diff --git a/src/main/resources/yaml/starlte_preparation.yml b/src/main/resources/yaml/starlte_preparation.yml
index d9a906d9..9a774cba 100644
--- a/src/main/resources/yaml/starlte_preparation.yml
+++ b/src/main/resources/yaml/starlte_preparation.yml
@@ -1,4 +1,4 @@
-## Copyright 2019-2021 - ECORP SAS 
+## Copyright 2019-2022 - ECORP SAS 
 
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -14,16 +14,81 @@
 ## along with this program.  If not, see <https://www.gnu.org/licenses/>.
 ## Author: Vincent Bourgmayer
 ---
-sources: 
-    rom:
-        url: https://images.ecloud.global/stable/starlte/e-latest-starlte.zip
-        filePath: e-latest-starlte.zip
-    twrp:         
-        url: https://images.ecloud.global/stable/twrp/starlte/twrp-3.2.3-0-starlte.img
-        filePath: twrp-3.2.3-0-starlte.img
-    f2:
-        url:  https://images.ecloud.global/stable/vendors/VENDOR-27_ARI9.zip
-        filePath: VENDOR-27_ARI9.zip
-    f3:
-        url:  https://images.ecloud.global/stable/patch/no-verity-opt-encrypt-samsung-1.0.zip
-        filePath: no-verity-opt-encrypt-samsung-1.0.zip
+stepsCount: 7
+steps:
+    p0:
+        type: welcome
+        stepNumber: 1
+        nextStepKey: p1
+    p1:
+        type: connectDevice
+        stepNumber: 2
+        nextStepKey: p2
+    p2:
+        type: custom
+        stepNumber: 3
+        nextStepKey: p3
+        titleKey: devMode_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - devMode_instr_settings
+          - devMode_instr_build
+          - devMode_instr_tap7
+    p3:
+        type: custom
+        stepNumber: 4
+        nextStepKey: p4
+        titleKey: debugADB_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - debugADB_instr_settings
+          - debugADB_instr_search
+          - debugADB_instr_androidDebug
+    p4:
+        type: checkDriver
+        stepNumber: 5
+        nextStepKey: p5
+        skipIf:
+          - linux
+          - windows
+    p5:
+        type: custom
+        stepNumber: 6
+        nextStepKey: p6
+        titleKey: enableMTP_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - enableMTP_instr_settings
+          - enableMTP_instr_scrollToUSBConfig
+          - enableMTP_instr_selectMTP
+    p6:
+        type: custom
+        stepNumber: 7
+        nextStepKey: p7
+        titleKey: removeAccounts_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - debugADB_instr_settings
+          - removeAccounts_instr_openAccounts
+          - removeAccounts_instr_selectAccounts
+    p7:
+        type: deviceDetection
+        stepNumber: 8
+        nextStepKey: p8
+    p8:
+        type: downloadSources
+        stepNumber: 9
+        nextStepKey: end
+        sources:
+            rom:
+                url: https://images.ecloud.global/stable/starlte/e-latest-starlte.zip
+                filePath: e-latest-starlte.zip
+            twrp:         
+                url: https://images.ecloud.global/stable/twrp/starlte/twrp-3.2.3-0-starlte.img
+                filePath: twrp-3.2.3-0-starlte.img
+            f2:
+                url:  https://images.ecloud.global/stable/vendors/VENDOR-27_ARI9.zip
+                filePath: VENDOR-27_ARI9.zip
+            f3:
+                url:  https://images.ecloud.global/stable/patch/no-verity-opt-encrypt-samsung-1.0.zip
+                filePath: no-verity-opt-encrypt-samsung-1.0.zip
-- 
GitLab


From 3e3e225cdb705c816c8cbfa1e4cc095281d68459 Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Wed, 23 Feb 2022 15:50:41 +0100
Subject: [PATCH 30/31] add default preparation config file

---
 .../resources/yaml/default_preparation.yml    | 82 +++++++++++++++++
 .../resources/yaml/starlte_preparation.yml    | 91 +++----------------
 2 files changed, 95 insertions(+), 78 deletions(-)
 create mode 100644 src/main/resources/yaml/default_preparation.yml

diff --git a/src/main/resources/yaml/default_preparation.yml b/src/main/resources/yaml/default_preparation.yml
new file mode 100644
index 00000000..ee4048fb
--- /dev/null
+++ b/src/main/resources/yaml/default_preparation.yml
@@ -0,0 +1,82 @@
+## Copyright 2022 - ECORP SAS
+
+## This program is free software: you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with this program.  If not, see <https://www.gnu.org/licenses/>.
+## Author: Vincent Bourgmayer
+---
+stepsCount: 7
+steps:
+    p0:
+        type: welcome
+        stepNumber: 1
+        nextStepKey: p1
+    p1:
+        type: connectDevice
+        stepNumber: 2
+        nextStepKey: p2
+    p2:
+        type: custom
+        stepNumber: 3
+        nextStepKey: p3
+        titleKey: devMode_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - devMode_instr_settings
+          - devMode_instr_build
+          - devMode_instr_tap7
+    p3:
+        type: custom
+        stepNumber: 4
+        nextStepKey: p4
+        titleKey: debugADB_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - debugADB_instr_settings
+          - debugADB_instr_search
+          - debugADB_instr_androidDebug
+    p4:
+        type: checkDriver
+        stepNumber: 5
+        nextStepKey: p5
+        skipIf:
+          - linux
+          - windows
+    p5:
+        type: custom
+        stepNumber: 6
+        nextStepKey: p6
+        titleKey: enableMTP_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - enableMTP_instr_settings
+          - enableMTP_instr_scrollToUSBConfig
+          - enableMTP_instr_selectMTP
+    p6:
+        type: custom
+        stepNumber: 7
+        nextStepKey: p7
+        titleKey: removeAccounts_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - debugADB_instr_settings
+          - removeAccounts_instr_openAccounts
+          - removeAccounts_instr_selectAccounts
+    p7:
+        type: deviceDetection
+        stepNumber: 8
+        nextStepKey: p8
+    p8:
+        type: downloadSources
+        stepNumber: 9
+        nextStepKey: end
+        sources: ~
\ No newline at end of file
diff --git a/src/main/resources/yaml/starlte_preparation.yml b/src/main/resources/yaml/starlte_preparation.yml
index 9a774cba..c6ded837 100644
--- a/src/main/resources/yaml/starlte_preparation.yml
+++ b/src/main/resources/yaml/starlte_preparation.yml
@@ -14,81 +14,16 @@
 ## along with this program.  If not, see <https://www.gnu.org/licenses/>.
 ## Author: Vincent Bourgmayer
 ---
-stepsCount: 7
-steps:
-    p0:
-        type: welcome
-        stepNumber: 1
-        nextStepKey: p1
-    p1:
-        type: connectDevice
-        stepNumber: 2
-        nextStepKey: p2
-    p2:
-        type: custom
-        stepNumber: 3
-        nextStepKey: p3
-        titleKey: devMode_mTitle
-        titleIconName: icon-hand.png
-        instructions:
-          - devMode_instr_settings
-          - devMode_instr_build
-          - devMode_instr_tap7
-    p3:
-        type: custom
-        stepNumber: 4
-        nextStepKey: p4
-        titleKey: debugADB_mTitle
-        titleIconName: icon-hand.png
-        instructions:
-          - debugADB_instr_settings
-          - debugADB_instr_search
-          - debugADB_instr_androidDebug
-    p4:
-        type: checkDriver
-        stepNumber: 5
-        nextStepKey: p5
-        skipIf:
-          - linux
-          - windows
-    p5:
-        type: custom
-        stepNumber: 6
-        nextStepKey: p6
-        titleKey: enableMTP_mTitle
-        titleIconName: icon-hand.png
-        instructions:
-          - enableMTP_instr_settings
-          - enableMTP_instr_scrollToUSBConfig
-          - enableMTP_instr_selectMTP
-    p6:
-        type: custom
-        stepNumber: 7
-        nextStepKey: p7
-        titleKey: removeAccounts_mTitle
-        titleIconName: icon-hand.png
-        instructions:
-          - debugADB_instr_settings
-          - removeAccounts_instr_openAccounts
-          - removeAccounts_instr_selectAccounts
-    p7:
-        type: deviceDetection
-        stepNumber: 8
-        nextStepKey: p8
-    p8:
-        type: downloadSources
-        stepNumber: 9
-        nextStepKey: end
-        sources:
-            rom:
-                url: https://images.ecloud.global/stable/starlte/e-latest-starlte.zip
-                filePath: e-latest-starlte.zip
-            twrp:         
-                url: https://images.ecloud.global/stable/twrp/starlte/twrp-3.2.3-0-starlte.img
-                filePath: twrp-3.2.3-0-starlte.img
-            f2:
-                url:  https://images.ecloud.global/stable/vendors/VENDOR-27_ARI9.zip
-                filePath: VENDOR-27_ARI9.zip
-            f3:
-                url:  https://images.ecloud.global/stable/patch/no-verity-opt-encrypt-samsung-1.0.zip
-                filePath: no-verity-opt-encrypt-samsung-1.0.zip
+sources: 
+    rom:
+        url: https://images.ecloud.global/stable/starlte/e-latest-starlte.zip
+        filePath: e-latest-starlte.zip
+    twrp:         
+        url: https://images.ecloud.global/stable/twrp/starlte/twrp-3.2.3-0-starlte.img
+        filePath: twrp-3.2.3-0-starlte.img
+    f2:
+        url:  https://images.ecloud.global/stable/vendors/VENDOR-27_ARI9.zip
+        filePath: VENDOR-27_ARI9.zip
+    f3:
+        url:  https://images.ecloud.global/stable/patch/no-verity-opt-encrypt-samsung-1.0.zip
+        filePath: no-verity-opt-encrypt-samsung-1.0.zip
-- 
GitLab


From bae7b77d834f6e8a239c6f03f220a8ea66f1d13c Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Wed, 23 Feb 2022 15:53:11 +0100
Subject: [PATCH 31/31] Update steps count value in all preparation config
 file.

Also fix an issue with starlte_preparation.yml due to previous commit
---
 src/main/resources/yaml/FP3_preparation.yml   |  2 +-
 src/main/resources/yaml/GS290_preparation.yml |  2 +-
 .../yaml/Teracube_2e_preparation.yml          |  2 +-
 .../resources/yaml/default_preparation.yml    |  2 +-
 .../resources/yaml/dream2lte_preparation.yml  |  2 +-
 .../resources/yaml/dreamlte_preparation.yml   |  2 +-
 .../resources/yaml/hero2lte_preparation.yml   |  2 +-
 .../resources/yaml/herolte_preparation.yml    |  2 +-
 .../resources/yaml/star2lte_preparation.yml   |  2 +-
 .../resources/yaml/starlte_preparation.yml    | 91 ++++++++++++++++---
 10 files changed, 87 insertions(+), 22 deletions(-)

diff --git a/src/main/resources/yaml/FP3_preparation.yml b/src/main/resources/yaml/FP3_preparation.yml
index 8c68ef3f..4d9d5062 100644
--- a/src/main/resources/yaml/FP3_preparation.yml
+++ b/src/main/resources/yaml/FP3_preparation.yml
@@ -14,7 +14,7 @@
 ## along with this program.  If not, see <https://www.gnu.org/licenses/>.
 ## Author: Vincent Bourgmayer
 ---
-stepsCount: 7
+stepsCount: 9
 steps:
     p0:
         type: welcome
diff --git a/src/main/resources/yaml/GS290_preparation.yml b/src/main/resources/yaml/GS290_preparation.yml
index 377ab655..76f3208f 100644
--- a/src/main/resources/yaml/GS290_preparation.yml
+++ b/src/main/resources/yaml/GS290_preparation.yml
@@ -14,7 +14,7 @@
 ## along with this program.  If not, see <https://www.gnu.org/licenses/>.
 ## Author: Vincent Bourgmayer
 ---
-stepsCount: 7
+stepsCount: 9
 steps:
     p0:
         type: welcome
diff --git a/src/main/resources/yaml/Teracube_2e_preparation.yml b/src/main/resources/yaml/Teracube_2e_preparation.yml
index b208809e..cd568063 100644
--- a/src/main/resources/yaml/Teracube_2e_preparation.yml
+++ b/src/main/resources/yaml/Teracube_2e_preparation.yml
@@ -14,7 +14,7 @@
 ## along with this program.  If not, see <https://www.gnu.org/licenses/>.
 ## Author: Vincent Bourgmayer
 ---
-stepsCount: 7
+stepsCount: 9
 steps:
     p0:
         type: welcome
diff --git a/src/main/resources/yaml/default_preparation.yml b/src/main/resources/yaml/default_preparation.yml
index ee4048fb..b5d65cdf 100644
--- a/src/main/resources/yaml/default_preparation.yml
+++ b/src/main/resources/yaml/default_preparation.yml
@@ -14,7 +14,7 @@
 ## along with this program.  If not, see <https://www.gnu.org/licenses/>.
 ## Author: Vincent Bourgmayer
 ---
-stepsCount: 7
+stepsCount: 9
 steps:
     p0:
         type: welcome
diff --git a/src/main/resources/yaml/dream2lte_preparation.yml b/src/main/resources/yaml/dream2lte_preparation.yml
index b555b255..4d5f1c0b 100644
--- a/src/main/resources/yaml/dream2lte_preparation.yml
+++ b/src/main/resources/yaml/dream2lte_preparation.yml
@@ -14,7 +14,7 @@
 ## along with this program.  If not, see <https://www.gnu.org/licenses/>.
 ## Author: Vincent Bourgmayer
 ---
-stepsCount: 7
+stepsCount: 9
 steps:
     p0:
         type: welcome
diff --git a/src/main/resources/yaml/dreamlte_preparation.yml b/src/main/resources/yaml/dreamlte_preparation.yml
index 483c86c0..1319419e 100644
--- a/src/main/resources/yaml/dreamlte_preparation.yml
+++ b/src/main/resources/yaml/dreamlte_preparation.yml
@@ -14,7 +14,7 @@
 ## along with this program.  If not, see <https://www.gnu.org/licenses/>.
 ## Author: Vincent Bourgmayer
 ---
-stepsCount: 7
+stepsCount: 9
 steps:
     p0:
         type: welcome
diff --git a/src/main/resources/yaml/hero2lte_preparation.yml b/src/main/resources/yaml/hero2lte_preparation.yml
index 1860c632..7f0e4cd5 100644
--- a/src/main/resources/yaml/hero2lte_preparation.yml
+++ b/src/main/resources/yaml/hero2lte_preparation.yml
@@ -14,7 +14,7 @@
 ## along with this program.  If not, see <https://www.gnu.org/licenses/>.
 ## Author: Vincent Bourgmayer
 ---
-stepsCount: 7
+stepsCount: 9
 steps:
     p0:
         type: welcome
diff --git a/src/main/resources/yaml/herolte_preparation.yml b/src/main/resources/yaml/herolte_preparation.yml
index fa4284f9..b96aa3c9 100644
--- a/src/main/resources/yaml/herolte_preparation.yml
+++ b/src/main/resources/yaml/herolte_preparation.yml
@@ -14,7 +14,7 @@
 ## along with this program.  If not, see <https://www.gnu.org/licenses/>.
 ## Author: Vincent Bourgmayer
 ---
-stepsCount: 7
+stepsCount: 9
 steps:
     p0:
         type: welcome
diff --git a/src/main/resources/yaml/star2lte_preparation.yml b/src/main/resources/yaml/star2lte_preparation.yml
index 8e80a096..e7d3dbfa 100644
--- a/src/main/resources/yaml/star2lte_preparation.yml
+++ b/src/main/resources/yaml/star2lte_preparation.yml
@@ -14,7 +14,7 @@
 ## along with this program.  If not, see <https://www.gnu.org/licenses/>.
 ## Author: Vincent Bourgmayer
 ---
-stepsCount: 7
+stepsCount: 9
 steps:
     p0:
         type: welcome
diff --git a/src/main/resources/yaml/starlte_preparation.yml b/src/main/resources/yaml/starlte_preparation.yml
index c6ded837..55e3c364 100644
--- a/src/main/resources/yaml/starlte_preparation.yml
+++ b/src/main/resources/yaml/starlte_preparation.yml
@@ -14,16 +14,81 @@
 ## along with this program.  If not, see <https://www.gnu.org/licenses/>.
 ## Author: Vincent Bourgmayer
 ---
-sources: 
-    rom:
-        url: https://images.ecloud.global/stable/starlte/e-latest-starlte.zip
-        filePath: e-latest-starlte.zip
-    twrp:         
-        url: https://images.ecloud.global/stable/twrp/starlte/twrp-3.2.3-0-starlte.img
-        filePath: twrp-3.2.3-0-starlte.img
-    f2:
-        url:  https://images.ecloud.global/stable/vendors/VENDOR-27_ARI9.zip
-        filePath: VENDOR-27_ARI9.zip
-    f3:
-        url:  https://images.ecloud.global/stable/patch/no-verity-opt-encrypt-samsung-1.0.zip
-        filePath: no-verity-opt-encrypt-samsung-1.0.zip
+stepsCount: 9
+steps:
+    p0:
+        type: welcome
+        stepNumber: 1
+        nextStepKey: p1
+    p1:
+        type: connectDevice
+        stepNumber: 2
+        nextStepKey: p2
+    p2:
+        type: custom
+        stepNumber: 3
+        nextStepKey: p3
+        titleKey: devMode_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - devMode_instr_settings
+          - devMode_instr_build
+          - devMode_instr_tap7
+    p3:
+        type: custom
+        stepNumber: 4
+        nextStepKey: p4
+        titleKey: debugADB_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - debugADB_instr_settings
+          - debugADB_instr_search
+          - debugADB_instr_androidDebug
+    p4:
+        type: checkDriver
+        stepNumber: 5
+        nextStepKey: p5
+        skipIf:
+          - linux
+          - windows
+    p5:
+        type: custom
+        stepNumber: 6
+        nextStepKey: p6
+        titleKey: enableMTP_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - enableMTP_instr_settings
+          - enableMTP_instr_scrollToUSBConfig
+          - enableMTP_instr_selectMTP
+    p6:
+        type: custom
+        stepNumber: 7
+        nextStepKey: p7
+        titleKey: removeAccounts_mTitle
+        titleIconName: icon-hand.png
+        instructions:
+          - debugADB_instr_settings
+          - removeAccounts_instr_openAccounts
+          - removeAccounts_instr_selectAccounts
+    p7:
+        type: deviceDetection
+        stepNumber: 8
+        nextStepKey: p8
+    p8:
+        type: downloadSources
+        stepNumber: 9
+        nextStepKey: end
+        sources:
+            rom:
+                url: https://images.ecloud.global/stable/starlte/e-latest-starlte.zip
+                filePath: e-latest-starlte.zip
+            twrp:         
+                url: https://images.ecloud.global/stable/twrp/starlte/twrp-3.2.3-0-starlte.img
+                filePath: twrp-3.2.3-0-starlte.img
+            f2:
+                url:  https://images.ecloud.global/stable/vendors/VENDOR-27_ARI9.zip
+                filePath: VENDOR-27_ARI9.zip
+            f3:
+                url:  https://images.ecloud.global/stable/patch/no-verity-opt-encrypt-samsung-1.0.zip
+                filePath: no-verity-opt-encrypt-samsung-1.0.zip
-- 
GitLab