decrypting bugfixes

src/gen_cpp_Engine.ysl2

@@ -56,13 +56,13 @@ tstylesheet {
 
                 apply "parm[1]", mode=return {
                     with "name" > result
-                    with "jtype" > _«@name»_Result
+                    with "jtype" > Engine$_«@name»_Return
-                    with "sig" > ()V
+                    with "sig" > (Lorg/pEp/jniadapter/Engine;)V
-                    with "jnitype" >
+                    with "jnitype" > InnerClass
                 }
 
                 apply "parm[returns|creates]", mode=setresult
-                    with "jtype" > _«@name»_Result
+                    with "jtype" > org/pEp/jniadapter/Engine$_«@name»_Return
             }
 
             when "count(parm[returns|creates]) = 1" choose {
@@ -184,7 +184,10 @@ tstylesheet {
 
                 indent(1);
                 > «$name»_ = env->NewObject(clazz_«$name»_, constructor_«$name»_
-                if "$jnitype != ''" > , («$jnitype») _«$retname»
+                choose {
+                    when "$jnitype = 'InnerClass'" > , obj
+                    when "$jnitype != ''" > , («$jnitype») _«$retname»
+                }
                 > );\n
 
                 ||

src/jniutils.cc

@@ -46,6 +46,7 @@ namespace pEp {
             )
         {
             jclass clazz = findClass(env, classname);
+            assert(clazz);
 
             jfieldID field = env->GetFieldID(clazz, fieldname, signature);
             assert(field);

src/org/pEp/jniadapter/AbstractEngine.java

@@ -103,7 +103,7 @@ abstract class AbstractEngine implements AutoCloseable {
         Vector<String> result = new Vector<String>(list.size());
 
         for (int i=0; i<list.size(); i++)
-            result.set(i, toUTF16(list.get(i)));
+            result.add(toUTF16(list.get(i)));
 
         return result;
     }

src/types_java.ysl2

@@ -46,17 +46,17 @@ function "toSig" {
         otherwise {
             > L
             choose {
-                when "$type='stringlist'" > java.util.Vector
+                when "$type='stringlist'" > java/util/Vector
                 when "$type='string'" error | # cannot declare "string"
-                when "$type='message'" > org.pEp.jniadapter.Message
+                when "$type='message'" > org/pEp/jniadapter/Message
-                when "$type='identity'" > org.pEp.jniadapter._Identity
+                when "$type='identity'" > org/pEp/jniadapter/_Identity
-                when "$type='identitylist'" > java.util.Vector
+                when "$type='identitylist'" > java/util/Vector
-                when "$type='timestamp'" > java.util.Date
+                when "$type='timestamp'" > java/util/Date
-                when "$type='EncFormat'" > org.pEp.jniadapter.Message.EncFormat
+                when "$type='EncFormat'" > org/pEp/jniadapter/Message/EncFormat
-                when "$type='bloblist'" > java.util.Vector
+                when "$type='bloblist'" > java/util/Vector
-                when "$type='stringpairlist'" > java.util.ArrayList
+                when "$type='stringpairlist'" > java/util/ArrayList
-                when "$type='message'" > org.pEp.jniadapter.Message
+                when "$type='message'" > org/pEp/jniadapter/Message
-                when "$type='Color'" > org.pEp.jniadapter.Color
+                when "$type='Color'" > org/pEp/jniadapter/Color
             }
             > ;
         }

test/Testing.java

@@ -67,6 +67,14 @@ class Testing {
         catch (pEpException ex) {
             System.out.println("cannot measure outgoing message color");
         }
+
+        try {
+            Engine.decrypt_message_Return result = e.decrypt_message(enc);
+            System.out.println("decrypted");
+        }
+        catch (pEpException ex) {
+            System.out.println("cannot decrypt");
+        }
     }
 }