Config for Motorola moto g7 power

Author: tsterbak

README.md

@@ -44,7 +44,7 @@ Samsung | Galaxy S7 | [herolte](https://wiki.lineageos.org/devices/herolte/) | S
 Samsung | Galaxy S9 | [starlte](https://wiki.lineageos.org/devices/starlte/) | | tested
 Samsung | Galaxy S10 | beyond1lte | | tested
 Google | Pixel 3a | [sargo](https://wiki.lineageos.org/devices/sargo/) | sargo | tested
-Google | Pixel 4 | flame | flame | tested 
+Google | Pixel 4 | [flame](https://wiki.lineageos.org/devices/flame/) | flame | tested 
 Google | Pixel 4a | sunfish | sunfish | tested 
 Google | Pixel 5 | redfin | redfin | tested
 Google | Pixel 5a | barbet | barbet | tested
@@ -54,7 +54,7 @@ Sony | Xperia ZX | kagura | | planned
 Fairphone | Fairphone 2 | [FP2](https://wiki.lineageos.org/devices/FP2/) | | tested
 Fairphone | Fairphone 3 | [FP3](https://wiki.lineageos.org/devices/FP3/) | | tested
 Motorola | moto G5 | cedric | | planned
-Motorola | moto g7 power | ocean | | under development
+Motorola | moto g7 power | [ocean](https://wiki.lineageos.org/devices/ocean/) | | tested
 OnePlus | 6 | enchilada | | under development
 OnePlus | 6T | fajita | | under development
 OnePlus | 7T | hotdogb | | under development
@@ -105,7 +105,7 @@ Every step in the config file corresponds to one view in the application. These
   - `call_button_with_input`: Display the content text, an input field and a button that runs a given command. The inputtext, can be used in the command by using the `<inputtext>` placeholder in the command field. After the command is run, a confirm button is displayed to allow the user to move to the next step.
   - `link_button_with_confirm`: Display a button that opens a browser with a given link, confirm afterwards. Link is given in `link`.
 - `content`: str; The content text displayed alongside the action of the step. Used to inform the user about whats going on.
-- `command`: [ONLY for call_button* steps] str; The command to run. One of `adb_reboot`, `adb_reboot_bootloader`, `adb_reboot_download`, `adb_sideload`, `adb_twrp_wipe_and_install`, `fastboot_flash_recovery`, `fastboot_unlock_with_code`, `fastboot_unlock`, `fastboot_oem_unlock`, `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_flash_recovery`, `fastboot_unlock_with_code`, `fastboot_unlock`, `fastboot_oem_unlock`, `fastboot_get_unlock_data`, `fastboot_reboot`, `heimdall_flash_recovery`.
 - `img`: [OPTIONAL] Display an image on the left pane of the step view. Images are loaded from `openandroidinstaller/assets/imgs/`.
 - `allow_skip`: [OPTIONAL] boolean; If a skip button should be displayed to allow skipping this step. Can be useful when the bootloader is already unlocked.
 - `link`: [OPTIONAL] Link to use for the link button if type is `link_button_with_confirm`.

openandroidinstaller/assets/configs/ocean.yaml

@@ -1,34 +1,33 @@
 metadata:
   maintainer: Tobias Sterbak (tsterbak)
   devicename: Moto G7 power
-  devicecode: Ocean 
-requirements:
-  copy_partitions: True
+  devicecode: ocean 
 steps:
   unlock_bootloader:
-    - type: confirm_button
+    - type: call_button 
+      command: adb_reboot_bootloader
       content: >
         As a first step, you need to unlock the bootloader of your device. A bootloader is the piece of software, that tells your phone
-        how to start and run an operating system (like Android). On the device, dial *#06# to launch the service menu.
-    - type: confirm_button
-      content: Go to service info > configuration and check rooting status - you can only continue if it says 'Bootloader unlock allowed":" Yes.'
-    - type: confirm_button
+        how to start and run an operating system (like Android). You need to boot into fastboot mode by pressing the 'Confirm and run' button. Then continue.
+    - type: call_button 
+      command: fastboot_get_unlock_data
       content: >
-        Now go to Settings 'About the phone' and then Status. Write down the IMEI of your device. You will need it in the next step.
+        Now you need to get your device ID to get an unlock code from Motorola. Press 'Confirm and run' to get the ID. (You need to toggle 'Advanced Output' here to see it.)
+        Copy it to a separate file to use it in the next step.
     - type: link_button_with_confirm
       content: >
         Click on the button to open the instructions on Motorola's official unlocking website to generate an unlock code for your bootloader.
-        Once you got the code write it down somewhere and continue to input the code. 
+        Copy the code from the last step to the website and follow the instructions there. Then continue here.
       link: https://motorola-global-portal.custhelp.com/app/standalone/bootloader/unlock-your-device-a
     - type: confirm_button
       content: Connect the device to your PC via USB. And confirm to continue.
-    - type: call_button
-      content: Press the button to reboot into the bootloader now. When the notification light turns blue, confirm to continue.
-      command: adb_reboot_bootloader
     - type: call_button_with_input
       content: >
-        Use your code to unlock the bootloader of your device. Type in the full 18 character code starting with 0x (Example: 0x3EC4F7AD6E0B32B6).
-        If you already did that, you can skip this step.
+        Use your code to unlock the bootloader of your device. Type in the full 21 character code you received by email (Example: 5RTSQCYL7ZJKL4NN35MY). Then confirm an run. Afterwards you can continue.
+      command: fastboot_unlock_with_code
+    - type: call_button_with_input
+      content: >
+        You need to perform the last command again, so reenter the code and run again. Afterwards you can continue.
       command: fastboot_unlock_with_code
     - type: call_button
       content: >
@@ -45,10 +44,19 @@ steps:
     - type: call_button
       content: Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue.
       command: fastboot_flash_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
+      content: >
+        Now we need to boot into recovery again. Press run and when you see the TWRP screen you can continue.
   install_os:
     - type: call_button 
       content: >
-        In the next steps, you finally flash the selected OS image.
+        In this last step, you finally flash the selected OS image.
         Wait until the TWRP screen appears. Then run the command.
         This step will format your phone and wipe all the data. It will also remove encryption and delete all files stored 
         in the internal storage. Then the OS image will be installed. Confirm to run. This might take a while. At the end your phone will boot into the new OS.

openandroidinstaller/installer_config.py

@@ -62,7 +62,6 @@ def __init__(
         self.install_os = install_os
         self.metadata = metadata
         self.requirements = requirements
-        self.copy_partitions = requirements.get("copy_partitions", False)
 
     @classmethod
     def from_file(cls, path):
@@ -137,7 +136,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|fastboot_flash_recovery|fastboot_unlock_with_code|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_flash_recovery|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,
@@ -154,7 +153,6 @@ def validate_config(config: str) -> bool:
             schema.Optional("requirements"): {
                 schema.Optional("android"): schema.Or(str, int),
                 schema.Optional("firmware"): str,
-                schema.Optional("copy_partitions"): bool,
             },
             "steps": {
                 "unlock_bootloader": schema.Or(None, [step_schema]),

openandroidinstaller/openandroidinstaller.py

@@ -46,7 +46,7 @@
 logger.add("openandroidinstaller.log")
 
 # Toggle to True for development purposes
-DEVELOPMENT = True
+DEVELOPMENT = False 
 DEVELOPMENT_CONFIG = "sargo"  # "a3y17lte"  # "sargo"
 
 

openandroidinstaller/tooling.py

@@ -101,42 +101,53 @@ def adb_sideload(bin_path: Path, target: str) -> bool:
         yield True
 
 
+def adb_twrp_copy_partitions(bin_path: Path, config_path: Path):
+    # some devices like one plus 6t or motorola moto g7 power need the partitions copied to prevent a hard brick
+    logger.info("Sideload copy_partitions script with adb.")
+    # activate sideload
+    for line in run_command("adb", ["shell", "twrp", "sideload"], bin_path):
+        yield line
+    if (type(line) == bool) and not line:
+        logger.error("Activating sideload failed.")
+        yield False
+        return
+    # now sideload the script
+    sleep(5)
+    logger.info("Sideload the copy_partitions script")
+    for line in run_command(
+        "adb",
+        [
+            "sideload",
+            str(config_path.parent) + "/copy-partitions-20220613-signed.zip",
+        ],
+        bin_path,
+    ):
+        yield line
+    if (type(line) == bool) and not line:
+        logger.error("Sideloading copy-partitions-20220613-signed.zip failed.")
+    sleep(10)
+    # reboot into the bootloader again
+    logger.info("Rebooting device into bootloader with adb.")
+    for line in run_command("adb", ["reboot", "bootloader"], bin_path):
+        yield line
+    if (type(line) == bool) and not line:
+        logger.error("Reboot into bootloader failed.")
+        yield False
+        return
+    sleep(7)
+    # Copy partitions end #
+    return True
+
+
 def adb_twrp_wipe_and_install(
-    bin_path: Path, target: str, config_path: Path, copy_partitions: bool = False
+    bin_path: Path, target: str, config_path: Path
 ) -> bool:
     """Wipe and format data with twrp, then flash os image with adb.
 
     Only works for twrp recovery.
     """
     logger.info("Wipe and format data with twrp, then install os image.")
     sleep(7)
-    # some devices like one plus 6t or motorola moto g7 power need the partitions copied to prevent a hardbrick
-    if copy_partitions:
-        logger.info("Sideload copy_partitions script with adb.")
-        # activate sideload
-        for line in run_command("adb", ["shell", "twrp", "sideload"], bin_path):
-            yield line
-        if (type(line) == bool) and not line:
-            logger.error("Activating sideload failed.")
-            yield False
-            return
-        # now sideload the script
-        sleep(5)
-        logger.info("Sideload the copy_partitions script")
-        for line in run_command(
-            "adb",
-            [
-                "sideload",
-                str(config_path.parent) + "/copy-partitions-20220613-signed.zip",
-            ],
-            bin_path,
-        ):
-            yield line
-        if (type(line) == bool) and not line:
-            logger.error("Sideloading copy-partitions-20220613-signed.zip failed.")
-        sleep(5)
-    # Copy partitions end #
-
     # now perform a factory reset
     for line in run_command("adb", ["shell", "twrp", "format", "data"], bin_path):
         yield line
@@ -193,7 +204,7 @@ def adb_twrp_wipe_and_install(
                 return
             break
     # finally reboot into os
-    sleep(5)
+    sleep(7)
     logger.info("Reboot into OS.")
     for line in run_command("adb", ["reboot"], bin_path):  # "shell", "twrp",
         yield line
@@ -241,6 +252,18 @@ def fastboot_oem_unlock(bin_path: Path) -> bool:
         yield True
 
 
+def fastboot_get_unlock_data(bin_path: Path) -> bool:
+    """Get the unlock data with fastboot"""
+    logger.info("Get unlock data with fastboot")
+    for line in run_command("fastboot", ["oem", "get_unlock_data"], bin_path):
+        yield line
+    if (type(line) == bool) and not line:
+        logger.error("Getting unlock data failed.")
+        yield False
+    else:
+        yield True
+
+
 def fastboot_reboot(bin_path: Path) -> bool:
     """Reboot with fastboot"""
     logger.info("Rebooting device with fastboot.")

openandroidinstaller/views/step_view.py

@@ -42,11 +42,13 @@
     adb_reboot_download,
     adb_sideload,
     adb_twrp_wipe_and_install,
+    adb_twrp_copy_partitions,
     fastboot_flash_recovery,
     fastboot_oem_unlock,
     fastboot_reboot,
     fastboot_unlock,
     fastboot_unlock_with_code,
+    fastboot_get_unlock_data,
     heimdall_flash_recovery,
 )
 from widgets import (
@@ -199,13 +201,14 @@ def call_to_phone(self, e, command: str):
                 adb_twrp_wipe_and_install,
                 target=self.state.image_path,
                 config_path=self.state.config_path,
-                copy_partitions=self.state.config.copy_partitions,
             ),
+            "adb_twrp_copy_partitions": partial(adb_twrp_copy_partitions, config_path=self.state.config_path),
             "fastboot_unlock": fastboot_unlock,
             "fastboot_unlock_with_code": partial(
                 fastboot_unlock_with_code, unlock_code=self.inputtext.value
             ),
             "fastboot_oem_unlock": fastboot_oem_unlock,
+            "fastboot_get_unlock_data": fastboot_get_unlock_data,
             "fastboot_flash_recovery": partial(
                 fastboot_flash_recovery, recovery=self.state.recovery_path
             ),