From 2359276202dce5761b7b46a8adddffa8add8bbe6 Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 14 Jul 2019 13:30:04 +0200 Subject: [PATCH] Better DNS lookup --- app/src/main/java/eu/faircode/email/EmailProvider.java | 5 +++-- app/src/main/java/eu/faircode/email/Helper.java | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/EmailProvider.java b/app/src/main/java/eu/faircode/email/EmailProvider.java index 49ebb55312..add5df50e1 100644 --- a/app/src/main/java/eu/faircode/email/EmailProvider.java +++ b/app/src/main/java/eu/faircode/email/EmailProvider.java @@ -429,13 +429,14 @@ public class EmailProvider { Lookup lookup = new Lookup(dns, Type.SRV); // https://dns.watch/ 84.200.69.80 - SimpleResolver resolver = new SimpleResolver("8.8.8.8"); + SimpleResolver resolver = new SimpleResolver(Helper.DEFAULT_DNS); lookup.setResolver(resolver); Log.i("Lookup dns=" + dns + " @" + resolver.getAddress()); Record[] records = lookup.run(); if (lookup.getResult() != Lookup.SUCCESSFUL) - if (lookup.getResult() == Lookup.HOST_NOT_FOUND) + if (lookup.getResult() == Lookup.HOST_NOT_FOUND || + lookup.getResult() == Lookup.TYPE_NOT_FOUND) throw new UnknownHostException(dns); else throw new IllegalArgumentException(lookup.getErrorString()); diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java index 726b8552b5..986ccf3901 100644 --- a/app/src/main/java/eu/faircode/email/Helper.java +++ b/app/src/main/java/eu/faircode/email/Helper.java @@ -114,6 +114,8 @@ public class Helper { static final float LOW_LIGHT = 0.6f; + static final String DEFAULT_DNS = "8.8.8.8"; + static final String FAQ_URI = "https://github.com/M66B/FairEmail/blob/master/FAQ.md"; static final String XDA_URI = "https://forum.xda-developers.com/android/apps-games/source-email-t3824168";