summaryrefslogtreecommitdiff
path: root/app/src/debug/java
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-04-24 00:37:08 +0200
committerParménides GV <parmegv@sdf.org>2014-04-24 00:37:08 +0200
commitfd96e0c9c77d1afdaa188590635597658a751879 (patch)
tree74f96dd8d8eeeba2681b93c49859b9c22b3c3c71 /app/src/debug/java
parenta7d27b132c0d267092a7f2c9a3f0a4f5836691d4 (diff)
Commercial certificate to download provider.json
Removed the default danger_on = true in the debug build.
Diffstat (limited to 'app/src/debug/java')
-rw-r--r--app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java b/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java
index 75ef511d..9f4b8d27 100644
--- a/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java
+++ b/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java
@@ -467,7 +467,7 @@ public class ProviderAPI extends IntentService {
broadcast_progress(progress++);
CA_CERT_DOWNLOADED = true;
if(!PROVIDER_JSON_DOWNLOADED)
- current_download = getAndSetProviderJson(last_provider_main_url);
+ current_download = getAndSetProviderJson(last_provider_main_url, last_danger_on);
if(PROVIDER_JSON_DOWNLOADED || (current_download.containsKey(RESULT_KEY) && current_download.getBoolean(RESULT_KEY))) {
broadcast_progress(progress++);
PROVIDER_JSON_DOWNLOADED = true;
@@ -518,11 +518,11 @@ public class ProviderAPI extends IntentService {
return result;
}
- private Bundle getAndSetProviderJson(String provider_main_url) {
+ private Bundle getAndSetProviderJson(String provider_main_url, boolean danger_on) {
Bundle result = new Bundle();
if(setting_up_provider) {
- String provider_dot_json_string = downloadWithProviderCA(provider_main_url + "/provider.json", true);
+ String provider_dot_json_string = downloadWithCommercialCA(provider_main_url + "/provider.json", danger_on);
try {
JSONObject provider_json = new JSONObject(provider_dot_json_string);