From 40834d1fcd2208bdaf3a2faff1184e168f3c2e3f Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Mon, 27 Apr 2015 14:40:52 +0200
Subject: add distinct status for messages signed by "your" key

---
 .../org/sufficientlysecure/keychain/ui/DecryptFragment.java | 13 +++++++++++++
 OpenKeychain/src/main/res/values/strings.xml                |  1 +
 2 files changed, 14 insertions(+)

(limited to 'OpenKeychain')

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>
-- 
cgit v1.2.3