Merge branch 'develop' into release-0.9.0

1 files changed, 69 insertions, 0 deletions

diff --git a/app/src/androidTest/assets/eip-service-test.json b/app/src/androidTest/assets/eip-service-test.json
new file mode 100644
index 00000000..78b49bae
--- /dev/null
+++ b/app/src/androidTest/assets/eip-service-test.json
@@ -0,0 +1,69 @@
+{
+  "gateways": [
+    {
+      "capabilities": {
+        "adblock": false,
+        "filter_dns": false,
+        "limited": false,
+        "ports": [
+          "443"
+        ],
+        "protocols": [
+          "tcp",
+          "udp"
+        ],
+        "transport": [
+          "openvpn"
+        ],
+        "user_ips": false
+      },
+      "host": "millipede.demo.bitmask.net",
+      "ip_address": "198.252.153.84",
+      "location": "seattle__wa"
+    },
+    {
+      "capabilities": {
+        "adblock": false,
+        "filter_dns": false,
+        "limited": false,
+        "ports": [
+          "443"
+        ],
+        "protocols": [
+          "tcp",
+          "udp"
+        ],
+        "transport": [
+          "openvpn"
+        ],
+        "user_ips": false
+      },
+      "host": "otter.demo.bitmask.net",
+      "ip_address": "46.165.242.169",
+      "location": "frankfurt"
+    }
+  ],
+  "locations": {
+    "frankfurt": {
+      "country_code": "DE",
+      "hemisphere": "N",
+      "name": "Frankfurt",
+      "timezone": "+1"
+    },
+    "seattle__wa": {
+      "country_code": "US",
+      "hemisphere": "N",
+      "name": "Seattle, WA",
+      "timezone": "-7"
+    }
+  },
+  "openvpn_configuration": {
+    "auth": "SHA1",
+    "cipher": "AES-128-CBC",
+    "keepalive": "10 30",
+    "tls-cipher": "DHE-RSA-AES128-SHA",
+    "tun-ipv6": true
+  },
+  "serial": 1,
+  "version": 1
+}
\ No newline at end of file