Test with LineageOS 19.1 on yuga

Author: tsterbak

README.md

@@ -86,7 +86,7 @@ Every step in the config file corresponds to one view in the application. These
 - `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`.
 
-The file should be named after device name output by `adb shell getprop | grep ro.poroduct.device` when the devices is connected to the computer. You can also get the device code by connecting the device to the computer and run OpenAndroidInstaller to detect the device.
+The file should be named after device name output by `adb shell getprop | grep ro.product.device` when the devices is connected to the computer. You can also get the device code by connecting the device to the computer and run OpenAndroidInstaller to detect the device.
 
 To test your config file with the executable without using the developer setup, place it in the same directory as the executable. There it will be detected by name. 
 After you created a config file and it works fine, you can open a pull request to make the file available to other users. Please also add the device to the supported devices table above.

openandroidinstaller/assets/configs/yuga.yaml

@@ -12,17 +12,21 @@ steps:
       content: Go to service info > configuration and check rooting status - you can only continue if it says 'Bootloader unlock allowed":" Yes.'
     - title: "Unlock the bootloader"
       type: confirm_button
-      content: Connect the device to your PC via USB. And confirm to continue.
-    - title: "Unlock the bootloader"
-      type: call_button
-      content: Press the button to reboot into the bootloader now. Then confirm to continue.
-      command: "adb reboot bootloader"
+      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.
     - title: "Unlock the bootloader"
       type: link_button_with_confirm
       content: >
         Click on the button to open the instructions on Sonys official unlocking website to generate an unlock code for your bootloader.
-        Once you got the code, continue to input the code. 
+        Once you got the code write it down somewhere and continue to input the code. 
       link: https://developer.sonymobile.com/unlockbootloader/unlock-yourboot-loader/
+    - title: "Unlock the bootloader"
+      type: confirm_button
+      content: Connect the device to your PC via USB. And confirm to continue.
+    - title: "Unlock the bootloader"
+      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"
     - title: "Unlock the bootloader"
       type: call_button_with_input
       content: >
@@ -59,14 +63,19 @@ steps:
     - title: "Flash LineageOS"
       type: confirm_button
       content: >
-        Return to the previous menu and tap 'Advanced Wipe', then select the 'Cache' and 'System' partitions and then 'Swipe to Wipe' on the phone.
-        Once it's finished, confirm here to continue.
+        Return to the previous menu on your phone by going back two times. 
+        Them tap 'Advanced Wipe', and select the 'Cache' and 'System' partitions and then 'Swipe to Wipe'. 
+        Confirm to continue once you are done.
     - title: "Flash LineageOS"
       type: confirm_button
-      content: On the device, go back to the main menu and select “Advanced”, “ADB Sideload”, then swipe to begin sideload. Then confirm here
+      content: >
+        Now connect the phone to the computer again with the USB-cable. On the device, go back three times and select “Advanced”, 
+        then “ADB Sideload”. Select 'Wipe cache' and 'Wipe dalvik cache', then swipe to begin sideload. Then confirm here.
     - title: "Flash LineageOS"
       type: call_button
-      content: By pressing the button, you flash lineageOS image now. This can take a while. Don't remove the USB-Cable!
+      content: >
+        Now it's time to flash the LineageOS image. Don't remove the USB-Cable and press 'Confirm and run' to start! 
+        This might take a while. Confirm after it's done.
       command: "adb sideload <image>"
     - title: "Reboot"
       type: call_button

openandroidinstaller/installer_config.py

@@ -43,6 +43,7 @@ def __init__(
 
 
 class InstallerConfig:
+
     def __init__(
         self,
         unlock_bootloader: List[Step],

openandroidinstaller/openandroidinstaller.py

@@ -34,7 +34,7 @@
 from widgets import call_button, confirm_button, get_title, link_button
 
 # Toggle to True for development purposes
-DEVELOPMENT = True 
+DEVELOPMENT = False
 DEVELOPMENT_CONFIG = "yuga"  # "a3y17lte"  # "sargo"
 
 
@@ -187,6 +187,10 @@ def close_developer_options_dlg(self, e):
 
     def search_devices(self, e):
         """Search the device when the button is clicked."""
+        # map some detected device codes to their real code.
+        device_code_mapping = {
+            "C6603": "yuga",
+        }
         # search the device
         if DEVELOPMENT:
             # this only happens for testing
@@ -197,6 +201,7 @@ def search_devices(self, e):
         else:
             device_code = search_device(platform=PLATFORM, bin_path=BIN_PATH)
             if device_code:
+                device_code = device_code_mapping.get(device_code, device_code)
                 self.device_name.value = device_code
             else:
                 self.device_name.value = (