From 25190fc5df41ad3a6c2acb245d6abf63ce7d197a Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Tue, 22 Nov 2022 16:27:34 +0100
Subject: [PATCH] SOP: Use new MessageMetadata class

---
 .../decryption_verification/MessageMetadata.java          | 4 ++++
 .../src/main/java/org/pgpainless/sop/DecryptImpl.java     | 6 +++---
 .../main/java/org/pgpainless/sop/InlineVerifyImpl.java    | 8 ++++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/MessageMetadata.java b/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/MessageMetadata.java
index 8c18eadb..648b99ab 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/MessageMetadata.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/MessageMetadata.java
@@ -69,6 +69,10 @@ public class MessageMetadata {
         return resultBuilder.build();
     }
 
+    public boolean isUsingCleartextSignatureFramework() {
+        return message.isCleartextSigned();
+    }
+
     public boolean isEncrypted() {
         SymmetricKeyAlgorithm algorithm = getEncryptionAlgorithm();
         return algorithm != null && algorithm != SymmetricKeyAlgorithm.NULL;
diff --git a/pgpainless-sop/src/main/java/org/pgpainless/sop/DecryptImpl.java b/pgpainless-sop/src/main/java/org/pgpainless/sop/DecryptImpl.java
index ee86f5e8..867024ef 100644
--- a/pgpainless-sop/src/main/java/org/pgpainless/sop/DecryptImpl.java
+++ b/pgpainless-sop/src/main/java/org/pgpainless/sop/DecryptImpl.java
@@ -21,7 +21,7 @@ import org.pgpainless.PGPainless;
 import org.pgpainless.algorithm.SymmetricKeyAlgorithm;
 import org.pgpainless.decryption_verification.ConsumerOptions;
 import org.pgpainless.decryption_verification.DecryptionStream;
-import org.pgpainless.decryption_verification.OpenPgpMetadata;
+import org.pgpainless.decryption_verification.MessageMetadata;
 import org.pgpainless.decryption_verification.SignatureVerification;
 import org.pgpainless.exception.MalformedOpenPgpMessageException;
 import org.pgpainless.exception.MissingDecryptionMethodException;
@@ -136,14 +136,14 @@ public class DecryptImpl implements Decrypt {
             public DecryptionResult writeTo(OutputStream outputStream) throws IOException, SOPGPException.NoSignature {
                 Streams.pipeAll(decryptionStream, outputStream);
                 decryptionStream.close();
-                OpenPgpMetadata metadata = decryptionStream.getResult();
+                MessageMetadata metadata = decryptionStream.getMetadata();
 
                 if (!metadata.isEncrypted()) {
                     throw new SOPGPException.BadData("Data is not encrypted.");
                 }
 
                 List<Verification> verificationList = new ArrayList<>();
-                for (SignatureVerification signatureVerification : metadata.getVerifiedInbandSignatures()) {
+                for (SignatureVerification signatureVerification : metadata.getVerifiedInlineSignatures()) {
                     verificationList.add(map(signatureVerification));
                 }
 
diff --git a/pgpainless-sop/src/main/java/org/pgpainless/sop/InlineVerifyImpl.java b/pgpainless-sop/src/main/java/org/pgpainless/sop/InlineVerifyImpl.java
index 82ed4282..f33f718b 100644
--- a/pgpainless-sop/src/main/java/org/pgpainless/sop/InlineVerifyImpl.java
+++ b/pgpainless-sop/src/main/java/org/pgpainless/sop/InlineVerifyImpl.java
@@ -17,7 +17,7 @@ import org.bouncycastle.util.io.Streams;
 import org.pgpainless.PGPainless;
 import org.pgpainless.decryption_verification.ConsumerOptions;
 import org.pgpainless.decryption_verification.DecryptionStream;
-import org.pgpainless.decryption_verification.OpenPgpMetadata;
+import org.pgpainless.decryption_verification.MessageMetadata;
 import org.pgpainless.decryption_verification.SignatureVerification;
 import org.pgpainless.exception.MalformedOpenPgpMessageException;
 import org.pgpainless.exception.MissingDecryptionMethodException;
@@ -63,12 +63,12 @@ public class InlineVerifyImpl implements InlineVerify {
                     Streams.pipeAll(decryptionStream, outputStream);
                     decryptionStream.close();
 
-                    OpenPgpMetadata metadata = decryptionStream.getResult();
+                    MessageMetadata metadata = decryptionStream.getMetadata();
                     List<Verification> verificationList = new ArrayList<>();
 
-                    List<SignatureVerification> verifications = metadata.isCleartextSigned() ?
+                    List<SignatureVerification> verifications = metadata.isUsingCleartextSignatureFramework() ?
                             metadata.getVerifiedDetachedSignatures() :
-                            metadata.getVerifiedInbandSignatures();
+                            metadata.getVerifiedInlineSignatures();
 
                     for (SignatureVerification signatureVerification : verifications) {
                         verificationList.add(map(signatureVerification));