Skip to content

Commit 9ba8e21

Browse files
committed
Fix merge issue
1 parent 6b28b52 commit 9ba8e21

2 files changed

Lines changed: 11 additions & 4 deletions

File tree

openandroidinstaller/installer_config.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,9 @@ def validate_config(config: str) -> bool:
170170
"device_code": str,
171171
"supported_device_codes": [str],
172172
schema.Optional("twrp-link"): str,
173-
schema.Optional("additional_steps"): Regex(r"dtbo|vbmeta|vendor_boot|super_empty"),
173+
schema.Optional("additional_steps"): [
174+
Regex(r"dtbo|vbmeta|vendor_boot|super_empty")
175+
],
174176
schema.Optional("notes"): str,
175177
schema.Optional("brand"): str,
176178
},

openandroidinstaller/views/select_view.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,12 +181,17 @@ def build(self):
181181
# Device specific notes
182182
notes = ""
183183
if "brand" in self.state.config.metadata and (
184-
self.state.config.metadata['brand'] == "xiaomi" or self.state.config.metadata['brand'] == "poco"):
184+
self.state.config.metadata["brand"] == "xiaomi"
185+
or self.state.config.metadata["brand"] == "poco"
186+
):
185187
notes += "- If something goes wrong, you can reinstall MiUI here :\n<https://xiaomifirmwareupdater.com/miui/lavender/>\n\n"
186-
if "untested" in self.state.config.metadata and self.state.config.metadata['untested'] == True:
188+
if (
189+
"untested" in self.state.config.metadata
190+
and self.state.config.metadata["untested"] == True
191+
):
187192
notes += "- **This device has never been tested with OpenAndroidInstaller.** The installation can go wrong. You may have to finish the installation process with command line. If you test, please report the result on GitHub.\n\n"
188193
if "notes" in self.state.config.metadata:
189-
for note in self.state.config.metadata['notes']:
194+
for note in self.state.config.metadata["notes"]:
190195
notes += "- " + note + "\n\n"
191196
if notes != "":
192197
self.right_view.controls.extend(

0 commit comments

Comments
 (0)