summaryrefslogtreecommitdiff
path: root/app/src/main/java/se/leap
diff options
context:
space:
mode:
authorcyBerta <cyberta@riseup.net>2018-03-21 23:31:12 +0100
committercyBerta <cyberta@riseup.net>2018-03-21 23:31:12 +0100
commitdcf338a665a56d28db8f001b6118d15cfdb88989 (patch)
treefa4e7c42033f8db7994e2e3f4fd7534154734c3e /app/src/main/java/se/leap
parent48a4abc9917291b53ce6e4a6d67782d950c3cc9d (diff)
#8885 rename class variable name
Diffstat (limited to 'app/src/main/java/se/leap')
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/utils/KeyStoreHelper.java15
1 files changed, 7 insertions, 8 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/utils/KeyStoreHelper.java b/app/src/main/java/se/leap/bitmaskclient/utils/KeyStoreHelper.java
index 0cc9687b..48d4cbad 100644
--- a/app/src/main/java/se/leap/bitmaskclient/utils/KeyStoreHelper.java
+++ b/app/src/main/java/se/leap/bitmaskclient/utils/KeyStoreHelper.java
@@ -2,7 +2,6 @@ package se.leap.bitmaskclient.utils;
import java.io.IOException;
import java.io.InputStream;
-import java.math.BigInteger;
import java.security.KeyStore;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
@@ -15,7 +14,7 @@ import java.security.cert.X509Certificate;
*/
public class KeyStoreHelper {
- private static KeyStore keystore_trusted;
+ private static KeyStore trustedKeystore;
/**
* Adds a new X509 certificate given its input stream and its provider name
@@ -29,7 +28,7 @@ public class KeyStoreHelper {
cf = CertificateFactory.getInstance("X.509");
X509Certificate cert =
(X509Certificate) cf.generateCertificate(inputStream);
- keystore_trusted.setCertificateEntry(provider, cert);
+ trustedKeystore.setCertificateEntry(provider, cert);
} catch (CertificateException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -49,11 +48,11 @@ public class KeyStoreHelper {
try {
X509Certificate cert = ConfigHelper.parseX509CertificateFromString(certificate);
- if (keystore_trusted == null) {
- keystore_trusted = KeyStore.getInstance("BKS");
- keystore_trusted.load(null);
+ if (trustedKeystore == null) {
+ trustedKeystore = KeyStore.getInstance("BKS");
+ trustedKeystore.load(null);
}
- keystore_trusted.setCertificateEntry(provider, cert);
+ trustedKeystore.setCertificateEntry(provider, cert);
} catch (KeyStoreException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -73,7 +72,7 @@ public class KeyStoreHelper {
* @return class wide keystore
*/
public static KeyStore getKeystore() {
- return keystore_trusted;
+ return trustedKeystore;
}
}