Merge branch 'dev' into zip

Makefile

@@ -1,3 +1,17 @@
+.phoney: install export format lint typing test app test-app build-app clean-build
+
+help:
+	@echo "install - install dependencies"
+	@echo "export - export dependencies to requirements.txt"
+	@echo "format - format code with black"
+	@echo "lint - lint code with ruff"
+	@echo "typing - type check code with mypy"
+	@echo "test - run tests"
+	@echo "app - run app"
+	@echo "test-app - run app in test mode with test config for sargo"
+	@echo "build-app - build app"
+	@echo "clean-build - clean build"
+
 poetry:
 	curl -sSL https://install.python-poetry.org | python3 -
 

README.md

@@ -57,7 +57,7 @@ Linux is currently the best supported platform (tested with Ubuntu 20.04/22.04 L
       - [MicroG](https://microg.org)
         - The recommended way to install MicroG is to use the zip file provided here: [https://github.com/FriendlyNeighborhoodShane/MinMicroG-abuse-CI/releases](https://github.com/FriendlyNeighborhoodShane/MinMicroG-abuse-CI/releases).
       - [F-Droid App-Store](https://f-droid.org/en/packages/org.fdroid.fdroid.privileged.ota).
-    - or you can just search the web or the [xda-developers forum](https://xdaforums.com) for an appropriate version for your device.
+    - or you can just search the web or the [xdaforums](https://xdaforums.com) for an appropriate version for your device.
 3. Start the desktop app and follow the instructions.
 
 ## Officially supported devices
@@ -111,9 +111,9 @@ Google | Pixel 3 | [blueline](https://wiki.lineageos.org/devices/blueline) | blu
 Google | Pixel 3 XL | [crosshatch](https://wiki.lineageos.org/devices/crosshatch) | crosshatch | tested
 Google | Pixel 3a | [sargo](https://wiki.lineageos.org/devices/sargo) | sargo | tested
 Google | Pixel 3a XL | [bonito](https://wiki.lineageos.org/devices/bonito) | bonito | tested
-Google | Pixel 4 | [flame](https://wiki.lineageos.org/devices/flame) | flame | tested 
-Google | Pixel 4 XL | [coral](https://wiki.lineageos.org/devices/coral) | coral | tested 
-Google | Pixel 4a | [sunfish](https://wiki.lineageos.org/devices/sunfish) | sunfish | tested 
+Google | Pixel 4 | [flame](https://wiki.lineageos.org/devices/flame) | flame | tested
+Google | Pixel 4 XL | [coral](https://wiki.lineageos.org/devices/coral) | coral | tested
+Google | Pixel 4a | [sunfish](https://wiki.lineageos.org/devices/sunfish) | sunfish | tested
 Google | Pixel 5 | [redfin](https://wiki.lineageos.org/devices/redfin) | redfin | tested
 Google | Pixel 5a | [barbet](https://wiki.lineageos.org/devices/barbet) | barbet | tested
 
@@ -148,13 +148,13 @@ Fairphone | Fairphone 4 | [FP4](https://wiki.lineageos.org/devices/FP4) | | test
 
 Vendor | Device Name | CodeName | Models | Status
 ---|---|---|---|---
-Motorola | edge | [racer](https://wiki.lineageos.org/devices/racer) | | tested
-Motorola | moto g5 | [cedric](https://wiki.lineageos.org/devices/cedric) | | tested
-Motorola | moto g6 plus | [evert](https://wiki.lineageos.org/devices/evert) | | tested
-Motorola | moto g7 power | [ocean](https://wiki.lineageos.org/devices/ocean) | | tested
-Motorola | moto g 5G plus / one 5G | [nairo](https://wiki.lineageos.org/devices/nairo) | | tested
-Motorola | moto g 5G / one 5G ace | [kiev](https://wiki.lineageos.org/devices/kiev) | | tested
-Motorola | moto z | [griffin](https://wiki.lineageos.org/devices/griffin) | | tested
+Motorola | edge | [racer](https://wiki.lineageos.org/devices/racer) | XT2063-2, XT2063-3 | tested
+Motorola | moto g5 | [cedric](https://wiki.lineageos.org/devices/cedric) | XT1670, XT1671, XT1672, XT1675, XT1676, XT1677 | tested
+Motorola | moto g6 plus | [evert](https://wiki.lineageos.org/devices/evert) | XT1926-2, XT1926-3, XT1926-5, XT1926-6, XT1926-7, XT1926-8, XT1926-9 | tested
+Motorola | moto g7 power | [ocean](https://wiki.lineageos.org/devices/ocean) | XT1955-1, XT1955-2, XT1955-4, XT1955-5, XT1955-7 | tested
+Motorola | moto g 5G plus / one 5G | [nairo](https://wiki.lineageos.org/devices/nairo) | XT2075-3, XT2075-5 | tested
+Motorola | moto g 5G / one 5G ace | [kiev](https://wiki.lineageos.org/devices/kiev) | XT2113-2, XT2113-3 | tested
+Motorola | moto z | [griffin](https://wiki.lineageos.org/devices/griffin) | XT1650-3, XT1650-05 | tested
 
 </details>
 
@@ -163,17 +163,18 @@ Motorola | moto z | [griffin](https://wiki.lineageos.org/devices/griffin) | | te
 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
-OnePlus | 6T | [fajita](https://wiki.lineageos.org/devices/fajita) | | tested
-OnePlus | 7 | [guacamoleb](https://wiki.lineageos.org/devices/guacamoleb) | | tested
-OnePlus | 7 Pro | [guacamole](https://wiki.lineageos.org/devices/guacamole) | | tested
-OnePlus | 7T | [hotdogb](https://wiki.lineageos.org/devices/hotdogb) | | tested
-OnePlus | 7T Pro | [hotdog](https://wiki.lineageos.org/devices/hotdog) | | tested
-OnePlus | Nord | [avicii](https://wiki.lineageos.org/devices/avicii) | | tested
-OnePlus | Nord N200 | [dre](https://wiki.lineageos.org/devices/dre) | | tested
-OnePlus | 9 | lemonade | | under development
+OnePlus | 3/3T | [oneplus3](https://wiki.lineageos.org/devices/oneplus3) | A3003, A3000, A3010 | untested
+OnePlus | 5 | [cheeseburger](https://wiki.lineageos.org/devices/cheeseburger) | A5000 | tested
+OnePlus | 5T | [dumpling](https://wiki.lineageos.org/devices/dumpling) | A5010 | tested
+OnePlus | 6 | [enchilada](https://wiki.lineageos.org/devices/enchilada) | A6000, A6003 | tested
+OnePlus | 6T | [fajita](https://wiki.lineageos.org/devices/fajita) | A6010, A6013 | tested
+OnePlus | 7 | [guacamoleb](https://wiki.lineageos.org/devices/guacamoleb) | GM1900, GM1901, GM1903, GM1905 | tested
+OnePlus | 7 Pro | [guacamole](https://wiki.lineageos.org/devices/guacamole) | GM1910, GM1911, GM1913, GM1917 | tested
+OnePlus | 7T | [hotdogb](https://wiki.lineageos.org/devices/hotdogb) | HD1900, HD1901, HD1903, HD1905 | tested
+OnePlus | 7T Pro | [hotdog](https://wiki.lineageos.org/devices/hotdog) | HD1910, HD1911, HD1913, HD1917 | tested
+OnePlus | Nord | [avicii](https://wiki.lineageos.org/devices/avicii) | AC2001, AC2003 | tested
+OnePlus | Nord N200 | [dre](https://wiki.lineageos.org/devices/dre) | DE2117 | tested
+OnePlus | 9 | lemonade | LE2110, LE2111, LE2113, LE2115 | under development
 
 </details>
 
@@ -191,7 +192,7 @@ Xiaomi | Mi 9T / Redmi K20 | [davinci](https://wiki.lineageos.org/devices/davinc
 Xiaomi | Redmi K20 Pro / Mi 9T Pro | raphael / raphaelin | | untested
 Xiaomi | Redmi Note 9S / 9 Pro / 9 Pro Max / 10 Lite / Poco M2 pro | [miatoll](https://wiki.lineageos.org/devices/lavender) : gram / curtana / excalibur / joyeuse  |  | untested
 Xiaomi | Redmi Note 10S / 11SE / Poco M5S | [rosemary](https://wiki.lineageos.org/devices/rosemary) / maltose / secret /rosemary_p | | untested
-Xiaomi | Redmi K40 / Mi 11X / Poco F3 | [alioth](https://wiki.lineageos.org/devices/alioth) / aliothin |  | untested                                            
+Xiaomi | Redmi K40 / Mi 11X / Poco F3 | [alioth](https://wiki.lineageos.org/devices/alioth) / aliothin |  | untested
 Xiaomi | Poco X3 / X3 NFC | [surya](https://wiki.lineageos.org/devices/surya) / karna |  | untested
 Xiaomi | Poco X3 Pro | [vayu](https://wiki.lineageos.org/devices/vayu) |  | tested
 Xiaomi | 12 | cupid | | untested
@@ -224,7 +225,7 @@ A detailed list can be found [here](https://openandroidinstaller.org/#contribute
 
 ## Tools
 
-- The [Android SDK Platform Tools](https://developer.android.com/studio/releases/platform-tools) (such as adb and fastboot) are [Apache](https://android.googlesource.com/platform/system/adb/+/refs/heads/master/NOTICE)-licensed universal Android utilities
+- The [Android SDK Platform Tools](https://developer.android.com/studio/releases/platform-tools) (such as adb and fastboot) are [Apache](https://android.googlesource.com/platform/system/adb/+/refs/heads/master/NOTICE)-licensed universal Android utilities.
 - [Heimdall](https://gitlab.com/BenjaminDobell/Heimdall) is an [MIT](https://gitlab.com/BenjaminDobell/Heimdall/-/blob/master/LICENSE)-licensed replacement for the leaked ODIN tool to flash Samsung devices.
 - [libusb-1.0](https://github.com/libusb/libusb) is a [LGPL-2.1](https://github.com/libusb/libusb/blob/master/COPYING)-licensed library for USB device access from Linux, macOS, Windows and others.
 - [copy-partitions-20220613-signed.zip](https://mirrorbits.lineageos.org/tools/copy-partitions-20220613-signed.zip) The copy-partitions script was created by LineageOS developer erfanoabdi and filipepferraz and released under LGPL. It is used when the partitions need to be copied before flashing.

openandroidinstaller/assets/configs/FP2.yaml

@@ -10,13 +10,13 @@ steps:
   boot_recovery:
     - type: call_button
       content: >
-        Now you need to boot a custom recovery system on the phone. A recovery is a small subsystem on your phone, that manages updating, 
+        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 and connected to the computer. Boot into the bootloader by pressing 'Confirm and run' here. Then continue.
       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.
-      command: fastboot_boot_recovery
+      command: fastboot_boot_recovery

openandroidinstaller/assets/configs/FP3.yaml

@@ -45,7 +45,7 @@ steps:
       content: >
         The bootloader is now unlocked. Since the device resets completely, you will need to re-enable USB debugging to continue.
   boot_recovery:
-    - type: confirm_button 
+    - type: confirm_button
       content: >
         Now you need to boot a custom recovery system on the phone. A recovery is a small subsystem on your phone, that manages updating, 
         adapting and repairing of the operating system.
@@ -57,4 +57,4 @@ steps:
       img: twrp-start.jpeg
       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_boot_recovery
+      command: fastboot_boot_recovery

openandroidinstaller/assets/configs/FP4.yaml

@@ -45,7 +45,7 @@ steps:
       content: >
         The bootloader is now unlocked. Since the device resets completely, you will need to re-enable USB debugging to continue.
   boot_recovery:
-    - type: confirm_button 
+    - type: confirm_button
       content: >
         Now you need to boot a custom recovery system on the phone. A recovery is a small subsystem on your phone, that manages updating, 
         adapting and repairing of the operating system.
@@ -57,4 +57,4 @@ steps:
       img: twrp-start.jpeg
       content: >
         Once the device is in fastboot mode, boot the custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue.
-      command: fastboot_boot_recovery
+      command: fastboot_boot_recovery

openandroidinstaller/assets/configs/Mi439.yaml

@@ -15,8 +15,8 @@ metadata:
     - olive
     - olivelite
     - olivewood
-  notes:
-    - Be careful when choosing OrangeFox version, Android 12 & 13 ROM needs OrangeFox version code with `A12`, for example `R11.1_5_A12`. Android 10 & 11 ROM needs OrangeFox version code without `A12` (bellow on the page)
+    - olives
+  twrp-link: mi439
 requirements:
   firmware: MiUI 12.5 (Q)
 steps:

openandroidinstaller/assets/configs/a3y17lte.yaml

@@ -1,10 +1,13 @@
 metadata:
   maintainer: Tobias Sterbak (tsterbak)
   device_name: Samsung Galaxy A3 (2017)
-  is_ab_device: false 
+  is_ab_device: false
   device_code: a3y17lte
   supported_device_codes:
     - a3y17lte
+    - a3y17ltexc
+    - a3y17ltexx
+    - a3y17ltelk
 steps:
   unlock_bootloader:
   boot_recovery:
@@ -22,6 +25,6 @@ steps:
     - type: confirm_button
       img: samsung-buttons.png
       content: >
-        Unplug the USB cable from your device. Then manually reboot into recovery by pressing the *Volume Down* + *Power buttons* for 
-        8~10 seconds until the screen turns black & release the buttons immediately when it does, then boot to recovery with the device powered off, 
-        hold *Volume Up* + *Home* + *Power*. Confirm when the recovery screen appears.
+        Unplug the USB cable from your device. Then manually reboot into recovery by pressing the *Volume Down* + *Power buttons* for
+        8~10 seconds until the screen turns black & release the buttons immediately when it does, then boot to recovery with the device powered off,
+        hold *Volume Up* + *Home* + *Power*. Confirm when the recovery screen appears.

openandroidinstaller/assets/configs/a5xelte.yaml

@@ -1,17 +1,20 @@
 metadata:
   maintainer: Tobias Sterbak (tsterbak)
   device_name: Samsung Galaxy A5 (2016)
-  is_ab_device: false 
+  is_ab_device: false
   device_code: a5xelte
   supported_device_codes:
     - a5xelte
+    - a5xeltexx
+    - a5xelteub
+    - a5xeltedo
 steps:
   unlock_bootloader:
   boot_recovery:
     - type: call_button
       content: >
-        As a first step, you need to boot into the bootloader. A bootloader is the piece of software, 
-        that tells your phone how to start and run an operating system (like Android). Your device should be turned on. 
+        As a first step, you need to boot into 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.
         Then press 'Confirm and run' to reboot into the bootloader. Continue once it's done.
       command: adb_reboot_download
     - type: call_button
@@ -22,6 +25,6 @@ steps:
     - type: confirm_button
       img: samsung-buttons.png
       content: >
-        Unplug the USB cable from your device. Then manually reboot into recovery by pressing the *Volume Down* + *Power buttons* for 8~10 seconds 
-        until the screen turns black & release the buttons immediately when it does, then boot to recovery with the device powered off, 
-        hold *Volume Up* + *Home* + *Power button*.
+        Unplug the USB cable from your device. Then manually reboot into recovery by pressing the *Volume Down* + *Power buttons* for 8~10 seconds
+        until the screen turns black & release the buttons immediately when it does, then boot to recovery with the device powered off,
+        hold *Volume Up* + *Home* + *Power button*.

openandroidinstaller/assets/configs/a72q.yaml

@@ -1,17 +1,17 @@
 metadata:
   maintainer: Tobias Sterbak (tsterbak)
   device_name: Samsung Galaxy A72
-  is_ab_device: false 
-  device_code: a72q 
+  is_ab_device: false
+  device_code: a72q
   supported_device_codes:
-    - a72q 
+    - a72q
 steps:
   unlock_bootloader:
   boot_recovery:
     - type: call_button
       content: >
-        As a first step, you need to boot into the bootloader. A bootloader is the piece of software, 
-        that tells your phone how to start and run an operating system (like Android). Your device should be turned on. 
+        As a first step, you need to boot into 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.
         Then press 'Confirm and run' to reboot into the bootloader. Continue once it's done.
       command: adb_reboot_download
     - type: call_button
@@ -22,6 +22,6 @@ steps:
     - type: confirm_button
       img: samsung-buttons.png
       content: >
-        Unplug the USB cable from your device. Then manually reboot into recovery by pressing the *Volume Down* + *Power* for 8~10 seconds 
-        until the screen turns black & release the buttons immediately when it does, then boot to recovery with the device powered off, 
-        hold *Volume Up* + *Power button*.
+        Unplug the USB cable from your device. Then manually reboot into recovery by pressing the *Volume Down* + *Power* for 8~10 seconds
+        until the screen turns black & release the buttons immediately when it does, then boot to recovery with the device powered off,
+        hold *Volume Up* + *Power button*.

openandroidinstaller/assets/configs/a7xelte.yaml

@@ -1,17 +1,20 @@
 metadata:
   maintainer: Tobias Sterbak (tsterbak)
-  device_name: Samsung Galaxy A7 (2016) 
-  is_ab_device: false 
+  device_name: Samsung Galaxy A7 (2016)
+  is_ab_device: false
   device_code: a7xelte
   supported_device_codes:
     - a7xelte
+    - a7xeltexx
+    - a7xelteub
+    - a7xeltedo
 steps:
   unlock_bootloader:
   boot_recovery:
     - type: call_button
       content: >
-        As a first step, you need to boot into the bootloader. A bootloader is the piece of software, 
-        that tells your phone how to start and run an operating system (like Android). Your device should be turned on. 
+        As a first step, you need to boot into 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.
         Then press 'Confirm and run' to reboot into the bootloader. Continue once it's done.
       command: adb_reboot_download
     - type: call_button
@@ -22,6 +25,6 @@ steps:
     - type: confirm_button
       img: samsung-buttons.png
       content: >
-        Unplug the USB cable from your device. Then manually reboot into recovery by pressing the *Volume Down* + *Power buttons* for 8~10 seconds 
-        until the screen turns black & release the buttons immediately when it does, then boot to recovery with the device powered off, 
-        hold *Volume Up* + *Home* + *Power button*.
+        Unplug the USB cable from your device. Then manually reboot into recovery by pressing the *Volume Down* + *Power buttons* for 8~10 seconds
+        until the screen turns black & release the buttons immediately when it does, then boot to recovery with the device powered off,
+        hold *Volume Up* + *Home* + *Power button*.

openandroidinstaller/assets/configs/akari.yaml

@@ -2,9 +2,9 @@ metadata:
   maintainer: Tobias Sterbak (tsterbak)
   device_name: Sony Xperia XZ2
   is_ab_device: true
-  device_code: akari 
+  device_code: akari
   supported_device_codes:
-    - akari 
+    - akari
 requirements:
   android: 10
 steps:
@@ -21,7 +21,7 @@ steps:
     - 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 write it down somewhere and 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/
     - type: confirm_button
       content: >
@@ -37,7 +37,7 @@ steps:
       command: fastboot_unlock_with_code
     - type: call_button
       content: >
-        Press the button to reboot. Since the device resets completely, you will need to re-enable USB debugging to continue. 
+        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
   boot_recovery:
@@ -59,4 +59,4 @@ steps:
     - type: call_button
       content: >
         Now we need to boot into recovery again. Press run and when you see the TWRP screen you can continue.
-      command: fastboot_flash_boot
+      command: fastboot_flash_boot