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

Commit 340cad32 authored by Paula's avatar Paula
Browse files

pixel 4a, 4xl & one+8 confirmed

parent f308d441

app/src/static/assets/languages/en.json

+25 −23
Original line number Diff line number Diff line
@@ -6,12 +6,16 @@ 
    "activate-developer-options-instructions-1": "1. Open the settings menu and type ‘build’ in the search bar.",

    "activate-developer-options-instructions-2": "2. On the next screen, find ‘Build number’ and tap 7 times on it.",

    "activate-usb-debugging": "Activate USB Debugging",

    "activate-usb-debugging-instructions-1": "Go back to the settings menu and type ‘USB debugging’ in the search bar.",

    "activate-usb-debugging-instructions-2": "At this point you should be in the ‘Developer options screen’. Now tap on ’USB debugging’ to activate it (on some devices it is called ’Android Debugging’).",

    "activate-usb-debugging-instructions-1": "1. Go back to the settings menu and type ‘USB debugging’ in the search bar.",

    "activate-usb-debugging-instructions-2": "2. At this point you should be in the ‘Developer options screen’. Now tap on ’USB debugging’ to activate it (on some devices it is called ’Android Debugging’).",

    "android-version-not-supported": "Android version outdated",

    "android-version-not-supported-instructions": "Update your system to the minimum version required <code>{{android-version-required}}</code>",

    "android-version-not-supported-title": "Your Android version <code>{{android-version}}</code> is not supported",

    "bootloader-to-recovery-manually": "Bootloader to recovery",

    "bootloader-to-recovery-manually-instructions": "Now we will restart your device in Recovery mode. Please, follow the steps below:",

    "bootloader-to-recovery-manually-instructions-1": "1. In the bootloader, select recovery by using <kbd>Volume Up</kbd> and <kbd>Volume Down</kbd> to navigate",

    "bootloader-to-recovery-manually-instructions-1": "1. In the bootloader, select <code>Recovery Mode</code> by using <kbd>Volume Up</kbd> and <kbd>Volume Down</kbd> to navigate",

    "bootloader-to-recovery-manually-instructions-2": "2. Press <kbd>Power</kbd> to confirm",

    "bootloader-to-recovery-manually-instructions-3": "3. Wait for your phone to start in recovery",

    "check-update-android-version": "Check & update your Android version",

    "check-update-android-version-caution": "<b>Caution</b>: before proceeding with the installation, verify if the latest Android firmware is available for your device.",

    "connect": "Connect",
@@ -35,17 +39,18 @@ 
    "enable-usb-file-transfer-instructions-1": "Still inside the ‘Developer options’, scroll down to find ’Default USB configuration’ and tap on it.",

    "enable-usb-file-transfer-instructions-2": "Now select the ’File Transfer’ option (on some devices it is called 'MTP mode (media transfer protocol)').",

    "format-device": "Format the device",

    "format-device-instructions-1": "1. Select Factory reset",

    "format-device-instructions-2": "2. Select Format data / Factory reset option",

    "format-device-instructions-1": "1. Select <code>Factory reset</code>",

    "format-device-instructions-2": "2. Select <code>Format data / Factory reset</code> option",

    "format-device-instructions-3": "3. Next screen will display a warning that this action cannot be undone",

    "format-device-instructions-4": "4. Select Format data to proceed",

    "format-device-instructions-4": "4. Select <code>Format data</code> to proceed",

    "format-device-instructions-5": "5. Wait the format process will complete",

    "format-device-instructions-6": "6. Display will now return to the Factory Reset screen",

    "format-device-instructions-7": "7. Press Back array, and click Next",

    "format-device-instructions-7": "7. Press <code>Back</code> array, and click <code>Next</code>",

    "go-to-apply-update": "Almost there!",

    "go-to-apply-update-instructions-1": "1. Select Apply Update",

    "go-to-apply-update-instructions-2": "2. Apply update from adb",

    "go-to-apply-update-instructions-3": "3. The device is now in sideload mode",

    "go-to-apply-update-instructions-1": "1. Select <code>Apply Update</code>.",

    "go-to-apply-update-instructions-2": "2. And then <code>Apply update from adb</code>.",

    "go-to-apply-update-instructions-3": "3. The device is now in sideload mode, you're ready for the next step.",

    "go-to-apply-update-instructions-4": "<b>Note: </b>For the next step, your browser may need to reconnect your phone. If a pop-up window appears, select your phone from the list.",

    "help": "Help",

    "help-us-improve-the-tool": "Help us improve the tool",

    "help-us-improve-the-tool-instructions-1": "Please, rate your experience with the Easy Installer.",
