diff --git a/README.md b/README.md index f40483b8da51d70adda52a0fb068d1dd576b2036..dba1c6de00ebab2aa49be598f9e918820d88ac12 100644 --- a/README.md +++ b/README.md @@ -45,8 +45,10 @@ developer: - Israel Yago pereira ## Changelogs +### v0.16.0 (candidate) +- Emerald and teracube detection -### v0.15.0 (candidate) +### v0.15.0 - No shortcut created when installing from a non-admin account on Windows - e-recovery assets - Update German translation - by F. Wildermuth diff --git a/flash-scripts/windows/emerald-install-from-bootloader.bat b/flash-scripts/windows/emerald-install-from-bootloader.bat index be287ed0e9c45524a78c739a64a749cbcbae3aaf..aab90c0ca249d3c65a455902afa99358d3164a38 100755 --- a/flash-scripts/windows/emerald-install-from-bootloader.bat +++ b/flash-scripts/windows/emerald-install-from-bootloader.bat @@ -121,7 +121,7 @@ timeout 5 >nul 2>&1 :: Flash partition (for /L %%i in (0,1,10) do ( - %FASTBOOT_PATH% -s %DEVICE_ID% flash %%partition_name[%%i]%% %%partition_image[%%i]%% + call %FASTBOOT_PATH% -s %DEVICE_ID% flash %%partition_name[%%i]%% %%partition_image[%%i]%% if errorLevel 1 ( exit /b %%partition_error[%%i]%% ) timeout 1 >nul 2>&1 call echo "Flashed %%partition_name[%%i]%% " diff --git a/src/main/java/ecorp/easy/installer/AppConstants.java b/src/main/java/ecorp/easy/installer/AppConstants.java index 62497b775cb49bb17327486301b551dde42f2a78..14cb30cac448b5c0c7b96a2e3fb930cda45c6ff7 100644 --- a/src/main/java/ecorp/easy/installer/AppConstants.java +++ b/src/main/java/ecorp/easy/installer/AppConstants.java @@ -27,7 +27,7 @@ import java.nio.file.Paths; */ public abstract class AppConstants { - public final static String APP_VERSION = "v0.15.0"; + public final static String APP_VERSION = "v0.16.0"; public final static String Separator = FileSystems.getDefault().getSeparator(); public final static String OsName = System.getProperty("os.name"); public final static String JavaHome = System.getProperty("java.home"); diff --git a/src/main/java/ecorp/easy/installer/controllers/subcontrollers/DeviceDetectedController.java b/src/main/java/ecorp/easy/installer/controllers/subcontrollers/DeviceDetectedController.java index bdff37e347db14713a0b9eea1b6afd17469cd804..fde8445dd7e4fb470f7fec1c9b3cb75bd7f3ec34 100644 --- a/src/main/java/ecorp/easy/installer/controllers/subcontrollers/DeviceDetectedController.java +++ b/src/main/java/ecorp/easy/installer/controllers/subcontrollers/DeviceDetectedController.java @@ -106,19 +106,6 @@ public class DeviceDetectedController extends AbstractSubController{ return; } - if("2e".equals(phone.getAdbDevice())){ - displayIncompatibleDeviceFound(phone.getAdbModel()); - return; - } - - if("emerald".equals(phone.getAdbDevice()) || - "Teracube_2e".equals(phone.getAdbDevice()) ){ - final String serial = phone.getSerialNo(); - if ( ! serial.startsWith("202111") ) { - displayIncompatibleDeviceFound(phone.getAdbModel()); - return; - } - } //If device is unauthorized if(!phone.isAdbAuthorized()){ displayUnauthorizedDeviceFound(); diff --git a/src/main/java/ecorp/easy/installer/tasks/DeviceDetectionTask.java b/src/main/java/ecorp/easy/installer/tasks/DeviceDetectionTask.java index b5d64f8b104f2d6aefa55796b945ad3ddc5d64d4..102cb097ebd99a659b599ada1eb769b994d9f10a 100644 --- a/src/main/java/ecorp/easy/installer/tasks/DeviceDetectionTask.java +++ b/src/main/java/ecorp/easy/installer/tasks/DeviceDetectionTask.java @@ -146,7 +146,14 @@ public class DeviceDetectionTask extends Task{ }else if(stringPart.contains("device:")){ logger.debug(" \"device\" keyword has been found"); String device = stringPart.substring("device:".length() ); - if(device.equals("Teracube_2e")) device ="emerald"; + + // Teracube, going to assume that anything that starts with 2020 is "2e", otherwise it's "emerald". + if(device.equals("Teracube_2e")) { + device ="emerald"; + if (datas[0].startsWith("2020")) + device ="Teracube_2e"; + } + //if(device.equals("k63v2_64_bsp")) device="GS290"; //bad idea. Device not really compatible. result.setAdbDevice(device); } diff --git a/src/main/resources/yaml/FP3_flash.yml b/src/main/resources/yaml/FP3_flash.yml index be82c380ec5885de9bfbcad989cf8bd3046cd2e2..b3f0a8f674776c729f5fc371194409bde693a64a 100644 --- a/src/main/resources/yaml/FP3_flash.yml +++ b/src/main/resources/yaml/FP3_flash.yml @@ -79,7 +79,7 @@ steps: titleKey: stepTitle6On7 instructions: - install_instr_eosInstall - averageTime: 200 + averageTime: 300 script: fp3_install-from-fastboot parameters: archive_path: ${ARCHIVE_PATH} diff --git a/src/main/resources/yaml/FP3_fs.yml b/src/main/resources/yaml/FP3_fs.yml index 88ca6731a38b15d8aae742d206fda80c63840203..05a26a400d4265f7a3166608c22d67a773088078 100644 --- a/src/main/resources/yaml/FP3_fs.yml +++ b/src/main/resources/yaml/FP3_fs.yml @@ -16,5 +16,5 @@ --- sources: rom: - url: https://images.ecloud.global/stable/FP3/IMG-e-latest-FP3.zip - filePath: IMG-e-latest-FP3.zip \ No newline at end of file + url: https://images.ecloud.global/stable/FP3/IMG-e-latest-r-FP3.zip + filePath: IMG-e-latest-r-FP3.zip \ No newline at end of file diff --git a/src/main/resources/yaml/dream2lte_flash.yml b/src/main/resources/yaml/dream2lte_flash.yml index f52364f20abc372336e71eb2f8cf2f7a8b0f6162..ea5ed72dfe99a00deaebdc9af1b7c13d63148af7 100644 --- a/src/main/resources/yaml/dream2lte_flash.yml +++ b/src/main/resources/yaml/dream2lte_flash.yml @@ -1,4 +1,4 @@ -## Copyright 2021 - ECORP SAS +## Copyright 202-2022 - ECORP SAS ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -12,20 +12,33 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . -## Author: Vincent Bourgmayer +## Author: Vincent Bourgmayer, Jan Altensen --- -stepsCount: 8 +stepsCount: 7 steps: f0: - type: custom-executable + type: custom stepNumber: 1 nextStepKey: f1 titleKey: stepTitle_oemUnlock - instructions: - - install_instr_openSettings - - install_instr_openDevOptions + instructions: + - install_instr_connectTowifi + - install_instr_openSettingsThenDevOptions + - install_instr_disableAutoUpdateSystem + - install_instr_openSoftwareUpdate + - install_instr_disableAutomaticDownload + - install_instr_clickDlAndInstall + - install_instr_rebootDeviceThenContinue + titleKeyIconName: icon-download.png + f1: + type: custom-executable + stepNumber: 2 + nextStepKey: f2 + titleKey: stepTitle_oemUnlock + instructions: + - install_instr_openSettingsThenDevOptions - install_instr_enableOEMUnlock - - install_instr_turnOff + - install_instr_acceptFactoryReset - install_instr_startDl_pressPowerBixbyVolDown - install_instr_acceptWarning titleKeyIconName: icon-download.png @@ -36,11 +49,11 @@ steps: 0: ~ koCodes: 1: script_error_waitDownload_1 - f1: + f2: type: load - stepNumber: 2 - nextStepKey: f2 - titleKey: stepTitle_installRecovery + stepNumber: 3 + nextStepKey: f3 + titleKey: stepTitle4On7 instructions: - install_instr_recoveryInstall averageTime: 6 @@ -53,118 +66,57 @@ steps: koCodes: 1: script_error_unknown 101: script_error_installRecovery_101 - f2: - type: custom-executable - stepNumber: 3 - nextStepKey: f3 - titleKey: stepTitle_startRecovery - instructions: - - install_instr_leaveDl_pressPowerBixbyVolDown - - install_instr_startRec_pressPowerBixbyVolUp - - install_instr_swipeTwrp - titleKeyIconName: icon-download.png - script: wait-recovery - parameters: - device_id: ${DEVICE_ID} - adb_folder_path: ${ADB_FOLDER_PATH} - okCodes: - 0: ~ - koCodes: - 1: script_error_waitRecovery_1 - 101: script_error_waitRecovery_101 - 102: script_error_waitRecovery_102 f3: type: custom-executable stepNumber: 4 nextStepKey: f4 - titleKey: stepTitle_formatDataTurnOff + titleKey: stepTitle5On7 instructions: - - install_instr_tapWipe - - install_instr_tapFormatData - - install_instr_writeYes - - install_instr_validate - - install_instr_backX3 - - install_instr_tapReboot - - install_instr_tapRebootPowerOff - - install_instr_doNotInstall - titleKeyIconName: icon-search.png - script: wait-reboot + - install_instr_leaveDl_pressPowerBixbyVolDown + - install_instr_startRec_pressPowerBixbyVolUp_e_reco + - install_instr_e_recovery_factory_reset + - install_instr_e_recovery_factory_reset_format_data + - install_instr_e_recovery_factory_reset_format_data_validate + - install_instr_e_recovery_back + - install_instr_e_recovery_apply_update + - install_instr_e_recovery_apply_update_from_adb + titleKeyIconName: icon-download.png + script: wait-e-recovery-sideload parameters: device_id: ${DEVICE_ID} adb_folder_path: ${ADB_FOLDER_PATH} okCodes: 0: ~ koCodes: - 1: script_error_unknown - 10: script_error_waitReboot_10 - 101: script_error_waitReboot_101 + 101: script_error_waitSideload_101 f4: - type: + type: load stepNumber: 5 nextStepKey: f5 - type: action - titleKey: stepTitle_restartRecovery + titleKey: install_instr_eosInstall instructions: - - install_instr_startRec_pressPowerBixbyVolUp - - install_instr_swipeTwrp - titleKeyIconName: icon-download.png - script: wait-recovery - parameters: + - install_instr_eosInstall + averageTime: 150 + script: install-from-e-recovery + parameters: device_id: ${DEVICE_ID} + archive_path: ${ARCHIVE_PATH} adb_folder_path: ${ADB_FOLDER_PATH} okCodes: 0: ~ koCodes: - 1: script_error_waitRecovery_1 - 101: script_error_waitRecovery_101 - 102: script_error_waitRecovery_102 + 1: script_error_installFromSideload f5: - type: load + type: askAccount stepNumber: 6 nextStepKey: f6 - titleKey: stepTitle_installOS - instructions: - - install_instr_eosInstall - averageTime: 475 - script: install-from-recovery - parameters: - device_id: ${DEVICE_ID} - archive_path: ${ARCHIVE_PATH} - adb_folder_path: ${ADB_FOLDER_PATH} - okCodes: - 0: ~ - koCodes: - 1: script_error_installFromRecovery_1 - 2: script_error_installFromRecovery_2 - 3: script_error_installFromRecovery_3 - 101: script_error_installFromRecovery_101 - 102: script_error_installFromRecovery_102 f6: - type: askAccount + type: custom stepNumber: 7 - nextStepKey: f7 - f7: - type: custom-executable - stepNumber: 8 nextStepKey: end - titleKey: stepTitle_resizeDataPartition + titleKey: stepTitle7On7 instructions: - - install_instr_tapWipe - - install_instr_tapAdvancedWipe - - install_instr_tickData - - install_instr_tapRepairChangeFs - - install_instr_resizeFs - - install_instr_swipeForOk - - install_instr_tapRebootSystem - - install_instr_doNotInstall - titleKeyIconName: icon-search.png - script: wait-reboot - parameters: - device_id: ${DEVICE_ID} - adb_folder_path: ${ADB_FOLDER_PATH} - okCodes: - 0: ~ - koCodes: - 1: script_error_unknown - 10: script_error_waitReboot_10 - 101: script_error_waitReboot_101 \ No newline at end of file + - install_instr_e_recovery_back + - install_instr_e_recovery_reboot + - eAccount_lbl_alreadyAccount + titleKeyIconName: icon-download.png diff --git a/src/main/resources/yaml/dream2lte_fs.yml b/src/main/resources/yaml/dream2lte_fs.yml index 81cfb3fcf41c55e14d678ab75146803299b9f378..a6024d5c55a917c7ddefe6959f9c992dad894831 100644 --- a/src/main/resources/yaml/dream2lte_fs.yml +++ b/src/main/resources/yaml/dream2lte_fs.yml @@ -19,5 +19,5 @@ sources: url: https://images.ecloud.global/stable/dream2lte/e-latest-dream2lte.zip filePath: e-latest-dream2lte.zip twrp: - url: https://images.ecloud.global/stable/twrp/dream2lte/twrp-3.3.1-2-dream2lte.img - filePath: twrp-3.3.1-2-dream2lte.img \ No newline at end of file + url: https://images.ecloud.global/stable/dream2lte/recovery-e-latest-dream2lte.img + filePath: recovery-e-latest-dream2lte.img \ No newline at end of file diff --git a/src/main/resources/yaml/dreamlte_flash.yml b/src/main/resources/yaml/dreamlte_flash.yml index f52364f20abc372336e71eb2f8cf2f7a8b0f6162..ea5ed72dfe99a00deaebdc9af1b7c13d63148af7 100644 --- a/src/main/resources/yaml/dreamlte_flash.yml +++ b/src/main/resources/yaml/dreamlte_flash.yml @@ -1,4 +1,4 @@ -## Copyright 2021 - ECORP SAS +## Copyright 202-2022 - ECORP SAS ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -12,20 +12,33 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . -## Author: Vincent Bourgmayer +## Author: Vincent Bourgmayer, Jan Altensen --- -stepsCount: 8 +stepsCount: 7 steps: f0: - type: custom-executable + type: custom stepNumber: 1 nextStepKey: f1 titleKey: stepTitle_oemUnlock - instructions: - - install_instr_openSettings - - install_instr_openDevOptions + instructions: + - install_instr_connectTowifi + - install_instr_openSettingsThenDevOptions + - install_instr_disableAutoUpdateSystem + - install_instr_openSoftwareUpdate + - install_instr_disableAutomaticDownload + - install_instr_clickDlAndInstall + - install_instr_rebootDeviceThenContinue + titleKeyIconName: icon-download.png + f1: + type: custom-executable + stepNumber: 2 + nextStepKey: f2 + titleKey: stepTitle_oemUnlock + instructions: + - install_instr_openSettingsThenDevOptions - install_instr_enableOEMUnlock - - install_instr_turnOff + - install_instr_acceptFactoryReset - install_instr_startDl_pressPowerBixbyVolDown - install_instr_acceptWarning titleKeyIconName: icon-download.png @@ -36,11 +49,11 @@ steps: 0: ~ koCodes: 1: script_error_waitDownload_1 - f1: + f2: type: load - stepNumber: 2 - nextStepKey: f2 - titleKey: stepTitle_installRecovery + stepNumber: 3 + nextStepKey: f3 + titleKey: stepTitle4On7 instructions: - install_instr_recoveryInstall averageTime: 6 @@ -53,118 +66,57 @@ steps: koCodes: 1: script_error_unknown 101: script_error_installRecovery_101 - f2: - type: custom-executable - stepNumber: 3 - nextStepKey: f3 - titleKey: stepTitle_startRecovery - instructions: - - install_instr_leaveDl_pressPowerBixbyVolDown - - install_instr_startRec_pressPowerBixbyVolUp - - install_instr_swipeTwrp - titleKeyIconName: icon-download.png - script: wait-recovery - parameters: - device_id: ${DEVICE_ID} - adb_folder_path: ${ADB_FOLDER_PATH} - okCodes: - 0: ~ - koCodes: - 1: script_error_waitRecovery_1 - 101: script_error_waitRecovery_101 - 102: script_error_waitRecovery_102 f3: type: custom-executable stepNumber: 4 nextStepKey: f4 - titleKey: stepTitle_formatDataTurnOff + titleKey: stepTitle5On7 instructions: - - install_instr_tapWipe - - install_instr_tapFormatData - - install_instr_writeYes - - install_instr_validate - - install_instr_backX3 - - install_instr_tapReboot - - install_instr_tapRebootPowerOff - - install_instr_doNotInstall - titleKeyIconName: icon-search.png - script: wait-reboot + - install_instr_leaveDl_pressPowerBixbyVolDown + - install_instr_startRec_pressPowerBixbyVolUp_e_reco + - install_instr_e_recovery_factory_reset + - install_instr_e_recovery_factory_reset_format_data + - install_instr_e_recovery_factory_reset_format_data_validate + - install_instr_e_recovery_back + - install_instr_e_recovery_apply_update + - install_instr_e_recovery_apply_update_from_adb + titleKeyIconName: icon-download.png + script: wait-e-recovery-sideload parameters: device_id: ${DEVICE_ID} adb_folder_path: ${ADB_FOLDER_PATH} okCodes: 0: ~ koCodes: - 1: script_error_unknown - 10: script_error_waitReboot_10 - 101: script_error_waitReboot_101 + 101: script_error_waitSideload_101 f4: - type: + type: load stepNumber: 5 nextStepKey: f5 - type: action - titleKey: stepTitle_restartRecovery + titleKey: install_instr_eosInstall instructions: - - install_instr_startRec_pressPowerBixbyVolUp - - install_instr_swipeTwrp - titleKeyIconName: icon-download.png - script: wait-recovery - parameters: + - install_instr_eosInstall + averageTime: 150 + script: install-from-e-recovery + parameters: device_id: ${DEVICE_ID} + archive_path: ${ARCHIVE_PATH} adb_folder_path: ${ADB_FOLDER_PATH} okCodes: 0: ~ koCodes: - 1: script_error_waitRecovery_1 - 101: script_error_waitRecovery_101 - 102: script_error_waitRecovery_102 + 1: script_error_installFromSideload f5: - type: load + type: askAccount stepNumber: 6 nextStepKey: f6 - titleKey: stepTitle_installOS - instructions: - - install_instr_eosInstall - averageTime: 475 - script: install-from-recovery - parameters: - device_id: ${DEVICE_ID} - archive_path: ${ARCHIVE_PATH} - adb_folder_path: ${ADB_FOLDER_PATH} - okCodes: - 0: ~ - koCodes: - 1: script_error_installFromRecovery_1 - 2: script_error_installFromRecovery_2 - 3: script_error_installFromRecovery_3 - 101: script_error_installFromRecovery_101 - 102: script_error_installFromRecovery_102 f6: - type: askAccount + type: custom stepNumber: 7 - nextStepKey: f7 - f7: - type: custom-executable - stepNumber: 8 nextStepKey: end - titleKey: stepTitle_resizeDataPartition + titleKey: stepTitle7On7 instructions: - - install_instr_tapWipe - - install_instr_tapAdvancedWipe - - install_instr_tickData - - install_instr_tapRepairChangeFs - - install_instr_resizeFs - - install_instr_swipeForOk - - install_instr_tapRebootSystem - - install_instr_doNotInstall - titleKeyIconName: icon-search.png - script: wait-reboot - parameters: - device_id: ${DEVICE_ID} - adb_folder_path: ${ADB_FOLDER_PATH} - okCodes: - 0: ~ - koCodes: - 1: script_error_unknown - 10: script_error_waitReboot_10 - 101: script_error_waitReboot_101 \ No newline at end of file + - install_instr_e_recovery_back + - install_instr_e_recovery_reboot + - eAccount_lbl_alreadyAccount + titleKeyIconName: icon-download.png diff --git a/src/main/resources/yaml/dreamlte_fs.yml b/src/main/resources/yaml/dreamlte_fs.yml index 865c0d77e3acfc30516e0d2eecbd7478c3d92682..c618bb5c1a68028a5f9cb7c93ee3da086db16824 100644 --- a/src/main/resources/yaml/dreamlte_fs.yml +++ b/src/main/resources/yaml/dreamlte_fs.yml @@ -16,8 +16,8 @@ --- sources: rom: - url: https://images.ecloud.global/stable/dreamlte/e-latest-dreamlte.zip - filePath: e-latest-dreamlte.zip + url: https://images.ecloud.global/stable/dreamlte/e-latest-r-dreamlte.zip + filePath: e-latest-r-dreamlte.zip twrp: - url: https://images.ecloud.global/stable/twrp/dreamlte/twrp-3.3.1-2-dreamlte.img - filePath: twrp-3.3.1-2-dreamlte.img \ No newline at end of file + url: https://images.ecloud.global/stable/dreamlte/recovery-e-latest-r-dreamlte.img + filePath: recovery-e-latest-r-dreamlte.img \ No newline at end of file