Merge branch 'no-dns-fallback' into 'master'

No dns fallback

See merge request leap/bitmask_android!99

1 files changed, 37 insertions, 0 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/DnsResolver.java b/app/src/main/java/se/leap/bitmaskclient/DnsResolver.java
new file mode 100644
index 00000000..92f70492
--- /dev/null
+++ b/app/src/main/java/se/leap/bitmaskclient/DnsResolver.java
@@ -0,0 +1,37 @@
+package se.leap.bitmaskclient;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.List;
+
+import okhttp3.Dns;
+import se.leap.bitmaskclient.utils.IPAddress;
+
+class DnsResolver implements Dns {
+
+    @Override
+    public List<InetAddress> lookup(@NotNull String hostname) throws UnknownHostException {
+        try {
+            return Dns.SYSTEM.lookup(hostname);
+        } catch (UnknownHostException e) {
+            ProviderObservable observable = ProviderObservable.getInstance();
+            Provider currentProvider;
+            if (observable.getProviderForDns() != null) {
+                currentProvider = observable.getProviderForDns();
+            } else {
+                currentProvider = observable.getCurrentProvider();
+            }
+            String ip = currentProvider.getIpForHostname(hostname);
+            if (!ip.isEmpty()) {
+                ArrayList<InetAddress> addresses = new ArrayList<>();
+                addresses.add(InetAddress.getByAddress(hostname, IPAddress.asBytes(ip)));
+                return addresses;
+            } else {
+                throw new UnknownHostException("Hostname " + hostname + " not found");
+            }
+        }
+    }
+}