From 93433cff05b105b929116dfb2c0539792e00ed5d Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 11 May 2016 16:46:40 +0200 Subject: [PATCH] equals() and hashCode() should always be overridden together This addressed the PMD error: "Ensure you override both equals() and hashCode()" #623 https://gitlab.com/fdroid/fdroidclient/issues/623 --- .../org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java | 5 +++++ .../java/org/fdroid/fdroid/localrepo/peers/BonjourPeer.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java b/app/src/main/java/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java index 2ff605da2..4dac48bec 100644 --- a/app/src/main/java/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java +++ b/app/src/main/java/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java @@ -34,6 +34,11 @@ public class BluetoothPeer implements Peer { return peer != null && peer instanceof BluetoothPeer && ((BluetoothPeer) peer).device.getAddress().equals(device.getAddress()); } + @Override + public int hashCode() { + return device.getAddress().hashCode(); + } + @Override public String getRepoAddress() { return "bluetooth://" + device.getAddress().replace(':', '-') + "/fdroid/repo"; diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/peers/BonjourPeer.java b/app/src/main/java/org/fdroid/fdroid/localrepo/peers/BonjourPeer.java index 1f3e5fc51..ae09329d6 100644 --- a/app/src/main/java/org/fdroid/fdroid/localrepo/peers/BonjourPeer.java +++ b/app/src/main/java/org/fdroid/fdroid/localrepo/peers/BonjourPeer.java @@ -36,6 +36,11 @@ public class BonjourPeer extends WifiPeer { return false; } + @Override + public int hashCode() { + return getFingerprint().hashCode(); + } + @Override public String getRepoAddress() { return serviceInfo.getRepoAddress();