Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-02 07:06:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use MX record for auto config

Browse Source
This commit is contained in:
M66B
2019-11-14 18:40:34 +01:00
parent dd39eec9b0
commit 39a3ceb99e
2 changed files with 82 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
View File

@@ -230,15 +230,17 @@ public class FragmentQuickSetup extends FragmentBase {
if (TextUtils.isEmpty(password))
throw new IllegalArgumentException(context.getString(R.string.title_no_password));
String[] dparts = email.split("@");
EmailProvider provider = EmailProvider.fromDomain(context, dparts[1], EmailProvider.Discover.ALL);
EmailProvider provider = EmailProvider.fromEmail(context, email, EmailProvider.Discover.ALL);
if (provider.link != null)
args.putString("link", provider.link);
if (provider.documentation != null)
args.putString("documentation", provider.documentation.toString());
String user = (provider.user == EmailProvider.UserType.EMAIL ? email : dparts[0]);
int at = email.indexOf('@');
String username = email.substring(0, at);
String user = (provider.user == EmailProvider.UserType.EMAIL ? email : username);
Log.i("User type=" + provider.user + " name=" + user);
boolean empty;
@@ -249,9 +251,9 @@ public class FragmentQuickSetup extends FragmentBase {
try {
iservice.connect(provider.imap.host, provider.imap.port, MailService.AUTH_TYPE_PASSWORD, user, password);
} catch (AuthenticationFailedException ex) {
if (user.contains("@")) {
if (!user.equals(username)) {
Log.w(ex);
user = dparts[0];
user = username;
Log.i("Retry with user=" + user);
iservice.connect(provider.imap.host, provider.imap.port, MailService.AUTH_TYPE_PASSWORD, user, password);
} else