diff options
author | Parménides GV <parmegv@sdf.org> | 2013-03-13 21:01:53 +0100 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2013-03-13 21:01:53 +0100 |
commit | 929fa9a3b7621e0a956ed8d7beffb87ed7f16249 (patch) | |
tree | 26e3dbb8c9662b63e72c096bf0a0e54edefcd49a /src/se/leap/leapclient/ProviderListContent.java | |
parent | a8274e8b2649481f22bfc6d205d2ca7599fea065 (diff) |
ConfigurationWizard sets provider.json correctly for Dashboard once a
custom provider is selected.
Tested using https://bitmask.net as url for custom provider.
Diffstat (limited to 'src/se/leap/leapclient/ProviderListContent.java')
-rw-r--r-- | src/se/leap/leapclient/ProviderListContent.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/se/leap/leapclient/ProviderListContent.java b/src/se/leap/leapclient/ProviderListContent.java index d475d36..dd227bf 100644 --- a/src/se/leap/leapclient/ProviderListContent.java +++ b/src/se/leap/leapclient/ProviderListContent.java @@ -41,7 +41,7 @@ public class ProviderListContent { public String id;
public String name;
public String provider_json_url;
- public String provider_json_assets;
+ public String provider_json_filename;
public String eip_service_json_url;
public String cert_json_url;
@@ -63,7 +63,7 @@ public class ProviderListContent { id = name;
this.name = name;
provider_json_url = (String) file_contents.get("json_provider");
- provider_json_assets = (String) file_contents.get("assets_json_provider");
+ provider_json_filename = (String) file_contents.get("assets_json_provider");
eip_service_json_url = (String) file_contents.get("json_eip_service");
cert_json_url = (String) file_contents.get("cert");
this.custom = custom;
@@ -88,6 +88,8 @@ public class ProviderListContent { eip_service_json_url = (String) file_contents.get("api_uri") + ConfigHelper.eip_service_api_path;
cert_json_url = (String) file_contents.get("ca_cert_uri");
this.custom = custom;
+ if(custom)
+ provider_json_filename = name + "_provider.json".replaceFirst("__", "_");
} catch (JSONException e) {
// TODO Auto-generated catch block
e.printStackTrace();
|