From e9d3260f6439c4b00c6708658d6edd61a246ea67 Mon Sep 17 00:00:00 2001
From: Fup Duck <fupduck@sacknagel.com>
Date: Mon, 12 Feb 2018 13:31:13 +0100
Subject: 8827 - fix equals for Provider

---
 app/src/main/java/se/leap/bitmaskclient/DefaultedURL.java        | 9 +++++++++
 app/src/main/java/se/leap/bitmaskclient/Provider.java            | 4 ++--
 .../main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java  | 1 -
 3 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'app/src/main')

diff --git a/app/src/main/java/se/leap/bitmaskclient/DefaultedURL.java b/app/src/main/java/se/leap/bitmaskclient/DefaultedURL.java
index 57ff1fd8..0cbb0d72 100644
--- a/app/src/main/java/se/leap/bitmaskclient/DefaultedURL.java
+++ b/app/src/main/java/se/leap/bitmaskclient/DefaultedURL.java
@@ -36,4 +36,13 @@ public class DefaultedURL {
     public String toString() {
         return url.toString();
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o instanceof DefaultedURL) {
+            return url.equals(((DefaultedURL) o).getUrl());
+        }
+        return false;
+    }
+
 }
diff --git a/app/src/main/java/se/leap/bitmaskclient/Provider.java b/app/src/main/java/se/leap/bitmaskclient/Provider.java
index 4937ed58..7aa2f398 100644
--- a/app/src/main/java/se/leap/bitmaskclient/Provider.java
+++ b/app/src/main/java/se/leap/bitmaskclient/Provider.java
@@ -287,8 +287,8 @@ public final class Provider implements Parcelable {
         if (o instanceof Provider) {
             Provider p = (Provider) o;
             return p.getDomain().equals(getDomain()) &&
-            definition.equals(p.getDefinition()) &&
-            eipServiceJson.equals(p.getEipServiceJson())&&
+            definition.toString().equals(p.getDefinition().toString()) &&
+            eipServiceJson.toString().equals(p.getEipServiceJson().toString())&&
             mainUrl.equals(p.getMainUrl()) &&
             apiUrl.equals(p.getApiUrl()) &&
             certificatePin.equals(p.getCertificatePin()) &&
diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java b/app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java
index 09e0faa8..f4fee635 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java
+++ b/app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java
@@ -660,7 +660,6 @@ public abstract class ProviderApiManagerBase {
         if (hasUpdatedProviderDetails(providerDomain)) {
             provider.setCaCert(getPersistedProviderCA(providerDomain));
             provider.define(getPersistedProviderDefinition(providerDomain));
-            provider.setCaCertFingerprint(getPersistedCaCertFingerprint(providerDomain));
             provider.setPrivateKey(getPersistedPrivateKey(providerDomain));
             provider.setVpnCertificate(getPersistedVPNCertificate(providerDomain));
         }
-- 
cgit v1.2.3