diff options
| author | Parménides GV <parmegv@sdf.org> | 2013-06-20 16:52:43 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2013-06-20 16:53:14 +0200 |
| commit | f4956bb818fb9ed04760e6de3b53b876272da5cc (patch) | |
| tree | 94b7b8629ea75a6e4db730aa20232103799ae7a0 /src/se/leap/leapclient/ProviderListContent.java | |
| parent | d475ae617d8dc0994a1294be7c8cca338a68fd9e (diff) | |
User messages are now in string.xml
Some more constants added to ConfigHelper.
This solves #2908.
Diffstat (limited to 'src/se/leap/leapclient/ProviderListContent.java')
| -rw-r--r-- | src/se/leap/leapclient/ProviderListContent.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/se/leap/leapclient/ProviderListContent.java b/src/se/leap/leapclient/ProviderListContent.java index 4ae46099..8727b16b 100644 --- a/src/se/leap/leapclient/ProviderListContent.java +++ b/src/se/leap/leapclient/ProviderListContent.java @@ -60,10 +60,10 @@ public class ProviderListContent { JSONObject file_contents = new JSONObject(urls_file_content);
id = name;
this.name = name;
- provider_json_url = file_contents.getString("json_provider");
+ provider_json_url = file_contents.getString(ConfigHelper.PROVIDER_JSON_URL);
provider_json_filename = file_contents.getString("assets_json_provider");
eip_service_json_url = file_contents.getString("json_eip_service");
- cert_json_url = file_contents.getString("cert");
+ cert_json_url = file_contents.getString(ConfigHelper.CERT_KEY);
this.custom = custom;
this.danger_on = danger_on;
} catch (JSONException e) {
@@ -89,7 +89,7 @@ public class ProviderListContent { this.name = name;
this.provider_json_url = provider_json_url;
this.provider_json = provider_json;
- eip_service_json_url = provider_json.getString("api_uri") + "/" + provider_json.getString("api_version") + "/" + ConfigHelper.EIP_SERVICE_API_PATH;
+ eip_service_json_url = provider_json.getString(ConfigHelper.API_URL_KEY) + "/" + provider_json.getString(ConfigHelper.API_VERSION_KEY) + "/" + ConfigHelper.EIP_SERVICE_API_PATH;
cert_json_url = (String) provider_json.get("ca_cert_uri");
this.custom = custom;
this.danger_on = danger_on;
|