mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Better DNS error handling

This commit is contained in:
M66B 2020-07-16 23:28:32 +02:00
parent c53d1d87cb
commit ad1347b7ff
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/eu/faircode/email/DnsHelper.java
View File

@ -63,12 +63,25 @@ public class DnsHelper {
String domain = email.substring(d + 1); String domain = email.substring(d + 1);
boolean found = true;
try { try {
lookup(context, domain, "mx"); SimpleResolver resolver = new SimpleResolver(getDnsServer(context));
} catch (UnknownHostException ex) { Lookup lookup = new Lookup(domain, Type.MX);
Log.i(ex); lookup.setResolver(resolver);
throw new UnknownHostException(context.getString(R.string.title_no_server, domain)); lookup.run();
Log.i("Check name=" + domain + " @" + resolver.getAddress() + " result=" + lookup.getResult());
if (lookup.getResult() == Lookup.HOST_NOT_FOUND ||
lookup.getResult() == Lookup.TYPE_NOT_FOUND)
found = false;
else if (lookup.getResult() != Lookup.SUCCESSFUL)
throw new UnknownHostException("DNS error=" + lookup.getErrorString());
} catch (Throwable ex) {
Log.e(ex);
} }
if (!found)
throw new UnknownHostException(context.getString(R.string.title_no_server, domain));
} }
} }
@ -99,9 +112,8 @@ public class DnsHelper {
} }
try { try {
Lookup lookup = new Lookup(name, rtype);
SimpleResolver resolver = new SimpleResolver(getDnsServer(context)); SimpleResolver resolver = new SimpleResolver(getDnsServer(context));
Lookup lookup = new Lookup(name, rtype);
lookup.setResolver(resolver); lookup.setResolver(resolver);
Log.i("Lookup name=" + name + " @" + resolver.getAddress() + " type=" + rtype); Log.i("Lookup name=" + name + " @" + resolver.getAddress() + " type=" + rtype);
Record[] records = lookup.run(); Record[] records = lookup.run();
@ -110,7 +122,7 @@ public class DnsHelper {
lookup.getResult() == Lookup.TYPE_NOT_FOUND) lookup.getResult() == Lookup.TYPE_NOT_FOUND)
throw new UnknownHostException(name); throw new UnknownHostException(name);
else if (lookup.getResult() != Lookup.SUCCESSFUL) else if (lookup.getResult() != Lookup.SUCCESSFUL)
Log.w("DNS error=" + lookup.getErrorString()); Log.e("DNS error=" + lookup.getErrorString());
List<DnsRecord> result = new ArrayList<>(); List<DnsRecord> result = new ArrayList<>();