1 files changed, 9 insertions, 5 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/DnsResolver.java b/app/src/main/java/se/leap/bitmaskclient/DnsResolver.java
index 069318a4..92f70492 100644
--- a/app/src/main/java/se/leap/bitmaskclient/DnsResolver.java
+++ b/app/src/main/java/se/leap/bitmaskclient/DnsResolver.java
@@ -1,29 +1,33 @@
 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(String hostname) throws UnknownHostException {
+    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.getProviderToSetup() != null) {
-                currentProvider = observable.getProviderToSetup();
+            if (observable.getProviderForDns() != null) {
+                currentProvider = observable.getProviderForDns();
             } else {
                 currentProvider = observable.getCurrentProvider();
             }
-            if (currentProvider.hasProviderIp()) {
+            String ip = currentProvider.getIpForHostname(hostname);
+            if (!ip.isEmpty()) {
                 ArrayList<InetAddress> addresses = new ArrayList<>();
-                addresses.add(InetAddress.getByAddress(hostname, currentProvider.getProviderIpAsBytes()));
+                addresses.add(InetAddress.getByAddress(hostname, IPAddress.asBytes(ip)));
                 return addresses;
             } else {
                 throw new UnknownHostException("Hostname " + hostname + " not found");