Fix the crap TWRP loading with sargo

Author: tsterbak

openandroidinstaller/assets/configs/sargo.yaml

@@ -44,7 +44,7 @@ steps:
     - 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.
+        Wait until the TWRP screen appears. Then run the command.
         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/tool_utils.py

@@ -108,7 +108,7 @@ def adb_sideload(bin_path: Path, target: str) -> bool:
         yield True
 
 
-def adb_twrp_wipe_and_install(bin_path: Path, target: str) -> bool:
+def adb_twrp_wipe_and_install(bin_path: Path, target: str, config_path: Path) -> bool:
     """Wipe and format data with twrp, then flash os image with adb.
 
     Only works for twrp recovery.
@@ -156,15 +156,21 @@ def adb_twrp_wipe_and_install(bin_path: Path, target: str) -> bool:
         sleep(1)
         if (type(line) == bool) and not line:
             logger.error(f"Wiping {partition} failed.")
-            yield False
-            return 
+            # TODO: if this fails, a fix can be to just sideload something and then adb reboot
+            for line in run_command("adb", ["sideload", str(config_path)], bin_path):
+                yield line
+            sleep(1)
+            if (type(line) == bool) and not line:
+                yield False
+                return 
+            break
     # finally reboot into os
     sleep(5)
     logger.info("Reboot into OS.")
-    for line in run_command("adb", ["shell", "twrp", "reboot"], bin_path):
+    for line in run_command("adb", ["reboot"], bin_path):  # "shell", "twrp", 
         yield line
     if (type(line) == bool) and not line:
-        logger.error("Rebooting with twrp failed.")
+        logger.error("Rebooting failed.")
         yield False
         return 
     else:

openandroidinstaller/views.py

@@ -16,6 +16,7 @@
 import webbrowser
 from time import sleep
 from typing import Callable
+from pathlib import Path
 from loguru import logger
 
 import flet
@@ -571,7 +572,11 @@ def call_to_phone(self, e, command: str):
                     self.terminal_box.update()
             success = line
         elif command == "adb_twrp_wipe_and_install":
-            for line in adb_twrp_wipe_and_install(bin_path=self.state.bin_path, target=self.state.image_path):
+            for line in adb_twrp_wipe_and_install(
+                    bin_path=self.state.bin_path,
+                    target=self.state.image_path,
+                    config_path=self.state.config_path.joinpath(Path(f"{self.state.config.metadata.get('devicecode')}.yaml"))
+                ):
                 if self.state.advanced and (type(line) == str) and line.strip():
                     self.terminal_box.content.controls.append(Text(f">{line.strip()}"))
                     self.terminal_box.update()