diff options
author | Parménides GV <parmegv@sdf.org> | 2013-02-05 20:46:33 +0100 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2013-02-05 20:46:33 +0100 |
commit | 1d5f1c320ee67cfadd62aeef056a043bee75096d (patch) | |
tree | d92f986b1579e6a2b365e774115f39c658d74fca /src/se/leap/leapclient/ProviderListContent.java | |
parent | 45b86cd7c8922cfd03a7f056941852273c2d122a (diff) |
Simplified certificates and urls: only 1 certificate, and no :443 port
in eip.
Downloads certificate and eip from web, and loads provider from assets.
KeyStore not created with latest version of BouncyCastle. Looking
forward to file a bug and look for a solution.
Diffstat (limited to 'src/se/leap/leapclient/ProviderListContent.java')
-rw-r--r-- | src/se/leap/leapclient/ProviderListContent.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/se/leap/leapclient/ProviderListContent.java b/src/se/leap/leapclient/ProviderListContent.java index 1fe60159..bf8bfa87 100644 --- a/src/se/leap/leapclient/ProviderListContent.java +++ b/src/se/leap/leapclient/ProviderListContent.java @@ -39,14 +39,17 @@ public class ProviderListContent { public String id;
public String name;
public String provider_json_url;
+ public String provider_json_assets;
public String eip_service_json_url;
+ public String cert_json_url;
- public ProviderItem(String id, String name, String provider_json_url, String eip_service_json_url) {
+ public ProviderItem(String id, String name, String provider_json_url, String eip_service_json_url, String cert_json_url) {
this.id = id;
this.name = name;
this.provider_json_url = provider_json_url;
this.eip_service_json_url = eip_service_json_url;
+ this.cert_json_url = cert_json_url;
}
public ProviderItem(String name, InputStream urls_file_input_stream) {
@@ -59,7 +62,9 @@ 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");
eip_service_json_url = (String) file_contents.get("json_eip_service");
+ cert_json_url = (String) file_contents.get("cert");
} catch (JSONException e) {
// TODO Auto-generated catch block
e.printStackTrace();
|