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

Commit 2bf4315d authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch '458-polish_rebanding' into 'master' 

458-polish_rebanding

See merge request !188
parents 83b44423 08840e32

src/main/java/ecorp/easy/installer/AppConstants.java

+4 −2
Original line number Diff line number Diff line
@@ -38,8 +38,10 @@ public abstract class AppConstants { 


    public final static String AdbFolderName = "adb";



    public final static String FEEDBACK_STORAGE_URL ="https://ecloud.global/s/QLwyiZ4fysodiz3";

    public final static String LOG_STORAGE_URL ="https://ecloud.global/s/4qRxWjeM5Yb72b4";

    public final static String MURENA_BASE_URL = "https://murena.io";



    public final static String FEEDBACK_STORAGE_URL = MURENA_BASE_URL + "/s/QLwyiZ4fysodiz3";

    public final static String LOG_STORAGE_URL = MURENA_BASE_URL + "/s/4qRxWjeM5Yb72b4";

    private final static String BuildSrcFolderName = "buildSrc";



    //step type key

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

+3 −1
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ import java.net.URI; 
import java.net.URLEncoder;

import java.nio.charset.StandardCharsets;

import java.util.Map;



import ecorp.easy.installer.AppConstants;

import javafx.concurrent.Task;

import java.net.http.HttpClient;

import java.net.http.HttpRequest;
@@ -98,7 +100,7 @@ public class AskAccountTask extends Task<String>{ 
            .POST(datas)

            .setHeader("User-Agent", "Java 11 HttpClient Bot") // add request header

            .header("Content-Type", "application/x-www-form-urlencoded")

            .uri(URI.create("https://welcome.ecloud.global/process_email_invite.php"))

            .uri(URI.create(AppConstants.MURENA_BASE_URL + "/signup/process_email_invite.php"))

            .build();

        

        return request;

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

+3 −1
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ import java.net.http.HttpRequest; 
import java.net.http.HttpResponse;

import java.nio.file.Paths;

import java.util.Base64;



import ecorp.easy.installer.AppConstants;

import javafx.concurrent.Task;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;
@@ -58,7 +60,7 @@ public class UploadToEcloudTask extends Task<Boolean>{ 
        var request = HttpRequest.newBuilder()

            .header("Referer", URL)

            .header("Authorization", "Basic "+autorizationToken) //the value is defined for the folder and is required! I've no idea how to automaticaly get it

            .uri(URI.create("https://ecloud.global/public.php/webdav/"+file.getName()))

            .uri(URI.create(AppConstants.MURENA_BASE_URL + "/public.php/webdav/" + file.getName()))

            .PUT(HttpRequest.BodyPublishers.ofFile(Paths.get(filePath)))

            .build();