diff options
| author | Fup Duck <fupduck@sacknagel.com> | 2017-12-07 12:52:29 +0100 |
|---|---|---|
| committer | Fup Duck <fupduck@sacknagel.com> | 2017-12-07 12:52:29 +0100 |
| commit | f8c2f76971f5a7f26d18e5e669d5e0ce9c560f3f (patch) | |
| tree | edd56030c03b259e147eba3af8987461874aedca /app/src/main/java/se/leap/bitmaskclient/ProviderApiBase.java | |
| parent | da7293252f197e9b54c1abd8127b4abe45b95110 (diff) | |
Rename constants
* renamed last constants
* remove unnecessary updates/ConstantUnification
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/ProviderApiBase.java')
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/ProviderApiBase.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderApiBase.java b/app/src/main/java/se/leap/bitmaskclient/ProviderApiBase.java index b9063f18..38981289 100644 --- a/app/src/main/java/se/leap/bitmaskclient/ProviderApiBase.java +++ b/app/src/main/java/se/leap/bitmaskclient/ProviderApiBase.java @@ -807,7 +807,7 @@ public abstract class ProviderApiBase extends IntentService { String certificateString = null, keyString = null; String[] certAndKey = cert_string.split("(?<=-\n)"); for (int i = 0; i < certAndKey.length - 1; i++) { - if (certAndKey[i].contains("KEY")) { + if (certAndKey[i].contains("PROVIDER_KEY")) { keyString = certAndKey[i++] + certAndKey[i]; } else if (certAndKey[i].contains("CERTIFICATE")) { certificateString = certAndKey[i++] + certAndKey[i]; @@ -816,11 +816,11 @@ public abstract class ProviderApiBase extends IntentService { RSAPrivateKey key = ConfigHelper.parseRsaKeyFromString(keyString); keyString = Base64.encodeToString(key.getEncoded(), Base64.DEFAULT); - preferences.edit().putString(Constants.PRIVATE_KEY, "-----BEGIN RSA PRIVATE KEY-----\n" + keyString + "-----END RSA PRIVATE KEY-----").commit(); + preferences.edit().putString(Constants.PROVIDER_PRIVATE_KEY, "-----BEGIN RSA PRIVATE PROVIDER_KEY-----\n" + keyString + "-----END RSA PRIVATE PROVIDER_KEY-----").commit(); X509Certificate certificate = ConfigHelper.parseX509CertificateFromString(certificateString); certificateString = Base64.encodeToString(certificate.getEncoded(), Base64.DEFAULT); - preferences.edit().putString(Constants.VPN_CERTIFICATE, "-----BEGIN CERTIFICATE-----\n" + certificateString + "-----END CERTIFICATE-----").commit(); + preferences.edit().putString(Constants.PROVIDER_VPN_CERTIFICATE, "-----BEGIN CERTIFICATE-----\n" + certificateString + "-----END CERTIFICATE-----").commit(); return true; } catch (CertificateException e) { // TODO Auto-generated catch block |