No duplicates between preseeded and custom

2 files changed, 5 insertions, 3 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/Provider.java b/app/src/main/java/se/leap/bitmaskclient/Provider.java
index f22a4bfb..d7ff6633 100644
--- a/app/src/main/java/se/leap/bitmaskclient/Provider.java
+++ b/app/src/main/java/se/leap/bitmaskclient/Provider.java
@@ -35,6 +35,7 @@ import java.util.Locale;
 
 /**
  * @author Sean Leonard <meanderingcode@aetherislands.net>
+ * @author Parménides GV <parmegv@sdf.org>
  *
  */
 public final class Provider implements Parcelable {
@@ -187,7 +188,7 @@ public final class Provider implements Parcelable {
     public boolean equals(Object o) {
         if(o instanceof Provider) {
             Provider p = (Provider) o;
-            return p.mainUrl().equals(mainUrl());
+            return p.mainUrl().getHost().equals(mainUrl().getHost());
         } else return false;
     }
 
@@ -203,6 +204,6 @@ public final class Provider implements Parcelable {
 
     @Override
     public int hashCode() {
-        return main_url.hashCode();
+        return mainUrl().getHost().hashCode();
     }
 }
diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderManager.java b/app/src/main/java/se/leap/bitmaskclient/ProviderManager.java
index 911144f7..69bd7c1e 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ProviderManager.java
+++ b/app/src/main/java/se/leap/bitmaskclient/ProviderManager.java
@@ -136,7 +136,8 @@ public class ProviderManager implements AdapteeCollection<Provider> {
 
     @Override
     public void add(Provider element) {
-        custom_providers.add(element);
+        if(!default_providers.contains(element))
+            custom_providers.add(element);
     }
 
     @Override