Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 702f37f0 authored by Frank Preel's avatar Frank Preel
Browse files

Adjustements, Teracube specifics device management

parent a45664ed
Loading
Loading
Loading
Loading
+11 −2
Original line number Diff line number Diff line
@@ -106,11 +106,20 @@ public class DeviceDetectedController extends AbstractSubController{
            return; 
        }

        if("Teracube_2e".equals(phone.getAdbDevice()) || "2e".equals(phone.getAdbDevice())){
        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();
+2 −2
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ public class DeviceDetectionTask extends Task<Phone>{
                }else if(stringPart.contains("device:")){
                    logger.debug("  \"device\" keyword has been found");
                    String device = stringPart.substring("device:".length() );
                    if(device.equals("2e")) device ="Teracube_2e"; 
                    if(device.equals("Teracube_2e")) device ="emerald"; 
                    //if(device.equals("k63v2_64_bsp")) device="GS290"; //bad idea. Device not really compatible.
                    result.setAdbDevice(device);
                }
+2 −0
Original line number Diff line number Diff line
@@ -186,6 +186,8 @@ install_instr_onceDeviceRebootThenContinue = Your device will reboot automatical
install_instr_rebootingOnBootloader=Your device will reboot automatically on bootloader mode
install_instr_pressVolUpToAcceptOEMUnlocking = Press "Volume up" to accept OEM unlocking
install_instr_pressVolDownToAcceptOEMUnlocking = Press "Volume down" to accept OEM unlocking
install_instr_selectOEMUnlockingMenu = Accept OEM unlocking by using the phone keys (refer to the instructions on the screen of the phone)

install_instr_unlockingOem= Easy-installer is unlocking OEM
install_instr_waitFastbootmodeDetected = The next step will start automatically once your device in fastboot mode will be detected. If it takes longer than 30 seconds, please check our FAQ by clicking on the "Need help" button
install_instr_choose_e_recovery_select= On the device by using Up or Down volume keys, select "Recovery Mode" option.
+3 −0
Original line number Diff line number Diff line
@@ -281,6 +281,9 @@ script_error_fastboot_flashingUnlock_failed=Impossible de déverouiller le flash
script_error_fastboot_path_missing=Aucun chemin vers l'outil fastboot n'a été fourni
script_error_serialNumber_missing=Aucun numéro de série fourni
install_instr_pressVolUpToAcceptOEMUnlocking=Appuyez sur "volume +" pour accepter le dévérouillage OEM
install_instr_pressVolDownToAcceptOEMUnlocking=Appuyez sur "volume -" pour accepter le dévérouillage OEM
install_instr_selectOEMUnlockingMenu = Acceptter le dévérouillage OEM en utilisant les touches du téléphone (se référer aux instructions sur l'écran du téléphone)

install_instr_rebootingOnBootloader=Votre téléphone va redémarrer automatiquement sur le mode bootloader
install_instr_onceDeviceRebootThenContinue=Votre téléphone va redémarrer automatiquement. Une fois que c'est fait, vous pouvez cliquer sur continuer
install_instr_waitInstallStartAuto=Veuillez patienter, l'installation va démarrer automatiquement
+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ steps:
        titleKey: stepTitle_oemUnlock
        titleIconName: icon-download.png
        instructions:
            - install_instr_pressVolDownToAcceptOEMUnlocking
            - install_instr_selectOEMUnlockingMenu
            - install_instr_unlockingOem
            - install_instr_waitInstallStartAuto
        script: emerald-flashingUnlock