1 files changed, 22 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 c43f72235..b1df7886d 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
@@ -36,6 +36,7 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
     public long keyId;
     public String keyIdHex;
     public boolean revoked;
+    public boolean expired;
     public Date date; // TODO: not displayed
     public String fingerprintHex;
     public int bitStrength;
@@ -44,6 +45,7 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
     public String mPrimaryUserId;
     private String mExtraData;
     private String mQuery;
+    private String mOrigin;
 
     private boolean mSelected;
 
@@ -57,6 +59,7 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
         dest.writeStringList(userIds);
         dest.writeLong(keyId);
         dest.writeByte((byte) (revoked ? 1 : 0));
+        dest.writeByte((byte) (expired ? 1 : 0));
         dest.writeSerializable(date);
         dest.writeString(fingerprintHex);
         dest.writeString(keyIdHex);
@@ -65,6 +68,7 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
         dest.writeByte((byte) (secretKey ? 1 : 0));
         dest.writeByte((byte) (mSelected ? 1 : 0));
         dest.writeString(mExtraData);
+        dest.writeString(mOrigin);
     }
 
     public static final Creator<ImportKeysListEntry> CREATOR = new Creator<ImportKeysListEntry>() {
@@ -75,6 +79,7 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
             source.readStringList(vr.userIds);
             vr.keyId = source.readLong();
             vr.revoked = source.readByte() == 1;
+            vr.expired = source.readByte() == 1;
             vr.date = (Date) source.readSerializable();
             vr.fingerprintHex = source.readString();
             vr.keyIdHex = source.readString();
@@ -83,6 +88,7 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
             vr.secretKey = source.readByte() == 1;
             vr.mSelected = source.readByte() == 1;
             vr.mExtraData = source.readString();
+            vr.mOrigin = source.readString();
 
             return vr;
         }
@@ -104,6 +110,14 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
         this.mSelected = selected;
     }
 
+    public boolean isExpired() {
+        return expired;
+    }
+
+    public void setExpired(boolean expired) {
+        this.expired = expired;
+    }
+
     public long getKeyId() {
         return keyId;
     }
@@ -196,6 +210,14 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
         mQuery = query;
     }
 
+    public String getOrigin() {
+        return mOrigin;
+    }
+
+    public void setOrigin(String origin) {
+        mOrigin = origin;
+    }
+
     /**
      * Constructor for later querying from keyserver
      */