1 files changed, 58 insertions, 6 deletions

diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyKeysAdapter.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyKeysAdapter.java
index 153a3f266..64b735bfa 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyKeysAdapter.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyKeysAdapter.java
@@ -18,27 +18,36 @@
 package org.sufficientlysecure.keychain.ui.adapter;
 
 import android.content.Context;
+import android.content.res.ColorStateList;
 import android.database.Cursor;
 import android.support.v4.widget.CursorAdapter;
+import android.text.format.DateFormat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.helper.OtherHelper;
 import org.sufficientlysecure.keychain.pgp.PgpKeyHelper;
 import org.sufficientlysecure.keychain.provider.KeychainContract.Keys;
 
+import java.util.Date;
+
 public class ViewKeyKeysAdapter extends CursorAdapter {
     private LayoutInflater mInflater;
 
     private int mIndexKeyId;
     private int mIndexAlgorithm;
     private int mIndexKeySize;
-    private int mIndexIsMasterKey;
+    private int mIndexRank;
     private int mIndexCanCertify;
     private int mIndexCanEncrypt;
     private int mIndexCanSign;
+    private int mIndexRevokedKey;
+    private int mIndexExpiry;
+
+    private ColorStateList mDefaultTextColor;
 
     public ViewKeyKeysAdapter(Context context, Cursor c, int flags) {
         super(context, c, flags);
@@ -66,10 +75,12 @@ public class ViewKeyKeysAdapter extends CursorAdapter {
             mIndexKeyId = cursor.getColumnIndexOrThrow(Keys.KEY_ID);
             mIndexAlgorithm = cursor.getColumnIndexOrThrow(Keys.ALGORITHM);
             mIndexKeySize = cursor.getColumnIndexOrThrow(Keys.KEY_SIZE);
-            mIndexIsMasterKey = cursor.getColumnIndexOrThrow(Keys.IS_MASTER_KEY);
+            mIndexRank = cursor.getColumnIndexOrThrow(Keys.RANK);
             mIndexCanCertify = cursor.getColumnIndexOrThrow(Keys.CAN_CERTIFY);
             mIndexCanEncrypt = cursor.getColumnIndexOrThrow(Keys.CAN_ENCRYPT);
             mIndexCanSign = cursor.getColumnIndexOrThrow(Keys.CAN_SIGN);
+            mIndexRevokedKey = cursor.getColumnIndexOrThrow(Keys.IS_REVOKED);
+            mIndexExpiry = cursor.getColumnIndexOrThrow(Keys.EXPIRY);
         }
     }
 
@@ -77,20 +88,21 @@ public class ViewKeyKeysAdapter extends CursorAdapter {
     public void bindView(View view, Context context, Cursor cursor) {
         TextView keyId = (TextView) view.findViewById(R.id.keyId);
         TextView keyDetails = (TextView) view.findViewById(R.id.keyDetails);
+        TextView keyExpiry = (TextView) view.findViewById(R.id.keyExpiry);
         ImageView masterKeyIcon = (ImageView) view.findViewById(R.id.ic_masterKey);
         ImageView certifyIcon = (ImageView) view.findViewById(R.id.ic_certifyKey);
         ImageView encryptIcon = (ImageView) view.findViewById(R.id.ic_encryptKey);
         ImageView signIcon = (ImageView) view.findViewById(R.id.ic_signKey);
+        ImageView revokedKeyIcon = (ImageView) view.findViewById(R.id.ic_revokedKey);
 
-        String keyIdStr = PgpKeyHelper.convertKeyIdToHex(cursor.getLong(mIndexKeyId));
+        String keyIdStr = PgpKeyHelper.convertKeyIdToHexShort(cursor.getLong(mIndexKeyId));
         String algorithmStr = PgpKeyHelper.getAlgorithmInfo(cursor.getInt(mIndexAlgorithm),
                 cursor.getInt(mIndexKeySize));
 
         keyId.setText(keyIdStr);
-
         keyDetails.setText("(" + algorithmStr + ")");
 
-        if (cursor.getInt(mIndexIsMasterKey) != 1) {
+        if (cursor.getInt(mIndexRank) == 0) {
             masterKeyIcon.setVisibility(View.INVISIBLE);
         } else {
             masterKeyIcon.setVisibility(View.VISIBLE);
@@ -113,11 +125,51 @@ public class ViewKeyKeysAdapter extends CursorAdapter {
         } else {
             signIcon.setVisibility(View.VISIBLE);
         }
+
+        boolean valid = true;
+        if (cursor.getInt(mIndexRevokedKey) > 0) {
+            revokedKeyIcon.setVisibility(View.VISIBLE);
+
+            valid = false;
+        } else {
+            keyId.setTextColor(mDefaultTextColor);
+            keyDetails.setTextColor(mDefaultTextColor);
+            keyExpiry.setTextColor(mDefaultTextColor);
+
+            revokedKeyIcon.setVisibility(View.GONE);
+        }
+
+        if (!cursor.isNull(mIndexExpiry)) {
+            Date expiryDate = new Date(cursor.getLong(mIndexExpiry) * 1000);
+
+            valid = valid && expiryDate.after(new Date());
+            keyExpiry.setText("(" +
+                    context.getString(R.string.label_expiry) + ": " +
+                    DateFormat.getDateFormat(context).format(expiryDate) + ")");
+
+            keyExpiry.setVisibility(View.VISIBLE);
+        } else {
+            keyExpiry.setVisibility(View.GONE);
+        }
+        // if key is expired or revoked, strike through text
+        if (!valid) {
+            keyId.setText(OtherHelper.strikeOutText(keyId.getText()));
+            keyDetails.setText(OtherHelper.strikeOutText(keyDetails.getText()));
+            keyExpiry.setText(OtherHelper.strikeOutText(keyExpiry.getText()));
+        }
+        keyId.setEnabled(valid);
+        keyDetails.setEnabled(valid);
+        keyExpiry.setEnabled(valid);
     }
 
     @Override
     public View newView(Context context, Cursor cursor, ViewGroup parent) {
-        return mInflater.inflate(R.layout.view_key_keys_item, null);
+        View view = mInflater.inflate(R.layout.view_key_keys_item, null);
+        if (mDefaultTextColor == null) {
+            TextView keyId = (TextView) view.findViewById(R.id.keyId);
+            mDefaultTextColor = keyId.getTextColors();
+        }
+        return view;
     }
 
 }