From 45567806c1264a3d791b48efe2c7813bd9c65174 Mon Sep 17 00:00:00 2001 From: MagicLike Date: Tue, 7 Mar 2023 22:28:17 +0100 Subject: [PATCH 01/21] Added config for bacon --- .../assets/configs/bacon.yaml | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 openandroidinstaller/assets/configs/bacon.yaml diff --git a/openandroidinstaller/assets/configs/bacon.yaml b/openandroidinstaller/assets/configs/bacon.yaml new file mode 100644 index 00000000..79cd9870 --- /dev/null +++ b/openandroidinstaller/assets/configs/bacon.yaml @@ -0,0 +1,37 @@ +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. Once it's done, press continue here. + command: fastboot_oem_unlock + - type: confirm_button + content: > + At this point the device may display on-screen prompts which will require interaction to continue the process of unlocking the bootloader. + Please take whatever actions the device asks you to to proceed. + - type: call_button + content: To finish the unlocking, the phone needs to reboot. Just press 'Confirm and run' here to reboot. Then continue. + command: fastboot_reboot + - 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. + flash_recovery: + - type: call_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, + 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: Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. + command: fastboot_flash_recovery \ No newline at end of file From a5d34b101e90c76869760a1a20283261fffed947 Mon Sep 17 00:00:00 2001 From: MagicLike Date: Sat, 11 Mar 2023 18:36:04 +0100 Subject: [PATCH 02/21] Renamed config --- openandroidinstaller/assets/configs/{bacon.yaml => A0001.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename openandroidinstaller/assets/configs/{bacon.yaml => A0001.yaml} (100%) diff --git a/openandroidinstaller/assets/configs/bacon.yaml b/openandroidinstaller/assets/configs/A0001.yaml similarity index 100% rename from openandroidinstaller/assets/configs/bacon.yaml rename to openandroidinstaller/assets/configs/A0001.yaml From 8da1b9023aa5e742aa42e5b2038274de63064242 Mon Sep 17 00:00:00 2001 From: MagicLike Date: Sat, 11 Mar 2023 21:04:39 +0100 Subject: [PATCH 03/21] Removing extra reboot step --- openandroidinstaller/assets/configs/A0001.yaml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/openandroidinstaller/assets/configs/A0001.yaml b/openandroidinstaller/assets/configs/A0001.yaml index 79cd9870..eafc1dbb 100644 --- a/openandroidinstaller/assets/configs/A0001.yaml +++ b/openandroidinstaller/assets/configs/A0001.yaml @@ -14,17 +14,10 @@ steps: 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. Once it's done, press continue here. + 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. command: fastboot_oem_unlock - type: confirm_button - content: > - At this point the device may display on-screen prompts which will require interaction to continue the process of unlocking the bootloader. - Please take whatever actions the device asks you to to proceed. - - type: call_button - content: To finish the unlocking, the phone needs to reboot. Just press 'Confirm and run' here to reboot. Then continue. - command: fastboot_reboot - - 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. + content: The bootloader is now unlocked. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue. When you are done, press continue. flash_recovery: - type: call_button content: > From 754b7be17122566ff9211350173fbce3c14b75b9 Mon Sep 17 00:00:00 2001 From: MagicLike Date: Sat, 11 Mar 2023 21:17:56 +0100 Subject: [PATCH 04/21] Cosmetic changes to the text elements --- openandroidinstaller/assets/configs/A0001.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/openandroidinstaller/assets/configs/A0001.yaml b/openandroidinstaller/assets/configs/A0001.yaml index eafc1dbb..b7c8be22 100644 --- a/openandroidinstaller/assets/configs/A0001.yaml +++ b/openandroidinstaller/assets/configs/A0001.yaml @@ -14,10 +14,14 @@ steps: 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. + 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. 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. When you are done, press continue. + content: > + The bootloader is now unlocked. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue. + When you are done, press continue. flash_recovery: - type: call_button content: > From 51f6c5d01903cc45122c643ec7d85cbd4d559266 Mon Sep 17 00:00:00 2001 From: MagicLike Date: Sat, 11 Mar 2023 21:22:54 +0100 Subject: [PATCH 05/21] Added OnePlus One to list Added OnePlus One to the list of officially supported devices --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 55ffa6db..929a5f65 100644 --- a/README.md +++ b/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 From 4b616abd35badedab80638ca51da8222d80b5646 Mon Sep 17 00:00:00 2001 From: MagicLike Date: Sat, 11 Mar 2023 21:41:17 +0100 Subject: [PATCH 06/21] Added another config for device code "bacon" Another config is needed, because after installation of a custom ROM the device switches from device code "A0001" to "bacon". --- .../assets/configs/bacon.yaml | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 openandroidinstaller/assets/configs/bacon.yaml diff --git a/openandroidinstaller/assets/configs/bacon.yaml b/openandroidinstaller/assets/configs/bacon.yaml new file mode 100644 index 00000000..b7c8be22 --- /dev/null +++ b/openandroidinstaller/assets/configs/bacon.yaml @@ -0,0 +1,34 @@ +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. + 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. + When you are done, press continue. + flash_recovery: + - type: call_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, + 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: Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. + command: fastboot_flash_recovery \ No newline at end of file From 077ea03da7feb50ab5e969c60ae63d25fa8254bd Mon Sep 17 00:00:00 2001 From: MagicLike Date: Sun, 12 Mar 2023 14:00:05 +0100 Subject: [PATCH 07/21] Added notice for custom recoveries --- openandroidinstaller/assets/configs/A0001.yaml | 4 ++++ openandroidinstaller/assets/configs/bacon.yaml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/openandroidinstaller/assets/configs/A0001.yaml b/openandroidinstaller/assets/configs/A0001.yaml index b7c8be22..302cfad8 100644 --- a/openandroidinstaller/assets/configs/A0001.yaml +++ b/openandroidinstaller/assets/configs/A0001.yaml @@ -17,10 +17,14 @@ steps: 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. flash_recovery: - type: call_button diff --git a/openandroidinstaller/assets/configs/bacon.yaml b/openandroidinstaller/assets/configs/bacon.yaml index b7c8be22..9f145c1d 100644 --- a/openandroidinstaller/assets/configs/bacon.yaml +++ b/openandroidinstaller/assets/configs/bacon.yaml @@ -17,10 +17,14 @@ steps: 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. flash_recovery: - type: call_button From ba97efed29060a23d8e265c1ee40650011f69c2a Mon Sep 17 00:00:00 2001 From: MagicLike Date: Sun, 12 Mar 2023 14:12:54 +0100 Subject: [PATCH 08/21] Added notice for launching recovery manually --- openandroidinstaller/assets/configs/A0001.yaml | 6 +++++- openandroidinstaller/assets/configs/bacon.yaml | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/openandroidinstaller/assets/configs/A0001.yaml b/openandroidinstaller/assets/configs/A0001.yaml index 302cfad8..85c25d8e 100644 --- a/openandroidinstaller/assets/configs/A0001.yaml +++ b/openandroidinstaller/assets/configs/A0001.yaml @@ -34,5 +34,9 @@ steps: 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: Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. + content: > + Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. + Notice: In some cases the bootloader won't boot into the flashed recovery automatically, but rather boot the normal system. + If this happens, please run the following command via adb and wait for a moment: `adb reboot recovery` + Now click 'Continue'. command: fastboot_flash_recovery \ No newline at end of file diff --git a/openandroidinstaller/assets/configs/bacon.yaml b/openandroidinstaller/assets/configs/bacon.yaml index 9f145c1d..4fe1c451 100644 --- a/openandroidinstaller/assets/configs/bacon.yaml +++ b/openandroidinstaller/assets/configs/bacon.yaml @@ -34,5 +34,9 @@ steps: 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: Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. + content: > + Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. + Notice: In some cases the bootloader won't boot into the flashed recovery automatically, but rather boot the normal system. + If this happens, please run the following command via adb and wait for a moment: `adb reboot recovery` + Now click 'Continue'. command: fastboot_flash_recovery \ No newline at end of file From e3c12e6b04e6b7ef9ea849bd151b87d614b1148d Mon Sep 17 00:00:00 2001 From: MagicLike Date: Sun, 12 Mar 2023 16:48:27 +0100 Subject: [PATCH 09/21] Updated contribute_link --- openandroidinstaller/views/success_view.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openandroidinstaller/views/success_view.py b/openandroidinstaller/views/success_view.py index 04016af8..b55860e7 100644 --- a/openandroidinstaller/views/success_view.py +++ b/openandroidinstaller/views/success_view.py @@ -47,7 +47,7 @@ def close_window(e): get_title("Installation completed successfully!"), ] # right view main part - contribute_link = "https://github.com/openandroidinstaller-dev/openandroidinstaller#contributing" + contribute_link = "https://openandroidinstaller.org/#contribute" self.right_view.controls = [ Text( "Now your devices boots into the new OS. Have fun with it!", From 0f487cea502701a5f75394b13cb7c6d6625b45ef Mon Sep 17 00:00:00 2001 From: MagicLike Date: Sun, 12 Mar 2023 18:15:03 +0100 Subject: [PATCH 10/21] Switched from flashing to booting TWRP --- openandroidinstaller/tooling.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/openandroidinstaller/tooling.py b/openandroidinstaller/tooling.py index fc16e7e8..500ca281 100644 --- a/openandroidinstaller/tooling.py +++ b/openandroidinstaller/tooling.py @@ -353,36 +353,32 @@ def fastboot_reboot(bin_path: Path) -> TerminalResponse: yield line -@add_logging("Flash or boot custom recovery with fastboot.") +@add_logging("Boot custom recovery with fastboot.") def fastboot_flash_recovery( bin_path: Path, recovery: str, is_ab: bool = True ) -> TerminalResponse: - """Temporarily, flash custom recovery with fastboot.""" + """Temporarily, boot custom recovery with fastboot.""" if is_ab: logger.info("Boot custom recovery with fastboot.") for line in run_command( "fastboot boot", target=f"{recovery}", bin_path=bin_path ): yield line + logger.info("Boot into TWRP with fastboot.") for line in adb_wait_for_recovery(bin_path=bin_path): yield line else: - logger.info("Flash custom recovery with fastboot.") + logger.info("Boot custom recovery with fastboot.") for line in run_command( - "fastboot flash recovery", target=f"{recovery}", bin_path=bin_path + "fastboot boot", target=f"{recovery}", bin_path=bin_path ): yield line - for line in adb_wait_for_recovery(bin_path=bin_path): - yield line if (type(line) == bool) and not line: - logger.error("Flashing recovery failed.") + logger.error("Booting recovery failed.") yield False else: yield True - # reboot logger.info("Boot into TWRP with fastboot.") - for line in run_command("fastboot reboot recovery", bin_path): - yield line for line in adb_wait_for_recovery(bin_path=bin_path): yield line From 1a99a42a9b513472bd0e501cac74f1b3f29e1bd5 Mon Sep 17 00:00:00 2001 From: MagicLike Date: Sun, 12 Mar 2023 18:45:44 +0100 Subject: [PATCH 11/21] Moved feedback to app header Moved feedback to app header instead of opening it automatically. --- openandroidinstaller/openandroidinstaller.py | 11 +++++++++++ openandroidinstaller/views/success_view.py | 3 --- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/openandroidinstaller/openandroidinstaller.py b/openandroidinstaller/openandroidinstaller.py index f6b26431..258a7db5 100644 --- a/openandroidinstaller/openandroidinstaller.py +++ b/openandroidinstaller/openandroidinstaller.py @@ -247,6 +247,17 @@ def main(page: Page, test: bool = False, test_config: str = "sargo"): padding=15, tooltip="Frequently asked questions and encountered issues.", ), + Container( + content=ElevatedButton( + icon=icons.BUG_REPORT_OUTLINED, + text="Give feedback", + on_click=lambda _: webbrowser.open( + "https://openandroidinstaller.org/feedback.html" + ), + ), + padding=15, + tooltip="Give feedback about your experience with Open Android Installer", + ), Container( content=ElevatedButton( icon=icons.BUG_REPORT_OUTLINED, diff --git a/openandroidinstaller/views/success_view.py b/openandroidinstaller/views/success_view.py index b55860e7..e7f84bf6 100644 --- a/openandroidinstaller/views/success_view.py +++ b/openandroidinstaller/views/success_view.py @@ -36,9 +36,6 @@ def build( ): def close_window(e): logger.success("Success! Close the window.") - # open the feedback page - feedback_url = "https://openandroidinstaller.org/feedback.html" - webbrowser.open(feedback_url) # close the window self.page.window_close() From 3c28998998262640c312a0a5c59c09b96422b76a Mon Sep 17 00:00:00 2001 From: MagicLike Date: Sun, 12 Mar 2023 20:43:48 +0100 Subject: [PATCH 12/21] Added feedback icon and updated tooltip --- openandroidinstaller/openandroidinstaller.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openandroidinstaller/openandroidinstaller.py b/openandroidinstaller/openandroidinstaller.py index 258a7db5..92868949 100644 --- a/openandroidinstaller/openandroidinstaller.py +++ b/openandroidinstaller/openandroidinstaller.py @@ -249,14 +249,14 @@ def main(page: Page, test: bool = False, test_config: str = "sargo"): ), Container( content=ElevatedButton( - icon=icons.BUG_REPORT_OUTLINED, + icon=icons.FEEDBACK_OUTLINED, text="Give feedback", on_click=lambda _: webbrowser.open( "https://openandroidinstaller.org/feedback.html" ), ), padding=15, - tooltip="Give feedback about your experience with Open Android Installer", + tooltip="Give feedback about your experience with OpenAndroidInstaller", ), Container( content=ElevatedButton( From 0abb90f45331efe80314a90980dad81bfc4c4c5c Mon Sep 17 00:00:00 2001 From: MagicLike Date: Sun, 12 Mar 2023 20:48:53 +0100 Subject: [PATCH 13/21] Renamed variables, updated configs & updated README --- README.md | 4 ++-- openandroidinstaller/app_state.py | 2 +- openandroidinstaller/assets/configs/FP2.yaml | 8 ++++---- openandroidinstaller/assets/configs/FP3.yaml | 6 +++--- openandroidinstaller/assets/configs/FP4.yaml | 6 +++--- .../assets/configs/a3y17lte.yaml | 4 ++-- openandroidinstaller/assets/configs/a5xelte.yaml | 4 ++-- openandroidinstaller/assets/configs/a72q.yaml | 4 ++-- openandroidinstaller/assets/configs/a7xelte.yaml | 4 ++-- openandroidinstaller/assets/configs/akari.yaml | 6 +++--- .../assets/configs/akatsuki.yaml | 6 +++--- openandroidinstaller/assets/configs/avicii.yaml | 10 +++++----- openandroidinstaller/assets/configs/barbet.yaml | 8 ++++---- .../assets/configs/beyond0lte.yaml | 4 ++-- .../assets/configs/beyond1lte.yaml | 4 ++-- .../assets/configs/beyond2lte.yaml | 4 ++-- .../assets/configs/blueline.yaml | 8 ++++---- openandroidinstaller/assets/configs/bonito.yaml | 8 ++++---- openandroidinstaller/assets/configs/cedric.yaml | 8 ++++---- .../assets/configs/cheeseburger.yaml | 8 ++++---- openandroidinstaller/assets/configs/coral.yaml | 8 ++++---- .../assets/configs/crosshatch.yaml | 8 ++++---- .../assets/configs/crownlte.yaml | 4 ++-- openandroidinstaller/assets/configs/d1.yaml | 4 ++-- openandroidinstaller/assets/configs/d2s.yaml | 4 ++-- openandroidinstaller/assets/configs/dre.yaml | 10 +++++----- .../assets/configs/dumpling.yaml | 8 ++++---- .../assets/configs/enchilada.yaml | 10 +++++----- openandroidinstaller/assets/configs/evert.yaml | 10 +++++----- openandroidinstaller/assets/configs/fajita.yaml | 10 +++++----- openandroidinstaller/assets/configs/flame.yaml | 8 ++++---- .../assets/configs/greatlte.yaml | 4 ++-- openandroidinstaller/assets/configs/griffin.yaml | 8 ++++---- .../assets/configs/guacamole.yaml | 8 ++++---- .../assets/configs/guacamoleb.yaml | 8 ++++---- .../assets/configs/hero2lte.yaml | 4 ++-- openandroidinstaller/assets/configs/herolte.yaml | 4 ++-- .../assets/configs/heroltexx.yaml | 4 ++-- openandroidinstaller/assets/configs/hltetmo.yaml | 4 ++-- openandroidinstaller/assets/configs/hotdog.yaml | 8 ++++---- openandroidinstaller/assets/configs/hotdogb.yaml | 8 ++++---- openandroidinstaller/assets/configs/j7elte.yaml | 4 ++-- openandroidinstaller/assets/configs/kiev.yaml | 10 +++++----- openandroidinstaller/assets/configs/kirin.yaml | 6 +++--- openandroidinstaller/assets/configs/mermaid.yaml | 6 +++--- openandroidinstaller/assets/configs/nairo.yaml | 10 +++++----- openandroidinstaller/assets/configs/ocean.yaml | 10 +++++----- openandroidinstaller/assets/configs/pioneer.yaml | 6 +++--- openandroidinstaller/assets/configs/racer.yaml | 10 +++++----- openandroidinstaller/assets/configs/redfin.yaml | 8 ++++---- openandroidinstaller/assets/configs/s3ve3g.yaml | 4 ++-- openandroidinstaller/assets/configs/sargo.yaml | 8 ++++---- openandroidinstaller/assets/configs/starlte.yaml | 4 ++-- openandroidinstaller/assets/configs/sunfish.yaml | 8 ++++---- openandroidinstaller/assets/configs/taimen.yaml | 8 ++++---- openandroidinstaller/assets/configs/walleye.yaml | 8 ++++---- openandroidinstaller/assets/configs/yuga.yaml | 4 ++-- openandroidinstaller/assets/configs/z3.yaml | 4 ++-- .../assets/configs/zerofltexx.yaml | 4 ++-- .../assets/configs/zeroltexx.yaml | 4 ++-- openandroidinstaller/installer_config.py | 16 ++++++++-------- openandroidinstaller/tooling.py | 8 ++++---- openandroidinstaller/views/start_view.py | 4 ++-- openandroidinstaller/views/step_view.py | 6 +++--- 64 files changed, 210 insertions(+), 210 deletions(-) diff --git a/README.md b/README.md index 55ffa6db..3549ccdd 100644 --- a/README.md +++ b/README.md @@ -191,7 +191,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: @@ -213,7 +213,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 `` 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`. diff --git a/openandroidinstaller/app_state.py b/openandroidinstaller/app_state.py index e81cedd3..40fb427d 100644 --- a/openandroidinstaller/app_state.py +++ b/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 ) diff --git a/openandroidinstaller/assets/configs/FP2.yaml b/openandroidinstaller/assets/configs/FP2.yaml index 8149c8b4..3f24809a 100644 --- a/openandroidinstaller/assets/configs/FP2.yaml +++ b/openandroidinstaller/assets/configs/FP2.yaml @@ -4,17 +4,17 @@ metadata: devicecode: 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! diff --git a/openandroidinstaller/assets/configs/FP3.yaml b/openandroidinstaller/assets/configs/FP3.yaml index 5fc45c57..417958e7 100644 --- a/openandroidinstaller/assets/configs/FP3.yaml +++ b/openandroidinstaller/assets/configs/FP3.yaml @@ -29,17 +29,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! diff --git a/openandroidinstaller/assets/configs/FP4.yaml b/openandroidinstaller/assets/configs/FP4.yaml index a5f5c436..903b501d 100644 --- a/openandroidinstaller/assets/configs/FP4.yaml +++ b/openandroidinstaller/assets/configs/FP4.yaml @@ -29,17 +29,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! diff --git a/openandroidinstaller/assets/configs/a3y17lte.yaml b/openandroidinstaller/assets/configs/a3y17lte.yaml index 940746dc..1814a5a0 100644 --- a/openandroidinstaller/assets/configs/a3y17lte.yaml +++ b/openandroidinstaller/assets/configs/a3y17lte.yaml @@ -4,7 +4,7 @@ metadata: devicecode: 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, @@ -13,7 +13,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 diff --git a/openandroidinstaller/assets/configs/a5xelte.yaml b/openandroidinstaller/assets/configs/a5xelte.yaml index 4d4d40bb..64ebf4b8 100644 --- a/openandroidinstaller/assets/configs/a5xelte.yaml +++ b/openandroidinstaller/assets/configs/a5xelte.yaml @@ -4,7 +4,7 @@ metadata: devicecode: 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, @@ -12,7 +12,7 @@ steps: 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 diff --git a/openandroidinstaller/assets/configs/a72q.yaml b/openandroidinstaller/assets/configs/a72q.yaml index 3d1290a0..97d4da5d 100644 --- a/openandroidinstaller/assets/configs/a72q.yaml +++ b/openandroidinstaller/assets/configs/a72q.yaml @@ -4,7 +4,7 @@ metadata: devicecode: 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, @@ -12,7 +12,7 @@ steps: 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 diff --git a/openandroidinstaller/assets/configs/a7xelte.yaml b/openandroidinstaller/assets/configs/a7xelte.yaml index 4f680c97..3c570247 100644 --- a/openandroidinstaller/assets/configs/a7xelte.yaml +++ b/openandroidinstaller/assets/configs/a7xelte.yaml @@ -4,7 +4,7 @@ metadata: devicecode: 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, @@ -12,7 +12,7 @@ steps: 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 diff --git a/openandroidinstaller/assets/configs/akari.yaml b/openandroidinstaller/assets/configs/akari.yaml index 8e971d37..b9e40662 100644 --- a/openandroidinstaller/assets/configs/akari.yaml +++ b/openandroidinstaller/assets/configs/akari.yaml @@ -33,15 +33,15 @@ steps: Press the button to reboot. Since the device resets completely, you will need to re-enable USB debugging to continue. Connect your device to your PC via USB. Then confirm here to continue. command: fastboot_reboot - flash_recovery: + boot_recovery: - type: call_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. 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: Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. + content: Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. command: fastboot_flash_boot - type: call_button command: adb_twrp_copy_partitions diff --git a/openandroidinstaller/assets/configs/akatsuki.yaml b/openandroidinstaller/assets/configs/akatsuki.yaml index ecafe733..ddd02f55 100644 --- a/openandroidinstaller/assets/configs/akatsuki.yaml +++ b/openandroidinstaller/assets/configs/akatsuki.yaml @@ -33,15 +33,15 @@ steps: Press the button to reboot. Since the device resets completely, you will need to re-enable USB debugging to continue. Connect your device to your PC via USB. Then confirm here to continue. command: fastboot_reboot - flash_recovery: + boot_recovery: - type: call_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. 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: Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. + content: Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. command: fastboot_flash_boot - type: call_button command: adb_twrp_copy_partitions diff --git a/openandroidinstaller/assets/configs/avicii.yaml b/openandroidinstaller/assets/configs/avicii.yaml index 99cc545f..f251610b 100644 --- a/openandroidinstaller/assets/configs/avicii.yaml +++ b/openandroidinstaller/assets/configs/avicii.yaml @@ -24,22 +24,22 @@ steps: command: fastboot_reboot - 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. - flash_recovery: + boot_recovery: - type: call_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. 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: 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: call_button command: adb_twrp_copy_partitions content: > In some cases, the inactive slot can be unpopulated or contain much older firmware than the active slot, leading to various issues including a potential hard-brick. We can ensure none of that will happen by copying the contents of the active slot to the inactive slot. Press 'confirm and run' to to this. Once you are in the bootloader again, continue. - type: call_button - command: fastboot_flash_recovery + command: fastboot_boot_recovery content: > Now we need to boot into recovery again. Press run and when you see the TWRP screen you can continue. \ No newline at end of file diff --git a/openandroidinstaller/assets/configs/barbet.yaml b/openandroidinstaller/assets/configs/barbet.yaml index 8471f0de..e2d4a889 100644 --- a/openandroidinstaller/assets/configs/barbet.yaml +++ b/openandroidinstaller/assets/configs/barbet.yaml @@ -29,10 +29,10 @@ 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: Once the device is fully booted, you need to reboot into the bootloader again by pressing 'Confirm and run' here. Then continue. @@ -40,5 +40,5 @@ steps: - type: confirm_button content: Select 'Restart bootloader' on your smartphone screen. Then confirm to continue. - type: call_button - content: Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. - command: fastboot_flash_recovery \ No newline at end of file + content: Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. + command: fastboot_boot_recovery \ No newline at end of file diff --git a/openandroidinstaller/assets/configs/beyond0lte.yaml b/openandroidinstaller/assets/configs/beyond0lte.yaml index 01bf3524..3ccdbc7e 100644 --- a/openandroidinstaller/assets/configs/beyond0lte.yaml +++ b/openandroidinstaller/assets/configs/beyond0lte.yaml @@ -21,14 +21,14 @@ steps: content: > The bootloader is now unlocked. Go through Android Setup skipping everything you can, then connect the device to a Wi-Fi network. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue. - flash_recovery: + boot_recovery: - type: call_button content: > Now plug the USB-cable to your device. As a first step, you need to boot into download mode. Your device should be turned on. Then press 'Confirm and run' to reboot into download mode. 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-bixby.png diff --git a/openandroidinstaller/assets/configs/beyond1lte.yaml b/openandroidinstaller/assets/configs/beyond1lte.yaml index 914d178e..dfc8a228 100644 --- a/openandroidinstaller/assets/configs/beyond1lte.yaml +++ b/openandroidinstaller/assets/configs/beyond1lte.yaml @@ -21,14 +21,14 @@ steps: content: > The bootloader is now unlocked. Go through Android Setup skipping everything you can, then connect the device to a Wi-Fi network. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue. - flash_recovery: + boot_recovery: - type: call_button content: > Now plug the USB-cable to your device. As a first step, you need to boot into download mode. Your device should be turned on. Then press 'Confirm and run' to reboot into download mode. 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-bixby.png diff --git a/openandroidinstaller/assets/configs/beyond2lte.yaml b/openandroidinstaller/assets/configs/beyond2lte.yaml index ff8a529a..62458d98 100644 --- a/openandroidinstaller/assets/configs/beyond2lte.yaml +++ b/openandroidinstaller/assets/configs/beyond2lte.yaml @@ -21,14 +21,14 @@ steps: content: > The bootloader is now unlocked. Go through Android Setup skipping everything you can, then connect the device to a Wi-Fi network. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue. - flash_recovery: + boot_recovery: - type: call_button content: > Now plug the USB-cable to your device. As a first step, you need to boot into download mode. Your device should be turned on. Then press 'Confirm and run' to reboot into download mode. 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-bixby.png diff --git a/openandroidinstaller/assets/configs/blueline.yaml b/openandroidinstaller/assets/configs/blueline.yaml index 680d63c5..8c99603f 100644 --- a/openandroidinstaller/assets/configs/blueline.yaml +++ b/openandroidinstaller/assets/configs/blueline.yaml @@ -24,14 +24,14 @@ steps: command: fastboot_reboot - 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. - flash_recovery: + boot_recovery: - type: call_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. 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: Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once your phone screen looks like the picture on the left, continue. - command: fastboot_flash_recovery + content: Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once your phone screen looks like the picture on the left, continue. + command: fastboot_boot_recovery img: twrp-start.jpeg \ No newline at end of file diff --git a/openandroidinstaller/assets/configs/bonito.yaml b/openandroidinstaller/assets/configs/bonito.yaml index 694ce1cc..ed771862 100644 --- a/openandroidinstaller/assets/configs/bonito.yaml +++ b/openandroidinstaller/assets/configs/bonito.yaml @@ -24,14 +24,14 @@ steps: command: fastboot_reboot - 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. - flash_recovery: + boot_recovery: - type: call_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. 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: Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once your phone screen looks like the picture on the left, continue. - command: fastboot_flash_recovery + content: Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once your phone screen looks like the picture on the left, continue. + command: fastboot_boot_recovery img: twrp-start.jpeg \ No newline at end of file diff --git a/openandroidinstaller/assets/configs/cedric.yaml b/openandroidinstaller/assets/configs/cedric.yaml index bb260c21..7a9195cc 100644 --- a/openandroidinstaller/assets/configs/cedric.yaml +++ b/openandroidinstaller/assets/configs/cedric.yaml @@ -34,13 +34,13 @@ steps: Press the button to reboot. Since the device resets completely, you will need to re-enable USB debugging to continue. Connect your device to your PC via USB. Then confirm here to continue. command: fastboot_reboot - flash_recovery: + boot_recovery: - type: call_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. 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: Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. - command: fastboot_flash_recovery \ No newline at end of file + content: Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. + command: fastboot_boot_recovery \ No newline at end of file diff --git a/openandroidinstaller/assets/configs/cheeseburger.yaml b/openandroidinstaller/assets/configs/cheeseburger.yaml index 6a825fa9..55375809 100644 --- a/openandroidinstaller/assets/configs/cheeseburger.yaml +++ b/openandroidinstaller/assets/configs/cheeseburger.yaml @@ -23,13 +23,13 @@ steps: command: fastboot_reboot - 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. - flash_recovery: + boot_recovery: - type: call_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. 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: Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. - command: fastboot_flash_recovery \ No newline at end of file + content: Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. + command: fastboot_boot_recovery \ No newline at end of file diff --git a/openandroidinstaller/assets/configs/coral.yaml b/openandroidinstaller/assets/configs/coral.yaml index e9647828..476748dd 100644 --- a/openandroidinstaller/assets/configs/coral.yaml +++ b/openandroidinstaller/assets/configs/coral.yaml @@ -29,10 +29,10 @@ 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: Once the device is fully booted, you need to reboot into the bootloader again by pressing 'Confirm and run' here. Then continue. @@ -40,5 +40,5 @@ steps: - type: confirm_button content: Select 'Restart bootloader' on your smartphone screen. Then confirm to continue. - type: call_button - content: Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. - command: fastboot_flash_recovery \ No newline at end of file + content: Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. + command: fastboot_boot_recovery \ No newline at end of file diff --git a/openandroidinstaller/assets/configs/crosshatch.yaml b/openandroidinstaller/assets/configs/crosshatch.yaml index a4a485a2..33ee81f5 100644 --- a/openandroidinstaller/assets/configs/crosshatch.yaml +++ b/openandroidinstaller/assets/configs/crosshatch.yaml @@ -24,14 +24,14 @@ steps: command: fastboot_reboot - 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. - flash_recovery: + boot_recovery: - type: call_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. 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: Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once your phone screen looks like the picture on the left, continue. - command: fastboot_flash_recovery + content: Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once your phone screen looks like the picture on the left, continue. + command: fastboot_boot_recovery img: twrp-start.jpeg \ No newline at end of file diff --git a/openandroidinstaller/assets/configs/crownlte.yaml b/openandroidinstaller/assets/configs/crownlte.yaml index 8b759e6b..fe857f0b 100644 --- a/openandroidinstaller/assets/configs/crownlte.yaml +++ b/openandroidinstaller/assets/configs/crownlte.yaml @@ -6,7 +6,7 @@ requirements: android: 10 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, @@ -14,7 +14,7 @@ steps: 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-bixby.png diff --git a/openandroidinstaller/assets/configs/d1.yaml b/openandroidinstaller/assets/configs/d1.yaml index 8ae30aeb..13a34932 100644 --- a/openandroidinstaller/assets/configs/d1.yaml +++ b/openandroidinstaller/assets/configs/d1.yaml @@ -21,14 +21,14 @@ steps: content: > The bootloader is now unlocked. Go through Android Setup skipping everything you can, then connect the device to a Wi-Fi network. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue. - flash_recovery: + boot_recovery: - type: call_button content: > Now plug the USB-cable to your device. As a first step, you need to boot into download mode. Your device should be turned on. Then press 'Confirm and run' to reboot into download mode. 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-bixby.png diff --git a/openandroidinstaller/assets/configs/d2s.yaml b/openandroidinstaller/assets/configs/d2s.yaml index 07bd6819..fce89b6b 100644 --- a/openandroidinstaller/assets/configs/d2s.yaml +++ b/openandroidinstaller/assets/configs/d2s.yaml @@ -21,14 +21,14 @@ steps: content: > The bootloader is now unlocked. Go through Android Setup skipping everything you can, then connect the device to a Wi-Fi network. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue. - flash_recovery: + boot_recovery: - type: call_button content: > Now plug the USB-cable to your device. As a first step, you need to boot into download mode. Your device should be turned on. Then press 'Confirm and run' to reboot into download mode. 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-bixby.png diff --git a/openandroidinstaller/assets/configs/dre.yaml b/openandroidinstaller/assets/configs/dre.yaml index 1b8be02a..604562b6 100644 --- a/openandroidinstaller/assets/configs/dre.yaml +++ b/openandroidinstaller/assets/configs/dre.yaml @@ -24,22 +24,22 @@ steps: command: fastboot_reboot - 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. - flash_recovery: + boot_recovery: - type: call_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. 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: 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: call_button command: adb_twrp_copy_partitions content: > In some cases, the inactive slot can be unpopulated or contain much older firmware than the active slot, leading to various issues including a potential hard-brick. We can ensure none of that will happen by copying the contents of the active slot to the inactive slot. Press 'confirm and run' to to this. Once you are in the bootloader again, continue. - type: call_button - command: fastboot_flash_recovery + command: fastboot_boot_recovery content: > Now we need to boot into recovery again. Press run and when you see the TWRP screen you can continue. \ No newline at end of file diff --git a/openandroidinstaller/assets/configs/dumpling.yaml b/openandroidinstaller/assets/configs/dumpling.yaml index a2324245..a96e1462 100644 --- a/openandroidinstaller/assets/configs/dumpling.yaml +++ b/openandroidinstaller/assets/configs/dumpling.yaml @@ -23,13 +23,13 @@ steps: command: fastboot_reboot - 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. - flash_recovery: + boot_recovery: - type: call_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. 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: Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. - command: fastboot_flash_recovery \ No newline at end of file + content: Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. + command: fastboot_boot_recovery \ No newline at end of file diff --git a/openandroidinstaller/assets/configs/enchilada.yaml b/openandroidinstaller/assets/configs/enchilada.yaml index e1da4282..a40742b9 100644 --- a/openandroidinstaller/assets/configs/enchilada.yaml +++ b/openandroidinstaller/assets/configs/enchilada.yaml @@ -24,22 +24,22 @@ steps: command: fastboot_reboot - 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. - flash_recovery: + boot_recovery: - type: call_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. 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: 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: call_button command: adb_twrp_copy_partitions content: > In some cases, the inactive slot can be unpopulated or contain much older firmware than the active slot, leading to various issues including a potential hard-brick. We can ensure none of that will happen by copying the contents of the active slot to the inactive slot. Press 'confirm and run' to to this. Once you are in the bootloader again, continue. - type: call_button - command: fastboot_flash_recovery + command: fastboot_boot_recovery content: > Now we need to boot into recovery again. Press run and when you see the TWRP screen you can continue. \ No newline at end of file diff --git a/openandroidinstaller/assets/configs/evert.yaml b/openandroidinstaller/assets/configs/evert.yaml index 790c1e0f..3acbc970 100644 --- a/openandroidinstaller/assets/configs/evert.yaml +++ b/openandroidinstaller/assets/configs/evert.yaml @@ -34,22 +34,22 @@ steps: Press the button to reboot. Since the device resets completely, you will need to re-enable USB debugging to continue. Connect your device to your PC via USB. Then confirm here to continue. command: fastboot_reboot - flash_recovery: + boot_recovery: - type: call_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. 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: 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: call_button command: adb_twrp_copy_partitions content: > In some cases, the inactive slot can be unpopulated or contain much older firmware than the active slot, leading to various issues including a potential hard-brick. We can ensure none of that will happen by copying the contents of the active slot to the inactive slot. Press 'confirm and run' to to this. Once you are in the bootloader again, continue. - type: call_button - command: fastboot_flash_recovery + command: fastboot_boot_recovery content: > Now we need to boot into recovery again. Press run and when you see the TWRP screen you can continue. \ No newline at end of file diff --git a/openandroidinstaller/assets/configs/fajita.yaml b/openandroidinstaller/assets/configs/fajita.yaml index 8ce4c1a2..e534a61c 100644 --- a/openandroidinstaller/assets/configs/fajita.yaml +++ b/openandroidinstaller/assets/configs/fajita.yaml @@ -24,22 +24,22 @@ steps: command: fastboot_reboot - 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. - flash_recovery: + boot_recovery: - type: call_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. 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: 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: call_button command: adb_twrp_copy_partitions content: > In some cases, the inactive slot can be unpopulated or contain much older firmware than the active slot, leading to various issues including a potential hard-brick. We can ensure none of that will happen by copying the contents of the active slot to the inactive slot. Press 'confirm and run' to to this. Once you are in the bootloader again, continue. - type: call_button - command: fastboot_flash_recovery + command: fastboot_boot_recovery content: > Now we need to boot into recovery again. Press run and when you see the TWRP screen you can continue. \ No newline at end of file diff --git a/openandroidinstaller/assets/configs/flame.yaml b/openandroidinstaller/assets/configs/flame.yaml index 2bbd5d31..8947ea75 100644 --- a/openandroidinstaller/assets/configs/flame.yaml +++ b/openandroidinstaller/assets/configs/flame.yaml @@ -29,10 +29,10 @@ 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: Once the device is fully booted, you need to reboot into the bootloader again by pressing 'Confirm and run' here. Then continue. @@ -40,5 +40,5 @@ steps: - type: confirm_button content: Select 'Restart bootloader' on your smartphone screen. Then confirm to continue. - type: call_button - content: Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. - command: fastboot_flash_recovery \ No newline at end of file + content: Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. + command: fastboot_boot_recovery \ No newline at end of file diff --git a/openandroidinstaller/assets/configs/greatlte.yaml b/openandroidinstaller/assets/configs/greatlte.yaml index 01e54325..e2ad394a 100644 --- a/openandroidinstaller/assets/configs/greatlte.yaml +++ b/openandroidinstaller/assets/configs/greatlte.yaml @@ -4,7 +4,7 @@ metadata: devicecode: greatlte 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, @@ -12,7 +12,7 @@ steps: 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-bixby.png diff --git a/openandroidinstaller/assets/configs/griffin.yaml b/openandroidinstaller/assets/configs/griffin.yaml index 36d18192..0c95d675 100644 --- a/openandroidinstaller/assets/configs/griffin.yaml +++ b/openandroidinstaller/assets/configs/griffin.yaml @@ -34,13 +34,13 @@ steps: Press the button to reboot. Since the device resets completely, you will need to re-enable USB debugging to continue. Connect your device to your PC via USB. Then confirm here to continue. command: fastboot_reboot - flash_recovery: + boot_recovery: - type: call_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. 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: Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. - command: fastboot_flash_recovery \ No newline at end of file + content: Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. + command: fastboot_boot_recovery \ No newline at end of file diff --git a/openandroidinstaller/assets/configs/guacamole.yaml b/openandroidinstaller/assets/configs/guacamole.yaml index 129d7b98..1b2c4faf 100644 --- a/openandroidinstaller/assets/configs/guacamole.yaml +++ b/openandroidinstaller/assets/configs/guacamole.yaml @@ -24,13 +24,13 @@ steps: command: fastboot_reboot - 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. - flash_recovery: + boot_recovery: - type: call_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. 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: Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. - command: fastboot_flash_recovery \ No newline at end of file + content: Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. + command: fastboot_boot_recovery \ No newline at end of file diff --git a/openandroidinstaller/assets/configs/guacamoleb.yaml b/openandroidinstaller/assets/configs/guacamoleb.yaml index e39c9378..0c06236a 100644 --- a/openandroidinstaller/assets/configs/guacamoleb.yaml +++ b/openandroidinstaller/assets/configs/guacamoleb.yaml @@ -24,13 +24,13 @@ steps: command: fastboot_reboot - 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. - flash_recovery: + boot_recovery: - type: call_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. 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: Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. - command: fastboot_flash_recovery \ No newline at end of file + content: Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. + command: fastboot_boot_recovery \ No newline at end of file diff --git a/openandroidinstaller/assets/configs/hero2lte.yaml b/openandroidinstaller/assets/configs/hero2lte.yaml index 4ec35346..3246e195 100644 --- a/openandroidinstaller/assets/configs/hero2lte.yaml +++ b/openandroidinstaller/assets/configs/hero2lte.yaml @@ -4,7 +4,7 @@ metadata: devicecode: hero2lte 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, @@ -12,7 +12,7 @@ steps: 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 diff --git a/openandroidinstaller/assets/configs/herolte.yaml b/openandroidinstaller/assets/configs/herolte.yaml index 4dcf7f8b..73d196cd 100644 --- a/openandroidinstaller/assets/configs/herolte.yaml +++ b/openandroidinstaller/assets/configs/herolte.yaml @@ -4,7 +4,7 @@ metadata: devicecode: herolte 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, @@ -12,7 +12,7 @@ steps: 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 diff --git a/openandroidinstaller/assets/configs/heroltexx.yaml b/openandroidinstaller/assets/configs/heroltexx.yaml index 4dcf7f8b..73d196cd 100644 --- a/openandroidinstaller/assets/configs/heroltexx.yaml +++ b/openandroidinstaller/assets/configs/heroltexx.yaml @@ -4,7 +4,7 @@ metadata: devicecode: herolte 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, @@ -12,7 +12,7 @@ steps: 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 diff --git a/openandroidinstaller/assets/configs/hltetmo.yaml b/openandroidinstaller/assets/configs/hltetmo.yaml index dc5c6eb1..087f7aab 100644 --- a/openandroidinstaller/assets/configs/hltetmo.yaml +++ b/openandroidinstaller/assets/configs/hltetmo.yaml @@ -4,7 +4,7 @@ metadata: devicecode: hltetmo 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, @@ -13,7 +13,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 diff --git a/openandroidinstaller/assets/configs/hotdog.yaml b/openandroidinstaller/assets/configs/hotdog.yaml index 15cc7015..ec37755c 100644 --- a/openandroidinstaller/assets/configs/hotdog.yaml +++ b/openandroidinstaller/assets/configs/hotdog.yaml @@ -24,13 +24,13 @@ steps: command: fastboot_reboot - 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. - flash_recovery: + boot_recovery: - type: call_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. 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: Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. - command: fastboot_flash_recovery \ No newline at end of file + content: Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. + command: fastboot_boot_recovery \ No newline at end of file diff --git a/openandroidinstaller/assets/configs/hotdogb.yaml b/openandroidinstaller/assets/configs/hotdogb.yaml index da1c487a..8748a482 100644 --- a/openandroidinstaller/assets/configs/hotdogb.yaml +++ b/openandroidinstaller/assets/configs/hotdogb.yaml @@ -24,13 +24,13 @@ steps: command: fastboot_reboot - 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. - flash_recovery: + boot_recovery: - type: call_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. 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: Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. - command: fastboot_flash_recovery \ No newline at end of file + content: Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. + command: fastboot_boot_recovery \ No newline at end of file diff --git a/openandroidinstaller/assets/configs/j7elte.yaml b/openandroidinstaller/assets/configs/j7elte.yaml index 99390c17..d4944f3a 100644 --- a/openandroidinstaller/assets/configs/j7elte.yaml +++ b/openandroidinstaller/assets/configs/j7elte.yaml @@ -4,7 +4,7 @@ metadata: devicecode: j7elte 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, @@ -12,7 +12,7 @@ steps: 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 diff --git a/openandroidinstaller/assets/configs/kiev.yaml b/openandroidinstaller/assets/configs/kiev.yaml index 607a16a4..05de4fdc 100644 --- a/openandroidinstaller/assets/configs/kiev.yaml +++ b/openandroidinstaller/assets/configs/kiev.yaml @@ -34,22 +34,22 @@ steps: Press the button to reboot. Since the device resets completely, you will need to re-enable USB debugging to continue. Connect your device to your PC via USB. Then confirm here to continue. command: fastboot_reboot - flash_recovery: + boot_recovery: - type: call_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. 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: 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: call_button command: adb_twrp_copy_partitions content: > In some cases, the inactive slot can be unpopulated or contain much older firmware than the active slot, leading to various issues including a potential hard-brick. We can ensure none of that will happen by copying the contents of the active slot to the inactive slot. Press 'confirm and run' to to this. Once you are in the bootloader again, continue. - type: call_button - command: fastboot_flash_recovery + command: fastboot_boot_recovery content: > Now we need to boot into recovery again. Press run and when you see the TWRP screen you can continue. \ No newline at end of file diff --git a/openandroidinstaller/assets/configs/kirin.yaml b/openandroidinstaller/assets/configs/kirin.yaml index 6418fbaf..27f5ae6c 100644 --- a/openandroidinstaller/assets/configs/kirin.yaml +++ b/openandroidinstaller/assets/configs/kirin.yaml @@ -31,15 +31,15 @@ steps: Press the button to reboot. Since the device resets completely, you will need to re-enable USB debugging to continue. Connect your device to your PC via USB. Then confirm here to continue. command: fastboot_reboot - flash_recovery: + boot_recovery: - type: call_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. 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: Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. + content: Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. command: fastboot_flash_boot - type: call_button command: adb_twrp_copy_partitions diff --git a/openandroidinstaller/assets/configs/mermaid.yaml b/openandroidinstaller/assets/configs/mermaid.yaml index 8a0861ef..fc4e4b25 100644 --- a/openandroidinstaller/assets/configs/mermaid.yaml +++ b/openandroidinstaller/assets/configs/mermaid.yaml @@ -31,15 +31,15 @@ steps: Press the button to reboot. Since the device resets completely, you will need to re-enable USB debugging to continue. Connect your device to your PC via USB. Then confirm here to continue. command: fastboot_reboot - flash_recovery: + boot_recovery: - type: call_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. 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: Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. + content: Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. command: fastboot_flash_boot - type: call_button command: adb_twrp_copy_partitions diff --git a/openandroidinstaller/assets/configs/nairo.yaml b/openandroidinstaller/assets/configs/nairo.yaml index 968aafef..7d77d1d5 100644 --- a/openandroidinstaller/assets/configs/nairo.yaml +++ b/openandroidinstaller/assets/configs/nairo.yaml @@ -34,22 +34,22 @@ steps: Press the button to reboot. Since the device resets completely, you will need to re-enable USB debugging to continue. Connect your device to your PC via USB. Then confirm here to continue. command: fastboot_reboot - flash_recovery: + boot_recovery: - type: call_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. 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: 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: call_button command: adb_twrp_copy_partitions content: > In some cases, the inactive slot can be unpopulated or contain much older firmware than the active slot, leading to various issues including a potential hard-brick. We can ensure none of that will happen by copying the contents of the active slot to the inactive slot. Press 'confirm and run' to to this. Once you are in the bootloader again, continue. - type: call_button - command: fastboot_flash_recovery + command: fastboot_boot_recovery content: > Now we need to boot into recovery again. Press run and when you see the TWRP screen you can continue. \ No newline at end of file diff --git a/openandroidinstaller/assets/configs/ocean.yaml b/openandroidinstaller/assets/configs/ocean.yaml index 0d9dceee..bc575c80 100644 --- a/openandroidinstaller/assets/configs/ocean.yaml +++ b/openandroidinstaller/assets/configs/ocean.yaml @@ -34,22 +34,22 @@ steps: Press the button to reboot. Since the device resets completely, you will need to re-enable USB debugging to continue. Connect your device to your PC via USB. Then confirm here to continue. command: fastboot_reboot - flash_recovery: + boot_recovery: - type: call_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. 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: 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: call_button command: adb_twrp_copy_partitions content: > In some cases, the inactive slot can be unpopulated or contain much older firmware than the active slot, leading to various issues including a potential hard-brick. We can ensure none of that will happen by copying the contents of the active slot to the inactive slot. Press 'confirm and run' to to this. Once you are in the bootloader again, continue. - type: call_button - command: fastboot_flash_recovery + command: fastboot_boot_recovery content: > Now we need to boot into recovery again. Press run and when you see the TWRP screen you can continue. \ No newline at end of file diff --git a/openandroidinstaller/assets/configs/pioneer.yaml b/openandroidinstaller/assets/configs/pioneer.yaml index a5ea1fbc..cc0222be 100644 --- a/openandroidinstaller/assets/configs/pioneer.yaml +++ b/openandroidinstaller/assets/configs/pioneer.yaml @@ -33,15 +33,15 @@ steps: Press the button to reboot. Since the device resets completely, you will need to re-enable USB debugging to continue. Connect your device to your PC via USB. Then confirm here to continue. command: fastboot_reboot - flash_recovery: + boot_recovery: - type: call_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. 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: Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. + content: Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. command: fastboot_flash_boot - type: call_button command: adb_twrp_copy_partitions diff --git a/openandroidinstaller/assets/configs/racer.yaml b/openandroidinstaller/assets/configs/racer.yaml index 50d888d8..8fb83dbc 100644 --- a/openandroidinstaller/assets/configs/racer.yaml +++ b/openandroidinstaller/assets/configs/racer.yaml @@ -34,22 +34,22 @@ steps: Press the button to reboot. Since the device resets completely, you will need to re-enable USB debugging to continue. Connect your device to your PC via USB. Then confirm here to continue. command: fastboot_reboot - flash_recovery: + boot_recovery: - type: call_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. 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: 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: call_button command: adb_twrp_copy_partitions content: > In some cases, the inactive slot can be unpopulated or contain much older firmware than the active slot, leading to various issues including a potential hard-brick. We can ensure none of that will happen by copying the contents of the active slot to the inactive slot. Press 'confirm and run' to to this. Once you are in the bootloader again, continue. - type: call_button - command: fastboot_flash_recovery + command: fastboot_boot_recovery content: > Now we need to boot into recovery again. Press run and when you see the TWRP screen you can continue. \ No newline at end of file diff --git a/openandroidinstaller/assets/configs/redfin.yaml b/openandroidinstaller/assets/configs/redfin.yaml index df12f3b4..7eae2345 100644 --- a/openandroidinstaller/assets/configs/redfin.yaml +++ b/openandroidinstaller/assets/configs/redfin.yaml @@ -29,10 +29,10 @@ 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: Once the device is fully booted, you need to reboot into the bootloader again by pressing 'Confirm and run' here. Then continue. @@ -40,5 +40,5 @@ steps: - type: confirm_button content: Select 'Restart bootloader' on your smartphone screen. Then confirm to continue. - type: call_button - content: Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. - command: fastboot_flash_recovery \ No newline at end of file + content: Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. + command: fastboot_boot_recovery \ No newline at end of file diff --git a/openandroidinstaller/assets/configs/s3ve3g.yaml b/openandroidinstaller/assets/configs/s3ve3g.yaml index c7c1d67d..4cde7173 100644 --- a/openandroidinstaller/assets/configs/s3ve3g.yaml +++ b/openandroidinstaller/assets/configs/s3ve3g.yaml @@ -4,7 +4,7 @@ metadata: devicecode: s3ve3g steps: unlock_bootloader: - flash_recovery: + boot_recovery: - type: confirm_button content: > There are two possible hardware configurations of this phone regardless of model number. Some phones were released with a Sony IMX 175 rear camera sensor, while others with a Samsung s5k4h5yb rear camera sensor. As such, we’ve separated this devices builds into two separate builds. The procedure to distinguish which to use is as follows: @@ -26,7 +26,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 diff --git a/openandroidinstaller/assets/configs/sargo.yaml b/openandroidinstaller/assets/configs/sargo.yaml index 2e19de38..fe6065fd 100644 --- a/openandroidinstaller/assets/configs/sargo.yaml +++ b/openandroidinstaller/assets/configs/sargo.yaml @@ -24,14 +24,14 @@ steps: command: fastboot_reboot - 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. - flash_recovery: + boot_recovery: - type: call_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. 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: Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once your phone screen looks like the picture on the left, continue. - command: fastboot_flash_recovery + content: Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once your phone screen looks like the picture on the left, continue. + command: fastboot_boot_recovery img: twrp-start.jpeg \ No newline at end of file diff --git a/openandroidinstaller/assets/configs/starlte.yaml b/openandroidinstaller/assets/configs/starlte.yaml index 3b09a481..9a922995 100644 --- a/openandroidinstaller/assets/configs/starlte.yaml +++ b/openandroidinstaller/assets/configs/starlte.yaml @@ -6,7 +6,7 @@ requirements: android: 10 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, @@ -14,7 +14,7 @@ steps: 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 content: > diff --git a/openandroidinstaller/assets/configs/sunfish.yaml b/openandroidinstaller/assets/configs/sunfish.yaml index b91a734d..2c3ee0be 100644 --- a/openandroidinstaller/assets/configs/sunfish.yaml +++ b/openandroidinstaller/assets/configs/sunfish.yaml @@ -29,10 +29,10 @@ 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: Once the device is fully booted, you need to reboot into the bootloader again by pressing 'Confirm and run' here. Then continue. @@ -40,5 +40,5 @@ steps: - type: confirm_button content: Select 'Restart bootloader' on your smartphone screen. Then confirm to continue. - type: call_button - content: Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. - command: fastboot_flash_recovery \ No newline at end of file + content: Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. + command: fastboot_boot_recovery \ No newline at end of file diff --git a/openandroidinstaller/assets/configs/taimen.yaml b/openandroidinstaller/assets/configs/taimen.yaml index 8bed3bbf..5fc02d21 100644 --- a/openandroidinstaller/assets/configs/taimen.yaml +++ b/openandroidinstaller/assets/configs/taimen.yaml @@ -24,14 +24,14 @@ steps: command: fastboot_reboot - 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. - flash_recovery: + boot_recovery: - type: call_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. 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: Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once your phone screen looks like the picture on the left, continue. - command: fastboot_flash_recovery + content: Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once your phone screen looks like the picture on the left, continue. + command: fastboot_boot_recovery img: twrp-start.jpeg \ No newline at end of file diff --git a/openandroidinstaller/assets/configs/walleye.yaml b/openandroidinstaller/assets/configs/walleye.yaml index 1daae392..652c2da2 100644 --- a/openandroidinstaller/assets/configs/walleye.yaml +++ b/openandroidinstaller/assets/configs/walleye.yaml @@ -24,14 +24,14 @@ steps: command: fastboot_reboot - 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. - flash_recovery: + boot_recovery: - type: call_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. 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: Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once your phone screen looks like the picture on the left, continue. - command: fastboot_flash_recovery + content: Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once your phone screen looks like the picture on the left, continue. + command: fastboot_boot_recovery img: twrp-start.jpeg \ No newline at end of file diff --git a/openandroidinstaller/assets/configs/yuga.yaml b/openandroidinstaller/assets/configs/yuga.yaml index 16409933..09d6005b 100644 --- a/openandroidinstaller/assets/configs/yuga.yaml +++ b/openandroidinstaller/assets/configs/yuga.yaml @@ -31,10 +31,10 @@ steps: Press the button to reboot. Since the device resets completely, you will need to re-enable USB debugging to continue. Connect your device to your PC via USB. Then confirm here to continue. command: fastboot_reboot - flash_recovery: + boot_recovery: - type: call_button content: Now you have to reboot into bootloader again. With your phone turned on, press the button to do so and continue once it is done. command: adb_reboot_bootloader - type: call_button - content: Next, you need to flash a custom recovery image. Press the button to flash the selected image. Then continue. + content: Next, you need to boot a custom recovery image. Press the button to flash the selected image. Then continue. command: fastboot_flash_boot \ No newline at end of file diff --git a/openandroidinstaller/assets/configs/z3.yaml b/openandroidinstaller/assets/configs/z3.yaml index e9f5c797..8e90bda4 100644 --- a/openandroidinstaller/assets/configs/z3.yaml +++ b/openandroidinstaller/assets/configs/z3.yaml @@ -33,10 +33,10 @@ steps: Press the button to reboot. Since the device resets completely, you will need to re-enable USB debugging to continue. Connect your device to your PC via USB. Then confirm here to continue. command: fastboot_reboot - flash_recovery: + boot_recovery: - type: call_button content: Now you have to reboot into bootloader again. With your phone turned on, press the button to do so and continue once it is done. command: adb_reboot_bootloader - type: call_button - content: Next, you need to flash a custom recovery image. Press the button to flash the selected image. Then continue. + content: Next, you need to boot a custom recovery image. Press the button to flash the selected image. Then continue. command: fastboot_flash_boot \ No newline at end of file diff --git a/openandroidinstaller/assets/configs/zerofltexx.yaml b/openandroidinstaller/assets/configs/zerofltexx.yaml index ad084e4f..5e9db38c 100644 --- a/openandroidinstaller/assets/configs/zerofltexx.yaml +++ b/openandroidinstaller/assets/configs/zerofltexx.yaml @@ -4,7 +4,7 @@ metadata: devicecode: zerofltexx 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, @@ -12,7 +12,7 @@ steps: 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 diff --git a/openandroidinstaller/assets/configs/zeroltexx.yaml b/openandroidinstaller/assets/configs/zeroltexx.yaml index 0830241c..a67b4d55 100644 --- a/openandroidinstaller/assets/configs/zeroltexx.yaml +++ b/openandroidinstaller/assets/configs/zeroltexx.yaml @@ -4,7 +4,7 @@ metadata: devicecode: zeroltexx 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, @@ -12,7 +12,7 @@ steps: 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 diff --git a/openandroidinstaller/installer_config.py b/openandroidinstaller/installer_config.py index 62aa1a01..0158d93a 100644 --- a/openandroidinstaller/installer_config.py +++ b/openandroidinstaller/installer_config.py @@ -70,12 +70,12 @@ class InstallerConfig: def __init__( self, unlock_bootloader: List[Step], - flash_recovery: List[Step], + boot_recovery: List[Step], metadata: dict, requirements: dict, ): self.unlock_bootloader = unlock_bootloader - self.flash_recovery = flash_recovery + self.boot_recovery = boot_recovery self.metadata = metadata self.requirements = requirements self.device_code = metadata.get("devicecode") @@ -111,11 +111,11 @@ def from_file(cls, path): ] else: unlock_bootloader = [] - flash_recovery = [ - Step(**raw_step, title="Flash custom recovery") - for raw_step in raw_steps.get("flash_recovery", []) + boot_recovery = [ + Step(**raw_step, title="Boot custom recovery") + for raw_step in raw_steps.get("boot_recovery", []) ] - return cls(unlock_bootloader, flash_recovery, metadata, requirements) + return cls(unlock_bootloader, boot_recovery, metadata, requirements) def _load_config(device_code: str, config_path: Path) -> Optional[InstallerConfig]: @@ -157,7 +157,7 @@ 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_flash_recovery|fastboot_flash_boot|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_with_code|fastboot_get_unlock_data|fastboot_unlock|fastboot_oem_unlock|fastboot_reboot|heimdall_flash_recovery" ), schema.Optional("allow_skip"): bool, schema.Optional("img"): str, @@ -178,7 +178,7 @@ def validate_config(config: str) -> bool: }, "steps": { "unlock_bootloader": schema.Or(None, [step_schema]), - "flash_recovery": [step_schema], + "boot_recovery": [step_schema], }, } ) diff --git a/openandroidinstaller/tooling.py b/openandroidinstaller/tooling.py index 500ca281..a5e69dd2 100644 --- a/openandroidinstaller/tooling.py +++ b/openandroidinstaller/tooling.py @@ -250,7 +250,7 @@ def adb_twrp_wipe_and_install( for line in adb_reboot_bootloader(bin_path): yield line # boot to TWRP again - for line in fastboot_flash_recovery( + for line in fastboot_boot_recovery( bin_path=bin_path, recovery=recovery, is_ab=is_ab ): yield line @@ -354,7 +354,7 @@ def fastboot_reboot(bin_path: Path) -> TerminalResponse: @add_logging("Boot custom recovery with fastboot.") -def fastboot_flash_recovery( +def fastboot_boot_recovery( bin_path: Path, recovery: str, is_ab: bool = True ) -> TerminalResponse: """Temporarily, boot custom recovery with fastboot.""" @@ -423,8 +423,8 @@ def heimdall_flash_recovery(bin_path: Path, recovery: str) -> TerminalResponse: """Temporarily, flash custom recovery with heimdall.""" for line in run_command( "heimdall flash --no-reboot --RECOVERY", target=f"{recovery}", bin_path=bin_path - ): - yield line + ):boot_recovery + yield line def search_device(platform: str, bin_path: Path) -> Optional[str]: diff --git a/openandroidinstaller/views/start_view.py b/openandroidinstaller/views/start_view.py index 44c6d6c8..724a64b7 100644 --- a/openandroidinstaller/views/start_view.py +++ b/openandroidinstaller/views/start_view.py @@ -99,13 +99,13 @@ def check_bootloader_unlocked(e): """Enable skipping unlocking the bootloader if selected.""" if self.bootloader_switch.value: logger.info("Skipping bootloader unlocking.") - self.state.steps = copy.deepcopy(self.state.config.flash_recovery) + self.state.steps = copy.deepcopy(self.state.config.boot_recovery) self.state.num_total_steps = len(self.state.steps) else: logger.info("Enabled unlocking the bootloader again.") self.state.steps = copy.deepcopy( self.state.config.unlock_bootloader - ) + copy.deepcopy(self.state.config.flash_recovery) + ) + copy.deepcopy(self.state.config.boot_recovery) self.state.num_total_steps = len(self.state.steps) self.bootloader_switch = Switch( diff --git a/openandroidinstaller/views/step_view.py b/openandroidinstaller/views/step_view.py index 86e5ef23..4bc5e38a 100644 --- a/openandroidinstaller/views/step_view.py +++ b/openandroidinstaller/views/step_view.py @@ -38,7 +38,7 @@ adb_reboot_download, adb_sideload, adb_twrp_copy_partitions, - fastboot_flash_recovery, + fastboot_boot_recovery, fastboot_flash_boot, fastboot_oem_unlock, fastboot_reboot, @@ -217,8 +217,8 @@ def call_to_phone(self, e, command: str): ), "fastboot_oem_unlock": fastboot_oem_unlock, "fastboot_get_unlock_data": fastboot_get_unlock_data, - "fastboot_flash_recovery": partial( - fastboot_flash_recovery, + "fastboot_boot_recovery": partial( + fastboot_boot_recovery, recovery=self.state.recovery_path, is_ab=self.state.is_ab, ), From 66d6cbac71f56e36a35c718f7986af174451f203 Mon Sep 17 00:00:00 2001 From: MagicLike Date: Sun, 12 Mar 2023 20:52:06 +0100 Subject: [PATCH 14/21] Updated bacon configs to new TWRP booting --- openandroidinstaller/assets/configs/A0001.yaml | 11 ++++------- openandroidinstaller/assets/configs/bacon.yaml | 11 ++++------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/openandroidinstaller/assets/configs/A0001.yaml b/openandroidinstaller/assets/configs/A0001.yaml index 85c25d8e..9f43951f 100644 --- a/openandroidinstaller/assets/configs/A0001.yaml +++ b/openandroidinstaller/assets/configs/A0001.yaml @@ -26,17 +26,14 @@ steps: 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. - flash_recovery: + boot_recovery: - type: call_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. 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: > - Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. - Notice: In some cases the bootloader won't boot into the flashed recovery automatically, but rather boot the normal system. - If this happens, please run the following command via adb and wait for a moment: `adb reboot recovery` - Now click 'Continue'. - command: fastboot_flash_recovery \ No newline at end of file + Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. + command: fastboot_boot_recovery \ No newline at end of file diff --git a/openandroidinstaller/assets/configs/bacon.yaml b/openandroidinstaller/assets/configs/bacon.yaml index 4fe1c451..34b2e187 100644 --- a/openandroidinstaller/assets/configs/bacon.yaml +++ b/openandroidinstaller/assets/configs/bacon.yaml @@ -26,17 +26,14 @@ steps: 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. - flash_recovery: + boot_recovery: - type: call_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. 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: > - Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. - Notice: In some cases the bootloader won't boot into the flashed recovery automatically, but rather boot the normal system. - If this happens, please run the following command via adb and wait for a moment: `adb reboot recovery` - Now click 'Continue'. - command: fastboot_flash_recovery \ No newline at end of file + Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue. + command: fastboot_boot_recovery \ No newline at end of file From 6880808056c2bb4cce6547f56368d2ffd3a835e6 Mon Sep 17 00:00:00 2001 From: MagicLike Date: Sun, 12 Mar 2023 22:30:16 +0100 Subject: [PATCH 15/21] Code formatting --- openandroidinstaller/openandroidinstaller.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openandroidinstaller/openandroidinstaller.py b/openandroidinstaller/openandroidinstaller.py index 92868949..6c1aa578 100644 --- a/openandroidinstaller/openandroidinstaller.py +++ b/openandroidinstaller/openandroidinstaller.py @@ -97,7 +97,10 @@ def __init__(self, state: AppState): ) # create the install view - self.install_view = InstallView(on_confirm=self.to_next_view, state=self.state) + self.install_view = InstallView( + on_confirm=self.to_next_view, + state=self.state, + ) # create the final success view self.final_view = SuccessView(state=self.state) From 13c3500fbc8822b823dce382f387f2d626768c08 Mon Sep 17 00:00:00 2001 From: MagicLike Date: Mon, 13 Mar 2023 11:08:43 +0100 Subject: [PATCH 16/21] Added restart button on final page --- openandroidinstaller/openandroidinstaller.py | 24 +++++++++++++++----- openandroidinstaller/views/success_view.py | 21 ++++++++++++++++- 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/openandroidinstaller/openandroidinstaller.py b/openandroidinstaller/openandroidinstaller.py index 6c1aa578..bc239841 100644 --- a/openandroidinstaller/openandroidinstaller.py +++ b/openandroidinstaller/openandroidinstaller.py @@ -76,7 +76,7 @@ def __init__(self, state: AppState): self.view = Column(expand=True, width=1200) # create default starter views - welcome_view = WelcomeView( + self.welcome_view = WelcomeView( on_confirm=self.to_next_view, state=self.state, ) @@ -103,7 +103,10 @@ def __init__(self, state: AppState): ) # create the final success view - self.final_view = SuccessView(state=self.state) + self.success_view = SuccessView( + on_confirm=self.restart, + state=self.state, + ) # initialize the addon view self.select_addon_view = AddonsView( @@ -120,7 +123,7 @@ def __init__(self, state: AppState): select_files_view, requirements_view, start_view, - welcome_view, + self.welcome_view, ] ) self.state.add_addon_views( @@ -132,7 +135,7 @@ def __init__(self, state: AppState): # final default views, ordered to allow to pop self.state.add_final_default_views( views=[ - self.final_view, + self.success_view, self.install_view, ] ) @@ -178,10 +181,19 @@ def to_next_view(self, e): # else: # # display the final view - # self.view.controls.append(self.final_view) + # self.view.controls.append(self.success_view) logger.info("Confirmed and moved to next step.") self.view.update() - + + def restart(self, e): + """Method to display the first view.""" + self.welcome_view.init_visuals() + # clear the current view + self.view.controls = [] + # retrieve the new view and update + self.view.controls.append(self.welcome_view) + logger.info("Restart.") + self.view.update() def configure(page: Page): """Configure the application.""" diff --git a/openandroidinstaller/views/success_view.py b/openandroidinstaller/views/success_view.py index e7f84bf6..fbc88464 100644 --- a/openandroidinstaller/views/success_view.py +++ b/openandroidinstaller/views/success_view.py @@ -13,6 +13,8 @@ # If not, see .""" # Author: Tobias Sterbak +from typing import Callable + import webbrowser from loguru import logger from flet import ( @@ -20,6 +22,7 @@ Row, Text, Markdown, + icons, ) from views import BaseView @@ -28,8 +31,13 @@ class SuccessView(BaseView): - def __init__(self, state: AppState): + def __init__( + self, + state: AppState, + on_confirm: Callable, + ): super().__init__(state=state, image="success.png") + self.on_confirm = on_confirm def build( self, @@ -69,5 +77,16 @@ def close_window(e): ) ] ), + Row( + [ + ElevatedButton( + "Flash new device", + on_click=self.on_confirm, + icon=icons.RESTART_ALT, + disabled=False, + expand=True, + ) + ] + ), ] return self.view From 4222309a5d0bd8362d415f74883b3151e9041bd0 Mon Sep 17 00:00:00 2001 From: MagicLike Date: Mon, 13 Mar 2023 20:19:33 +0100 Subject: [PATCH 17/21] Put restart and finish buttons next to each other --- openandroidinstaller/views/success_view.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/openandroidinstaller/views/success_view.py b/openandroidinstaller/views/success_view.py index fbc88464..38ade88d 100644 --- a/openandroidinstaller/views/success_view.py +++ b/openandroidinstaller/views/success_view.py @@ -68,15 +68,6 @@ def close_window(e): """, on_tap_link=lambda e: self.page.launch_url(e.data), ), - Row( - [ - ElevatedButton( - "Finish and close", - expand=True, - on_click=close_window, - ) - ] - ), Row( [ ElevatedButton( @@ -85,8 +76,14 @@ def close_window(e): icon=icons.RESTART_ALT, disabled=False, expand=True, + ), + ElevatedButton( + "Finish and close", + on_click=close_window, + icon=icons.EXIT_TO_APP_OUTLINED, + expand=True, ) ] - ), + ) ] return self.view From 2d7b0e21533fc025b1e6b4f55745b87bde1cb84c Mon Sep 17 00:00:00 2001 From: MagicLike Date: Mon, 13 Mar 2023 20:22:18 +0100 Subject: [PATCH 18/21] Updated search icon Updated the search icon, due to coming support for other devices than phones. --- openandroidinstaller/views/start_view.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openandroidinstaller/views/start_view.py b/openandroidinstaller/views/start_view.py index 44c6d6c8..b7e09487 100644 --- a/openandroidinstaller/views/start_view.py +++ b/openandroidinstaller/views/start_view.py @@ -186,7 +186,7 @@ def build(self): FilledButton( "Search for device", on_click=self.search_devices, - icon=icons.PHONE_ANDROID, + icon=icons.DEVICES_OTHER_OUTLINED, expand=True, tooltip="Search for a connected device.", ), From dd1c897e794684ae095bf8954072653144f16bd3 Mon Sep 17 00:00:00 2001 From: MagicLike Date: Mon, 20 Mar 2023 21:36:26 +0100 Subject: [PATCH 19/21] Fixed image not showing in "Boot custom recovery" --- openandroidinstaller/views/step_view.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openandroidinstaller/views/step_view.py b/openandroidinstaller/views/step_view.py index 4bc5e38a..eb484eb3 100644 --- a/openandroidinstaller/views/step_view.py +++ b/openandroidinstaller/views/step_view.py @@ -106,7 +106,7 @@ def check_advanced_switch(e): # main controls steps_indictor_img_lookup = { "Unlock the bootloader": "steps-header-unlock.png", - "Flash custom recovery": "steps-header-recovery.png", + "Boot custom recovery": "steps-header-recovery.png", } self.right_view_header.controls = [ get_title( From 475cfa357c316f95467f871d3a896ecfad308ac3 Mon Sep 17 00:00:00 2001 From: MagicLike Date: Thu, 23 Mar 2023 19:45:19 +0100 Subject: [PATCH 20/21] Revert "Put restart and finish buttons next to each other" This reverts commit 4222309a5d0bd8362d415f74883b3151e9041bd0. --- openandroidinstaller/views/success_view.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/openandroidinstaller/views/success_view.py b/openandroidinstaller/views/success_view.py index 38ade88d..fbc88464 100644 --- a/openandroidinstaller/views/success_view.py +++ b/openandroidinstaller/views/success_view.py @@ -68,6 +68,15 @@ def close_window(e): """, on_tap_link=lambda e: self.page.launch_url(e.data), ), + Row( + [ + ElevatedButton( + "Finish and close", + expand=True, + on_click=close_window, + ) + ] + ), Row( [ ElevatedButton( @@ -76,14 +85,8 @@ def close_window(e): icon=icons.RESTART_ALT, disabled=False, expand=True, - ), - ElevatedButton( - "Finish and close", - on_click=close_window, - icon=icons.EXIT_TO_APP_OUTLINED, - expand=True, ) ] - ) + ), ] return self.view From f24ed79a36c12d132e5ab007b44fd0ec9b569ef6 Mon Sep 17 00:00:00 2001 From: MagicLike Date: Thu, 23 Mar 2023 19:45:52 +0100 Subject: [PATCH 21/21] Revert "Added restart button on final page" This reverts commit 13c3500fbc8822b823dce382f387f2d626768c08. --- openandroidinstaller/openandroidinstaller.py | 24 +++++--------------- openandroidinstaller/views/success_view.py | 21 +---------------- 2 files changed, 7 insertions(+), 38 deletions(-) diff --git a/openandroidinstaller/openandroidinstaller.py b/openandroidinstaller/openandroidinstaller.py index bc239841..6c1aa578 100644 --- a/openandroidinstaller/openandroidinstaller.py +++ b/openandroidinstaller/openandroidinstaller.py @@ -76,7 +76,7 @@ def __init__(self, state: AppState): self.view = Column(expand=True, width=1200) # create default starter views - self.welcome_view = WelcomeView( + welcome_view = WelcomeView( on_confirm=self.to_next_view, state=self.state, ) @@ -103,10 +103,7 @@ def __init__(self, state: AppState): ) # create the final success view - self.success_view = SuccessView( - on_confirm=self.restart, - state=self.state, - ) + self.final_view = SuccessView(state=self.state) # initialize the addon view self.select_addon_view = AddonsView( @@ -123,7 +120,7 @@ def __init__(self, state: AppState): select_files_view, requirements_view, start_view, - self.welcome_view, + welcome_view, ] ) self.state.add_addon_views( @@ -135,7 +132,7 @@ def __init__(self, state: AppState): # final default views, ordered to allow to pop self.state.add_final_default_views( views=[ - self.success_view, + self.final_view, self.install_view, ] ) @@ -181,19 +178,10 @@ def to_next_view(self, e): # else: # # display the final view - # self.view.controls.append(self.success_view) + # self.view.controls.append(self.final_view) logger.info("Confirmed and moved to next step.") self.view.update() - - def restart(self, e): - """Method to display the first view.""" - self.welcome_view.init_visuals() - # clear the current view - self.view.controls = [] - # retrieve the new view and update - self.view.controls.append(self.welcome_view) - logger.info("Restart.") - self.view.update() + def configure(page: Page): """Configure the application.""" diff --git a/openandroidinstaller/views/success_view.py b/openandroidinstaller/views/success_view.py index fbc88464..e7f84bf6 100644 --- a/openandroidinstaller/views/success_view.py +++ b/openandroidinstaller/views/success_view.py @@ -13,8 +13,6 @@ # If not, see .""" # Author: Tobias Sterbak -from typing import Callable - import webbrowser from loguru import logger from flet import ( @@ -22,7 +20,6 @@ Row, Text, Markdown, - icons, ) from views import BaseView @@ -31,13 +28,8 @@ class SuccessView(BaseView): - def __init__( - self, - state: AppState, - on_confirm: Callable, - ): + def __init__(self, state: AppState): super().__init__(state=state, image="success.png") - self.on_confirm = on_confirm def build( self, @@ -77,16 +69,5 @@ def close_window(e): ) ] ), - Row( - [ - ElevatedButton( - "Flash new device", - on_click=self.on_confirm, - icon=icons.RESTART_ALT, - disabled=False, - expand=True, - ) - ] - ), ] return self.view