1 files changed, 37 insertions, 16 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CachedKeyRing.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CachedKeyRing.java
index 334f676c4..def673469 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CachedKeyRing.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CachedKeyRing.java
@@ -3,45 +3,66 @@ package org.sufficientlysecure.keychain.pgp;
 public abstract class CachedKeyRing {
 
     private final long mMasterKeyId;
-    private final boolean mCanCertify;
-    private final byte[] mFingerprint;
     private final String mUserId;
+    private final boolean mHasAnySecret;
+    private final boolean mIsRevoked;
+    private final boolean mCanCertify;
+    private final long mHasEncryptId;
+    private final long mHasSignId;
     private final int mVerified;
-    private final boolean mHasSecret;
 
-    protected CachedKeyRing(long masterKeyId, boolean canCertify,
-            byte[] fingerprint, String userId, int verified, boolean hasSecret)
+    protected CachedKeyRing(long masterKeyId, String userId, boolean hasAnySecret,
+                            boolean isRevoked, boolean canCertify, long hasEncryptId, long hasSignId,
+                            int verified)
     {
         mMasterKeyId = masterKeyId;
-        mCanCertify = canCertify;
-        mFingerprint = fingerprint;
         mUserId = userId;
+        mHasAnySecret = hasAnySecret;
+        mIsRevoked = isRevoked;
+        mCanCertify = canCertify;
+        mHasEncryptId = hasEncryptId;
+        mHasSignId = hasSignId;
         mVerified = verified;
-        mHasSecret = hasSecret;
     }
 
-    public byte[] getFingerprint() {
-        return mFingerprint;
+    public long getMasterKeyId() {
+        return mMasterKeyId;
     }
 
     public String getPrimaryUserId() {
         return mUserId;
     }
 
-    public long getMasterKeyId() {
-        return mMasterKeyId;
+    public boolean hasAnySecret() {
+        return mHasAnySecret;
     }
 
-    public int getVerified() {
-        return mVerified;
+    public boolean isRevoked() {
+        return mIsRevoked;
     }
 
     public boolean canCertify() {
         return mCanCertify;
     }
 
-    public boolean hasSecret() {
-        return mHasSecret;
+    public long getEncryptId() {
+        return mHasEncryptId;
+    }
+
+    public boolean hasEncrypt() {
+        return mHasEncryptId != 0;
+    }
+
+    public long getSignId() {
+        return mHasSignId;
+    }
+
+    public boolean hasSign() {
+        return mHasSignId != 0;
+    }
+
+    public int getVerified() {
+        return mVerified;
     }
 
 }