Merge branch 'ipv6_gateway_selection' into 'beta-release'

adapt eip-service.json parsing to support ipv6

See merge request leap/bitmask_android!125

1 files changed, 5 insertions, 0 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 729c75ed..0fdc94ca 100644
--- a/app/src/sharedTest/java/se.leap.bitmaskclient/testutils/TestSetupHelper.java
+++ b/app/src/sharedTest/java/se.leap.bitmaskclient/testutils/TestSetupHelper.java
@@ -53,6 +53,11 @@ public class TestSetupHelper {
         return getProvider(null,  null, null, null, null, null, null, null);
     }
 
+    public static Provider getConfiguredProviderAPIv4() {
+           return getProvider(null, null, null, null, null, "v4/riseup.net.json", "v4/riseup.service.json", null);
+    }
+
+
     public static Provider getProvider(String domain, String geoipUrl, String providerIp, String providerApiIp, String caCertFile, String providerJson, String eipServiceJson, String geoIpJson) {
         if (domain == null)
             domain = "https://riseup.net";