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

No dns fallback

See merge request leap/bitmask_android!99

1 files changed, 11 insertions, 3 deletions

diff --git a/app/src/sharedTest/java/se.leap.bitmaskclient/testutils/TestSetupHelper.java b/app/src/sharedTest/java/se.leap.bitmaskclient/testutils/TestSetupHelper.java
index 669abc84..c7c85f8d 100644
--- a/app/src/sharedTest/java/se.leap.bitmaskclient/testutils/TestSetupHelper.java
+++ b/app/src/sharedTest/java/se.leap.bitmaskclient/testutils/TestSetupHelper.java
@@ -51,12 +51,18 @@ public class TestSetupHelper {
 
 
     public static Provider getConfiguredProvider() throws IOException, JSONException {
-        return getProvider(null, null, null, null);
+        return getProvider(null,  null, null, null, null, null);
     }
 
-    public static Provider getProvider(String domain, String caCertFile, String providerJson, String eipServiceJson) {
+    public static Provider getProvider(String domain, String providerIp, String providerApiIp, String caCertFile, String providerJson, String eipServiceJson) {
         if (domain == null)
             domain = "https://riseup.net";
+        if (providerIp == null) {
+            providerIp = "";
+        }
+        if (providerApiIp == null) {
+            providerApiIp = "";
+        }
         if (caCertFile == null)
             caCertFile = "riseup.net.pem";
         if (providerJson == null)
@@ -67,7 +73,9 @@ public class TestSetupHelper {
 
         try {
             Provider p = new Provider(
-                    new URL(domain),
+                    domain,
+                    providerIp,
+                    providerApiIp,
                     getInputAsString(TestSetupHelper.class.getClassLoader().getResourceAsStream(caCertFile)),
                     getInputAsString(TestSetupHelper.class.getClassLoader().getResourceAsStream(providerJson))