Set branch to anon1892:dtbo

tsterbak · tsterbak · commit 5d34157f8add · 2023-08-08T17:35:29.000+02:00
diff --git a/README.md b/README.md
@@ -195,7 +195,6 @@ Please have a look before opening an issue or starting to contribute.
 A detailed list can be found [here](https://openandroidinstaller.org/#contribute).
 
 
-
 ## Tools
 
 - The [Android SDK Platform Tools](https://developer.android.com/studio/releases/platform-tools) (such as adb and fastboot) are [Apache](https://android.googlesource.com/platform/system/adb/+/refs/heads/master/NOTICE)-licensed universal Android utilities
diff --git a/openandroidinstaller/app_state.py b/openandroidinstaller/app_state.py
@@ -44,6 +44,9 @@ def __init__(
         self.config = None
         self.image_path = None
         self.recovery_path = None
+        self.dtbo_path = None
+        self.vbmeta_path = None
+        self.super_empty_path = None
 
         # store views
         self.default_views: List = []
diff --git a/openandroidinstaller/installer_config.py b/openandroidinstaller/installer_config.py
@@ -62,6 +62,7 @@ def __init__(
         self.requirements = requirements
         self.device_code = metadata.get("device_code")
         self.is_ab = metadata.get("is_ab_device", False)
+        self.additional_steps = metadata.get("additional_steps")
         self.supported_device_codes = metadata.get("supported_device_codes")
         self.twrp_link = metadata.get("twrp-link")
 
@@ -134,6 +135,8 @@ def _load_config(device_code: str, config_path: Path) -> Optional[InstallerConfi
             config = InstallerConfig.from_file(path)
             logger.info(f"Loaded device config from {path}.")
             if config:
+                if "additional_steps" not in config.metadata:
+                    config.metadata.update({"additional_steps": "[]"})
                 logger.info(f"Config metadata: {config.metadata}.")
             return config
         else:
@@ -150,7 +153,8 @@ def validate_config(config: str) -> bool:
         ),
         "content": str,
         schema.Optional("command"): Regex(
-            r"adb_reboot|adb_reboot_bootloader|adb_reboot_download|adb_sideload|adb_twrp_wipe_and_install|adb_twrp_copy_partitions|fastboot_boot_recovery|fastboot_flash_boot|fastboot_unlock_critical|fastboot_unlock_with_code|fastboot_get_unlock_data|fastboot_unlock|fastboot_oem_unlock|fastboot_reboot|heimdall_flash_recovery"
+            r"""adb_reboot|adb_reboot_bootloader|adb_reboot_download|adb_sideload|adb_twrp_wipe_and_install|adb_twrp_copy_partitions|fastboot_boot_recovery|fastboot_flash_boot|
+            fastboot_unlock_critical|fastboot_unlock_with_code|fastboot_get_unlock_data|fastboot_unlock|fastboot_oem_unlock|fastboot_reboot|heimdall_flash_recovery|fastboot_flash_additional_partitions"""
         ),
         schema.Optional("allow_skip"): bool,
         schema.Optional("img"): str,
@@ -166,6 +170,7 @@ def validate_config(config: str) -> bool:
                 "device_code": str,
                 "supported_device_codes": [str],
                 schema.Optional("twrp-link"): str,
+                schema.Optional("additional_steps"): [str],
             },
             schema.Optional("requirements"): {
                 schema.Optional("android"): schema.Or(str, int),
diff --git a/openandroidinstaller/tooling.py b/openandroidinstaller/tooling.py
@@ -497,3 +497,54 @@ def search_device(platform: str, bin_path: Path) -> Optional[str]:
     except CalledProcessError:
         logger.error("Failed to detect a device.")
         return None
+
+
+@add_logging("Flash additional partitions with fastboot")
+def fastboot_flash_additional_partitions(
+    bin_path: Path, dtbo: str, vbmeta: str, super_empty: str, is_ab: bool = True
+) -> TerminalResponse:
+    """Flash additional partitions (dtbo, vbmeta, super_empty) with fastboot."""
+    if dtbo:
+        for line in run_command(
+            "fastboot flash dtbo ", target=f"{dtbo}", bin_path=bin_path
+        ):
+            yield line
+        if not is_ab:
+            if (type(line) == bool) and not line:
+                logger.error("Flashing dtbo failed.")
+                yield False
+            else:
+                yield True
+    else:
+        logger.info("No dtbo selected. Skipping")
+        yield True
+
+    if vbmeta:
+        for line in run_command(
+            "fastboot flash vbmeta ", target=f"{vbmeta}", bin_path=bin_path
+        ):
+            yield line
+        if not is_ab:
+            if (type(line) == bool) and not line:
+                logger.error("Flashing vbmeta failed.")
+                yield False
+            else:
+                yield True
+    else:
+        logger.info("No vbmeta selected. Skipping")
+        yield True
+
+    if super_empty:
+        for line in run_command(
+            "fastboot wipe-super ", target=f"{super_empty}", bin_path=bin_path
+        ):
+            yield line
+        if not is_ab:
+            if (type(line) == bool) and not line:
+                logger.error("Wiping super failed.")
+                yield False
+            else:
+                yield True
+    else:
+        logger.info("No super_empty selected. Skipping")
+        yield True
diff --git a/openandroidinstaller/utils.py b/openandroidinstaller/utils.py
@@ -60,6 +60,22 @@ def image_works_with_device(supported_device_codes: List[str], image_path: str)
                 return False
 
 
+def image_sdk_level(image_path: str) -> int:
+    """
+    Determine Android version of the selected image.
+    Android 13 : 33
+    """
+    with zipfile.ZipFile(image_path) as image_zip:
+        with image_zip.open(
+            "META-INF/com/android/metadata", mode="r"
+        ) as image_metadata:
+            metadata = image_metadata.readlines()
+            for line in metadata:
+                if b"sdk-level" in line:
+                    return int(line[line.find(b"=") + 1 : -1].decode("utf-8"))
+    return 0
+
+
 def recovery_works_with_device(device_code: str, recovery_path: str) -> bool:
     """Determine if a recovery works for the given device.
 
diff --git a/openandroidinstaller/views/select_view.py b/openandroidinstaller/views/select_view.py
@@ -95,14 +95,26 @@ def init_visuals(
         # initialize file pickers
         self.pick_image_dialog = FilePicker(on_result=self.pick_image_result)
         self.pick_recovery_dialog = FilePicker(on_result=self.pick_recovery_result)
+        self.pick_dtbo_dialog = FilePicker(on_result=self.pick_dtbo_result)
+        self.pick_vbmeta_dialog = FilePicker(on_result=self.pick_vbmeta_result)
+        self.pick_super_empty_dialog = FilePicker(
+            on_result=self.pick_super_empty_result
+        )
+
         self.selected_image = Text("Selected image: ")
         self.selected_recovery = Text("Selected recovery: ")
+        self.selected_dtbo = Text("Selected dtbo: ")
+        self.selected_vbmeta = Text("Selected vbmeta: ")
+        self.selected_super_empty = Text("Selected super_empty: ")
 
         # initialize and manage button state.
         self.confirm_button = confirm_button(self.on_confirm)
         self.confirm_button.disabled = True
         self.pick_recovery_dialog.on_result = self.enable_button_if_ready
         self.pick_image_dialog.on_result = self.enable_button_if_ready
+        self.pick_dtbo_dialog.on_result = self.enable_button_if_ready
+        self.pick_vbmeta_dialog.on_result = self.enable_button_if_ready
+        self.pick_super_empty_dialog.on_result = self.enable_button_if_ready
         # back button
         self.back_button = ElevatedButton(
             "Back",
@@ -122,6 +134,9 @@ def build(self):
         # attach hidden dialogues
         self.right_view.controls.append(self.pick_image_dialog)
         self.right_view.controls.append(self.pick_recovery_dialog)
+        self.right_view.controls.append(self.pick_dtbo_dialog)
+        self.right_view.controls.append(self.pick_vbmeta_dialog)
+        self.right_view.controls.append(self.pick_super_empty_dialog)
 
         # create help/info button to show the help dialog
         info_button = OutlinedButton(
@@ -226,6 +241,83 @@ def build(self):
                 ),
                 self.selected_recovery,
                 Divider(),
+            ]
+        )
+
+        # attach the controls for uploading others partitions, like dtbo, vbmeta & super_empty
+        if "dtbo" in self.state.config.metadata["additional_steps"]:
+            self.right_view.controls.extend(
+                [
+                    Text("Select other specific images:", style="titleSmall"),
+                    Markdown(
+                        """
+        Depending of the ROM, OpenAndroidInstaller may have to install additional images.
+        These images are usually needed for Android 13 ROM.
+        Make sure the file is for **your exact phone model!**
+                                """
+                    ),
+                    Row(
+                        [
+                            FilledButton(
+                                "Pick `dtbo.img` image",
+                                icon=icons.UPLOAD_FILE,
+                                on_click=lambda _: self.pick_dtbo_dialog.pick_files(
+                                    allow_multiple=False,
+                                    file_type="custom",
+                                    allowed_extensions=["img"],
+                                ),
+                                expand=True,
+                            ),
+                        ]
+                    ),
+                    self.selected_dtbo,
+                ]
+            )
+        if "vbmeta" in self.state.config.metadata["additional_steps"]:
+            self.right_view.controls.extend(
+                [
+                    Row(
+                        [
+                            FilledButton(
+                                "Pick `vbmeta.img` image",
+                                icon=icons.UPLOAD_FILE,
+                                on_click=lambda _: self.pick_vbmeta_dialog.pick_files(
+                                    allow_multiple=False,
+                                    file_type="custom",
+                                    allowed_extensions=["img"],
+                                ),
+                                expand=True,
+                            ),
+                        ]
+                    ),
+                    self.selected_vbmeta,
+                ]
+            )
+        if "super_empty" in self.state.config.metadata["additional_steps"]:
+            self.right_view.controls.extend(
+                [
+                    Row(
+                        [
+                            FilledButton(
+                                "Pick `super_empty.img` image",
+                                icon=icons.UPLOAD_FILE,
+                                on_click=lambda _: self.pick_super_empty_dialog.pick_files(
+                                    allow_multiple=False,
+                                    file_type="custom",
+                                    allowed_extensions=["img"],
+                                ),
+                                expand=True,
+                            ),
+                        ]
+                    ),
+                    self.selected_super_empty,
+                    Divider(),
+                ]
+            )
+
+        # attach the bottom buttons
+        self.right_view.controls.extend(
+            [
                 self.info_field,
                 Row([self.back_button, self.confirm_button]),
             ]
@@ -291,6 +383,61 @@ def pick_recovery_result(self, e: FilePickerResultEvent):
         # update
         self.selected_recovery.update()
 
+    def pick_dtbo_result(self, e: FilePickerResultEvent):
+        path = ", ".join(map(lambda f: f.name, e.files)) if e.files else "Cancelled!"
+        # update the textfield with the name of the file
+        self.selected_dtbo.value = self.selected_dtbo.value.split(":")[0] + f": {path}"
+        if e.files:
+            # check if the dtbo works with the device and show the filename in different colors accordingly
+            if path == "dtbo.img":
+                self.selected_dtbo.color = colors.GREEN
+                self.state.dtbo_path = e.files[0].path
+                logger.info(f"Selected dtbo from {self.state.dtbo_path}")
+            else:
+                self.selected_dtbo.color = colors.RED
+        else:
+            logger.info("No image selected.")
+        # update
+        self.selected_dtbo.update()
+
+    def pick_vbmeta_result(self, e: FilePickerResultEvent):
+        path = ", ".join(map(lambda f: f.name, e.files)) if e.files else "Cancelled!"
+        # update the textfield with the name of the file
+        self.selected_vbmeta.value = (
+            self.selected_vbmeta.value.split(":")[0] + f": {path}"
+        )
+        if e.files:
+            # check if the vbmeta works with the device and show the filename in different colors accordingly
+            if path == "vbmeta.img":
+                self.selected_vbmeta.color = colors.GREEN
+                self.state.vbmeta_path = e.files[0].path
+                logger.info(f"Selected vbmeta from {self.state.vbmeta_path}")
+            else:
+                self.selected_vbmeta.color = colors.RED
+        else:
+            logger.info("No image selected.")
+        # update
+        self.selected_vbmeta.update()
+
+    def pick_super_empty_result(self, e: FilePickerResultEvent):
+        path = ", ".join(map(lambda f: f.name, e.files)) if e.files else "Cancelled!"
+        # update the textfield with the name of the file
+        self.selected_super_empty.value = (
+            self.selected_super_empty.value.split(":")[0] + f": {path}"
+        )
+        if e.files:
+            # check if the super_empty works with the device and show the filename in different colors accordingly
+            if path == "super_empty.img":
+                self.selected_super_empty.color = colors.GREEN
+                self.state.super_empty_path = e.files[0].path
+                logger.info(f"Selected super_empty from {self.state.super_empty_path}")
+            else:
+                self.selected_super_empty.color = colors.RED
+        else:
+            logger.info("No image selected.")
+        # update
+        self.selected_super_empty.update()
+
     def enable_button_if_ready(self, e):
         """Enable the confirm button if both files have been selected."""
         if (".zip" in self.selected_image.value) and (
@@ -320,6 +467,29 @@ def enable_button_if_ready(self, e):
                 self.confirm_button.disabled = True
                 self.right_view.update()
                 return
+
+            if (
+                (self.selected_dtbo.color and self.selected_dtbo.color == "red")
+                or (self.selected_vbmeta.color and self.selected_vbmeta.color == "red")
+                or (
+                    self.selected_super_empty.color
+                    and self.selected_super_empty.color == "red"
+                )
+            ):
+                logger.error(
+                    "Some additional images don't match. Please select different ones."
+                )
+                self.info_field.controls = [
+                    Text(
+                        "Some additional images don't match. Select right ones or unselect them.",
+                        color=colors.RED,
+                        weight="bold",
+                    )
+                ]
+                self.confirm_button.disabled = True
+                self.right_view.update()
+                return
+
             logger.info("Image and recovery work with the device. You can continue.")
             self.info_field.controls = []
             self.confirm_button.disabled = False
diff --git a/openandroidinstaller/views/start_view.py b/openandroidinstaller/views/start_view.py
@@ -104,9 +104,7 @@ def check_bootloader_unlocked(e):
                 self.state.steps = []
             else:
                 logger.info("Enabled unlocking the bootloader again.")
-                self.state.steps = copy.deepcopy(
-                    self.state.config.unlock_bootloader
-                ) 
+                self.state.steps = copy.deepcopy(self.state.config.unlock_bootloader)
             # if the recovery is already flashed, skip flashing it again
             if self.recovery_switch.value == False:
                 self.state.steps += copy.deepcopy(self.state.config.boot_recovery)
@@ -122,12 +120,10 @@ def check_bootloader_unlocked(e):
         # toggleswitch to allow skipping flashing recovery
         def check_recovery_already_flashed(e):
             """Enable skipping flashing recovery if selected."""
-            
+
             # manage the bootloader unlocking switch
             if self.bootloader_switch.value == False:
-                self.state.steps = copy.deepcopy(
-                    self.state.config.unlock_bootloader
-                )
+                self.state.steps = copy.deepcopy(self.state.config.unlock_bootloader)
             else:
                 self.state.steps = []
 
diff --git a/openandroidinstaller/views/step_view.py b/openandroidinstaller/views/step_view.py
@@ -45,6 +45,7 @@
     adb_twrp_copy_partitions,
     fastboot_boot_recovery,
     fastboot_flash_boot,
+    fastboot_flash_additional_partitions,
     fastboot_oem_unlock,
     fastboot_reboot,
     fastboot_unlock,
@@ -233,6 +234,13 @@ def call_to_phone(self, e, command: str):
                 fastboot_flash_boot,
                 recovery=self.state.recovery_path,
             ),
+            "fastboot_flash_additional_partitions": partial(
+                fastboot_flash_additional_partitions,
+                dtbo=self.state.dtbo_path,
+                vbmeta=self.state.vbmeta_path,
+                super_empty=self.state.super_empty_path,
+                is_ab=self.state.config.is_ab,
+            ),
             "fastboot_reboot": fastboot_reboot,
             "heimdall_flash_recovery": partial(
                 heimdall_flash_recovery, recovery=self.state.recovery_path
