Use twrp for sargo; some fixes

Author: tsterbak

openandroidinstaller/assets/configs/a3y17lte.yaml

@@ -25,6 +25,7 @@ steps:
   install_os:
     - type: call_button 
       content: >
+        In the next steps, you finally flash the selected OS image.
         Connect your device with your computer with the USB-Cable.
         This step will format your phone and wipe all the data. It will also remove encryption and delete all files stored 
         in the internal storage. Then the OS image will be installed. Confirm to run. This might take a while. At the end your phone will boot into the new OS.

openandroidinstaller/assets/configs/sargo.yaml

@@ -41,22 +41,10 @@ steps:
       content: Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue.
       command: fastboot_flash_recovery
   install_os:
-    - type: confirm_button
-      content: >
-        In the next steps, you finally flash LineageOS.
-        Select 'Recovery Mode' on your smartphone screen and press the Start-Button to confirm. Then confirm here.
-    - type: confirm_button
-      content: >
-        Now tap Factory Reset, then Format data / Factory reset on your phone screen and continue with the formatting process.
-        This will remove encryption and delete all files stored in the internal storage, as well as format your cache partition (if you have one).
-    - type: confirm_button
-      content: >
-        Return to the main menu on the phone by pressing the back button.
-        On the device, select “Apply Update”, then “Apply from ADB” to begin sideload. Then confirm here.
-    - type: call_button
+    - type: call_button 
       content: >
-        Now it's time to flash the LineageOS image. Don't remove the USB-Cable and press 'Confirm and run' to start!
-        This might take a while. Confirm after it's done.
-      command: adb_sideload
-    - type: confirm_button
-      content: Flashing finished. Now press 'back' (arrow) and then 'Reboot system now' on the phone screen to finish the installation.
+        In the next steps, you finally flash the selected OS image.
+        Connect your device with your computer with the USB-Cable.
+        This step will format your phone and wipe all the data. It will also remove encryption and delete all files stored 
+        in the internal storage. Then the OS image will be installed. Confirm to run. This might take a while. At the end your phone will boot into the new OS.
+      command: adb_twrp_wipe_and_install

openandroidinstaller/installer_config.py

@@ -119,7 +119,7 @@ def validate_config(config: str) -> bool:
             r"text|confirm_button|call_button|call_button_with_input|link_button_with_confirm"
         ),
         "content": str,
-        schema.Optional("command"): Regex(r"adb_reboot|adb_reboot_bootloader|adb_reboot_download|adb_sideload|adb_twrp_wipe_and_install|fastboot_unlock_with_code|fastboot_unlock|fastboot_reboot|heimdall_flash_recovery"),
+        schema.Optional("command"): Regex(r"adb_reboot|adb_reboot_bootloader|adb_reboot_download|adb_sideload|adb_twrp_wipe_and_install|fastboot_flash_recovery|fastboot_unlock_with_code|fastboot_unlock|fastboot_reboot|heimdall_flash_recovery"),
         schema.Optional("allow_skip"): bool,
         schema.Optional("img"): str,
         schema.Optional("link"): str,

openandroidinstaller/openandroidinstaller.py

@@ -653,6 +653,8 @@ def call_to_phone(self, e, command: str):
             success = adb_sideload(bin_path=BIN_PATH, target=self.image_path)
         elif command == "adb_twrp_wipe_and_install":
             success = adb_twrp_wipe_and_install(bin_path=BIN_PATH, target=self.image_path)
+        elif command == "fastboot_flash_recovery":
+            success = fastboot_flash_recovery(bin_path=BIN_PATH, recovery=self.recovery_path)
         elif command == "fastboot_unlock_with_code":
             success = fastboot_unlock_with_code(bin_path=BIN_PATH, unlock_code=self.inputtext.value)
         elif command == "fastboot_unlock":

openandroidinstaller/tool_utils.py

@@ -173,7 +173,7 @@ def fastboot_reboot(bin_path: Path) -> bool:
 def fastboot_flash_recovery(bin_path: Path, recovery: str) -> bool:
     """Temporarily, flash custom recovery with fastboot."""
     logger.info(f"Flash custom recovery with fastboot.")
-    result = run_command("fastboot", ["flash", "boot", f"{recovery}"] , bin_path)
+    result = run_command("fastboot", ["boot", f"{recovery}"] , bin_path)
     if result.returncode != 0:
         logger.info(f"Flashing recovery failed.")
         return False