@@ -55,6 +60,7 @@ 
    "installation-complete": "The installation is complete!",

    "installation-complete-instructions-1": "Congrats! While your phone is booting, you should see the logo below. This takes time, please be patient.",

    "installation-complete-instructions-2": "<b>Tip</b>: follow the instructions on your phone to set up your device. You can now add your files back to your phone.",

    "installing": "Installing",

    "let-s-get-started": "Let's get started",

    "let-s-get-started-instruction-1": "The complete installation process requires around 1 hour. Be\n  patient!",

    "let-s-get-started-instruction-2": "You'll need to have at least 6GB of free space in your computer to\n  download and install /e/OS. Make sure you have enough free disk space.",
@@ -74,35 +80,31 @@ 
    "murena-cloud-account-instructions": "Keep your data safe and sync this device with your personal Murena Cloud account. 1GB free and paid plans available for more storage.",

    "navigator-detection": "Navigator detection",

    "navigator-not-supported": "Your navigator is not supported",

    "android-version-not-supported": "Android version outdated",

    "android-version-not-supported-title": "Your Android version <code>{{android-version}}</code> is not supported",

    "android-version-not-supported-instructions": "Update your system to the minimum version required <code>{{android-version-required}}</code>",

    "navigator-not-supported-instructions": "You can use the following browsers",

    "neutral": "Neutral",

    "next": "Next",

    "ready-to-install-e-os": "You're now ready to install /e/OS.",

    "recovery-to-bootloader": "<code>Recovery</code> to <code>Bootloader</code>",

    "recovery-to-bootloader-instructions": "Select Advanced",

    "recovery-to-bootloader": "Recovery to Bootloader",

    "recovery-to-bootloader-instructions": "In the main menu",

    "recovery-to-bootloader-instructions-1": "1. Select <code>Advanced</code>",

    "recovery-to-bootloader-instructions-2": "2. Select <code>Reboot to bootloader</code>",

    "satisfied": "Satisfied",

    "send-to-e-team": "Send to Murena team",

    "sideload": "Installation in progress",

    "sideload-instructions-1": "The screen will show the progress percentage... ",

    "sideload-instructions-2": "This might pause at 47%, give it some time.",

    "sideload-instructions-1": "The screen will show the progress ... ",

    "sideload-instructions-2": "This can take several minutes, give it some time.",

    "sideload-instructions-3": "Once the installation is finished, the phone returns to the main screen.",

    "sideload-instructions-4": "Only then can you click <code>Next</code>.",

    "sign-up-free": "Sign up FREE",

    "skip": "Skip",

    "start": "Start",

    "this-might-take-some-time-please-be-patient": "This might take some time please be patient",

    "unlocking-instructions-1": "Your phone is asking for an unlock. Select <code>unlock bootloader</code>",

    "unlocking-instructions-1-a": "Use the volume buttons and the On/Off button to confirm.",

    "unlocking-instructions-2": "If the device doesn’t automatically reboot, reboot it. It should now be unlocked.",

    "unlocking-instructions-2-a": "Your device will reboot, <b>wait</b> the bootloader screen is visible again ",

    "unlocking-instructions-1": "Your phone is asking for an unlock. Select <code>unlock bootloader</code> by using <kbd>Volume Up</kbd> and <kbd>Volume Down</kbd> to navigate.",

    "unlocking-instructions-1-a": "Use the button <kbd>Power</kbd> to confirm.",

    "unlocking-instructions-2": "If the device doesn’t automatically reboot, reboot it.",

    "unlocking-instructions-2-a": "Your device will reboot. <b>Wait until the bootloader screen is visible again</b> before going to the next step",

    "unlocking-instructions-3": "Since the device <b>resets completely</b>, you will need to <b>re-enable USB debugging</b>.",

    "unlocking-instructions-4": "Pass the setup and click on next",

    "unlocking-instructions-5": "Then click on next",

    "unlocking-instructions-4": "Pass the setup on the phone and click on next",

    "very-dissatisfied": "Very Dissatisfied",

    "very-satisfied": "Very Satisfied"

}

