Merge branch 'dev' into config-formatting

README.md

@@ -62,7 +62,7 @@ Linux is currently the best supported platform (tested with Ubuntu 20.04/22.04 L
 
 ## Officially supported devices
 
-Currently, the **we support 56 devices** by various vendors and working on adding more soon!
+Currently, the **we support 57 devices** by various vendors and working on adding more soon!
 
 
 Support for these devices is provided as best effort, but things might still go wrong.
@@ -198,6 +198,7 @@ A config file consists of two parts. The first part are some metadata about the
 Every config file should have `metadata` with the following fields:
 - `maintainer`: str; Maintainer and author of the config file.
 - `device_name`: str; Name of the device.
+- `is_ab_device`: bool; A boolean to determine if the device is a/b-partitioned or not.
 - `device_code`: str; The official device code.
 - `supported_device_codes`: List[str]; A list of supported device codes for the config. The config will be loaded based on this field.
 - `twrp-link`: [OPTIONAL] str; name of the corresponding twrp page.

openandroidinstaller/app_state.py

@@ -43,7 +43,6 @@ def __init__(
         self.config = None
         self.image_path = None
         self.recovery_path = None
-        self.is_ab = None
 
         # store views
         self.default_views: List = []

openandroidinstaller/assets/configs/FP2.yaml

@@ -1,6 +1,7 @@
 metadata:
   maintainer: Tobias Sterbak (tsterbak)
   device_name: Fairphone 2
+  is_ab_device: false
   device_code: FP2
   supported_device_codes:
     - FP2

openandroidinstaller/assets/configs/FP3.yaml

@@ -1,6 +1,7 @@
 metadata:
   maintainer: Tobias Sterbak (tsterbak)
   device_name: Fairphone 3
+  is_ab_device: true
   device_code: FP3
   supported_device_codes:
     - FP3

openandroidinstaller/assets/configs/FP4.yaml

@@ -1,6 +1,7 @@
 metadata:
   maintainer: Tobias Sterbak (tsterbak)
   device_name: Fairphone 4
+  is_ab_device: true
   device_code: FP4
   supported_device_codes:
     - FP4

openandroidinstaller/assets/configs/a3y17lte.yaml

@@ -1,6 +1,7 @@
 metadata:
   maintainer: Tobias Sterbak (tsterbak)
   device_name: Samsung Galaxy A3 (2017)
+  is_ab_device: false 
   device_code: a3y17lte
   supported_device_codes:
     - a3y17lte

openandroidinstaller/assets/configs/a5xelte.yaml

@@ -1,6 +1,7 @@
 metadata:
   maintainer: Tobias Sterbak (tsterbak)
   device_name: Samsung Galaxy A5 (2016)
+  is_ab_device: false 
   device_code: a5xelte
   supported_device_codes:
     - a5xelte

openandroidinstaller/assets/configs/a72q.yaml

@@ -1,6 +1,7 @@
 metadata:
   maintainer: Tobias Sterbak (tsterbak)
   device_name: Samsung Galaxy A72
+  is_ab_device: false 
   device_code: a72q 
   supported_device_codes:
     - a72q 

openandroidinstaller/assets/configs/a7xelte.yaml

@@ -1,6 +1,7 @@
 metadata:
   maintainer: Tobias Sterbak (tsterbak)
   device_name: Samsung Galaxy A7 (2016) 
+  is_ab_device: false 
   device_code: a7xelte
   supported_device_codes:
     - a7xelte

openandroidinstaller/assets/configs/akari.yaml

@@ -1,6 +1,7 @@
 metadata:
   maintainer: Tobias Sterbak (tsterbak)
   device_name: Sony Xperia XZ2
+  is_ab_device: true
   device_code: akari 
   supported_device_codes:
     - akari 

openandroidinstaller/assets/configs/akatsuki.yaml

@@ -1,6 +1,7 @@
 metadata:
   maintainer: Tobias Sterbak (tsterbak)
   device_name: Sony Xperia XZ3
+  is_ab_device: true
   device_code: akatsuki 
   supported_device_codes:
     - akatsuki 

openandroidinstaller/assets/configs/avicii.yaml

@@ -1,6 +1,7 @@
 metadata:
   maintainer: Tobias Sterbak (tsterbak)
   device_name: OnePlus Nord
+  is_ab_device: true
   device_code: avicii
   supported_device_codes:
     - avicii
@@ -16,17 +17,13 @@ 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.
-      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
+        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.
+      content: > 
+        The bootloader is now unlocked. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue.
   boot_recovery:
     - type: call_button
       content: >
@@ -36,13 +33,14 @@ steps:
       command: adb_reboot_bootloader
     - type: call_button
       img: twrp-start.jpeg
-      content: Boot 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_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.
+      command: adb_twrp_copy_partitions
     - type: call_button
       img: twrp-start.jpeg
       content: >

openandroidinstaller/assets/configs/bacon.yaml

@@ -1,6 +1,7 @@
 metadata:
   maintainer: MagicLike
   device_name: OnePlus One
+  is_ab_device: false
   device_code: bacon
   supported_device_codes:
     - bacon

openandroidinstaller/assets/configs/barbet.yaml

@@ -1,6 +1,7 @@
 metadata:
   maintainer: Tobias Sterbak (tsterbak)
   device_name: Pixel 5a
+  is_ab_device: true
   device_code: barbet 
   supported_device_codes:
     - barbet 

openandroidinstaller/assets/configs/beyond0lte.yaml

@@ -1,6 +1,7 @@
 metadata:
   maintainer: Tobias Sterbak (tsterbak)
   device_name: Samsung Galaxy S10e
+  is_ab_device: false
   device_code: beyond0lte 
   supported_device_codes:
     - beyond0lte 

openandroidinstaller/assets/configs/beyond1lte.yaml

@@ -1,6 +1,7 @@
 metadata:
   maintainer: Tobias Sterbak (tsterbak)
   device_name: Samsung Galaxy S10
+  is_ab_device: false 
   device_code: beyond1lte 
   supported_device_codes:
     - beyond1lte 

openandroidinstaller/assets/configs/beyond2lte.yaml

@@ -1,6 +1,7 @@
 metadata:
   maintainer: Tobias Sterbak (tsterbak)
   device_name: Samsung Galaxy S10+
+  is_ab_device: false
   device_code: beyond2lte 
   supported_device_codes:
     - beyond2lte 

openandroidinstaller/assets/configs/blueline.yaml

@@ -1,6 +1,7 @@
 metadata:
   maintainer: Tobias Sterbak (tsterbak)
   device_name: Google Pixel 3
+  is_ab_device: true
   device_code: blueline
   supported_device_codes:
     - blueline

openandroidinstaller/assets/configs/bonito.yaml

@@ -1,6 +1,7 @@
 metadata:
   maintainer: Tobias Sterbak (tsterbak)
   device_name: Google Pixel 3a XL
+  is_ab_device: true
   device_code: bonito
   supported_device_codes:
     - bonito

openandroidinstaller/assets/configs/cedric.yaml

@@ -1,6 +1,7 @@
 metadata:
   maintainer: Tobias Sterbak (tsterbak)
   device_name: Motorola Moto G5
+  is_ab_device: false
   device_code: cedric
   supported_device_codes:
     - cedric

openandroidinstaller/assets/configs/cheeseburger.yaml

@@ -1,6 +1,7 @@
 metadata:
   maintainer: SirRGB
   device_name: OnePlus 5
+  is_ab_device: false
   device_code: cheeseburger
   supported_device_codes:
     - cheeseburger
@@ -15,17 +16,13 @@ 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.
-      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
+        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.
+      content: > 
+        The bootloader is now unlocked. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue.
   boot_recovery:
     - type: call_button
       content: >

openandroidinstaller/assets/configs/coral.yaml

@@ -1,6 +1,7 @@
 metadata:
   maintainer: Tobias Sterbak (tsterbak)
   device_name: Google Pixel 4 XL
+  is_ab_device: true
   device_code: coral
   supported_device_codes:
     - coral

openandroidinstaller/assets/configs/crosshatch.yaml

@@ -1,6 +1,7 @@
 metadata:
   maintainer: Tobias Sterbak (tsterbak)
   device_name: Google Pixel 3 XL
+  is_ab_device: true
   device_code: crosshatch
   supported_device_codes:
     - crosshatch

openandroidinstaller/assets/configs/crownlte.yaml

@@ -1,6 +1,7 @@
 metadata:
   maintainer: Tobias Sterbak (tsterbak)
   device_name: Samsung Galaxy Note 9 
+  is_ab_device: false
   device_code: crownlte 
   supported_device_codes:
     - crownlte 

openandroidinstaller/assets/configs/d1.yaml

@@ -1,6 +1,7 @@
 metadata:
   maintainer: Tobias Sterbak (tsterbak)
   device_name: Samsung Galaxy Note 10
+  is_ab_device: false
   device_code: d1 
   supported_device_codes:
     - d1 

openandroidinstaller/assets/configs/d2s.yaml

@@ -1,6 +1,7 @@
 metadata:
   maintainer: Tobias Sterbak (tsterbak)
   device_name: Samsung Galaxy Note 10+
+  is_ab_device: false
   device_code: d2s 
   supported_device_codes:
     - d2s

openandroidinstaller/assets/configs/dre.yaml

@@ -1,6 +1,7 @@
 metadata:
   maintainer: Tobias Sterbak (tsterbak)
   device_name: OnePlus Nord N200
+  is_ab_device: true
   device_code: dre
   supported_device_codes:
     - dre
@@ -16,17 +17,13 @@ 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.
-      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
+        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.
+      content: > 
+        The bootloader is now unlocked. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue.
   boot_recovery:
     - type: call_button
       content: >
@@ -36,13 +33,14 @@ steps:
       command: adb_reboot_bootloader
     - type: call_button
       img: twrp-start.jpeg
-      content: Boot 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_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.
+      command: adb_twrp_copy_partitions
     - type: call_button
       img: twrp-start.jpeg
       content: >

openandroidinstaller/assets/configs/dumpling.yaml

@@ -1,6 +1,7 @@
 metadata:
   maintainer: SirRGB
   device_name: OnePlus 5T
+  is_ab_device: false
   device_code: dumpling
   supported_device_codes:
     - dumpling
@@ -15,17 +16,13 @@ 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.
-      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
+        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.
+      content: > 
+        The bootloader is now unlocked. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue.
   boot_recovery:
     - type: call_button
       content: >
@@ -35,5 +32,6 @@ steps:
       command: adb_reboot_bootloader
     - type: call_button
       img: twrp-start.jpeg
-      content: Boot 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_boot_recovery