Merge branch 'release-0.4.2-beta' into device-code-as-list

Author: tsterbak

README.md

@@ -149,6 +149,7 @@ Motorola | moto z | [griffin](https://wiki.lineageos.org/devices/griffin/) | | t
 
 Vendor | Device Name | CodeName | Models | Status
 ---|---|---|---|---
+OnePlus | One | [bacon](https://wiki.lineageos.org/devices/bacon/) | A0001 | tested
 OnePlus | 5 | [cheeseburger](https://wiki.lineageos.org/devices/cheeseburger/) | | tested
 OnePlus | 5T | [dumpling](https://wiki.lineageos.org/devices/dumpling/) | | tested
 OnePlus | 6 | [enchilada](https://wiki.lineageos.org/devices/enchilada/) | | tested
@@ -191,7 +192,7 @@ If you want to use the tool for a non-supported smartphone, the fastest way is t
 
 #### Content of a config file
 
-A config file consists of two parts. The first part are some metadata about the device and the second parts are the steps to unlock the bootloader, flash a recovery and install the ROMs.
+A config file consists of two parts. The first part are some metadata about the device and the second parts are the steps to unlock the bootloader, boot a recovery and install the ROMs.
 
 ##### How to write Metadata
 Every config file should have metadata with the following fields:
@@ -214,7 +215,7 @@ Every step in the config file corresponds to one view in the application. These
   - `call_button_with_input`: Display the content text, an input field and a button that runs a given command. The inputtext, can be used in the command by using the `<inputtext>` placeholder in the command field. After the command is run, a confirm button is displayed to allow the user to move to the next step.
   - `link_button_with_confirm`: Display a button that opens a browser with a given link, confirm afterwards. Link is given in `link`.
 - `content`: str; The content text displayed alongside the action of the step. Used to inform the user about whats going on.
-- `command`: [ONLY for call_button* steps] str; The command to run. One of `adb_reboot`, `adb_reboot_bootloader`, `adb_reboot_download`, `adb_sideload`, `adb_twrp_wipe_and_install`, `adb_twrp_copy_partitions`, `fastboot_flash_recovery`, `fastboot_unlock_with_code`, `fastboot_unlock`, `fastboot_oem_unlock`, `fastboot_get_unlock_data`, `fastboot_reboot`, `heimdall_flash_recovery`.
+- `command`: [ONLY for call_button* steps] str; The command to run. One of `adb_reboot`, `adb_reboot_bootloader`, `adb_reboot_download`, `adb_sideload`, `adb_twrp_wipe_and_install`, `adb_twrp_copy_partitions`, `fastboot_boot_recovery`, `fastboot_unlock_with_code`, `fastboot_unlock`, `fastboot_oem_unlock`, `fastboot_get_unlock_data`, `fastboot_reboot`, `heimdall_flash_recovery`.
 - `img`: [OPTIONAL] Display an image on the left pane of the step view. Images are loaded from `openandroidinstaller/assets/imgs/`.
 - `allow_skip`: [OPTIONAL] boolean; If a skip button should be displayed to allow skipping this step. Can be useful when the bootloader is already unlocked.
 - `link`: [OPTIONAL] Link to use for the link button if type is `link_button_with_confirm`.

openandroidinstaller/app_state.py

@@ -67,5 +67,5 @@ def load_config(self, device_code: str):
         self.config = _load_config(device_code, self.config_path)
         if self.config:
             self.steps = copy.deepcopy(self.config.unlock_bootloader) + copy.deepcopy(
-                self.config.flash_recovery
+                self.config.boot_recovery
             )

openandroidinstaller/assets/configs/A0001.yaml

@@ -0,0 +1,39 @@
+metadata:
+  maintainer: MagicLike
+  devicename: OnePlus One
+  devicecode: bacon
+  twrp-link: bacon
+requirements:
+  android: 6.0.1
+steps:
+  unlock_bootloader:
+    - type: call_button
+      content: >
+        As a first step, you need to unlock the bootloader. A bootloader is the piece of software, that tells your phone
+        how to start and run an operating system (like Android). Your device should be turned on.
+        Press 'Confirm and run' to reboot into the bootloader.
+      command: adb_reboot_bootloader
+    - type: call_button
+      content: >
+        In this step you actually unlock the bootloader. Just press 'Confirm and run' here. The phone will automatically reboot and reformat.
+        Once it's done, press continue here.
+
+        Notice: If you don't have the stock OnePlus One recovery, your device might boot into your custom recovery, but don't do anything / throw an error.
+        If this appears, reboot you device through your bootloader and just continue normally. (Your bootloader will be unlocked.)
+      command: fastboot_oem_unlock
+    - type: confirm_button
+      content: > 
+        The bootloader is now unlocked. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue.
+        You don't need to re-enable those options, if you have a custom recovery. (See last step.)
+        When you are done, press continue.
+  boot_recovery:
+    - type: call_button
+      content: >
+        Now you need to boot a custom recovery system on the phone. A recovery is a small subsystem on your phone, that manages updating,
+        adapting and repairing of the operating system.
+        Make sure your device is turned on. You need to reboot into the bootloader again by pressing 'Confirm and run' here. Then continue.
+      command: adb_reboot_bootloader
+    - type: call_button
+      content: >
+        Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue.
+      command: fastboot_boot_recovery

openandroidinstaller/assets/configs/FP2.yaml

@@ -6,17 +6,17 @@ metadata:
     - FP2
 steps:
   unlock_bootloader:
-  flash_recovery:
+  boot_recovery:
     - type: confirm_button 
       content: >
-        Now you need to flash a custom recovery system on the phone. A recovery is a small subsystem on your phone, that manages updating, 
+        Now you need to boot a custom recovery system on the phone. A recovery is a small subsystem on your phone, that manages updating, 
         adapting and repairing of the operating system.
     - type: call_button
       content: Once the device is fully booted, you need to reboot into the bootloader again by pressing 'Confirm and run' here. Then continue.
       command: adb_reboot_bootloader
     - type: call_button
-      content: Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue.
-      command: fastboot_flash_recovery
+      content: Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue.
+      command: fastboot_boot_recovery
     - type: confirm_button 
       content: >
         Now reboot into recovery to verify the installation. Do not reboot into the existing OS, since it will overwrite the recovery you just installed!

openandroidinstaller/assets/configs/FP3.yaml

@@ -31,17 +31,17 @@ steps:
       command: fastboot_reboot
     - type: confirm_button
       content: The bootloader is now unlocked. Since the device resets completely, you will need to re-enable USB debugging to continue.
-  flash_recovery:
+  boot_recovery:
     - type: confirm_button 
       content: >
-        Now you need to flash a custom recovery system on the phone. A recovery is a small subsystem on your phone, that manages updating, 
+        Now you need to boot a custom recovery system on the phone. A recovery is a small subsystem on your phone, that manages updating, 
         adapting and repairing of the operating system.
     - type: call_button
       content: Turn on your device. Once the device is fully booted, you need to reboot into the bootloader again by pressing 'Confirm and run' here. Then continue.
       command: adb_reboot_bootloader
     - type: call_button
       content: Once the device is in fastboot mode, flash the custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue.
-      command: fastboot_flash_recovery
+      command: fastboot_boot_recovery
     - type: confirm_button 
       content: >
         Now reboot into recovery to verify the installation. Do not reboot into the existing OS, since it will overwrite the recovery you just installed!

openandroidinstaller/assets/configs/FP4.yaml

@@ -31,17 +31,17 @@ steps:
       command: fastboot_reboot
     - type: confirm_button
       content: The bootloader is now unlocked. Since the device resets completely, you will need to re-enable USB debugging to continue.
-  flash_recovery:
+  boot_recovery:
     - type: confirm_button 
       content: >
-        Now you need to flash a custom recovery system on the phone. A recovery is a small subsystem on your phone, that manages updating, 
+        Now you need to boot a custom recovery system on the phone. A recovery is a small subsystem on your phone, that manages updating, 
         adapting and repairing of the operating system.
     - type: call_button
       content: Turn on your device. Once the device is fully booted, you need to reboot into the bootloader again by pressing 'Confirm and run' here. Then continue.
       command: adb_reboot_bootloader
     - type: call_button
       content: Once the device is in fastboot mode, flash the custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue.
-      command: fastboot_flash_recovery
+      command: fastboot_boot_recovery
     - type: confirm_button 
       content: >
         Now reboot into recovery to verify the installation. Do not reboot into the existing OS, since it will overwrite the recovery you just installed!

openandroidinstaller/assets/configs/a3y17lte.yaml

@@ -6,7 +6,7 @@ metadata:
     - a3y17lte
 steps:
   unlock_bootloader:
-  flash_recovery:
+  boot_recovery:
     - type: call_button
       content: >
         As a first step, you need to boot into the bootloader. A bootloader is the piece of software,
@@ -15,7 +15,7 @@ steps:
       command: adb_reboot_download
     - type: call_button
       content: >
-        In this step, you need to flash a custom recovery on your device.
+        In this step, you need to boot a custom recovery on your device.
         Press 'Confirm and run' to start the process. Confirm afterwards to continue.
       command: heimdall_flash_recovery
     - type: confirm_button

openandroidinstaller/assets/configs/a5xelte.yaml

@@ -6,15 +6,15 @@ metadata:
     - a5xelte
 steps:
   unlock_bootloader:
-  flash_recovery:
+  boot_recovery:
     - type: call_button
       content: >
         As a first step, you need to boot into the bootloader. A bootloader is the piece of software, 
         that tells your phone who to start and run an operating system (like Android). Your device should be turned on. 
         Then press 'Confirm and run' to reboot into the bootloader. Continue once it's done.
       command: adb_reboot_download
     - type: call_button
-      content: In this step, you need to flash a custom recovery on your device. Press 'Confirm and run' to start the process. Confirm afterwards to continue.
+      content: In this step, you need to boot a custom recovery on your device. Press 'Confirm and run' to start the process. Confirm afterwards to continue.
       command: heimdall_flash_recovery
     - type: confirm_button
       img: samsung-buttons.png

openandroidinstaller/assets/configs/a72q.yaml

@@ -6,15 +6,15 @@ metadata:
     - a72q 
 steps:
   unlock_bootloader:
-  flash_recovery:
+  boot_recovery:
     - type: call_button
       content: >
         As a first step, you need to boot into the bootloader. A bootloader is the piece of software, 
         that tells your phone who to start and run an operating system (like Android). Your device should be turned on. 
         Then press 'Confirm and run' to reboot into the bootloader. Continue once it's done.
       command: adb_reboot_download
     - type: call_button
-      content: In this step, you need to flash a custom recovery on your device. Press 'Confirm and run' to start the process. Confirm afterwards to continue.
+      content: In this step, you need to boot a custom recovery on your device. Press 'Confirm and run' to start the process. Confirm afterwards to continue.
       command: heimdall_flash_recovery
     - type: confirm_button
       img: samsung-buttons.png

openandroidinstaller/assets/configs/a7xelte.yaml

@@ -6,15 +6,15 @@ metadata:
     - a7xelte
 steps:
   unlock_bootloader:
-  flash_recovery:
+  boot_recovery:
     - type: call_button
       content: >
         As a first step, you need to boot into the bootloader. A bootloader is the piece of software, 
         that tells your phone who to start and run an operating system (like Android). Your device should be turned on. 
         Then press 'Confirm and run' to reboot into the bootloader. Continue once it's done.
       command: adb_reboot_download
     - type: call_button
-      content: In this step, you need to flash a custom recovery on your device. Press 'Confirm and run' to start the process. Confirm afterwards to continue.
+      content: In this step, you need to boot a custom recovery on your device. Press 'Confirm and run' to start the process. Confirm afterwards to continue.
       command: heimdall_flash_recovery
     - type: confirm_button
       img: samsung-buttons.png