Edit key: key flags

1 files changed, 21 insertions, 10 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAddedAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAddedAdapter.java
index b3f87a4c4..be2e17c63 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAddedAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAddedAdapter.java
@@ -28,6 +28,7 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import org.spongycastle.bcpg.sig.KeyFlags;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.pgp.PgpKeyHelper;
 import org.sufficientlysecure.keychain.service.SaveKeyringParcel;
@@ -56,7 +57,6 @@ public class SubkeysAddedAdapter extends ArrayAdapter<SaveKeyringParcel.SubkeyAd
         public ImageView vCertifyIcon;
         public ImageView vEncryptIcon;
         public ImageView vSignIcon;
-        public ImageView vRevokedIcon;
         public ImageButton vDelete;
         // also hold a reference to the model item
         public SaveKeyringParcel.SubkeyAdd mModel;
@@ -73,13 +73,14 @@ public class SubkeysAddedAdapter extends ArrayAdapter<SaveKeyringParcel.SubkeyAd
             holder.vCertifyIcon = (ImageView) convertView.findViewById(R.id.subkey_item_ic_certify);
             holder.vEncryptIcon = (ImageView) convertView.findViewById(R.id.subkey_item_ic_encrypt);
             holder.vSignIcon = (ImageView) convertView.findViewById(R.id.subkey_item_ic_sign);
-            holder.vRevokedIcon = (ImageView) convertView.findViewById(R.id.subkey_item_ic_revoked);
             holder.vDelete = (ImageButton) convertView.findViewById(R.id.subkey_item_delete_button);
             holder.vDelete.setVisibility(View.VISIBLE); // always visible
 
             // not used:
             ImageView editImage = (ImageView) convertView.findViewById(R.id.subkey_item_edit_image);
             editImage.setVisibility(View.GONE);
+            ImageView revokedIcon = (ImageView) convertView.findViewById(R.id.subkey_item_ic_revoked);
+            revokedIcon.setVisibility(View.GONE);
 
             convertView.setTag(holder);
 
@@ -115,14 +116,24 @@ public class SubkeysAddedAdapter extends ArrayAdapter<SaveKeyringParcel.SubkeyAd
                     + getContext().getString(R.string.none));
         }
 
-//        holder.mModel.mFlags
-
-        // Set icons according to properties
-//        holder.vMasterIcon.setVisibility(cursor.getInt(INDEX_RANK) == 0 ? View.VISIBLE : View.INVISIBLE);
-//        holder.vCertifyIcon.setVisibility(cursor.getInt(INDEX_CAN_CERTIFY) != 0 ? View.VISIBLE : View.GONE);
-//        holder.vEncryptIcon.setVisibility(cursor.getInt(INDEX_CAN_ENCRYPT) != 0 ? View.VISIBLE : View.GONE);
-//        holder.vSignIcon.setVisibility(cursor.getInt(INDEX_CAN_SIGN) != 0 ? View.VISIBLE : View.GONE);
-
+        int flags = holder.mModel.mFlags;
+        if ((flags & KeyFlags.CERTIFY_OTHER) > 0) {
+            holder.vCertifyIcon.setVisibility(View.VISIBLE);
+        } else {
+            holder.vCertifyIcon.setVisibility(View.GONE);
+        }
+        if ((flags & KeyFlags.SIGN_DATA) > 0) {
+            holder.vSignIcon.setVisibility(View.VISIBLE);
+        } else {
+            holder.vSignIcon.setVisibility(View.GONE);
+        }
+        if (((flags & KeyFlags.ENCRYPT_COMMS) > 0)
+                || ((flags & KeyFlags.ENCRYPT_STORAGE) > 0)) {
+            holder.vEncryptIcon.setVisibility(View.VISIBLE);
+        } else {
+            holder.vEncryptIcon.setVisibility(View.GONE);
+        }
+        // TODO: missing icon for authenticate
 
         return convertView;
     }