summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2013-08-05 11:33:02 +0200
committerSean Leonard <meanderingcode@aetherislands.net>2013-11-13 16:50:15 -0800
commite8c7e0f55fdc669aba1ec20c2faa0483ac80dfa9 (patch)
tree6c849d0c87dd97926d5d8ae2a73ac0f44b61e280 /src
parent5e2588f199edef2c54d6357c53e4bcbcb148d5a9 (diff)
Renamed certificate handling methods.
I still let one method to bypass hostname verifier, otherwise dev.bm will not work. I've reduced downloading functions to 3: download without CA, download with commercial CA and download with provider CA. I only download CA cert once, when the user selects the corresponding provider. Each time a user switch provider, the cert is downloaded (along with other json files).
Diffstat (limited to 'src')
-rw-r--r--src/se/leap/bitmaskclient/ProviderAPI.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/se/leap/bitmaskclient/ProviderAPI.java b/src/se/leap/bitmaskclient/ProviderAPI.java
index 39b44e24..908cf830 100644
--- a/src/se/leap/bitmaskclient/ProviderAPI.java
+++ b/src/se/leap/bitmaskclient/ProviderAPI.java
@@ -204,7 +204,6 @@ public class ProviderAPI extends IntentService {
String eip_service_string = downloadWithCommercialCA(eip_service_json_url, danger_on);
ConfigHelper.saveSharedPref(EIP.KEY, new JSONObject(eip_service_string));
-
return true;
} catch (JSONException e) {
return false;
@@ -547,7 +546,7 @@ public class ProviderAPI extends IntentService {
}
/**
- * Tries to download the contents of the provided url using not commercially validated CA certificate from chosen provider.
+ * Tries to download the contents of the provided url using not commercially validated CA certificate from chosen provider.
* @param url
* @param danger_on true to download CA certificate in case it has not been downloaded.
* @return an empty string if it fails, the url content if not.