diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-11-12 21:33:12 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-11-12 21:33:12 +0100 |
| commit | 9f5ea856f8d304f4fe5d752c171c5f16f1bac78c (patch) | |
| tree | c167ac826c4ed8a0e05cf659f14e6a28fd995461 /app/src/debug/java/se | |
| parent | 613cb749bfae1e408a1e98f758060498b763bb5b (diff) | |
| parent | 8007384a1c8056308016ddb3291c149083a549e3 (diff) | |
Merge branch 'develop' into release-0.8.0
Diffstat (limited to 'app/src/debug/java/se')
| -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 |