diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-01 17:28:43 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-01 17:28:43 +0200 |
| commit | 7c79902a82602ff4e25b03e1232faa1a1768ba16 (patch) | |
| tree | 03ec60c97bd961436ffffe17ad6917db768bfafa /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util | |
| parent | 7f1dbccb5b1640482e9b83391400506f4ad40e04 (diff) | |
| parent | 4f13dc4fc5e9be78a73fcc4bbafbc025baaf3aa0 (diff) | |
| download | open-keychain-7c79902a82602ff4e25b03e1232faa1a1768ba16.tar.gz open-keychain-7c79902a82602ff4e25b03e1232faa1a1768ba16.tar.bz2 open-keychain-7c79902a82602ff4e25b03e1232faa1a1768ba16.zip | |
Merge branch 'master' into encrypted-export
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java index 8f5753dae..9ab0db03e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java @@ -571,8 +571,9 @@ public class KeyFormattingUtils { sigIcon = R.drawable.status_signature_invalid_cutout_24dp; sigColor = R.color.key_flag_red; - sigActionText = R.string.decrypt_result_action_show; - sigActionIcon = R.drawable.ic_vpn_key_grey_24dp; + // won't be used, but makes compiler happy + sigActionText = 0; + sigActionIcon = 0; break; } @@ -584,7 +585,8 @@ public class KeyFormattingUtils { holder.getSignatureStatusText().setText(sigText); holder.getSignatureStatusText().setTextColor(sigColorRes); - if (signatureResult.getResult() != OpenPgpSignatureResult.RESULT_NO_SIGNATURE) { + if (signatureResult.getResult() != OpenPgpSignatureResult.RESULT_NO_SIGNATURE + && signatureResult.getResult() != OpenPgpSignatureResult.RESULT_INVALID_SIGNATURE) { // has a signature, thus display layouts holder.getSignatureLayout().setVisibility(View.VISIBLE); |