cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove signing icon for master keys which can't sign

Browse Source
This commit is contained in:
Ash Hughes
2013-03-14 17:24:22 +00:00
parent 00afc2e8ac
commit 935274960d
2 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/KeyListAdapter.java
View File

@@ -159,8 +159,14 @@ public class KeyListAdapter extends CursorTreeAdapter {
}
ImageView signIcon = (ImageView) view.findViewById(R.id.ic_signKey);
if (cursor.getInt(cursor.getColumnIndex(Keys.CAN_SIGN)) != 1) {
signIcon.setVisibility(View.GONE);
boolean privateEmpty = false; //Don't show signing icon for master keys without private keys
//TODO: does this need to be done for encrypting icon? Does anyone use master key for encrypt?
if (cursor.getInt(cursor.getColumnIndex(Keys.IS_MASTER_KEY)) == 1) {
privateEmpty = PgpHelper.isSecretKeyPrivateEmpty(context,
cursor.getLong(cursor.getColumnIndex(Keys.KEY_ID)));
}
if (privateEmpty || cursor.getInt(cursor.getColumnIndex(Keys.CAN_SIGN)) != 1) {
signIcon.setVisibility(View.GONE);
} else {
signIcon.setVisibility(View.VISIBLE);
}
@@ -261,4 +267,4 @@ public class KeyListAdapter extends CursorTreeAdapter {
return mContext.getContentResolver().query(uri, projection, selection, null, sortOrder);
}
}
}