Improve behaviour of the continue buttons and validation

Author: tsterbak

openandroidinstaller/views/select_view.py

@@ -636,9 +636,9 @@ def enable_button_if_ready(self, e):
             # check if the additional images are there
             if self.state.config.additional_steps and not all(
                 [
-                    self.selected_dtbo.value,
-                    self.selected_vbmeta.value,
-                    self.selected_super_empty.value,
+                    self.selected_dtbo.value or "dtbo" not in self.state.config.additional_steps,
+                    self.selected_vbmeta.value or "vbmeta" not in self.state.config.additional_steps,
+                    self.selected_super_empty.value or "super_empty" not in self.state.config.additional_steps,
                 ]
             ):
                 logger.error(
@@ -658,6 +658,7 @@ def enable_button_if_ready(self, e):
             logger.info("Image and recovery work with the device. You can continue.")
             self.info_field.controls = []
             self.confirm_button.disabled = False
+            self.continue_eitherway_button.disabled = True 
             self.right_view.update()
         elif (".zip" in self.selected_image.value) and (not self.state.flash_recovery):
             if not (
@@ -685,7 +686,7 @@ def enable_button_if_ready(self, e):
             logger.info("Image works with the device. You can continue.")
             self.info_field.controls = []
             self.confirm_button.disabled = False
-            self.continue_eitherway_button.disabled = False
+            self.continue_eitherway_button.disabled = True
             self.right_view.update()
         else:
             self.confirm_button.disabled = True