8827 - remove caCertificate from Provider

It's already represented by CertificatePin & CertificatePinEncoding

1 files changed, 0 insertions, 22 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/Provider.java b/app/src/main/java/se/leap/bitmaskclient/Provider.java
index 7aa2f398..a2f50dd9 100644
--- a/app/src/main/java/se/leap/bitmaskclient/Provider.java
+++ b/app/src/main/java/se/leap/bitmaskclient/Provider.java
@@ -45,7 +45,6 @@ public final class Provider implements Parcelable {
     private String certificatePin = "";
     private String certificatePinEncoding = "";
     private String caCert = "";
-    private String caCertFingerprint = "";
     private String apiVersion = "";
     private String privateKey = "";
     private String vpnCertificate = "";
@@ -191,12 +190,6 @@ public final class Provider implements Parcelable {
         return apiVersion;
     }
 
-    protected String certificatePin() { return certificatePin; }
-
-    protected boolean hasCertificatePin() {
-        return certificatePin != null && !certificatePin.isEmpty();
-    }
-
     boolean hasCaCert() {
         return caCert != null && !caCert.isEmpty();
     }
@@ -210,10 +203,6 @@ public final class Provider implements Parcelable {
         return caCert;
     }
 
-    public String getCaCertFingerprint() {
-        return caCertFingerprint;
-    }
-
     public String getName() {
         // Should we pass the locale in, or query the system here?
         String lang = Locale.getDefault().getLanguage();
@@ -276,7 +265,6 @@ public final class Provider implements Parcelable {
         parcel.writeString(getMainUrlString());
         parcel.writeString(getDefinitionString());
         parcel.writeString(getCaCert());
-        parcel.writeString(getCaCertFingerprint());
         parcel.writeString(getEipServiceJsonString());
         parcel.writeString(getPrivateKey());
         parcel.writeString(getVpnCertificate());
@@ -294,7 +282,6 @@ public final class Provider implements Parcelable {
             certificatePin.equals(p.getCertificatePin()) &&
             certificatePinEncoding.equals(p.getCertificatePinEncoding()) &&
             caCert.equals(p.getCaCert()) &&
-            caCertFingerprint.equals(p.getCaCertFingerprint()) &&
             apiVersion.equals(p.getApiVersion()) &&
             privateKey.equals(p.getPrivateKey()) &&
             vpnCertificate.equals(p.getVpnCertificate()) &&
@@ -341,10 +328,6 @@ public final class Provider implements Parcelable {
             }
             tmpString = in.readString();
             if (!tmpString.isEmpty()) {
-               this.caCertFingerprint = tmpString;
-            }
-            tmpString = in.readString();
-            if (!tmpString.isEmpty()) {
                 this.setEipServiceJson(new JSONObject(tmpString));
             }
             tmpString = in.readString();
@@ -378,10 +361,6 @@ public final class Provider implements Parcelable {
         this.caCert = cert;
     }
 
-    public void setCaCertFingerprint(String certFingerprint) {
-        this.caCertFingerprint = certFingerprint;
-    }
-
     public boolean allowsAnonymous() {
         return allowAnonymous;
     }
@@ -451,7 +430,6 @@ public final class Provider implements Parcelable {
         certificatePin = "";
         certificatePinEncoding = "";
         caCert = "";
-        caCertFingerprint = "";
         apiVersion = "";
         privateKey = "";
         vpnCertificate = "";