summaryrefslogtreecommitdiff
path: root/src/se
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2013-02-13 20:40:58 +0100
committerParménides GV <parmegv@sdf.org>2013-02-13 20:40:58 +0100
commit0222df37d072fd6529dfe2cce1f857834ccbd02e (patch)
treed69e1f0b6b347e84e6ebb08006d852c8b70eaeec /src/se
parentc01aa98a1d43ae0d6b56f0d13a8782dbb6a3e35e (diff)
Solves Issue #1757.
The problem was that ProviderItem.custom was not being set by the constructor, and when using this variable from ConfigurationWizard to get providers.json from http or from assets file.
Diffstat (limited to 'src/se')
-rw-r--r--src/se/leap/leapclient/ConfigurationWizard.java2
-rw-r--r--src/se/leap/leapclient/ProviderListContent.java2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/se/leap/leapclient/ConfigurationWizard.java b/src/se/leap/leapclient/ConfigurationWizard.java
index 422f9968..e252fa6b 100644
--- a/src/se/leap/leapclient/ConfigurationWizard.java
+++ b/src/se/leap/leapclient/ConfigurationWizard.java
@@ -118,7 +118,7 @@ public class ConfigurationWizard extends Activity
if(current_provider_item.id.equalsIgnoreCase(id))
{
try {
- if(current_provider_item.custom)
+ if(!current_provider_item.custom)
processAssetsFiles(current_provider_item);
// TODO ask Provider class to save provider.json, setResult(OK), finish() to ConfigurationWizard
downloadJSONFiles(current_provider_item);
diff --git a/src/se/leap/leapclient/ProviderListContent.java b/src/se/leap/leapclient/ProviderListContent.java
index 5fe206eb..d475d368 100644
--- a/src/se/leap/leapclient/ProviderListContent.java
+++ b/src/se/leap/leapclient/ProviderListContent.java
@@ -66,6 +66,7 @@ public class ProviderListContent {
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");
+ this.custom = custom;
} catch (JSONException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -86,6 +87,7 @@ public class ProviderListContent {
this.name = name;
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;
} catch (JSONException e) {
// TODO Auto-generated catch block
e.printStackTrace();