app/src/static/css/styles.css

+4 −10
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ button.next:disabled { 
    align-items: center;

}

#logo {

    max-width: 96px;

    max-width: 80px;

}

/* <header> */

/* <card> */
@@ -119,17 +119,15 @@ button.next:disabled { 
    margin-bottom : 20px;

    margin-top : 20px;

}

.connect-your-phone .instruction-img{

    max-width: 500px;

}

.enable-usb-file-transfer .instruction-img {

    max-width: 225px;

}

.device-detection .instruction-img {

.device-detection .instruction-img, .connect-your-phone .instruction-img {

    max-width: 300px;

}

.activate-developer-options .instruction-img,

.activate-usb-debugging .instruction-img {

.activate-usb-debugging .instruction-img,

.connect-your-phone .instruction-img  {

    max-width: 350px;

}

#overlay-background {
@@ -185,10 +183,6 @@ progress[value].success::-webkit-progress-value { 
    padding: 16px 0;

}

/* <help-us-improve-the-tool> */

.help-us-improve-the-tool p {

    padding-top: 16px;

    padding-bottom: 16px;

}

.help-us-improve-the-tool .instructions-ctn {

    display: grid;

    grid-template-columns: repeat(5, 1fr);

app/src/static/index.html

+8 −9
Original line number Diff line number Diff line
@@ -84,9 +84,9 @@ 
    <div id="connect-your-phone" class="connect-your-phone card inactive">

        <div class="card-header" data-translate="connect-your-phone"></div>

        <div class="card-body">

            <p data-translate="connect-your-phone-instructions"></p>

            <div class="text-center">

            <div class="normal-padding flex align-items-center gap-4">

                <img class="instruction-img" src="assets/images/illustrations/connect-your-phone.png">

                <p data-translate="connect-your-phone-instructions"></p>

            </div>

            <p class="secondary" data-translate="connect-your-phone-instructions-notes"></p>

        </div>
@@ -160,10 +160,6 @@ 
                <button data-translate="connect" class="connect" onclick="VIEW.executeStep(this, 'device-detection')"></button>

            </div>

        </div>

        <div class="card-body inactive">

            <p data-translate="device-detection-detected"></p>

            <img class="instruction-img" src="assets/images/icons/check-success.svg">

        </div>

    </div>



    <div id="device-model-not-supported" class="device-model-not-supported card inactive">
@@ -212,10 +208,10 @@ 
        <div class="card-header" data-translate="Unlocking"></div>

        <div class="card-body">

            <p data-translate="unlocking-instructions-1"></p>

            <p data-translate="unlocking-instructions-1-a"></p>

            <div class="text-center">

                <img class="instruction-img" src="assets/images/illustrations/teracube/Illustration - Accept warning-1.png">

            </div>

            <p data-translate="unlocking-instructions-5"></p>

        </div>

        <div class="card-footer">

            <button data-translate="next" class="next" onclick="VIEW.executeStep(this, 'unlocking-teracube')"></button>
@@ -230,8 +226,8 @@ 
                <div>

                    <p data-translate="unlocking-instructions-1"></p>

                    <p data-translate="unlocking-instructions-1-a"></p>

                    <p data-translate="unlocking-instructions-2"></p>

                    <p data-translate="unlocking-instructions-2-a"></p>

                    <p data-translate="unlocking-instructions-5"></p>

                </div>

            </div>

        </div>
@@ -244,6 +240,7 @@ 
        <div class="card-header" data-translate="Unlocking"></div>

        <div class="card-body">0

            <p data-translate="unlocking-instructions-1"></p>

            <p data-translate="unlocking-instructions-1-a"></p>

            <p data-translate="unlocking-instructions-2"></p>

            <p data-translate="unlocking-instructions-3"></p>

            <p data-translate="unlocking-instructions-4"></p>
@@ -271,6 +268,7 @@ 
            <p data-translate="bootloader-to-recovery-manually-instructions"></p>

            <p data-translate="bootloader-to-recovery-manually-instructions-1"></p>

            <p data-translate="bootloader-to-recovery-manually-instructions-2"></p>

            <p data-translate="bootloader-to-recovery-manually-instructions-3"></p>

        </div>

        <div class="card-footer">

            <button data-translate="next" class="next" onclick="VIEW.executeStep(this, 'bootloader-to-recovery-manually')"></button>
@@ -297,6 +295,7 @@ 
            <p data-translate="go-to-apply-update-instructions-1"></p>

            <p data-translate="go-to-apply-update-instructions-2"></p>

            <p data-translate="go-to-apply-update-instructions-3"></p>

            <p class="secondary" data-translate="go-to-apply-update-instructions-4"></p>

        </div>

        <div class="card-footer">

            <button data-translate="next" class="next" onclick="VIEW.executeStep(this, 'go-to-apply-update')"></button>

app/src/static/js/controller.manager.js

+5 −29
Original line number Diff line number Diff line
@@ -11,10 +11,10 @@ export class Controller { 
    constructor() {

        this.steps = [

            new Step("let-s-get-started", undefined, true),

            /*new Step("connect-your-phone",  undefined, true),

            new Step("connect-your-phone",  undefined, true),

            new Step("activate-developer-options", undefined, true),

            new Step("activate-usb-debugging", undefined, true),

            new Step("enable-usb-file-transfer", undefined, true),*/

            new Step("enable-usb-file-transfer", undefined, true),

            new Step("device-detection", 'connect adb', true),



        ];
@@ -51,17 +51,6 @@ export class Controller { 
            if (!current.needUserGesture) {

                await this.executeStep(current.name);

            }

            /*current.commandDone = await this.runCommand(current.command);

            if(current.commandDone) {

                next = this.steps[this.currentIndex + 1];

                if(next && current.nextWhenFinished) {

                    await this.next();

                }

            } else {

                VIEW.onStepFailed(current, previous);

                this.currentIndex--;

                throw Error('command failed');

            }*/

        }

    }
@@ -158,27 +147,18 @@ export class Controller { 
                    try {

                        if (this.deviceManager.adb.getProductName() === "Teracube_2e") { //K1ZFP Hardcoded behavior

                            this.deviceManager.unlock(cmd.command);

                        } else

                        } else {

                            await this.deviceManager.unlock(cmd.command);

                        //this.steps[this.currentIndex].needUser = true;

                        }

                    } catch (e) {

                        //on some device, check unlocked does not work but when we try the command, it throws an error with "already unlocked"

                        if (e.bootloaderMessage?.includes("already")) {

                            await this.deviceManager.reboot('adb');



                        } else if (e.bootloaderMessage?.includes("not allowed")) {

                            //K1ZFP TODO

                        }

                    }

                }

                if (!isUnlocked) {

                    //it's not unlocked

                    //the unlock command needs for the user to accept unlocking on the device and restarting the phone, like the commands used at the start

                    //TODO

                    /*const stepsToAdd = this.startCommand.concat([

                        this.steps[this.currentIndex]

                    ])

                    this.addSteps(stepsToAdd, this.currentIndex + 1);*/

                }

                return true;

            case Command.CMD_TYPE.lock:

                let isLocked = false;
@@ -219,12 +199,10 @@ export class Controller { 
                    console.error(e); // K1ZFP TODO

                    return false;

                }

                break;

            default:

                WDebug.log(`try unknown command ${cmd.command}`)

                await this.deviceManager.runCommand(cmd.command);

                return true;

                break;

        }

    }
@@ -239,8 +217,6 @@ export class Controller { 
            WDebug.log("ControllerManager Model:", this.model);

            try {

                const resources = await this.getResources();

                console.log(resources)

                console.log(resources.android)

                if(resources.android){

                    VIEW.updateData('android-version-required', resources.android);

                    await this.checkAndroidVersion(resources.android);

app/src/static/js/controller/device/adb.class.js

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ export class ADB extends Device { 




    getSerialNumber() {

        return this.webusb.serialNumber;

        return this.device.serialNumber;

    }



    async getAndroidVersion() {