* show error dialog if provider is misconfigured and has not allowed registration nor anonymous usage

* always download provider.json, Use preseeded provider.json only to check if the  client
  can connect with preseeded certificate. Keeps the provider.json updated if provider changes it's
  config
* Tests for both cases

3 files changed, 88 insertions, 13 deletions

diff --git a/app/src/test/resources/error_messages.json b/app/src/test/resources/error_messages.json
index 4d72b074..8430d9e0 100644
--- a/app/src/test/resources/error_messages.json
+++ b/app/src/test/resources/error_messages.json
@@ -1,16 +1,17 @@
 {
   "server_unreachable_message": "Server is unreachable, please try again.",
-"error.security.pinnedcertificate": "Security error, update the app or choose another provider.",
-"malformed_url": "It doesn't seem to be a Bitmask provider.",
-"certificate_error": "This is not a trusted Bitmask provider.",
-"error_srp_math_error_user_message": "Try again: server math error.",
-"error_bad_user_password_user_message": "Incorrect username or password.",
-"error_not_valid_password_user_message": "It should have at least 8 characters.",
-"error_client_http_user_message": "Try again: Client HTTP error",
-"error_io_exception_user_message": "Try again: I/O error",
-"error_json_exception_user_message": "Try again: Bad response from the server",
-"error_no_such_algorithm_exception_user_message": "Encryption algorithm not found. Please update your OS!",
-"warning_corrupted_provider_details": "Stored provider details are corrupted. You can either update Bitmask (recommended) or update the provider details using a commercial CA certificate.",
-"warning_corrupted_provider_cert": "Stored provider certificate is invalid. You can either update Bitmask (recommended) or update the provider certificate using a commercial CA certificate.",
-"warning_expired_provider_cert": "Stored provider certificate is expired. You can either update Bitmask (recommended) or update the provider certificate using a commercial CA certificate."
+  "error.security.pinnedcertificate": "Security error, update the app or choose another provider.",
+  "malformed_url": "It doesn't seem to be a Bitmask provider.",
+  "certificate_error": "This is not a trusted Bitmask provider.",
+  "error_srp_math_error_user_message": "Try again: server math error.",
+  "error_bad_user_password_user_message": "Incorrect username or password.",
+  "error_not_valid_password_user_message": "It should have at least 8 characters.",
+  "error_client_http_user_message": "Try again: Client HTTP error",
+  "error_io_exception_user_message": "Try again: I/O error",
+  "error_json_exception_user_message": "Try again: Bad response from the server",
+  "error_no_such_algorithm_exception_user_message": "Encryption algorithm not found. Please update your OS!",
+  "warning_corrupted_provider_details": "Stored provider details are corrupted. You can either update Bitmask (recommended) or update the provider details using a commercial CA certificate.",
+  "warning_corrupted_provider_cert": "Stored provider certificate is invalid. You can either update Bitmask (recommended) or update the provider certificate using a commercial CA certificate.",
+  "warning_expired_provider_cert": "Stored provider certificate is expired. You can either update Bitmask (recommended) or update the provider certificate using a commercial CA certificate.",
+  "setup_error_text": "There was an error configuring Bitmask with your chosen provider."
 }
\ No newline at end of file
diff --git a/app/src/test/resources/riseup_net_invalid_config.json b/app/src/test/resources/riseup_net_invalid_config.json
new file mode 100644
index 00000000..b91b4d51
--- /dev/null
+++ b/app/src/test/resources/riseup_net_invalid_config.json
@@ -0,0 +1,37 @@
+{
+  "api_uri": "https://api.black.riseup.net:443",
+  "api_version": "1",
+  "ca_cert_fingerprint": "SHA256: a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494",
+  "ca_cert_uri": "https://black.riseup.net/ca.crt",
+  "default_language": "en",
+  "description": {
+    "en": "Riseup is a non-profit collective in Seattle that provides online communication tools for people and groups working toward liberatory social change."
+  },
+  "domain": "riseup.net",
+  "enrollment_policy": "open",
+  "languages": [
+    "en"
+  ],
+  "name": {
+    "en": "Riseup Networks"
+  },
+  "service": {
+    "allow_anonymous": false,
+    "allow_free": true,
+    "allow_limited_bandwidth": false,
+    "allow_paid": false,
+    "allow_registration": false,
+    "allow_unlimited_bandwidth": true,
+    "bandwidth_limit": 102400,
+    "default_service_level": 1,
+    "levels": {
+      "1": {
+        "description": "Please donate.",
+        "name": "free"
+      }
+    }
+  },
+  "services": [
+    "openvpn"
+  ]
+}
\ No newline at end of file
diff --git a/app/src/test/resources/riseup_net_outdated_config.json b/app/src/test/resources/riseup_net_outdated_config.json
new file mode 100644
index 00000000..82290ecd
--- /dev/null
+++ b/app/src/test/resources/riseup_net_outdated_config.json
@@ -0,0 +1,37 @@
+{
+  "api_uri": "https://api.black.riseup.net:443",
+  "api_version": "1",
+  "ca_cert_fingerprint": "SHA256: a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494",
+  "ca_cert_uri": "https://black.riseup.net/ca.crt",
+  "default_language": "en",
+  "description": {
+    "en": "Riseup is a non-profit collective in Seattle that provides online communication tools for people and groups working toward liberatory social change."
+  },
+  "domain": "riseup.net",
+  "enrollment_policy": "open",
+  "languages": [
+    "en"
+  ],
+  "name": {
+    "en": "Riseup Networks"
+  },
+  "service": {
+    "allow_anonymous": true,
+    "allow_free": true,
+    "allow_limited_bandwidth": false,
+    "allow_paid": false,
+    "allow_registration": true,
+    "allow_unlimited_bandwidth": true,
+    "bandwidth_limit": 102400,
+    "default_service_level": 1,
+    "levels": {
+      "1": {
+        "description": "Please donate.",
+        "name": "free"
+      }
+    }
+  },
+  "services": [
+    "openvpn"
+  ]
+}
\ No newline at end of file