diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-27 14:40:52 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-27 17:46:07 +0200 |
| commit | 40834d1fcd2208bdaf3a2faff1184e168f3c2e3f (patch) | |
| tree | 1396209d6fb65062d65aa8acf9c85b3ed4994871 /OpenKeychain | |
| parent | 8dbb82a8b61922e788e844e747b43f1838e6e58f (diff) | |
| download | open-keychain-40834d1fcd2208bdaf3a2faff1184e168f3c2e3f.tar.gz open-keychain-40834d1fcd2208bdaf3a2faff1184e168f3c2e3f.tar.bz2 open-keychain-40834d1fcd2208bdaf3a2faff1184e168f3c2e3f.zip | |
add distinct status for messages signed by "your" key
Diffstat (limited to 'OpenKeychain')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java | 13 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 1 |
2 files changed, 14 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java index 651b56ab0..9c51893ce 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java @@ -231,6 +231,7 @@ public abstract class DecryptFragment extends CryptoOperationFragment implements KeychainContract.KeyRings.IS_REVOKED, KeychainContract.KeyRings.IS_EXPIRED, KeychainContract.KeyRings.VERIFIED, + KeychainContract.KeyRings.HAS_ANY_SECRET, }; @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_EXPIRED = 4; static final int INDEX_VERIFIED = 5; + static final int INDEX_HAS_ANY_SECRET = 6; @Override 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 isExpired = data.getInt(INDEX_IS_EXPIRED) != 0; boolean isVerified = data.getInt(INDEX_VERIFIED) > 0; + boolean isYours = data.getInt(INDEX_HAS_ANY_SECRET) != 0; if (isRevoked) { mSignatureText.setText(R.string.decrypt_result_signature_revoked_key); @@ -302,6 +305,16 @@ public abstract class DecryptFragment extends CryptoOperationFragment implements 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) { mSignatureText.setText(R.string.decrypt_result_signature_certified); KeyFormattingUtils.setStatusImage(getActivity(), mSignatureIcon, mSignatureText, State.VERIFIED); diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 4d92dac20..ffdd86259 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -287,6 +287,7 @@ <string name="decrypt_result_no_signature">"Not Signed"</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_secret">"Signed by your 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_revoked_key">"Signed by <b>revoked</b> key!"</string> |