diff options
author | Parménides GV <parmegv@sdf.org> | 2014-12-15 20:48:11 +0100 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2014-12-15 20:48:11 +0100 |
commit | 953e87f2d9a175e242bdf5c0e030a6a9944aa3e5 (patch) | |
tree | c694b6bc5f893d4ad5b92712c85042ca4b45bbfa /app/src/main/java/se/leap/bitmaskclient/Provider.java | |
parent | f9b875c58f2a370b0c4727ed54cab46424bda603 (diff) | |
parent | 9f146deb3448815fccc1637c00588e0dfb23293e (diff) |
Merge branch 'develop' into release-0.8.1
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/Provider.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/Provider.java | 5 |
1 files changed, 3 insertions, 2 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(); } } |