moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-02-24 07:21:49 -05:00
Code Issues Releases Wiki Activity

add distinct status for messages signed by "your" key

Browse Source
This commit is contained in:
Vincent Breitmoser 2015-04-27 14:40:52 +02:00
parent ef8506fc26
commit 0ad66eb510
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
View File

@ -231,6 +231,7 @@ public abstract class DecryptFragment extends CryptoOperationFragment implements
KeychainContract.KeyRings.IS_REVOKED, KeychainContract.KeyRings.IS_REVOKED,
KeychainContract.KeyRings.IS_EXPIRED, KeychainContract.KeyRings.IS_EXPIRED,
KeychainContract.KeyRings.VERIFIED, KeychainContract.KeyRings.VERIFIED,
KeychainContract.KeyRings.HAS_ANY_SECRET,
}; };
@SuppressWarnings("unused") @SuppressWarnings("unused")
@ -239,6 +240,7 @@ public abstract class DecryptFragment extends CryptoOperationFragment implements
static final int INDEX_IS_REVOKED = 3; static final int INDEX_IS_REVOKED = 3;
static final int INDEX_IS_EXPIRED = 4; static final int INDEX_IS_EXPIRED = 4;
static final int INDEX_VERIFIED = 5; static final int INDEX_VERIFIED = 5;
static final int INDEX_HAS_ANY_SECRET = 6;
@Override @Override
public Loader<Cursor> onCreateLoader(int id, Bundle args) { public Loader<Cursor> onCreateLoader(int id, Bundle args) {
@ -283,6 +285,7 @@ public abstract class DecryptFragment extends CryptoOperationFragment implements
boolean isRevoked = data.getInt(INDEX_IS_REVOKED) != 0; boolean isRevoked = data.getInt(INDEX_IS_REVOKED) != 0;
boolean isExpired = data.getInt(INDEX_IS_EXPIRED) != 0; boolean isExpired = data.getInt(INDEX_IS_EXPIRED) != 0;
boolean isVerified = data.getInt(INDEX_VERIFIED) > 0; boolean isVerified = data.getInt(INDEX_VERIFIED) > 0;
boolean isYours = data.getInt(INDEX_HAS_ANY_SECRET) != 0;
if (isRevoked) { if (isRevoked) {
mSignatureText.setText(R.string.decrypt_result_signature_revoked_key); mSignatureText.setText(R.string.decrypt_result_signature_revoked_key);
@ -302,6 +305,16 @@ public abstract class DecryptFragment extends CryptoOperationFragment implements
onVerifyLoaded(true); onVerifyLoaded(true);
} else if (isYours) {
mSignatureText.setText(R.string.decrypt_result_signature_secret);
KeyFormattingUtils.setStatusImage(getActivity(), mSignatureIcon, mSignatureText, State.VERIFIED);
setSignatureLayoutVisibility(View.VISIBLE);
setShowAction(signatureKeyId);
onVerifyLoaded(true);
} else if (isVerified) { } else if (isVerified) {
mSignatureText.setText(R.string.decrypt_result_signature_certified); mSignatureText.setText(R.string.decrypt_result_signature_certified);
KeyFormattingUtils.setStatusImage(getActivity(), mSignatureIcon, mSignatureText, State.VERIFIED); KeyFormattingUtils.setStatusImage(getActivity(), mSignatureIcon, mSignatureText, State.VERIFIED);

1
OpenKeychain/src/main/res/values/strings.xml
View File

@ -289,6 +289,7 @@
<string name="decrypt_result_no_signature">"Not Signed"</string> <string name="decrypt_result_no_signature">"Not Signed"</string>
<string name="decrypt_result_invalid_signature">"Invalid signature!"</string> <string name="decrypt_result_invalid_signature">"Invalid signature!"</string>
<string name="decrypt_result_signature_uncertified">"Signed by <b>unconfirmed</b> key"</string> <string name="decrypt_result_signature_uncertified">"Signed by <b>unconfirmed</b> key"</string>
<string name="decrypt_result_signature_secret">"Signed by your key"</string>
<string name="decrypt_result_signature_certified">"Signed by confirmed key"</string> <string name="decrypt_result_signature_certified">"Signed by confirmed key"</string>
<string name="decrypt_result_signature_expired_key">"Signed by <b>expired</b> key!"</string> <string name="decrypt_result_signature_expired_key">"Signed by <b>expired</b> key!"</string>
<string name="decrypt_result_signature_revoked_key">"Signed by <b>revoked</b> key!"</string> <string name="decrypt_result_signature_revoked_key">"Signed by <b>revoked</b> key!"</string>