diff --git a/app/public/resources/FP4-safe.json b/app/public/resources/FP4-safe.json index 1f267bbc34bbd55796aa33cc50dc2fe9a2f629aa..f23cb99524906b2284db182d20b7a4ac17308f1e 100644 --- a/app/public/resources/FP4-safe.json +++ b/app/public/resources/FP4-safe.json @@ -125,7 +125,7 @@ { "name": "FP4 installer", "unzip": true, - "path": "https://images.ecloud.global/official/FP4/IMG-e-latest-t-official-FP4.zip" + "path": "https://images.ecloud.global/official/FP4/IMG-e-latest-u-official-FP4.zip" } ] } diff --git a/app/public/resources/FP4.json b/app/public/resources/FP4.json index 036fcfb7bf47e042d6ffa0b66ab2ec75900fa808..de3334953a1f10785e8998a01f053a12cbcea2a7 100644 --- a/app/public/resources/FP4.json +++ b/app/public/resources/FP4.json @@ -157,7 +157,7 @@ { "name": "FP4 installer", "unzip": true, - "path": "https://images.ecloud.global/official/FP4/IMG-e-latest-t-official-FP4.zip" + "path": "https://images.ecloud.global/official/FP4/IMG-e-latest-u-official-FP4.zip" } ] } diff --git a/app/public/resources/FP5-safe.json b/app/public/resources/FP5-safe.json new file mode 100644 index 0000000000000000000000000000000000000000..d0e336f03119de84dc94bc59937c50be3c53aef0 --- /dev/null +++ b/app/public/resources/FP5-safe.json @@ -0,0 +1,133 @@ +{ + "steps": [ + { + "mode": "bootloader", + "id": "connect-bootloader", + "command": ["connect bootloader", "flashing unlock goto_flashing"], + "needUserGesture": true + }, + { + "id": "unlocking-fp4", + "needUserGesture": true + }, + { + "id": "activate-developer-options", + "needUserGesture": true + }, + { + "id": "activate-usb-debugging", + "needUserGesture": true + }, + { + "id": "enable-usb-file-transfer", + "needUserGesture": true + }, + { + "id": "device-detection", + "command": "connect adb", + "needUserGesture": true + }, + { + "mode": "bootloader", + "id": "connect-bootloader", + "command": ["connect bootloader", "flashing unlock_critical"], + "needUserGesture": true + }, + { + "id": "unlocking-fp4", + "needUserGesture": true + }, + { + "id": "activate-developer-options", + "needUserGesture": true + }, + { + "id": "activate-usb-debugging", + "needUserGesture": true + }, + { + "id": "enable-usb-file-transfer", + "needUserGesture": true + }, + { + "id": "device-detection", + "command": "connect adb", + "needUserGesture": true + }, + { + "mode": "bootloader", + "id": "connect-bootloader", + "command": "connect bootloader", + "needUserGesture": true + }, + { + "id": "flashing", + "command": [ + "flash bluetooth_a bluetooth.img", + "flash bluetooth_b bluetooth.img", + "flash devcfg_a devcfg.img", + "flash devcfg_b devcfg.img", + "flash dsp_a dsp.img", + "flash dsp_b dsp.img", + "flash modem_a modem.img", + "flash modem_b modem.img", + "flash xbl_a xbl.img", + "flash xbl_b xbl.img", + "flash tz_a tz.img", + "flash tz_b tz.img", + "flash hyp_a hyp.img", + "flash hyp_b hyp.img", + "flash keymaster_a keymaster.img", + "flash keymaster_b keymaster.img", + "flash abl_a abl.img", + "flash abl_b abl.img", + "flash boot_a boot.img", + "flash boot_b boot.img", + "flash vendor_boot_a vendor_boot.img", + "flash vendor_boot_b vendor_boot.img", + "flash dtbo_a dtbo.img", + "flash dtbo_b dtbo.img", + "flash vbmeta_system_a vbmeta_system.img", + "flash vbmeta_system_b vbmeta_system.img", + "flash vbmeta_a vbmeta.img", + "flash vbmeta_b vbmeta.img", + "flash super super.img", + "flash aop_a aop.img", + "flash aop_b aop.img", + "flash featenabler_a featenabler.img", + "flash featenabler_b featenabler.img", + "flash imagefv_a imagefv.img", + "flash imagefv_b imagefv.img", + "flash multiimgoem_a multiimgoem.img", + "flash multiimgoem_b multiimgoem.img", + "flash qupfw_a qupfw.img", + "flash qupfw_b qupfw.img", + "flash uefisecapp_a uefisecapp.img", + "flash uefisecapp_b uefisecapp.img", + "flash xbl_config_a xbl_config.img", + "flash xbl_config_b xbl_config.img", + "flash cpucp_a cpucp.img", + "flash cpucp_b cpucp.img", + "flash shrm_b shrm.img", + "flash shrm_a shrm.img --set-active=a", + "erase userdata", + "erase metadata", + "reboot" + ] + }, + { + "id": "murena-workspace-account", + "needUserGesture": true + }, + { + "id": "installation-complete" + } + ], + "folder": [ + { + "name": "fp5 installer", + "unzip": true, + "path": "https://images.ecloud.global/official/FP5/IMG-e-latest-t-official-FP5.zip" + } + ] +} diff --git a/app/public/resources/FP5.json b/app/public/resources/FP5.json new file mode 100644 index 0000000000000000000000000000000000000000..7bec74d9061090e4151fcd74a1d6739a1d8c1ab6 --- /dev/null +++ b/app/public/resources/FP5.json @@ -0,0 +1,165 @@ +{ + "security_patch_level": "2024-12-05", + "steps": [ + { + "mode": "bootloader", + "id": "connect-bootloader", + "command": ["connect bootloader", "flashing unlock goto_flashing"], + "needUserGesture": true + }, + { + "id": "unlocking-fp4", + "needUserGesture": true + }, + { + "id": "activate-developer-options", + "needUserGesture": true + }, + { + "id": "activate-usb-debugging", + "needUserGesture": true + }, + { + "id": "enable-usb-file-transfer", + "needUserGesture": true + }, + { + "id": "device-detection", + "command": "connect adb", + "needUserGesture": true + }, + { + "mode": "bootloader", + "id": "connect-bootloader", + "command": ["connect bootloader", "flashing unlock_critical"], + "needUserGesture": true + }, + { + "id": "unlocking-fp4", + "needUserGesture": true + }, + { + "id": "activate-developer-options", + "needUserGesture": true + }, + { + "id": "activate-usb-debugging", + "needUserGesture": true + }, + { + "id": "enable-usb-file-transfer", + "needUserGesture": true + }, + { + "id": "device-detection", + "command": "connect adb", + "needUserGesture": true + }, + { + "mode": "bootloader", + "id": "connect-bootloader", + "command": "connect bootloader", + "needUserGesture": true + }, + { + "id": "flashing", + "command": [ + "flash bluetooth_a bluetooth.img", + "flash bluetooth_b bluetooth.img", + "flash devcfg_a devcfg.img", + "flash devcfg_b devcfg.img", + "flash dsp_a dsp.img", + "flash dsp_b dsp.img", + "flash modem_a modem.img", + "flash modem_b modem.img", + "flash xbl_a xbl.img", + "flash xbl_b xbl.img", + "flash tz_a tz.img", + "flash tz_b tz.img", + "flash hyp_a hyp.img", + "flash hyp_b hyp.img", + "flash keymaster_a keymaster.img", + "flash keymaster_b keymaster.img", + "flash abl_a abl.img", + "flash abl_b abl.img", + "flash boot_a boot.img", + "flash boot_b boot.img", + "flash vendor_boot_a vendor_boot.img", + "flash vendor_boot_b vendor_boot.img", + "flash dtbo_a dtbo.img", + "flash dtbo_b dtbo.img", + "flash vbmeta_system_a vbmeta_system.img", + "flash vbmeta_system_b vbmeta_system.img", + "flash vbmeta_a vbmeta.img", + "flash vbmeta_b vbmeta.img", + "flash super super.img", + "flash aop_a aop.img", + "flash aop_b aop.img", + "flash featenabler_a featenabler.img", + "flash featenabler_b featenabler.img", + "flash imagefv_a imagefv.img", + "flash imagefv_b imagefv.img", + "flash multiimgoem_a multiimgoem.img", + "flash multiimgoem_b multiimgoem.img", + "flash qupfw_a qupfw.img", + "flash qupfw_b qupfw.img", + "flash uefisecapp_a uefisecapp.img", + "flash uefisecapp_b uefisecapp.img", + "flash xbl_config_a xbl_config.img", + "flash xbl_config_b xbl_config.img", + "flash cpucp_a cpucp.img", + "flash cpucp_b cpucp.img", + "flash shrm_b shrm.img", + "flash shrm_a shrm.img --set-active=a", + "erase userdata", + "erase metadata", + "flashing lock" + ] + }, + { + "id": "locking-fp4", + "needUserGesture": true + }, + { + "id": "activate-developer-options", + "needUserGesture": true + }, + { + "id": "activate-usb-debugging", + "needUserGesture": true + }, + { + "id": "enable-usb-file-transfer", + "needUserGesture": true + }, + { + "id": "device-detection", + "command": "connect adb", + "needUserGesture": true + }, + { + "mode": "bootloader", + "id": "connect-bootloader", + "command": ["connect bootloader", "flashing lock_critical"], + "needUserGesture": true + }, + { + "id": "locking-fp4", + "needUserGesture": true + }, + { + "id": "murena-workspace-account", + "needUserGesture": true + }, + { + "id": "installation-complete" + } + ], + "folder": [ + { + "name": "fp5 installer", + "unzip": true, + "path": "https://images.ecloud.global/official/FP5/IMG-e-latest-t-official-FP5.zip" + } + ] +} diff --git a/app/src/controller.manager.js b/app/src/controller.manager.js index 990540e1873f99347d8c57606f468dd10b210b58..58ad10875e9a67dded050d0b8e7e94dc21b13683 100644 --- a/app/src/controller.manager.js +++ b/app/src/controller.manager.js @@ -383,11 +383,12 @@ export class Controller { current_security_path_level != null && typeof resources.security_patch_level != "undefined" ) { - WDebug.log("EOS Rom has security patch "); + WDebug.log(`EOS Rom has security patch ${current_security_path_level}`); const new_security_path_level = parseInt( resources.security_patch_level.replace(/-/g, ""), 10, ); + WDebug.log(`New security patch ${new_security_path_level}`); if (current_security_path_level > new_security_path_level) { WDebug.log( "Bypass lock procedure",