Fix bug where the validation still required some additional images even if non are required; hide the additional button to bypass additional images if non are necessary

Author: tsterbak

openandroidinstaller/installer_config.py

@@ -63,7 +63,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.additional_steps = metadata.get("additional_steps", [])
         self.supported_device_codes = metadata.get("supported_device_codes")
         self.twrp_link = metadata.get("twrp-link")
 
@@ -136,8 +136,6 @@ 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:

openandroidinstaller/views/select_view.py

@@ -289,16 +289,19 @@ def build(self):
             )
 
         # attach the bottom buttons
+        if self.state.config.additional_steps:
+            bottom_buttons = [
+                self.back_button,
+                self.continue_eitherway_button,
+                self.confirm_button,
+            ]
+
+        else:
+            bottom_buttons = [self.back_button, self.confirm_button]
         self.right_view.controls.extend(
             [
                 self.info_field,
-                Row(
-                    [
-                        self.back_button,
-                        self.continue_eitherway_button,
-                        self.confirm_button,
-                    ]
-                ),
+                Row(bottom_buttons),
             ]
         )
         return self.view
@@ -379,7 +382,7 @@ def toggle_additional_image_selection(self):
 
         # attach the controls for uploading others partitions, like dtbo, vbmeta & super_empty
         additional_image_selection = []
-        if self.state.config.metadata["additional_steps"]:
+        if self.state.config.additional_steps:
             additional_image_selection.extend(
                 [
                     Row(
@@ -398,7 +401,7 @@ def toggle_additional_image_selection(self):
                     ),
                 ]
             )
-        if "dtbo" in self.state.config.metadata["additional_steps"]:
+        if "dtbo" in self.state.config.additional_steps:
             self.selected_dtbo.value = False
             additional_image_selection.extend(
                 [
@@ -419,7 +422,7 @@ def toggle_additional_image_selection(self):
                     ),
                 ]
             )
-        if "vbmeta" in self.state.config.metadata["additional_steps"]:
+        if "vbmeta" in self.state.config.additional_steps:
             self.selected_vbmeta.value = False
             additional_image_selection.extend(
                 [
@@ -440,7 +443,7 @@ def toggle_additional_image_selection(self):
                     ),
                 ]
             )
-        if "super_empty" in self.state.config.metadata["additional_steps"]:
+        if "super_empty" in self.state.config.additional_steps:
             self.selected_super_empty.value = False
             additional_image_selection.extend(
                 [
@@ -631,7 +634,7 @@ def enable_button_if_ready(self, e):
             self.continue_eitherway_button.disabled = False
 
             # check if the additional images are there
-            if not all(
+            if self.state.config.additional_steps and not all(
                 [
                     self.selected_dtbo.value,
                     self.selected_vbmeta.value,
@@ -686,4 +689,4 @@ def enable_button_if_ready(self, e):
             self.right_view.update()
         else:
             self.confirm_button.disabled = True
-            self.continue_eitherway_button.disabled = True
+            # self.continue_eitherway_button.disabled = True