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

Commit 2e5cc9c5 authored by Vincent Bourgmayer's avatar Vincent Bourgmayer
Browse files

fix conflict in DownloadSrcController.java

parents 30482c55 53feec01

Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ RUN unsquashfs -d /snap/core18/current core18.snap 


# Grab the snapcraft snap from the stable channel and unpack it in the proper

# place.

RUN curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/snapcraft?channel=stable' | jq '.download_url' -r) --output snapcraft.snap

RUN curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/snapcraft?channel=5.x/stable' | jq '.download_url' -r) --output snapcraft.snap

RUN mkdir -p /snap/snapcraft

RUN unsquashfs -d /snap/snapcraft/current snapcraft.snap

README.md

+22 −20
Original line number Diff line number Diff line 
# Easy Installer

**Current Version:** v0.13.3-beta

**Current released Version:** v0.13.2-beta

**Current released Version:** v0.13.3-beta



Members:

- Gaël
@@ -29,24 +29,31 @@ Community: 
- Piero

- GunChleoc



Tester

Reviewer

- Alexandre

- Sooraj

- Romain

- Kumar



developer: [Vincent Bourgmayer](vincent.bourgmayer@e.email)



developer: 

-[Vincent Bourgmayer](vincent.bourgmayer@e.email)

-Israel Yago pereira



## Changelogs

### v0.13.3-beta (current - unreleased)

- Update Russian translations - by Nikolay Sinyov

- Update German translations - by F. Wildermuth

### v0.13.4-beta (current - unreleased)



### v0.13.3-beta (latest release)

- Refactor user interface related to flashing device

- Refactor Configuration file

- Handle "Too many devices detected"

- Update config file for arch-linux build - by steadfasterX

- Update version number to v0.13.3-beta

- Fixed e-mail registration API Url - by Israel Yago pereira

- Update Russian translations - by Nikolay Sinyov & Israel Yago pereira

- Update German translations - by F. Wildermuth

- Update Dutch translations - by Edoardo Regni

- Update config file for arch-linux build - by steadfasterX



### v0.13.2-beta (latest release)

### v0.13.2-beta

- Small refactoring of FlashSceneController.java & FlashScene.fxml

- Revert support of Volla phone

- Update translations
@@ -55,16 +62,6 @@ developer: [Vincent Bourgmayer](vincent.bourgmayer@e.email) 
- Update russian translations - by Nikolay Sinyov

- Update Italian translations - by Paolo Pantaleo



### v0.13.1-beta 

- Remove useless/unused code from FlashThread.java

- Refactor Device.java into Phone.java

- Easy-installer now detect Volla phone as a GS290

- Add gaelic translations - by GunChleoc

- Add catalan translations - by Arnau Vàzquez

- Update Italian translations - by Paolo Pantaleo

- Update French translations - by Piero & Vincent Bourgmayer

- Update German translations - by F. Wildermuth



## Documentation

To run directly from source:

`./gradlew run -Dorg.gradle.java.home=buildSrc/linux/jdk-11.0.2/`
@@ -76,6 +73,11 @@ from root of the project. 


- [Weblate](https://i18n.e.foundation/projects/e/easy-installer/)





## Where to get log at runtime

- Windows: `C:\Users\<your username>\AppData\Local\easy-installer`

- linux : ``



## Techno dependancy

- Java

- JavaFX

src/main/java/ecorp/easy/installer/controllers/subcontrollers/DownloadSrcController.java

+10 −0
Original line number Diff line number Diff line
@@ -17,8 +17,10 @@ 
package ecorp.easy.installer.controllers.subcontrollers;





import ecorp.easy.installer.AppConstants;

import ecorp.easy.installer.controllers.MainWindowController;

import ecorp.easy.installer.helpers.DeviceHelper;

import ecorp.easy.installer.tasks.CommandExecutionTask;

import ecorp.easy.installer.tasks.DownloadTask;

import ecorp.easy.installer.utils.UiUtils;

import java.io.IOException;
@@ -132,6 +134,14 @@ public class DownloadSrcController extends AbstractSubController { 
        preparationProgressBar.setProgress(1.0); //BUG! apparement pas accessible par le service. J'ai un "A bound value cannot be set"

        progressLabel.setText(i18n.getString("download_lbl_complete"));

        progressTitle.setVisible(false);

        

        //need to update/add CommandExecutionTask.CommonParameters at this time..

        //But I'm not sure it's the best place to do that.

        //I don't like to add dependency to CommandExecutionTask just for that

        String sourcesFolderPath = AppConstants.getSourcesFolderPath();

        CommandExecutionTask.updateCommonParam("TWRP_IMAGE_PATH", sourcesFolderPath+AppConstants.getTwrpImgPath());

        CommandExecutionTask.updateCommonParam("ARCHIVE_PATH", sourcesFolderPath+AppConstants.getEArchivePath());

        

        parentController.disableNextButton(false);

    }

src/main/java/ecorp/easy/installer/tasks/CommandExecutionTask.java

+0 −2
Original line number Diff line number Diff line
@@ -50,8 +50,6 @@ public class CommandExecutionTask extends Task<CommandExecutionResult> { 
        final String sourcePath = AppConstants.getSourcesFolderPath();

        

        COMMON_PARAMS.put("SOURCES_PATH", sourcePath);

        COMMON_PARAMS.put("TWRP_IMAGE_PATH", sourcePath+AppConstants.getTwrpImgPath());

        COMMON_PARAMS.put("ARCHIVE_PATH", sourcePath+AppConstants.getEArchivePath());

        COMMON_PARAMS.put("ADB_FOLDER_PATH", AppConstants.getADBFolderPath());

        COMMON_PARAMS.put("HEIMDALL_FOLDER_PATH", AppConstants.getHeimdallFolderPath());

        COMMON_PARAMS.put("JAVA_FOLDER_PATH", AppConstants.JavaHome);

src/main/resources/lang/translation_de.properties

+13 −0
Original line number Diff line number Diff line
@@ -283,3 +283,16 @@ detect_lbl_tooManyDevicesDetected=Mehr als ein Android-Gerät wurde gefunden.\nE 
#install

##FP3

install_title_lockBootloader=Den Bootloader sperren

script_error_cantrebootFromFasboot=Fehler beim Neustart vom Fastboot

script_error_cantFlashVendor=Fehler beim Flashen der Vendor-Partition

script_error_cantFlashproduct=Fehler beim Flashen der Produkt-Partition 

script_error_cantFlashSystem=Fehler beim Flashen der Systempartitionen

script_error_cantRebootToFastboot=Fehler beim Neustarten in den Fastboot-Modus

script_error_cantFlashVBmeta_vendor=Fehler beim Flashen der vb meta vendor-Partition

script_error_cantFlashVbmeta_system=Fehler beim Flashen der vb meta System-Partition

script_error_cantFlashVbmeta=Fehler beim Flashen der vb meta-Partition

script_error_cantFlashRecovery=Fehler beim Flashen des Wiederherstellungssystems (Recovery)

script_error_cantFlashBoot=Fehler beim Flashen der Boot-Partition

script_error_cantWipeData=Fehler beim Löschen der Daten

script_error_cantUnpackSources=Fehler beim Entpacker der /e/-Quellen

script_error_cantRebootBootloader=Fehler beim Starten (booten) in den Bootloader