use hashcode instead of keyid in import list (keyids may not be unique!)

1 files changed, 10 insertions, 0 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
index 47265c3aa..0a49cb629 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
@@ -46,6 +46,7 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
     private String mExtraData;
     private String mQuery;
     private String mOrigin;
+    private Integer mHashCode = null;
 
     private boolean mSelected;
 
@@ -98,6 +99,13 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
         }
     };
 
+    public int hashCode() {
+        if (mHashCode != null) {
+            return mHashCode;
+        }
+        return super.hashCode();
+    }
+
     public String getKeyIdHex() {
         return mKeyIdHex;
     }
@@ -240,6 +248,8 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
         mSecretKey = ring.isSecret();
         UncachedPublicKey key = ring.getPublicKey();
 
+        mHashCode = key.hashCode();
+
         mPrimaryUserId = key.getPrimaryUserId();
         mUserIds = key.getUnorderedUserIds();