Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-12-26 23:50:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Check mail.domain.tld as alternative host

Browse Source
This commit is contained in:
M66B
2019-05-12 10:20:19 +02:00
parent c88cb380d3
commit 561c628817
3 changed files with 51 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
app/src/main/java/eu/faircode/email/EmailProvider.java
View File

@@ -35,6 +35,9 @@ import org.xmlpull.v1.XmlPullParserFactory;
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.URL;
import java.net.UnknownHostException;
import java.text.Collator;
@@ -70,6 +73,18 @@ public class EmailProvider {
this.name = name;
}
private EmailProvider(String name, String domain, String imap_prefix, String smtp_prefix) {
this.name = name;
this.imap_host = imap_prefix + "." + domain;
this.imap_port = 993;
this.imap_starttls = false;
this.smtp_host = smtp_prefix + "." + domain;
this.smtp_port = 587;
this.smtp_starttls = true;
}
static List<EmailProvider> loadProfiles(Context context) {
List<EmailProvider> result = null;
try {
@@ -138,8 +153,13 @@ public class EmailProvider {
return addSpecials(context, fromDNS(domain));
} catch (UnknownHostException ex1) {
Log.w(ex1);
Log.i("Provider from template domain=" + domain);
return addSpecials(context, fromTemplate(domain));
try {
Log.i("Provider from template domain=" + domain);
return addSpecials(context, fromTemplate(domain));
} catch (UnknownHostException ex2) {
Log.w(ex2);
throw new UnknownHostException(context.getString(R.string.title_setup_no_settings, domain));
}
}
}
}
@@ -339,17 +359,34 @@ public class EmailProvider {
return provider;
}
private static EmailProvider fromTemplate(String domain) {
EmailProvider provider = new EmailProvider(domain);
provider.imap_host = "imap." + domain;
provider.imap_port = 993;
provider.imap_starttls = false;
private static EmailProvider fromTemplate(String domain) throws UnknownHostException {
if (checkTemplate(domain, "imap", 993, "smtp", 587))
return new EmailProvider(domain, domain, "imap", "smtp");
provider.smtp_host = "smtp." + domain;
provider.smtp_port = 587;
provider.smtp_starttls = true;
else if (checkTemplate(domain, "mail", 993, "mail", 587))
return new EmailProvider(domain, domain, "mail", "mail");
return provider;
else
throw new UnknownHostException();
}
private static boolean checkTemplate(
String domain, String imap_prefix, int imap_port, String smtp_prefix, int smtp_port) {
return isHostReachable(imap_prefix + "." + domain, imap_port, 5000) &&
isHostReachable(smtp_prefix + "." + domain, smtp_port, 5000);
}
static boolean isHostReachable(String host, int port, int timeoutms) {
Log.i("Checking " + host + ":" + port);
try (Socket socket = new Socket()) {
InetAddress iaddr = InetAddress.getByName(host);
InetSocketAddress inetSocketAddress = new InetSocketAddress(iaddr, port);
socket.connect(inetSocketAddress, timeoutms);
return true;
} catch (IOException ex) {
Log.w(ex);
return false;
}
}
private static void addDocumentation(EmailProvider provider, String href, String title) {