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

Commit 9da9ea47 authored by Nihar Thakkar's avatar Nihar Thakkar Committed by Sumit Pundir
Browse files

Encode email address and password

parent 12627f67

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

+13 −4
Original line number Diff line number Diff line
@@ -3,6 +3,9 @@ package io.eelo.mail.activity.setup; 
import android.content.Context;

import android.util.Log;



import java.io.UnsupportedEncodingException;

import java.net.URLEncoder;



import io.eelo.mail.Account;

import io.eelo.mail.K9;

import io.eelo.mail.Preferences;
@@ -22,10 +25,16 @@ public class EeloAccountCreator { 
        accountConfig.setSentFolderName("Sent");

        accountConfig.setSpamFolderName("Spam");

        accountConfig.setAutoExpandFolderName("INBOX");

        accountConfig.setStoreUri("imap+ssl+://" + emailId.replace("@", "%40") +

                ":" + password + "@mail.eelo.io");

        accountConfig.setTransportUri("smtp+tls+://" + emailId.replace("@", "%40") +

                ":" + password + "@mail.eelo.io");



        try {

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

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

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

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

        }

        catch (UnsupportedEncodingException e) {

            e.printStackTrace();

        }



        Log.e("Add /e/ account", "Store URI: " + accountConfig.getStoreUri());

        Log.e("Add /e/ account", "Transport URI: " + accountConfig.getTransportUri());

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

+14 −4
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ package io.eelo.mail.activity.setup; 


import android.content.Context;



import java.io.UnsupportedEncodingException;

import java.net.URLEncoder;



import io.eelo.mail.Account;

import io.eelo.mail.K9;

import io.eelo.mail.Preferences;
@@ -21,10 +24,17 @@ public class GoogleAccountCreator { 
        accountConfig.setSentFolderName("[Gmail]/Sent Mail");

        accountConfig.setSpamFolderName("[Gmail]/Spam");

        accountConfig.setAutoExpandFolderName("INBOX");

        accountConfig.setStoreUri("imap+ssl+://XOAUTH2:" + emailId.replace("@",

                "%40") + ":@imap.gmail.com");

        accountConfig.setTransportUri("smtp+ssl+://" + emailId.replace("@", "%40") +



        try {

            accountConfig.setStoreUri("imap+ssl+://XOAUTH2:" +

                    URLEncoder.encode(emailId, "UTF-8") + ":@imap.gmail.com");

            accountConfig.setTransportUri("smtp+ssl+://" +

                    URLEncoder.encode(emailId, "UTF-8") +

                    "::XOAUTH2@smtp.gmail.com");

        }

        catch (UnsupportedEncodingException e) {

            e.printStackTrace();

        }



        Account account = preferences.newAccount();

        account.setDeviceAccount(true);