mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-01-04 06:20:26 +00:00
Code Issues Releases Wiki Activity

Simplification

Browse source
This commit is contained in:
M66B 2021-12-02 20:26:19 +01:00
parent dec9f9c4fa
commit 644d36f322
1 changed files with 10 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
app/src/main/java/eu/faircode/email/DnsHelper.java
View file

@ -67,32 +67,17 @@ public class DnsHelper {
String domain = UriHelper.getEmailDomain(email); String domain = UriHelper.getEmailDomain(email);
if (domain == null) if (domain == null)
continue; continue;
lookup(context, domain, "mx", CHECK_TIMEOUT);
try {
SimpleResolver resolver = new SimpleResolver(getDnsServer(context));
resolver.setTimeout(CHECK_TIMEOUT);
Lookup lookup = new Lookup(domain, Type.MX);
lookup.setResolver(resolver);
lookup.run();
Log.i("Check name=" + domain + " @" + resolver.getAddress() + " result=" + lookup.getResult());
if (lookup.getResult() == Lookup.SUCCESSFUL)
continue;
String error = "Error " + lookup.getResult() + ": " + lookup.getErrorString();
if (lookup.getResult() == Lookup.HOST_NOT_FOUND ||
lookup.getResult() == Lookup.TYPE_NOT_FOUND)
throw new UnknownHostException(context.getString(R.string.title_no_server, domain));
} catch (UnknownHostException ex) {
throw ex;
} catch (Throwable ex) {
Log.e(ex);
}
} }
} }
@NonNull @NonNull
static DnsRecord[] lookup(Context context, String name, String type) throws UnknownHostException { static DnsRecord[] lookup(Context context, String name, String type) throws UnknownHostException {
return lookup(context, name, type, LOOKUP_TIMEOUT);
}
@NonNull
static DnsRecord[] lookup(Context context, String name, String type, int timeout) throws UnknownHostException {
int rtype; int rtype;
switch (type) { switch (type) {
case "mx": case "mx":
@ -165,7 +150,7 @@ public class DnsHelper {
} }
}); });
try { try {
if (!sem.tryAcquire(LOOKUP_TIMEOUT, TimeUnit.SECONDS)) if (!sem.tryAcquire(timeout, TimeUnit.SECONDS))
ex = new IOException("timeout"); ex = new IOException("timeout");
} catch (InterruptedException e) { } catch (InterruptedException e) {
ex = new IOException("interrupted"); ex = new IOException("interrupted");
@ -185,7 +170,7 @@ public class DnsHelper {
} }
} }
}; };
resolver.setTimeout(LOOKUP_TIMEOUT); resolver.setTimeout(timeout);
Lookup lookup = new Lookup(name, rtype); 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);
@ -221,7 +206,8 @@ public class DnsHelper {
return result.toArray(new DnsRecord[0]); return result.toArray(new DnsRecord[0]);
} catch (TextParseException ex) { } catch (TextParseException ex) {
throw new UnknownHostException(ex.getMessage()); Log.e(ex);
return new DnsRecord[0];
} }
} }