summaryrefslogtreecommitdiff
path: root/app/src/sharedTest/java/se.leap.bitmaskclient
diff options
context:
space:
mode:
authorcyberta <cyberta@riseup.net>2021-02-26 19:59:44 +0000
committercyberta <cyberta@riseup.net>2021-02-26 19:59:44 +0000
commitf8af21d625c4e732b2079a7814b7b4b03c22cd80 (patch)
treec668abce6b16e4b27b64a1ab0d6f23c8f1e76b88 /app/src/sharedTest/java/se.leap.bitmaskclient
parent2666b87be9d8911ca21a555f6d33e8202063e87b (diff)
parentef7ac468e0b3adcd70d21f7e49bf1750f600fdbe (diff)
Merge branch 'ipv6_gateway_selection' into 'beta-release'
adapt eip-service.json parsing to support ipv6 See merge request leap/bitmask_android!125
Diffstat (limited to 'app/src/sharedTest/java/se.leap.bitmaskclient')
-rw-r--r--app/src/sharedTest/java/se.leap.bitmaskclient/testutils/TestSetupHelper.java5
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";