X-pEp-Version = '2.1' <- using getProtocolVersion()

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<Pair<String, String>> opts = new ArrayList<>();
         Pair<String, String> xpEp = new Pair<>();
         xpEp.first = "X-pEp-Version";
-        xpEp.second = "2.1";
+        xpEp.second = this.getProtocolVersion();;
         opts.add(xpEp);
         msg.setOptFields(opts);
 

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