certifications text

2 files changed, 11 insertions, 2 deletions

diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpOperationOutgoing.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpOperationOutgoing.java
index 8431aa165..52e41306f 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpOperationOutgoing.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpOperationOutgoing.java
@@ -33,7 +33,6 @@ import org.spongycastle.openpgp.PGPSecretKeyRing;
 import org.spongycastle.openpgp.PGPSignature;
 import org.spongycastle.openpgp.PGPSignatureGenerator;
 import org.spongycastle.openpgp.PGPSignatureSubpacketGenerator;
-import org.spongycastle.openpgp.PGPUtil;
 import org.spongycastle.openpgp.PGPV3SignatureGenerator;
 import org.spongycastle.openpgp.operator.PBESecretKeyDecryptor;
 import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder;
@@ -308,6 +307,8 @@ public class PgpOperationOutgoing {
         OutputStream encryptionOut = null;
         BCPGOutputStream bcpgOut;
         if (enableEncryption) {
+            /* actual encryption */
+
             encryptionOut = cPk.open(out, new byte[1 << 16]);
 
             if (enableCompression) {
@@ -410,7 +411,7 @@ public class PgpOperationOutgoing {
         }
 
         // closing outputs
-        // NOTE: closing need to be done in the correct order!
+        // NOTE: closing needs to be done in the correct order!
         // TODO: closing bcpgOut and pOut???
         if (enableEncryption) {
             if (enableCompression) {
@@ -430,6 +431,7 @@ public class PgpOperationOutgoing {
     }
 
     // TODO: merge this into signAndEncrypt method!
+    // TODO: allow binary input for this class
     public void generateSignature()
             throws PgpGeneralException, PGPException, IOException, NoSuchAlgorithmException,
             SignatureException {
diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_certs_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/view_key_certs_fragment.xml
index 2a3dafc93..299471c66 100644
--- a/OpenPGP-Keychain/src/main/res/layout/view_key_certs_fragment.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/view_key_certs_fragment.xml
@@ -11,6 +11,13 @@
         android:paddingRight="16dp">
 
         <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
+            android:layout_marginTop="14dp"
+            android:text="Display of existing certifications is a planned feature for a later release of OpenPGP Keychain. Stay tuned for updates!" />
+
+        <TextView
             style="@style/SectionHeader"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"