From 2e6b1ebccd8f7a196d849c96d3111abd110a9019 Mon Sep 17 00:00:00 2001 From: heck Date: Wed, 20 May 2020 00:27:13 +0200 Subject: [PATCH] X-pEp-Version = '2.1' <- using getProtocolVersion() --- src/foundation/pEp/jniadapter/AbstractEngine.java | 4 ++-- test/java/foundation/pEp/jniadapter/test/jni98/TestMain.java | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/foundation/pEp/jniadapter/AbstractEngine.java b/src/foundation/pEp/jniadapter/AbstractEngine.java index 0617e69..f492ccb 100644 --- a/src/foundation/pEp/jniadapter/AbstractEngine.java +++ b/src/foundation/pEp/jniadapter/AbstractEngine.java @@ -195,7 +195,7 @@ abstract class AbstractEngine extends UniquelyIdentifiable implements AutoClosea return 0; } - public static Message incomingMessageFromPGPText(String pgpText, Message.EncFormat encFormat) { + public Message incomingMessageFromPGPText(String pgpText, Message.EncFormat encFormat) { Message msg = new Message(); msg.setDir(Message.Direction.Incoming); msg.setEncFormat(encFormat); @@ -204,7 +204,7 @@ abstract class AbstractEngine extends UniquelyIdentifiable implements AutoClosea ArrayList> opts = new ArrayList<>(); Pair xpEp = new Pair<>(); xpEp.first = "X-pEp-Version"; - xpEp.second = "2.1"; + xpEp.second = this.getProtocolVersion();; opts.add(xpEp); msg.setOptFields(opts); diff --git a/test/java/foundation/pEp/jniadapter/test/jni98/TestMain.java b/test/java/foundation/pEp/jniadapter/test/jni98/TestMain.java index 7fac43a..129b6a0 100644 --- a/test/java/foundation/pEp/jniadapter/test/jni98/TestMain.java +++ b/test/java/foundation/pEp/jniadapter/test/jni98/TestMain.java @@ -126,9 +126,8 @@ class TestMain { // Create msg2 by using incomingMessageFromPGPText with the pgpText and EncFormat from msg1 logH2("incomingMessageFromPGPText()"); - Message msg2 = Engine.incomingMessageFromPGPText(pgpText, Message.EncFormat.PEP); + Message msg2 = env.engine.incomingMessageFromPGPText(pgpText, Message.EncFormat.PEP); log("\n" + msgToString(msg2, false)); - logH2("Verify msg2"); Engine.decrypt_message_Return result = null; result = env.engine.decrypt_message(msg2, env.vStr, 0); @@ -147,7 +146,7 @@ class TestMain { // Create msg2 by using incomingMessageFromPGPText with the pgpText and EncFormat from msg1 logH2("incomingMessageFromPGPText()"); - Message msg2 = Engine.incomingMessageFromPGPText(pgpText, ef); + Message msg2 = env.engine.incomingMessageFromPGPText(pgpText, ef); log("\n" + msgToString(msg2, false)); // Cant be just simply decrypted again