2 files changed, 7 insertions, 2 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/connectivity/DnsResolver.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/connectivity/DnsResolver.java
index e8249692..30d008d5 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/connectivity/DnsResolver.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/connectivity/DnsResolver.java
@@ -19,6 +19,7 @@ import okhttp3.dnsoverhttps.DnsOverHttps;
 import se.leap.bitmaskclient.base.models.Provider;
 import se.leap.bitmaskclient.base.models.ProviderObservable;
 import se.leap.bitmaskclient.base.utils.IPAddress;
+import se.leap.bitmaskclient.tor.TorStatusObservable;
 
 public class DnsResolver implements Dns {
     OkHttpClient dohHttpClient;
@@ -34,7 +35,7 @@ public class DnsResolver implements Dns {
     public List<InetAddress> lookup(@NonNull String hostname) throws UnknownHostException {
         Log.d("DNS", "trying to resolve DNS for " + hostname);
         List<InetAddress> list = null;
-        if (preferDoH) {
+        if (preferDoH && !"127.0.0.1".equals(hostname)) {
             if ((list = tryLookupDoH(hostname)) == null) {
                 list  = tryLookupSystemDNS(hostname);
             }
@@ -71,7 +72,7 @@ public class DnsResolver implements Dns {
 
     private List<InetAddress> tryLookupSystemDNS(@NonNull String hostname) throws RuntimeException, UnknownHostException {
         try {
-            Log.d("DNS", "trying to resolve " + hostname + "with system DNS");
+            Log.d("DNS", "trying to resolve " + hostname + " with system DNS");
             return Dns.SYSTEM.lookup(hostname);
         } catch (UnknownHostException e) {
             e.printStackTrace();
diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/connectivity/OkHttpClientGenerator.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/connectivity/OkHttpClientGenerator.java
index 97393551..b0dbd49b 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/connectivity/OkHttpClientGenerator.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/connectivity/OkHttpClientGenerator.java
@@ -43,10 +43,12 @@ import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
 import java.security.cert.CertificateException;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import okhttp3.CipherSuite;
 import okhttp3.ConnectionSpec;
@@ -139,6 +141,8 @@ public class OkHttpClientGenerator {
 
         clientBuilder.dns(new DnsResolver(clientBuilder.build(), true));
         sslCompatFactory.initSSLSocketFactory(clientBuilder);
+        clientBuilder.connectTimeout(45L, TimeUnit.SECONDS);
+        clientBuilder.readTimeout(45L, TimeUnit.SECONDS);
         return clientBuilder.build();
     }