summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-04-24 00:51:57 +0200
committerParménides GV <parmegv@sdf.org>2014-04-24 00:51:57 +0200
commitd141f09640b27cca6c635e83e91de9854f86330e (patch)
tree551d8458bf80421cfbdc4c5ec68bfbadacad65dc /app
parent00030cd3b937b3be3ffbe8b390845371e7bd8aab (diff)
parente9fdf500fb3d8451c1feda27d9d97cbd41505a4e (diff)
Merge branch 'develop' into release-0.5.1
Diffstat (limited to 'app')
-rw-r--r--app/build.gradle2
-rw-r--r--app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java6
-rw-r--r--app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java2
3 files changed, 5 insertions, 5 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 8f1b1575..4795488d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,7 +23,7 @@ android {
buildTypes {
release {
- runProguard true
+ //runProguard true
signingConfig signingConfigs.release.isSigningReady() ? signingConfigs.release : signingConfigs.debug
}
}
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);
diff --git a/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java b/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
index 39ce1146..150b27b2 100644
--- a/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
+++ b/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
@@ -516,7 +516,7 @@ public class ProviderAPI extends IntentService {
Bundle result = new Bundle();
if(setting_up_provider) {
- String provider_dot_json_string = downloadWithProviderCA(provider_main_url + "/provider.json");
+ String provider_dot_json_string = downloadWithCommercialCA(provider_main_url + "/provider.json");
try {
JSONObject provider_json = new JSONObject(provider_dot_json_string);