* 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

1 files changed, 2 insertions, 2 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java b/app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java
index 5cf27854..15c7457e 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java
+++ b/app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java
@@ -595,7 +595,7 @@ public abstract class ProviderApiManagerBase {
 
     private boolean canConnect(String caCert, JSONObject providerDefinition, Bundle result) {
         JSONObject errorJson = new JSONObject();
-        String baseUrl = getApiUrl(providerDefinition);
+        String providerUrl = getApiUrl(providerDefinition) + "/provider.json";
 
         OkHttpClient okHttpClient = clientGenerator.initSelfSignedCAHttpClient(caCert, errorJson);
         if (okHttpClient == null) {
@@ -605,7 +605,7 @@ public abstract class ProviderApiManagerBase {
 
         try {
 
-            return ProviderApiConnector.canConnect(okHttpClient, baseUrl);
+            return ProviderApiConnector.canConnect(okHttpClient, providerUrl);
 
         }  catch (UnknownHostException | SocketTimeoutException e) {
             setErrorResult(result, server_unreachable_message, null);