Merge branch 'wizard' of ssh://leap.se/leap_android into wizard

Conflicts:
	src/se/leap/leapclient/Dashboard.java

2 files changed, 3 insertions, 44 deletions

diff --git a/assets/providers/bitmask.net_eip-service.json b/assets/providers/bitmask.net_eip-service.json
deleted file mode 100644
index 6ac2fed6..00000000
--- a/assets/providers/bitmask.net_eip-service.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "clusters": [
-    {
-      "label": {
-        "en": "Location Unknown"
-      },
-      "name": "location_unknown"
-    }
-  ],
-  "gateways": [
-    {
-      "capabilities": {
-        "adblock": false,
-        "filter_dns": true,
-        "ports": [
-          "1194",
-          "443",
-          "53",
-          "80"
-        ],
-        "protocols": [
-          "tcp",
-          "udp"
-        ],
-        "transport": [
-          "openvpn"
-        ],
-        "user_ips": false
-      },
-      "cluster": "location_unknown",
-      "host": "aligator.bitmask.net",
-      "ip_address": "176.53.69.121"
-    }
-  ],
-  "openvpn_configuration": {
-    "auth": "SHA1",
-    "cipher": "AES-128-CBC",
-    "tls-cipher": "DHE-RSA-AES128-SHA"
-  },
-  "serial": 1,
-  "version": 1
-}
\ No newline at end of file
diff --git a/assets/urls/bitmask.url b/assets/urls/bitmask.url
index 132e295d..f83ead86 100644
--- a/assets/urls/bitmask.url
+++ b/assets/urls/bitmask.url
@@ -1,6 +1,7 @@
 {

 	"name" : "bitmask",

+	"assets_json_provider" : "providers/bitmask.net_provider.json",

 	"json_provider" : "https://bitmask.net/provider.json",

-	"cert" : "https://bitmask.net/1/cert",

-	"json_eip_service" : "https://api.bitmask.net:4430/1/config/eip-service.json"

+	"cert" : "https://bitmask.net/ca.crt",

+	"json_eip_service" : "https://api.bitmask.net/1/config/eip-service.json"

 }
\ No newline at end of file