diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-11-12 21:32:21 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-11-12 21:32:21 +0100 |
| commit | 8007384a1c8056308016ddb3291c149083a549e3 (patch) | |
| tree | 0f7f053ed51fcf4033bc7bea7e12cd1bda327eb0 /app/src/debug | |
| parent | 284a35d3ee622c75593bc79e08a356099517154f (diff) | |
| parent | 15d2881a189c1663ae1b8bd9ecf056af0dcc0ff0 (diff) | |
Merge branch 'bug/JSON-error-when-updating-client-certificate-#6364' into develop
Diffstat (limited to 'app/src/debug')
| -rw-r--r-- | app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java b/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java index 07e0e2fe..1b2d723d 100644 --- a/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java +++ b/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java @@ -567,7 +567,6 @@ public class ProviderAPI extends IntentService { return result; } - public static boolean caCertDownloaded() { return CA_CERT_DOWNLOADED; } @@ -636,12 +635,6 @@ public class ProviderAPI extends IntentService { return result; } - - - public static boolean providerJsonDownloaded() { - return PROVIDER_JSON_DOWNLOADED; - } - private Bundle getAndSetEipServiceJson() { Bundle result = new Bundle(); String eip_service_json_string = ""; @@ -664,10 +657,6 @@ public class ProviderAPI extends IntentService { } return result; } - - public static boolean eipServiceDownloaded() { - return EIP_SERVICE_JSON_DOWNLOADED; - } /** * Interprets the error message as a JSON object and extract the "errors" keyword pair. @@ -962,7 +951,6 @@ public class ProviderAPI extends IntentService { certificateString = Base64.encodeToString( certCert.getEncoded(), Base64.DEFAULT); preferences.edit().putString(EIP.CERTIFICATE, "-----BEGIN CERTIFICATE-----\n"+certificateString+"-----END CERTIFICATE-----").commit(); preferences.edit().putString(EIP.DATE_FROM_CERTIFICATE, EIP.certificate_date_format.format(Calendar.getInstance().getTime())).commit(); - return true; } catch (CertificateException e) { // TODO Auto-generated catch block |