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

Commit 5874c6e2 authored by Nihar Thakkar's avatar Nihar Thakkar
Browse files

Update /e/ URLs, add new email address providers

parent f1a2a62d

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -28,3 +28,4 @@ build.xml 
proguard-project.txt

.idea/

*.iml

*.apk

k9mail/src/main/java/io/eelo/mail/activity/Accounts.java

+2 −2
Original line number Diff line number Diff line
@@ -543,10 +543,10 @@ public class Accounts extends K9ListActivity implements OnItemClickListener 
        try {

            String deviceAccountStoreUri = "imap+ssl+://" +

                    URLEncoder.encode(deviceAccountEmailId, "UTF-8") + ":" +

                    URLEncoder.encode(deviceAccountPassword, "UTF-8") + "@mail.eelo.io";

                    URLEncoder.encode(deviceAccountPassword, "UTF-8") + "@mail.ecloud.global";

            String deviceAccountTransportUri = "smtp+tls+://" +

                    URLEncoder.encode(deviceAccountEmailId, "UTF-8") + ":" +

                    URLEncoder.encode(deviceAccountPassword, "UTF-8") + "@mail.eelo.io";

                    URLEncoder.encode(deviceAccountPassword, "UTF-8") + "@mail.ecloud.global";



            if (deviceAccountStoreUri.equals(account.getStoreUri()) &&

                    deviceAccountTransportUri.equals(account.getTransportUri())) {

k9mail/src/main/java/io/eelo/mail/activity/setup/EeloAccountCreator.java

+2 −2
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ public class EeloAccountCreator { 


        try {

            accountConfig.setStoreUri("imap+ssl+://" + URLEncoder.encode(emailId, "UTF-8") +

                    ":" + URLEncoder.encode(password, "UTF-8") + "@mail.eelo.io");

                    ":" + URLEncoder.encode(password, "UTF-8") + "@mail.ecloud.global");

            accountConfig.setTransportUri("smtp+tls+://" + URLEncoder.encode(emailId, "UTF-8") +

                    ":" + URLEncoder.encode(password, "UTF-8") + "@mail.eelo.io");

                    ":" + URLEncoder.encode(password, "UTF-8") + "@mail.ecloud.global");

        }

        catch (UnsupportedEncodingException e) {

            e.printStackTrace();

k9mail/src/main/java/io/eelo/mail/controller/MessagingController.java

+17 −10
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ package io.eelo.mail.controller; 




import java.io.IOException;

import java.io.UnsupportedEncodingException;

import java.net.URLEncoder;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collection;
@@ -4127,17 +4129,22 @@ public class MessagingController 
    private boolean hasPasswordUpdate(Account account,

                                      String deviceAccountEmailId,

                                      String deviceAccountPassword) {

        String deviceAccountStoreUri = "imap+ssl+://" + deviceAccountEmailId

                .replace("@", "%40") + ":" + deviceAccountPassword

                + "@mail.eelo.io";

        String deviceAccountTransportUri = "smtp+tls+://" + deviceAccountEmailId

                .replace("@", "%40") + ":" + deviceAccountPassword

                + "@mail.eelo.io";

        try {

            String deviceAccountStoreUri = "imap+ssl+://" +

                    URLEncoder.encode(deviceAccountEmailId, "UTF-8") + ":" +

                    URLEncoder.encode(deviceAccountPassword, "UTF-8") + "@mail.ecloud.global";

            String deviceAccountTransportUri = "smtp+tls+://" +

                    URLEncoder.encode(deviceAccountEmailId, "UTF-8") + ":" +

                    URLEncoder.encode(deviceAccountPassword, "UTF-8") + "@mail.ecloud.global";



            if (deviceAccountStoreUri.equals(account.getStoreUri()) &&

                    deviceAccountTransportUri.equals(account.getTransportUri())) {

                return false;

            }

        }

        catch (UnsupportedEncodingException e) {

            e.printStackTrace();

        }

        return true;

    }

k9mail/src/main/res/xml/providers.xml

+27 −5
Original line number Diff line number Diff line
@@ -77,16 +77,38 @@ 


<providers>



    <!-- eelo.io / eelo.me -->

    <!-- eelo.io / eelo.me / e.email / ecloud.global -->

    <provider

        domain="ecloud.global"

        id="ecloud.global"

        label="ecloud.global mail services">

        <incoming

            uri="imap+ssl+://mail.ecloud.global"

            username="$email" />

        <outgoing

            uri="smtp+tls+://mail.ecloud.global"

            username="$email" />

    </provider>

    <provider

        domain="e.email"

        id="e.email"

        label="e.email mail services">

        <incoming

            uri="imap+ssl+://mail.ecloud.global"

            username="$email" />

        <outgoing

            uri="smtp+tls+://mail.ecloud.global"

            username="$email" />

    </provider>

    <provider

        domain="eelo.io"

        id="eelo.io"

        label="eelo.io mail services">

        <incoming

            uri="imap+ssl+://mail.eelo.io"

            uri="imap+ssl+://mail.ecloud.global"

            username="$email" />

        <outgoing

            uri="smtp+tls+://mail.eelo.io"

            uri="smtp+tls+://mail.ecloud.global"

            username="$email" />

    </provider>

    <provider
@@ -94,10 +116,10 @@ 
        id="eelo.me"

        label="eelo.me mail services">

        <incoming

            uri="imap+ssl+://mail.eelo.io"

            uri="imap+ssl+://mail.ecloud.global"

            username="$email" />

        <outgoing

            uri="smtp+tls+://mail.eelo.io"

            uri="smtp+tls+://mail.ecloud.global"

            username="$email" />

    </provider>